Merge remote-tracking branch 'origin/feature_dev_20221010_extend' into feature_dev_20221010_extend

2022-10-28 15:12:30 +08:00
parent a5152885f9 90810956fa
commit 44d8dea8a7
1 changed files with 4 additions and 4 deletions
@@ -397,7 +397,7 @@
        return str
      },
      handleOk() {
-        // if (!this.isNullArray(this.queryParamsModel)) {
+        if (!this.isNullArray(this.queryParamsModel)) {
          let event = {
            matchType: this.matchType,
            params: this.removeEmptyObject(this.queryParamsModel)
@@ -407,9 +407,9 @@
            this.visible = false
          }
          this.emitCallback(event)
-        // } else {
-        //   this.$message.warn(this.$t('CannotQueryEmpty'))
-        // }
+        } else {
+          this.$message.warn(this.$t('CannotQueryEmpty'))
+        }
      },
      emitCallback(event = {}) {
        let { params = [], matchType = this.matchType } = event