vue2-client 1.9.74 → 1.9.76

package/package.json

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

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

@@ -105,7 +105,7 @@ import { mapState } from 'vuex'
 import { addOrModify, getConfigByName, getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
 import { checkIdNumber, REG_EMAIL, REG_LANDLINE, REG_PHONE } from '@vue2-client/utils/reg'
 import moment from 'moment/moment'
-import { executeStrFunction } from '@vue2-client/utils/runEvalFunction'
+import { executeStrFunction, executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 
 export default {
   name: 'XAddNativeForm',
@@ -565,7 +565,7 @@ export default {
     },
     customJsValidate (rule, value, callback, item) {
       if (item.rule.customValidatorFunc) {
-        executeStrFunction(item.rule.customValidatorFunc, [rule, value, callback, this.form, item, this.util])
+        executeStrFunctionByContext(this, item.rule.customValidatorFunc, [rule, value, callback, this.form, item, this.util, runLogic, getConfigByNameAsync])
       } else {
         callback()
       }

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

@@ -85,13 +85,13 @@ export default {
      * @param businessType 新增还是修改
      */
     init ({
-            groups,
-            modifyModelData = {},
-            serviceName = process.env.VUE_APP_SYSTEM_NAME,
-            env = 'prod',
-            showLeftTab = false,
-            businessType = '新增'
-          }) {
+           groups,
+           modifyModelData = {},
+           serviceName = process.env.VUE_APP_SYSTEM_NAME,
+           env = 'prod',
+           showLeftTab = false,
+           businessType = '新增'
+         }) {
       Object.assign(this, { groups, modifyModelData, serviceName, env, showLeftTab, businessType })
       this.initView()
       this.$nextTick(() => {
@@ -170,8 +170,15 @@ export default {
       }
     },
     // xfromitem 一路传递上来的事件
-    emitFunc (func, data) {
-      this.$emit('x-form-item-emit-func', func, data)
+    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)
     },
     // 提交表单
     asyncSubmit () {