vue2-client 1.9.91 → 1.9.93

package/package.json

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

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

@@ -96,8 +96,8 @@ export default {
       afterSubmit (params) {
         this.$emit('afterSubmit', params)
       },
-      emitFunc (func, data) {
-        this.$emit('x-form-item-emit-func', func, data)
+      emitFunc (func, data, value) {
+        this.$emit('x-form-item-emit-func', func, data, value)
       },
       setForm (form) {
         this.$refs.nativeForm.setForm(form)

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

@@ -889,14 +889,9 @@ export default {
     setFormWithKey (obj) {
       setDataByRealKey(this.form, obj)
     },
-    emitFunc (func, data) {
-      // 打开列表选择框逻辑
-      if (data?.model) {
-        this.$emit(func, data, this.form[data.model])
-      } else {
-        this.$emit(func, data)
-      }
-      this.$emit('x-form-item-emit-func', func, data)
+    emitFunc (func, data, value) {
+      this.$emit(func, data, value)
+      this.$emit('x-form-item-emit-func', func, data, value)
     },
     close () {
       this.loaded = false

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

@@ -1182,7 +1182,7 @@ export default {
       }
     },
     emitFunc (func, data) {
-      this.$emit('x-form-item-emit-func', func, data)
+      this.$emit('x-form-item-emit-func', func, data, data.model ? this.form[data.model] : this.form)
     },
     itemMounted (h) {
       this.$emit('mounted', h)

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

@@ -32,6 +32,7 @@
           <x-add-form
             ref="xAddForm"
             @onLocalSubmit="onLocalSubmit"
+            @x-form-item-emit-func="emitFunc"
             @afterSubmit="onAddOrEditSubmitAfterSubmit"
           >
             <template slot="groupFormItems" slot-scope="{form, model, rules, modifyModelData}">
@@ -126,10 +127,12 @@ import { mapState } from 'vuex'
 import XTreePro from '@vue2-client/base-client/components/common/XTree/XTreePro.vue'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import util, { getRealKeyData } from '@vue2-client/utils/util'
+import XAddNativeForm from '@/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
 
 export default {
   name: 'XFormTable',
   components: {
+    XAddNativeForm,
     XTreePro,
     XTable,
     XForm,
@@ -731,6 +734,9 @@ export default {
       if (callback) {
         callback()
       }
+    },
+    emitFunc (func, data, value) {
+      this.$emit(func, data, value)
     }
   },
   action: {

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

@@ -529,6 +529,8 @@ export default {
           if (executeStrFunctionByContext(this, tempConfig.editRowShowFunc, [text, record, index, tempConfig])) {
             return tempConfig
           }
+        } else {
+          return tempConfig
         }
       }
       return false