vue2-client 1.12.45 → 1.12.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.12.45",
+  "version": "1.12.48",
   "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

@@ -6,8 +6,7 @@
       :zIndex="1001"
       :model="form"
       v-bind="formItemLayoutGen"
-      :layout="layout"
-      :rules="rules">
+      :layout="layout">
       <template v-for="(item, key) in childTableData">
         <a-row
           v-if="childTablePriority"
@@ -66,6 +65,7 @@
               :service-name="serviceName"
               mode="新增/修改"
               :layout="layout"
+              :rules="rules[`${item.name}${item.model}`]"
               :get-data-params="getDataParams"
               :env="env"
               @x-form-item-emit-func="emitFunc"
@@ -90,6 +90,7 @@
             :images="images"
             :service-name="serviceName"
             mode="新增/修改"
+            :rules="rules[`${item.name}${item.model}`]"
             :get-data-params="getDataParams"
             :env="env"
             :setForm="setForm"
@@ -120,6 +121,7 @@
             :images="images"
             :service-name="serviceName"
             mode="新增/修改"
+            :rules="rules[`${item.name}${item.model}`]"
             :get-data-params="getDataParams"
             :env="env"
             :setForm="setForm"
@@ -164,6 +166,7 @@ import { addOrModify, getConfigByName, getConfigByNameAsync, runLogic } from '@v
 import { checkIdNumber, REG_EMAIL, REG_LANDLINE, REG_PHONE } from '@vue2-client/utils/reg'
 import moment from 'moment/moment'
 import { executeStrFunction, executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
+import formValidationMixin from '@vue2-client/mixins/formValidationMixin'
 
 const DEFAULT_GROUP_NAME = '__default__'
 export default {
@@ -343,6 +346,11 @@ export default {
     return {
       getComponentByName: this.getComponentByName,
       registerComponent: this.registerComponent,
+      XFormContext: this,
+      // 移除必填项
+      removeRequired: this.removeRequired,
+      // 设置必填项
+      setRequired: this.setRequired,
       getSelf: () => this,
     }
   },
@@ -382,6 +390,7 @@ export default {
   //     deep: true
   //   }
   // },
+  mixins: [formValidationMixin],
   methods: {
     runLogic,
     getConfigByNameAsync,
@@ -544,6 +553,7 @@ export default {
       return start
     },
     setFormProps (formData, item, groupItem) {
+      const rulesKey = `${item.name}${item.model}`
       if (formData[item.model] === undefined || formData[item.model] === null) {
         formData[item.model] = undefined
       }
@@ -569,7 +579,7 @@ export default {
         if (groupItem) {
           this.rules[groupItem] = []
         } else {
-          this.rules[item.model] = []
+          this.rules[rulesKey] = []
         }
         const required = item.rule.required ? item.rule.required === true || item.rule.required === 'true' : false
         let trigger
@@ -603,7 +613,7 @@ export default {
               trigger: trigger
             })
           } else {
-            this.rules[item.model].push({
+            this.rules[rulesKey].push({
               required: true,
               message: message,
               trigger: trigger
@@ -650,7 +660,7 @@ export default {
                 trigger: 'blur'
               })
             } else {
-              this.rules[item.model].push({
+              this.rules[rulesKey].push({
                 type: item.rule.type,
                 message: item.name + '必须为' + message,
                 transform: (value) => {
@@ -672,7 +682,7 @@ export default {
                 callback()
               }
             }
-            this.rules[groupItem || item.model].push({
+            this.rules[groupItem || rulesKey].push({
               type: 'email',
               validator: validator,
               message: '请输入正确的邮箱地址',
@@ -681,7 +691,7 @@ export default {
             break
           }
           case 'userPhone': {
-            this.rules[groupItem || item.model].push({
+            this.rules[groupItem || rulesKey].push({
               type: 'userPhone',
               validator: (rule, value, callback) => {
                 if (value && !REG_PHONE.test(value)) {
@@ -696,7 +706,7 @@ export default {
             break
           }
           case 'idNumber': {
-            this.rules[groupItem || item.model].push({
+            this.rules[groupItem || rulesKey].push({
               validator: (rule, value, callback) => {
                 if (value && !checkIdNumber(value)) {
                   callback(new Error('请输入正确的身份证号码'))
@@ -709,7 +719,7 @@ export default {
             break
           }
           case 'landlineNumber': {
-            this.rules[item.model].push({
+            this.rules[rulesKey].push({
               validator: (rule, value, callback) => {
                 if (value && !REG_LANDLINE.test(value)) {
                   callback(new Error('请输入正确的座机号码'))
@@ -724,7 +734,7 @@ export default {
           // 大于0
           case 'greaterThanZero': {
             item.numberInput = true
-            this.rules[item.model].push({
+            this.rules[rulesKey].push({
               validator: (rule, value, callback) => {
                 if (isNaN(value) || value <= 0) {
                   callback(new Error('请输入一个大于0的数字'))
@@ -739,7 +749,7 @@ export default {
           // 大于等于0
           case 'greaterThanOrEqualZero': {
             item.numberInput = true
-            this.rules[item.model].push({
+            this.rules[rulesKey].push({
               validator: (rule, value, callback) => {
                 if (isNaN(value) || value < 0) {
                   callback(new Error('请输入一个大于等于0的数字'))
@@ -752,7 +762,7 @@ export default {
             break
           }
           case 'stringLength': {
-            this.rules[item.model].push({
+            this.rules[rulesKey].push({
               validator: (rule, value, callback) => {
                 if (value && value.length < item.rule.minLen) {
                   callback(new Error('长度不能少于' + item.rule.minLen + '个字符'))
@@ -767,7 +777,7 @@ export default {
             break
           }
           case 'customJs': {
-            this.rules[item.model].push({
+            this.rules[rulesKey].push({
               validator: (rule, value, callback) => {
                 this.customJsValidate(rule, value, callback, item)
               },
@@ -1125,7 +1135,7 @@ export default {
       if (callback) {
         callback()
       }
-    }
+    },
   }
 }
 </script>