vue2-client 1.18.52 → 1.18.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.18.52",
+  "version": "1.18.54",
   "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

@@ -523,12 +523,16 @@ export default {
      * @param {Object} conditionParams - 额外的查询条件参数
      */
     submitForm(conditionParams = {}) {
+      // 备份一下 form 这个函数传递的 condition 仅临时用一下
+      // 如果要实质修改 form 从其他地方赋值
+      const _from = JSON.parse(JSON.stringify(this.form))
       // 将外部参数合并到表单中
       if (Object.keys(conditionParams).length > 0) {
         this.form = Object.assign({}, this.form, conditionParams)
       }
       // 调用现有的 onSubmit 方法，触发 emit
       this.onSubmit()
+      this.form = _from
     }
   },
   mounted() {

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

@@ -1,5 +1,8 @@
 <template>
   <a-card :bordered="false">
+    <div style="margin-bottom: 16px">
+      <a-button type="primary" @click="handleCustomQuery">查询 XianFeng 数据</a-button>
+    </div>
     <x-form-table
       title="示例表单"
       :queryParamsName="queryParamsName"
@@ -14,10 +17,9 @@
       :defaultQueryForm="{
         s_f_user_name: '张三'
       }"
-      serviceName="af-system"
+      serviceName="af-revenue"
       ref="xFormTable"
     ></x-form-table>
-    <div style="height: 100px; width: 100%; background-color: #f0f2f5"></div>
   </a-card>
 </template>
 
@@ -32,7 +34,7 @@ export default {
   data() {
     return {
       // 查询配置文件名
-      queryParamsName: 'ceshiCRUD',
+      queryParamsName: 'ChargeCenterQueryUserCRUD',
       // 查询配置左侧tree
       xTreeConfigName: 'addressType',
       // 新增表单固定值
@@ -51,7 +53,12 @@ export default {
   },
 
   methods: {
-    // ========== 原有方法 ==========
+    handleCustomQuery() {
+      this.$refs.xFormTable.queryTable({
+        uf_f_alias: 'XianFeng',
+        uf_f_card_id: '10500030'
+      })
+    },
     rowDblClick(record) {
       console.log('rowDblClick', record)
     },

package/src/router/async/router.map.js

@@ -55,13 +55,13 @@ routerResource.example = {
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/HChart/demo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
+  component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
   // component: () => import('@vue2-client/base-client/components/common/ImagePreviewModal/demo.vue'),
   // component: () => import('@vue2-client/components/xScrollBox/example.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue')
+  // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue')
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),