vue2-client 1.18.51 → 1.18.53

package/.eslintrc.js

@@ -12,17 +12,7 @@ module.exports = {
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'generator-star-spacing': 'off',
     'no-mixed-operators': 0,
-    'vue/max-attributes-per-line': [
-      2,
-      {
-        singleline: {
-          max: 5
-        },
-        multiline: {
-          max: 1
-        }
-      }
-    ],
+    'vue/max-attributes-per-line': 'off',
     'vue/attribute-hyphenation': 0,
     'vue/html-self-closing': 0,
     'vue/component-name-in-template-casing': 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.18.51",
+  "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/XAddNativeForm/XAddNativeForm.vue

@@ -1,17 +1,10 @@
 <template>
   <div id="XAddNativeForm">
-    <a-form-model
-      v-if="loaded"
-      ref="selectForm"
-      :zIndex="1001"
-      :model="form"
-      v-bind="formItemLayoutGen"
-      :layout="layout">
+    <!-- 骨架屏 -->
+    <a-skeleton v-if="!loaded" active :paragraph="{ rows: 3 }" />
+    <a-form-model v-else ref="selectForm" :zIndex="1001" :model="form" v-bind="formItemLayoutGen" :layout="layout">
       <template v-for="(item, key) in childTableData">
-        <a-row
-          v-if="childTablePriority"
-          :gutter="16"
-          :key="'childTableRow' + key">
+        <a-row v-if="childTablePriority" :gutter="16" :key="'childTableRow' + key">
           <a-card :title="item.name" :bordered="false" size="small">
             <x-form-table
               :key="'childTable_' + item.model"
@@ -22,21 +15,14 @@
               :service-name="serviceName"
               @innerXFormTableEmit="innerXFormTableEmit"
               @afterTableInit="childTableMounted(item)"
-              :ref="'childXFormTable_' + item.model">
-            </x-form-table>
+              :ref="'childXFormTable_' + item.model"
+            ></x-form-table>
           </a-card>
         </a-row>
       </template>
       <template v-if="isSimpleInlineMode">
-        <a-row
-          v-for="(row, rowIndex) in simpleInlineRows"
-          :key="'simple-row-' + rowIndex"
-          :gutter="0"
-          type="flex">
-          <a-col
-            v-for="(item, itemIndex) in row.items"
-            :key="'simple-item-' + itemIndex"
-            :span="item.span">
+        <a-row v-for="(row, rowIndex) in simpleInlineRows" :key="'simple-row-' + rowIndex" :gutter="0" type="flex">
+          <a-col v-for="(item, itemIndex) in row.items" :key="'simple-item-' + itemIndex" :span="item.span">
             <x-form-item
               class="simple-inline-item"
               :attr="item.formItem"
@@ -64,25 +50,26 @@
         <a-col :span="3" v-if="!inXFormGroup && !(groups[0].groupName === DEFAULT_GROUP_NAME)">
           <a-tabs tab-position="left" v-model="activeTab" @change="scrollToGroup">
             <a-tab-pane
-              v-for="(groupsItem,groupsIndex) in groups"
+              v-for="(groupsItem, groupsIndex) in groups"
               :tab="groupsItem.groupName"
-              :key="groupsIndex">
-            </a-tab-pane>
+              :key="groupsIndex"
+            ></a-tab-pane>
           </a-tabs>
         </a-col>
-        <a-col
-          :span="(!inXFormGroup && !(groups[0].groupName === DEFAULT_GROUP_NAME)) ? 21: 24">
-          <a-row
-            :gutter="16"
-            type="flex"
-            :key="groupsIndex"
-            v-for="(groupsItem,groupsIndex) in groups"
-          >
+        <a-col :span="!inXFormGroup && !(groups[0].groupName === DEFAULT_GROUP_NAME) ? 21 : 24">
+          <a-row :gutter="16" type="flex" :key="groupsIndex" v-for="(groupsItem, groupsIndex) in groups">
             <a-col
               :span="24"
-              :style="{ marginTop: groupsIndex === 0 ? '' : '8px',fontSize:inXFormGroup?'15px':'14px', marginLeft:'-5px' }"
-              v-if="groupsItem.groupName !== DEFAULT_GROUP_NAME">
-              <span class="xFormGroupTitle" :ref="`group-title-${groupsIndex}`">{{ groupsItem.groupName }}</span>
+              :style="{
+                marginTop: groupsIndex === 0 ? '' : '8px',
+                fontSize: inXFormGroup ? '15px' : '14px',
+                marginLeft: '-5px'
+              }"
+              v-if="groupsItem.groupName !== DEFAULT_GROUP_NAME"
+            >
+              <span class="xFormGroupTitle" :ref="`group-title-${groupsIndex}`">
+                {{ groupsItem.groupName }}
+              </span>
             </a-col>
             <x-form-item
               v-for="(item, index) in groupsItem.realJsonData"
