vue2-client 1.9.107 → 1.9.108

package/package.json

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

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

@@ -335,8 +335,8 @@ export default {
     getRealKeyData,
     getConfigByNameAsync,
     getConfigByName,
-    customEvent (func) {
-      this.$emit(func)
+    customEvent (func, data) {
+      this.$emit(func, data)
     },
     columnClick (key, value, record) {
       this.$emit('columnClick', key, value, record)

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

@@ -4,12 +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>
+            <!--            <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"/>新增
@@ -553,6 +553,13 @@ export default {
       // 获取最新数据
       const editRowAfterData = this.getTableData()
       const changeData = getChangedData(this.editRowBeforeData, editRowAfterData)
+      if (this.eventState?.customSave) {
+        this.custom('customSave', {
+          tableData: editRowAfterData,
+          changeData
+        })
+        return
+      }
       if (changeData.length === 0) {
         this.$message.info('没有数据发生变化')
       } else {
@@ -1034,6 +1041,10 @@ export default {
     },
     // 新增业务
     add () {
+      if (this.eventState?.customAdd) {
+        this.custom('customAdd', {})
+        return
+      }
       this.$emit('add')
     },
     // 添加业务
@@ -1048,6 +1059,10 @@ export default {
     edit (id) {
       this.editLoading = true
       this.getEditData(id).then(modifyModelData => {
+        if (this.eventState?.customEdit) {
+          this.custom('customEdit', { id, modifyModelData })
+          return
+        }
         this.$emit('edit', modifyModelData)
         this.editLoading = false
       })
@@ -1116,6 +1131,13 @@ export default {
             queryParamsName: this.queryParamsName,
             idList: this.selectedRowKeys
           }
+          if (this.eventState?.customDelete) {
+            this.custom('customDelete', {
+              selectedRowKeys: this.selectedRowKeys,
+              selectedRows: this.selectedRows
+            })
+            return
+          }
           return new Promise((resolve, reject) => {
             if (this.localEditMode) {
               this.localEditModeDataSource = this.getLocalData().filter(item => !this.selectedRowKeys.includes(item[this.rowKey]))

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'),