vue2-client 1.8.400 → 1.8.401

package/package.json

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

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

@@ -26,6 +26,7 @@
 </template>
 <script>
 import { mapState } from 'vuex'
+import { executeStrFunctionByContext } from '@/utils/runEvalFunction'
 // import XReport from '@vue2-client/pages/XReportGridView/XReport.vue'
 
 export default {
@@ -94,8 +95,14 @@ export default {
         this.$emit('close')
       },
       onSubmit () {
-        this.loading = true
-        this.close()
+        if (this.$refs.main?.config?.confirmFunction) {
+          console.info('执行自定义确认逻辑')
+          executeStrFunctionByContext(this, this.$refs.main?.config?.confirmFunction, [])
+        } else {
+          console.warn('未配置modal确认按钮逻辑')
+          this.loading = true
+          this.close()
+        }
       },
       updateImg (data) {
         console.log(data)

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

@@ -1,40 +1,40 @@
-<script>
-import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup/XFormGroup.vue'
-import { getConfigByNameAsync } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'Demo',
-  components: { XFormGroup },
-  created () {
-    getConfigByNameAsync('addUserGeneralInfoFrom', 'af-revenue').then(res => {
-      this.$refs.xFormGroupDemo.init({
-        ...res,
-        serviceName: 'af-revenue',
-        showLeftTab: true,
-      })
-    })
-  },
-  methods: {
-    submitForm () {
-      this.$refs.xFormGroupDemo.onSubmit().then(res => {
-        console.log('所有表单的结果', res)
-      })
-    }
-  }
-}
-</script>
-
-<template>
-  <a-modal
-    :visible="true"
-    :bodyStyle="{height:'70vh'}"
-    title="测试表单组"
-    @ok="submitForm"
-    width="85vw">
-    <x-form-group ref="xFormGroupDemo"></x-form-group>
-  </a-modal>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script>
+import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup/XFormGroup.vue'
+import { getConfigByNameAsync } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'Demo',
+  components: { XFormGroup },
+  created () {
+    getConfigByNameAsync('addUserGeneralInfoFrom', 'af-revenue').then(res => {
+      this.$refs.xFormGroupDemo.init({
+        ...res,
+        serviceName: 'af-revenue',
+        showLeftTab: true,
+      })
+    })
+  },
+  methods: {
+    submitForm () {
+      this.$refs.xFormGroupDemo.onSubmit().then(res => {
+        console.log('所有表单的结果', res)
+      })
+    }
+  }
+}
+</script>
+
+<template>
+  <a-modal
+    :visible="true"
+    :bodyStyle="{height:'70vh'}"
+    title="测试表单组"
+    @ok="submitForm"
+    width="85vw">
+    <x-form-group ref="xFormGroupDemo"></x-form-group>
+  </a-modal>
+</template>
+
+<style scoped lang="less">
+
+</style>

package/src/base-client/components/common/XReportGrid/XReport.vue

@@ -779,6 +779,14 @@ export default {
             const func = eval('(' + cell.customFunctionForDynamicDataIndex + ')')
             cell.dataIndex = func(this.config)
           }
+          // 处理 自定义函数的旧逻辑
+          if (['action', 'click'].includes(cell.eventType) && cell.customFunction && !cell.events) {
+            cell.events = []
+            cell.events.push({
+              type: cell.eventType,
+              customFunction: cell.customFunction
+            })
+          }
         })
       })
       // 将数据复制到临时数据中，带有@@@的数据，我们将其整体作为一个key保存，当编辑完成后，再将其解析，回填到需要的数据中

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -18,14 +18,13 @@
                 :key="cellIndex"
                 :serviceName="cell.serviceName"
                 @selectRow="selectRow"
-                @[cell.eventType]="(...args)=>executeCustomFunction( cell,...args)"
+                v-on="getEventHandlers(cell)"
                 :queryParamsName="cell.slotConfig"/>
             </template>
           </template>
           <!-- button 按钮渲染 -->
           <template v-else-if="cell.type === 'button'">
-            <a-button @[cell.eventType]="($event, ...args)=>executeCustomFunction($event, cell,...args)"
-            >
+            <a-button v-on="getEventHandlers(cell)">
               {{ cell.buttonName }}
             </a-button>
           </template>
@@ -478,9 +477,18 @@ export default {
   },
   inject: ['openDialog'],
   methods: {
-    executeCustomFunction (cell, ...args) {
-      console.info('Event handled:', cell.eventType, args)
-      executeStrFunctionByContext(this, cell.customFunction, args)
+    getEventHandlers (cell) {
+      const handlers = {}
+      if (!cell.events && cell.events.length === 0) {
+        return handlers
+      }
+      cell.events.forEach(event => {
+        handlers[event.type] = (...args) => {
+          console.info('Event handled:', event.type, args)
+          executeStrFunctionByContext(this, event.customFunction, args)
+        }
+      })
+      return handlers
     },
     getComponentName (queryParamsName, serviceName, componentName) {
       // const config = await getConfigByName(queryParamsName, serviceName)

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

@@ -78,7 +78,7 @@ routerResource.example = {
         {
             path: 'default',
             name: '示例页面',
-            component: () => import('@vue2-client/pages/DefaultExample'),
+            component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
             meta: {
                 // 菜单中不显示
                 invisible: true,