@@ -92,7 +79,7 @@
               :read-only="readonly(item)"
               :files="files"
               v-bind="formItemLayoutGen"
-              :style="layout === 'inline' ? { marginTop:'5px' } : undefined"
+              :style="layout === 'inline' ? { marginTop: '5px' } : undefined"
               :form="form"
               :images="images"
               :enablePopupToBody="enablePopupToBody"
@@ -119,7 +106,7 @@
             :readonly="readonly(item)"
             :files="files"
             v-bind="formItemLayoutGen"
-            :style="layout ==='inline'?{marginTop:'5px'}:undefined"
+            :style="layout === 'inline' ? { marginTop: '5px' } : undefined"
             :form="form[groupItem.model]"
             :images="images"
             :service-name="serviceName"
@@ -137,7 +124,8 @@
             :form="form"
             :model="groupItem.model"
             :rules="rules"
-            :modifyModelData="modifyModelData"></slot>
+            :modifyModelData="modifyModelData"
+          ></slot>
         </template>
       </a-row>
       <a-row :gutter="16" v-for="(item, key) in simpleFormJsonData" :key="'row' + key" v-if="!isSimpleInlineMode">
@@ -151,7 +139,7 @@
             :files="files"
             :enablePopupToBody="enablePopupToBody"
             v-bind="formItemLayoutGen"
-            :style="layout ==='inline'?{marginTop:'5px'}:undefined"
+            :style="layout === 'inline' ? { marginTop: '5px' } : undefined"
             :form="form[groupItem.model]"
             :images="images"
             :service-name="serviceName"
@@ -165,10 +153,7 @@
         </a-card>
       </a-row>
       <template v-for="(item, key) in childTableData">
-        <a-row
-          v-if="!childTablePriority"
-          :gutter="16"
-          :key="'childTableRow' + key">
+        <a-row v-if="!childTablePriority" :gutter="16" :key="'childTableRow' + key">
           <a-card :title="item.name" :bordered="false" size="small">
             <x-form-table
               :key="'childTable_' + item.model"
@@ -179,14 +164,16 @@
               :fixed-query-form="childTableFixedQueryForm(item)"
               :service-name="serviceName"
               @afterTableInit="childTableMounted(item)"
-              :ref="'childXFormTable_' + item.model">
-            </x-form-table>
+              :ref="'childXFormTable_' + item.model"
+            ></x-form-table>
           </a-card>
         </a-row>
       </template>
-      <a-row type="flex" :justify="btnPlace" :style="{paddingLeft: '16px',paddingRight: '16px'}">
+      <a-row type="flex" :justify="btnPlace" :style="{ paddingLeft: '16px', paddingRight: '16px' }">
         <slot name="footer" :loading="loading">
-          <a-button v-if="showSubmitBtn" :loading="loading" type="primary" @click="onSubmit()">{{ btnName }}</a-button>
+          <a-button v-if="showSubmitBtn" :loading="loading" type="primary" @click="onSubmit()">
+            {{ btnName }}
+          </a-button>
         </slot>
       </a-row>
     </a-form-model>
