vue2-client 1.18.52 → 1.18.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.18.52",
+  "version": "1.18.53",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XForm/XForm.vue

@@ -516,19 +516,6 @@ export default {
     },
     setForm(obj) {
       this.form = Object.assign(this.form, obj)
-    },
-    /**
-     * 主动触发表单提交
-     * 用于 queryTable 等场景，确保走相同的数据处理流程
-     * @param {Object} conditionParams - 额外的查询条件参数
-     */
-    submitForm(conditionParams = {}) {
-      // 将外部参数合并到表单中
-      if (Object.keys(conditionParams).length > 0) {
-        this.form = Object.assign({}, this.form, conditionParams)
-      }
-      // 调用现有的 onSubmit 方法，触发 emit
-      this.onSubmit()
     }
   },
   mounted() {

package/src/base-client/components/common/XFormTable/XFormTable.vue

@@ -1032,10 +1032,7 @@ export default {
       if (this.tableShowMode === 'popup') {
         this.formQueryLoading = true
       }
-      // 调用 XForm 的 submitForm 方法
-      // 这会触发 emit 'onSubmit'，然后走现有的 onSearchSubmit 逻辑
-      // 最终通过 setQueryForm → refresh → loadData 进行数据处理
-      this.$refs.xForm.submitForm(conditionParams)
+      this.$refs.xTable.queryTable(conditionParams)
     },
     /**
      * 向外暴露 resetForm 函数

package/src/base-client/components/common/XTable/XTable.vue

@@ -1220,6 +1220,18 @@ export default {
       // 如果要实质修改 form 需要在 x-form 中赋值
       const _from = JSON.parse(JSON.stringify(this.form))
       this.form = Object.assign(_from, conditionParams)
+      for (const key of Object.keys(this.form)) {
+        if (this.form[key] === null || this.form[key] === '') {
+          this.form[key] = undefined
+        }
+        // 树形选择框重置后会重置为[undefined],查询时为[null]
+        if (
+          Array.isArray(this.form[key]) &&
+          (this.form[key].length === 0 || this.form[key][0] === null || this.form[key][0] === undefined)
+        ) {
+          this.form[key] = undefined
+        }
+      }
       await this.refresh(true)
       this.form = _from
     },