vue2-client 1.9.105 → 1.9.107

package/package.json

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

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

@@ -521,7 +521,7 @@
         <template #content>
           <x-form-table
             title="请选择数据"
-            :queryParamsName="attr.keyName.split('@')[attr.keyName.split('@').length - 1]"
+            :queryParamsName="queryParamsName"
             :rowSelectMode="true"
             :allowSelectRowNum="1"
             :service-name="serviceName"
@@ -838,7 +838,16 @@ export default {
     }
   },
   computed: {
-    ...mapState('account', { currUser: 'user' })
+    ...mapState('account', { currUser: 'user' }),
+    queryParamsName () {
+        if (this.attr.keyName.startsWith('function')) {
+            // 调用异步函数获取内容
+            return executeStrFunctionByContext(this, this.attr.keyName, [this.form, runLogic, this.mode, getConfigByNameAsync])
+        } else {
+            // 按现有方式处理
+            return this.attr.keyName.split('@')[this.attr.keyName.split('@').length - 1]
+        }
+    }
   },
   watch: {
     attr: {
@@ -1181,6 +1190,11 @@ export default {
         return child.child.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
       }
     },
+    // 表单项变更函数中调用 控制表单组中表单项组名为 groupName 的表单是否展示
+    // func：x-form-show（显示）/x-form-no-show（不显示）
+    emitShowFormFunc (func, groupName) {
+      this.emitFunc(func, groupName)
+    },
     emitFunc (func, data) {
       this.$emit('x-form-item-emit-func', func, data, data.model ? this.form[data.model] : this.form)
     },

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

@@ -9,24 +9,27 @@
               <a-tab-pane
                 :tab="item.describe"
                 :key="index"
-                v-if="item.describe">
+                v-if="item.describe && formShow[`show${item.groupName}`]">
               </a-tab-pane>
             </template>
           </a-tabs>
         </a-col>
         <a-col :span="showLeftTab ? 21 : 24" class="formGroupContext" ref="formGroupContext">
           <div class="group-item" :ref="`group-${index}`" :key="index" v-for="(item, index) in groups">
-            <a-row :style="{ marginTop: index === 0 ? '' : '8px' }">
+            <a-row :style="{ marginTop: index === 0 ? '' : '8px' }" v-if="formShow[`show${item.groupName}`]">
               <a-col :span="5">
                 <span class="xFormGroupTitle">{{ item.describe }}</span>
               </a-col>
             </a-row>
-            <template v-if="item.formGroupType === 'slot'">
+            <template v-if="item.formGroupType === 'slot' && formShow[`show${item.groupName}`]">
               <slot :name="item.slotName" :data="allFormData" :index="index">
                 <a-empty :description="`[${item.describe}:${item.slotName}]插槽没有使用`"/>
               </slot>
             </template>
-            <x-add-native-form @x-form-item-emit-func="emitFunc" v-else :ref="`nativeForm-${index}`"/>
+            <x-add-native-form
+              @x-form-item-emit-func="emitFunc"
+              v-if="item.formGroupType !== 'slot' && formShow[`show${item.groupName}`]"
+              :ref="`nativeForm-${index}`"/>
           </div>
         </a-col>
       </a-row>
@@ -55,6 +58,7 @@ export default {
       loading: false,
       allFormData: {},
       businessType: {},
+      formShow: {},
       env: 'dev',
       spinning: true,
       loadingErr: false,
@@ -133,6 +137,7 @@ export default {
         this.allFormData[res.slotName] = {}
         return
       }
+      this.$set(this.formShow, `show${res.groupName}`, true)
       // 组织native表单存储的结果
       this.allFormData[res.groupName] = {}
       this.formList.push(res)
@@ -169,16 +174,33 @@ export default {
         groupElement.scrollIntoView({ behavior: 'smooth' })
       }
     },
+    xFormShow (func, data, index) {
+      if (data) {
+        this.groups.forEach((item, index) => {
+          console.warn('item', item)
+          if (data === item.groupName) {
+            this.$set(this.formShow, `show${item.groupName}`, func === 'x-form-show')
+            if (func === 'x-form-show') {
+              this.initData(index)
+            }
+          }
+        })
+      }
+    },
     // xfromitem 一路传递上来的事件
     emitFunc (func, data, index) {
-      let value = null
-      try {
-        if (data && data.model && this.$refs[`nativeForm-${index}`]) {
-          value = this.$refs[`nativeForm-${index}`]?.form[data.model]
-        }
-        this.$emit(func, data, value)
-      } catch (error) { console.error(error) }
-      this.$emit('x-form-item-emit-func', func, data, value)
+      if (func === 'x-form-show' || func === 'x-form-no-show') {
+        this.xFormShow(func, data, index)
+      } else {
+        let value = null
+        try {
+          if (data && data.model && this.$refs[`nativeForm-${index}`]) {
+            value = this.$refs[`nativeForm-${index}`]?.form[data.model]
+          }
+          this.$emit(func, data, value)
+        } catch (error) { console.error(error) }
+        this.$emit('x-form-item-emit-func', func, data, value)
+      }
     },
     // 提交表单
     asyncSubmit () {

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

@@ -71,6 +71,7 @@
             @edit="edit"
             @del="del"
             @rowChoose="rowChoose"
+            @customEvent="customEvent"
             @afterDelete="afterDelete"
             @action="action"
             @selectRow="selectRow"
@@ -334,6 +335,9 @@ export default {
     getRealKeyData,
     getConfigByNameAsync,
     getConfigByName,
+    customEvent (func) {
+      this.$emit(func)
+    },
     columnClick (key, value, record) {
       this.$emit('columnClick', key, value, record)
     },
@@ -456,6 +460,7 @@ export default {
             queryParams: setQueryParams ? res : null,
             tableColumns: res.columnJson,
             buttonState: Object.assign(res.buttonState, this.buttonState),
+            eventState: res.eventState || {},
             buttonPermissions: res.buttonPermissions,
             editButtonStateData: res.editButtonStateData,
             title: this.title,

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

@@ -5,6 +5,7 @@
       :queryParamsName="queryParamsName"
       :fixedAddForm="fixedAddForm"
       @action="action"
+      @customSave="$message.warn('customSave')"
       @columnClick="columnClick"
       ref="xFormTable">
     </x-form-table>
@@ -40,7 +41,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'DayReportQueryCRUD',
+      queryParamsName: 'ceshiCRUD',
       // 查询配置左侧tree
       // xTreeConfigName: 'addressType',
       // 新增表单固定值

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

@@ -4,6 +4,12 @@
       <a-col v-show="showLeftOperaBtn">
         <span :style="{ float: 'left', overflow: 'hidden', marginBottom: '8px' }">
           <a-space>
+            <a-button v-if="eventState.customDelete" type="primary" @click="custom('customDelete')">
+              <a-icon type="delete"/>删除
+            </a-button>
+            <a-button v-if="eventState.customSave" type="primary" @click="custom('customSave')">
+              <a-icon type="save"/>保存
+            </a-button>
             <slot name="leftButton" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
             <a-button v-if="buttonState.add && buttonRendering('add')" type="primary" @click="add">
               <a-icon type="plus"/>新增
@@ -419,6 +425,8 @@ export default {
       editLoading: false,
       // 按钮状态
       buttonState: {},
+      // eventBtnState
+      eventState: {},
       // 自定义按钮数组
       editButtonStateData: [],
       // 按钮权限
@@ -637,6 +645,7 @@ export default {
         tableColumns,
         attachGrid,
         buttonState,
+        eventState,
         buttonPermissions,
         editButtonStateData = [],
         title,
@@ -698,6 +707,7 @@ export default {
       this.createdQuery = createdQuery
       this.primaryKey = primaryKey
       this.buttonState = buttonState
+      this.eventState = eventState
       if (this.localEditMode) {
         this.localEditModeDataSource = []
         this.isLocalDataSourceLoadedExternally = false
@@ -1030,6 +1040,10 @@ export default {
     move () {
       this.$emit('move')
     },
+    // 通用事件业务
+    custom (func) {
+      this.$emit('customEvent', func)
+    },
     // 编辑业务
     edit (id) {
       this.editLoading = true

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

@@ -87,9 +87,9 @@ routerResource.example = {
           // component: () => import('@vue2-client/base-client/components/common/XFormGroup/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/XFormTable/demo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
-          component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),