@@ -233,7 +220,7 @@ export default {
       default: false
     }
   },
-  data () {
+  data() {
     return {
       DEFAULT_GROUP_NAME,
       // 预览模式
@@ -290,18 +277,26 @@ export default {
   computed: {
     // 过滤出用于新增/修改场景的表单项
     realJsonData: function () {
-      return this.formItems.filter((item) => {
-        return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version' && !this.itemDisabled(item)
+      return this.formItems.filter(item => {
+        return (
+          item.addOrEdit &&
+          item.addOrEdit !== 'no' &&
+          item.addOrEdit !== 'silenceAdd' &&
+          item.addOrEdit !== 'version' &&
+          !this.itemDisabled(item)
+        )
       })
     },
     // 表单项组 / 不是 数据组
     groups: function () {
       if (!this.realJsonData || this.realJsonData.length === 0) {
-        return [{
-          groupName: DEFAULT_GROUP_NAME,
-          realJsonData: this.realJsonData,
-          xAddFormLayout: 'horizontal'
-        }]
+        return [
+          {
+            groupName: DEFAULT_GROUP_NAME,
+            realJsonData: this.realJsonData,
+            xAddFormLayout: 'horizontal'
+          }
+        ]
       }
       const uniqueGroups = new Set(this.realJsonData.map(item => item.group).filter(Boolean))
       const allGroup = Array.from(uniqueGroups).map(group => {
@@ -315,46 +310,57 @@ export default {
       if (allGroup.reduce((total, item) => total + item.realJsonData.length, 0) === this.realJsonData.length) {
         return allGroup
       } else {
-        return [{
-          groupName: DEFAULT_GROUP_NAME,
-          realJsonData: this.realJsonData,
-          xAddFormLayout: 'horizontal'
-        }]
+        return [
+          {
+            groupName: DEFAULT_GROUP_NAME,
+            realJsonData: this.realJsonData,
+            xAddFormLayout: 'horizontal'
+          }
+        ]
       }
     },
     // 拥有自定义校验函数得表单项
     customValidateItems: function () {
-      return this.formItems.filter((item) => {
+      return this.formItems.filter(item => {
         return item?.rule?.type === 'customJs'
       })
     },
     // 过滤出用于新增/修改场景的表单项
     groupJsonData: function () {
-      return this.formItems.filter((item) => {
-        return item.type === 'group'
-      }).map((item) => {
-          item.groupItems = item.groupItems.filter((item) => {
-            return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version' && !this.itemDisabled(item)
-          }).map((groupItem) => {
-            // 只保留第一个下划线后面的内容
-            //  多层校验规则需要将prop设置为 key1.key2.....
-            groupItem.prop = `${item.model}.${groupItem.model.substring(groupItem.model.indexOf('_') + 1)}`
-            groupItem.model = groupItem.model.substring(groupItem.model.indexOf('_') + 1)
-            return groupItem
-          })
+      return this.formItems
+        .filter(item => {
+          return item.type === 'group'
+        })
+        .map(item => {
+          item.groupItems = item.groupItems
+            .filter(item => {
+              return (
+                item.addOrEdit &&
+                item.addOrEdit !== 'no' &&
+                item.addOrEdit !== 'silenceAdd' &&
+                item.addOrEdit !== 'version' &&
+                !this.itemDisabled(item)
+              )
+            })
+            .map(groupItem => {
+              // 只保留第一个下划线后面的内容
+              //  多层校验规则需要将prop设置为 key1.key2.....
+              groupItem.prop = `${item.model}.${groupItem.model.substring(groupItem.model.indexOf('_') + 1)}`
+              groupItem.model = groupItem.model.substring(groupItem.model.indexOf('_') + 1)
+              return groupItem
+            })
           return item
-        }
-      )
+        })
     },
     // 过滤出用于子表数据新增/修改场景的表单项
     childTableData: function () {
-      return this.formItems.filter((item) => {
+      return this.formItems.filter(item => {
         return item.type === 'childTable'
       })
     },
     // 过滤出用于form子表数据新增/修改场景的表单项
     childFormData: function () {
-      return this.formItems.filter((item) => {
+      return this.formItems.filter(item => {
         return item.type === 'rowEdit'
       })
     },
@@ -370,7 +376,7 @@ export default {
         return item.addOrEdit === 'version'
       })
     },
-    formItemLayoutGen () {
+    formItemLayoutGen() {
       if (this.layout === 'simple-inline') {
         return {
           labelCol: { span: 0 },
@@ -382,16 +388,16 @@ export default {
         if (this.enableHorizontalCustom && this.formItemLayout) {
           return {
             labelCol: {
-              span: (this.formItemLayout.labelCol ?? 4),
-              offset: (this.formItemLayout.offset ?? 2)
+              span: this.formItemLayout.labelCol ?? 4,
+              offset: this.formItemLayout.offset ?? 2
             },
-            wrapperCol: { span: (this.formItemLayout.wrapperCol ?? 14) },
+            wrapperCol: { span: this.formItemLayout.wrapperCol ?? 14 }
           }
         }
         // 默认配置
         return {
           labelCol: { span: 4, offset: 2 },
-          wrapperCol: { span: 14 },
+          wrapperCol: { span: 14 }
         }
       } else if (this.layout === 'vertical') {
         return {}
@@ -399,35 +405,35 @@ export default {
         if (!this.formItemLayout.labelCol || !this.formItemLayout.wrapperCol) {
           return {
             labelCol: { span: 8 },
-            wrapperCol: { span: 16 },
+            wrapperCol: { span: 16 }
           }
         }
         return {
           labelCol: { span: this.formItemLayout.labelCol },
-          wrapperCol: { span: this.formItemLayout.wrapperCol },
+          wrapperCol: { span: this.formItemLayout.wrapperCol }
         }
       }
     },
     // simple-inline模式判断
-    isSimpleInlineMode () {
+    isSimpleInlineMode() {
       return this.layout === 'simple-inline' && this.simpleInline
     },
     // simple-inline布局行数据
-    simpleInlineRows () {
+    simpleInlineRows() {
       if (!this.isSimpleInlineMode) return []
       return this.simpleInline.rows.map(row => ({
         ...row,
-        items: row.items.map(item => ({
-          ...item,
-          formItem: this.realJsonData.find(f =>
-            f.model === item.key && f.name === item.title
-          )
-        })).filter(item => item.formItem)
+        items: row.items
+          .map(item => ({
+            ...item,
+            formItem: this.realJsonData.find(f => f.model === item.key && f.name === item.title)
+          }))
+          .filter(item => item.formItem)
       }))
     },
     ...mapState('account', { currUser: 'user' })
   },
-  provide () {
+  provide() {
     return {
       getComponentByName: this.getComponentByName,
       registerComponent: this.registerComponent,
@@ -436,12 +442,12 @@ export default {
       removeRequired: this.removeRequired,
       // 设置必填项
       setRequired: this.setRequired,
-      getSelf: () => this,
+      getSelf: () => this
     }
   },
   watch: {
     form: {
-      handler (val) {
+      handler(val) {
         if (this.formDataChange && typeof this.formDataChange === 'function') {
           this.formDataChange(val)
         }
@@ -490,7 +496,7 @@ export default {
     runLogic,
     getConfigByNameAsync,
     getConfigByName,
-    init (params) {
+    init(params) {
       const {
         configName,
         configContent,
@@ -600,25 +606,25 @@ export default {
       }
       this.loaded = true
     },
-    scrollToGroup (index) {
+    scrollToGroup(index) {
       const groupElement = this.$refs[`group-title-${index}`][0]
       if (groupElement) {
         groupElement.scrollIntoView({ behavior: 'smooth' })
       }
     },
-    registerComponent (componentName, component) {
+    registerComponent(componentName, component) {
       console.log('内部注册', this.$options.name, componentName)
       this.$refs[componentName] = component
       console.log('内部注册完成', this.$refs)
     },
     // 根据名字从注册到组件中获取组件
-    getComponentByName (componentName) {
+    getComponentByName(componentName) {
       console.log('内部取组件', this.$options.name, componentName)
       console.log('内部组件内容', this.$refs)
       return this.$refs[componentName]
     },
     // 兼容需要省略 传递 [formItems: res.formJson ] 可以使用 ...res 展开运算符 直接转递
-    getFromItem (formItems, formJson) {
+    getFromItem(formItems, formJson) {
       const _formItems = formItems || formJson
       if (typeof formItems === 'string') {
         return JSON.parse(_formItems)
@@ -626,12 +632,12 @@ export default {
         return JSON.parse(JSON.stringify(_formItems))
       }
     },
-    innerXFormTableEmit (fun, record, id, actionType, index) {
+    innerXFormTableEmit(fun, record, id, actionType, index) {
       this.$emit(fun, record, id, actionType, index)
     },
     // 时间组件赋默认值
     // .type, item.formDefault
-    getDateRange ({ type, formDefault: defaultValue, formValueFormat }) {
+    getDateRange({ type, formDefault: defaultValue, formValueFormat }) {
       // const format = type === 'datePicker' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss'
       let format = 'YYYY-MM-DD HH:mm:ss'
       if (formValueFormat) {
@@ -656,15 +662,22 @@ export default {
       }
       return start
     },
-    setFormProps (formData, item, groupItem) {
+    setFormProps(formData, item, groupItem) {
       const rulesKey = `${item.name}${item.model}`
       if (formData[item.model] === undefined || formData[item.model] === null) {
         formData[item.model] = undefined
       }
       if (!formData[item.model] && item.formDefault) {
-        if (['datePicker', 'rangePicker', 'yearPicker', 'monthPicker', 'yearRangePicker', 'monthRangePicker'].includes(item.type)) {
+        if (
+          ['datePicker', 'rangePicker', 'yearPicker', 'monthPicker', 'yearRangePicker', 'monthRangePicker'].includes(
+            item.type
+          )
+        ) {
           formData[item.model] = this.getDateRange(item)
-        } else if (['treeSelect', 'select', 'checkbox'].includes(item.type) && ['curOrgId', 'curDepId', 'curUserId'].includes(item.formDefault)) {
+        } else if (
+          ['treeSelect', 'select', 'checkbox'].includes(item.type) &&
+          ['curOrgId', 'curDepId', 'curUserId'].includes(item.formDefault)
+        ) {
           if (item.formDefault === 'curOrgId') {
             formData[item.model] = item.type === 'select' ? this.currUser.orgid : [this.currUser.orgid]
           }
@@ -721,7 +734,7 @@ export default {
           const minCount = Number(item.minAcceptCount)
           this.rules[rulesArrayKey].push({
             validator: (rule, value, callback) => {
-              const count = Array.isArray(value) ? value.length : (value ? 1 : 0)
+              const count = Array.isArray(value) ? value.length : value ? 1 : 0
               if ((required || count > 0) && count < minCount) {
                 callback(new Error(`请至少上传${minCount}个${item.name}`))
               } else {
@@ -760,7 +773,7 @@ export default {
             this.rules[rulesArrayKey].push({
               type: item.rule.type,
               message: item.name + '必须为' + message,
-              transform: (value) => {
+              transform: value => {
                 if (value && value.length !== 0) {
                   return Number(value)
                 } else {
@@ -884,27 +897,38 @@ export default {
         }
       }
     },
-    childTableMounted (item) {
+    childTableMounted(item) {
       // 子表初始化时，设置表格数据
       if (this.form[item.model] && this.form[item.model].length > 0) {
         this.$refs[`childXFormTable_${item.model}`][0].setTableData(this.form[item.model])
       }
     },
-    customJsValidate (rule, value, callback, item) {
+    customJsValidate(rule, value, callback, item) {
       if (item.rule.customValidatorFunc) {
-        executeStrFunctionByContext(this, item.rule.customValidatorFunc, [rule, value, callback, this.form, item, this.util, runLogic, getConfigByNameAsync])
+        executeStrFunctionByContext(this, item.rule.customValidatorFunc, [
+          rule,
+          value,
+          callback,
+          this.form,
+          item,
+          this.util,
+          runLogic,
+          getConfigByNameAsync
+        ])
       } else {
         callback()
       }
     },
-    itemDisabled (value) {
-      return (this.businessType === '新增' && value.addOrEdit === 'edit') ||
+    itemDisabled(value) {
+      return (
+        (this.businessType === '新增' && value.addOrEdit === 'edit') ||
         (this.businessType === '修改' && value.addOrEdit === 'add')
+      )
     },
-    readonly (value) {
+    readonly(value) {
       return value.addOrEdit === 'readonly'
     },
-    async onSubmit () {
+    async onSubmit() {
       const valid = await this.validateForm()
       if (!valid) return false
       if (this.viewMode) {
@@ -964,7 +988,7 @@ export default {
       }
     },
 
-    async asyncSubmit () {
+    async asyncSubmit() {
       return new Promise((resolve, reject) => {
         this.$refs.selectForm.validate(async valid => {
           if (!valid) {
@@ -987,13 +1011,13 @@ export default {
       })
     },
 
-    validateForm () {
-      return new Promise((resolve) => {
+    validateForm() {
+      return new Promise(resolve => {
         this.$refs.selectForm.validate(valid => resolve(valid))
       })
     },
 
-    childTableFixedQueryForm (item) {
+    childTableFixedQueryForm(item) {
       if (this.modifyModelData?.primaryKeyData) {
         const fixedForm = {}
         fixedForm[item.childTableForeignKeyName] = Object.values(this.modifyModelData.primaryKeyData)[0]
@@ -1002,7 +1026,7 @@ export default {
       return null
     },
 
-    prepareForm () {
+    prepareForm() {
       const form = { ...this.form }
       for (const key of Object.keys(form)) {
         const value = form[key]
@@ -1013,7 +1037,7 @@ export default {
       return form
     },
 
-    async appendSilenceAddFields (form) {
+    async appendSilenceAddFields(form) {
       if (this.businessType === '新增') {
         for (const item of this.silenceAddJsonData) {
           switch (item.silencePurpose) {
@@ -1040,7 +1064,7 @@ export default {
               break
           }
         }
-        for (const item of this.silenceAddJsonData.filter((item) => item.silencePurpose === 'customize')) {
+        for (const item of this.silenceAddJsonData.filter(item => item.silencePurpose === 'customize')) {
           const result = await runLogic(item.silenceSource, form, this.serviceName)
           if (result) {
             const keys = Object.keys(result)
@@ -1056,7 +1080,7 @@ export default {
       }
     },
 
-    handleFormKeys (form, mustHandleKey = false) {
+    handleFormKeys(form, mustHandleKey = false) {
       const realForm = {}
       for (const key of Object.keys(form)) {
         const value = form[key]
@@ -1081,7 +1105,7 @@ export default {
       return realForm
     },
     // 默认提交事件
-    defaultSubmit (realForm, callback) {
+    defaultSubmit(realForm, callback) {
       // 新增移除id
       if (this.businessType === '新增') {
         delete realForm.id
@@ -1094,21 +1118,28 @@ export default {
         businessType: this.businessType,
         operator: this.currUser.name
       }
-      addOrModify(requestParameters, this.serviceName, this.env === 'dev').then(data => {
-        this.$message.success(this.businessType + '成功！')
-        // commit
-        this.$emit('afterSubmit', { type: this.businessType, id: data.id, data: data, form: requestParameters.form })
-        this.loading = false
-        if (callback) {
-          callback()
-        }
-      }).catch(e => {
-        this.loading = false
-        this.$message.error(this.businessType + '失败：' + e)
-      })
+      addOrModify(requestParameters, this.serviceName, this.env === 'dev')
+        .then(data => {
+          this.$message.success(this.businessType + '成功！')
+          // commit
+          this.$emit('afterSubmit', {
+            type: this.businessType,
+            id: data.id,
+            data: data,
+            form: requestParameters.form
+          })
+          this.loading = false
+          if (callback) {
+            callback()
+          }
+        })
+        .catch(e => {
+          this.loading = false
+          this.$message.error(this.businessType + '失败：' + e)
+        })
     },
     // 获取表单字段实际值
-    getRealKey (key, mustHandleKey = false) {
+    getRealKey(key, mustHandleKey = false) {
       if (key === 'selected_id') return key
       if (this.isHandleFormKey || mustHandleKey) {
         return key.substring(key.indexOf('_') + 1)
@@ -1120,7 +1151,7 @@ export default {
      * 获取被修改记录数据
      * @param modifyModelData 被修改记录的数据
      */
-    getModifyModelData (modifyModelData) {
+    getModifyModelData(modifyModelData) {
       if (modifyModelData.primaryKeyData) {
         this.form = Object.assign(this.form, modifyModelData.primaryKeyData)
       }
@@ -1179,7 +1210,7 @@ export default {
         }
       }
     },
-    setForm (obj) {
+    setForm(obj) {
       this.form = Object.assign(this.form, obj)
       // 给子表赋外键条件
       if (this.childFormData.length > 0) {
@@ -1190,7 +1221,9 @@ export default {
           // 有主键，且主键有值，添加主键条件
           if (this.primaryKey && this.form[this.primaryKey]) {
             const foreignKey = item.foreignKey
-            const fixedQueryForm = { [alias + '_' + foreignKey]: this.form[this.primaryKey] }
+            const fixedQueryForm = {
+              [alias + '_' + foreignKey]: this.form[this.primaryKey]
+            }
             if (!child.fixedQueryForm) {
               child.fixedQueryForm = fixedQueryForm
             } else {
@@ -1201,21 +1234,21 @@ export default {
         }
       }
     },
-    setFormWithKey (obj) {
+    setFormWithKey(obj) {
       setDataByRealKey(this.form, obj)
     },
-    setFormWithNoKey (obj) {
+    setFormWithNoKey(obj) {
       setDataByRealKey(this.form, obj)
     },
-    emitFunc (func, data, value) {
+    emitFunc(func, data, value) {
       this.$emit(func, data, value)
       this.$emit('x-form-item-emit-func', func, data, value)
     },
     // 直接转发事件的函数
-    emitEvent (event, ...args) {
+    emitEvent(event, ...args) {
       this.$emit(event, ...args)
     },
-    close () {
+    close() {
       this.loaded = false
     },
     /**
@@ -1223,13 +1256,21 @@ export default {
      * @param row 选中行集合
      * @param attr 表单项属性
      */
-    async rowChoose (row, attr, callback) {
+    async rowChoose(row, attr, callback) {
       // 如果配置了自定义函数
       if (attr.dataChangeFunc) {
-        await executeStrFunction(attr.dataChangeFunc, [this.form, this.setForm, {
-          ...attr,
-          selectRows: row
-        }, util, this.mode, runLogic, getConfigByNameAsync])
+        await executeStrFunction(attr.dataChangeFunc, [
+          this.form,
+          this.setForm,
+          {
+            ...attr,
+            selectRows: row
+          },
+          util,
+          this.mode,
+          runLogic,
+          getConfigByNameAsync
+        ])
       } else {
         // 默认填充选中行数据到当前表单
         setDataByRealKey(this.form, row[0])
@@ -1237,13 +1278,13 @@ export default {
       if (callback) {
         callback()
       }
-    },
+    }
   }
 }
 </script>
 
 <style scoped lang="less">
-:deep(.ant-form-inline .ant-form-item ) {
+:deep(.ant-form-inline .ant-form-item) {
   display: block !important;
 }
 

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
     },