vue2-client 1.8.131 → 1.8.132

package/CHANGELOG.md

@@ -1,9 +1,6 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.8.131 -2024-4-12 @陈博晨**
-- 查询配置解析json字段内容表单校验bug修改
-
 **1.8.130 -2024-4-11 @江超**
 - 导出bug修改
 

package/package.json

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

@@ -51,7 +51,7 @@
             :attr="formItem"
             :disabled="itemDisabled(formItem)"
             :files="files"
-            :form="form[groupItem.model]"
+            :form="form"
             :images="images"
             :service-name="serviceName"
             mode="新增/修改"
@@ -137,8 +137,6 @@ export default {
             return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version' && !this.itemDisabled(item)
           }).map((groupItem) => {
             // 只保留第一个下划线后面的内容
-            //  多层校验规则需要将prop设置为 key1.key2.....
-            groupItem.prop = `${item.model}.${groupItem.model.substring(groupItem.model.indexOf('_') + 1)}`
             groupItem.model = groupItem.model.substring(groupItem.model.indexOf('_') + 1)
             return groupItem
           })
@@ -191,7 +189,7 @@ export default {
       const formData = Object.assign({}, fixedAddForm)
       for (let i = 0; i < this.realJsonData.length; i++) {
         const item = this.realJsonData[i]
-        this.setFormProps(formData, item, null)
+        this.setFormProps(formData, item)
       }
       // 设置表单分组项目相关参数
       for (let i = 0; i < this.groupJsonData.length; i++) {
@@ -199,14 +197,14 @@ export default {
         formData[groupItem.model] = {}
         for (let j = 0; j < groupItem.groupItems.length; j++) {
           const item = groupItem.groupItems[j]
-          this.setFormProps(formData[groupItem.model], item, item.prop)
+          this.setFormProps(formData[groupItem.model], item)
         }
       }
       // 设置动态简易表单项的相关参数
       for (const key in this.simpleFormJsonData) {
         for (const item of this.simpleFormJsonData[key].value) {
           item.model = key + '@' + item.model
-          this.setFormProps(formData, item, null)
+          this.setFormProps(formData, item)
         }
       }
 
@@ -222,15 +220,11 @@ export default {
       }
       this.loaded = true
     },
-    setFormProps (formData, item, groupItem) {
+    setFormProps (formData, item) {
       formData[item.model] = undefined
       // 处理表单校验情况
       if (item.rule) {
-        if (groupItem) {
-          this.rules[groupItem] = []
-        } else {
-          this.rules[item.model] = []
-        }
+        this.rules[item.model] = []
         const required = item.rule.required ? item.rule.required === true || item.rule.required === 'true' : false
         let trigger
         let message
@@ -256,19 +250,11 @@ export default {
               message = '请输入' + item.name
               trigger = 'blur'
           }
-          if (groupItem) {
-            this.rules[groupItem].push({
-              required: true,
-              message: message,
-              trigger: trigger
-            })
-          } else {
-            this.rules[item.model].push({
-              required: true,
-              message: message,
-              trigger: trigger
-            })
-          }
+          this.rules[item.model].push({
+            required: true,
+            message: message,
+            trigger: trigger
+          })
         }
 
         switch (item.rule.type) {
@@ -293,33 +279,18 @@ export default {
                 defaultValue = 0.0
                 break
             }
-            if (groupItem) {
-              this.rules[groupItem].push({
-                type: item.rule.type,
-                message: item.name + '必须为' + message,
-                transform: (value) => {
-                  if (value && value.length !== 0) {
-                    return Number(value)
-                  } else {
-                    return defaultValue
-                  }
-                },
-                trigger: 'blur'
-              })
-            } else {
-              this.rules[item.model].push({
-                type: item.rule.type,
-                message: item.name + '必须为' + message,
-                transform: (value) => {
-                  if (value && value.length !== 0) {
-                    return Number(value)
-                  } else {
-                    return defaultValue
-                  }
-                },
-                trigger: 'blur'
-              })
-            }
+            this.rules[item.model].push({
+              type: item.rule.type,
+              message: item.name + '必须为' + message,
+              transform: (value) => {
+                if (value && value.length !== 0) {
+                  return Number(value)
+                } else {
+                  return defaultValue
+                }
+              },
+              trigger: 'blur'
+            })
             break
         }
       }

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

@@ -395,7 +395,6 @@ export default {
         // 挨个获取插槽
         waitForDownloadSlotName.forEach(configName => {
           getConfigByName(configName, undefined, res => {
-            console.warn('res', res)
             this.configFromWeb[configName] = res
             count++
           })