vue2-client 1.8.171-test → 1.8.172-test

package/package.json

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

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

@@ -90,8 +90,11 @@
                 {{ item.scopedSlots?.customRender || item.slotValue }} <a-icon type="down" />
               </a>
               <a-menu slot="overlay">
-                <a-menu-item v-for="(action_item,index) in item.actionArr" :key="index">
-                  <a @click="action(record, item.dataIndex, action_item.func)">{{ action_item.text }}</a>
+                <a-menu-item v-for="(action_item, index) in item.actionArr" :key="index">
+                  <a
+                    @click="action(record, item.dataIndex, action_item.func)"
+                    v-if="!item.customFunction || executeStringFunction( item.customFunction,[record,index])"
+                  >{{ action_item.text }}</a>
                 </a-menu-item>
               </a-menu>
             </a-dropdown>
@@ -127,6 +130,7 @@ import { Modal } from 'ant-design-vue'
 import { post } from '@vue2-client/services/api'
 import { CommonTempTable } from '@vue2-client/services/api/commonTempTable'
 import { mapState } from 'vuex'
+import executeStringFunction from '@vue2-client/utils/runEvalFunction'
 
 export default {
   name: 'XTable',
@@ -248,6 +252,7 @@ export default {
   },
   mounted () {},
   methods: {
+    executeStringFunction,
     /**
      * 初始化表格参数
      */

package/src/utils/runEvalFunction.js

@@ -0,0 +1,6 @@
+function executeStringFunction (funcString, args) {
+  // eslint-disable-next-line no-eval
+  return eval(`(${funcString})`)(...args)
+}
+
+module.exports = executeStringFunction