vue2-client 1.8.131 → 1.8.133

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.133",
   "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

@@ -53,12 +53,16 @@ export default {
     localConfig: {
       type: Object,
       default: undefined
+    },
+    dontFormat: {
+      type: Boolean,
+      default: false
     }
   },
   components: {
     XReportDesign
   },
-  data () {
+  data() {
     return {
       config: undefined,
       type: 'design',
@@ -77,7 +81,7 @@ export default {
   },
   methods: {
     // 检查slot是否在配置文件中包含，如果没有包含，则视为非法获取
-    checkSlotDefine (config) {
+    checkSlotDefine(config) {
       const slotsDeclare = config.slotsDeclare
       const total = slotsDeclare.length
       let count = 0
@@ -94,16 +98,16 @@ export default {
       return count === total
     },
     // 切换了标签页
-    tabChanged (key) {
+    tabChanged(key) {
       this.scanFinish = false
-      this.originalConfig.data = { ...this.originalConfig.data, ...this.config.data }
+      this.originalConfig.data = {...this.originalConfig.data, ...this.config.data}
       this.config.data = this.originalConfig.data
       this.$nextTick(() => {
         this.scanFinish = true
       })
     },
     // 获取当前日期，为保存文件命名用
-    getDate () {
+    getDate() {
       const currentDate = new Date()
 
       const year = currentDate.getFullYear()
@@ -115,7 +119,7 @@ export default {
       return formattedDate
     },
     // 导出PDF
-    exportPDF () {
+    exportPDF() {
       const date = this.getDate()
       let title = this.config.title
       title = title.replace(/<[^>]+>/g, '')
@@ -123,7 +127,7 @@ export default {
       HtmlToPdf.getPdf(fileName, '#printReady')
     },
     // 用于分割配置中的colums，将需要处理的数组提取出来
-    formatConfigRow () {
+    formatConfigRow() {
       for (let i = 0; i < this.config.columns.length; i++) {
         // 对原始数组进行递归，依次将该位置拆分为三个部分，当前处理位置之前的，当前处理位置，当前处理位置之后的
         const before = this.config.columns.slice(0, i)
@@ -173,7 +177,7 @@ export default {
       }
     },
     // 处理colums数组，为声明了rowspan的单元格，自动匹配格式
-    checkRow (rowArr) {
+    checkRow(rowArr) {
       // 不需要更改的数据
       const original = []
       // 需要更改新加的数据
@@ -204,7 +208,14 @@ export default {
         }
 
         if (cell.text && total !== 0) { // 如果遇到了下一个声明行，证明rowspan少了一行，需要补充一个占位格
-          const nullObj = { type: 'placeHolderColumn', order: subRowIndex, noBoarder: true, needSplit: true, colSpan: preColSpan, dontShowRow: true }
+          const nullObj = {
+            type: 'placeHolderColumn',
+            order: subRowIndex,
+            noBoarder: true,
+            needSplit: true,
+            colSpan: preColSpan,
+            dontShowRow: true
+          }
           subRowIndex++
           waitForAddArr.push(nullObj)
           total = 0
@@ -213,7 +224,14 @@ export default {
           firstSubLine = false
         } else if ((total !== count + cell.rowSpan) && forEachCount === rowArr.length) {
           // 如果没有遇到了下一个声明行，但已经是当前行最后一个数据，也证明rowspan少了一行，需要补充一个占位格
-          const nullObj = { type: 'placeHolderColumn', order: subRowIndex, noBoarder: true, needSplit: true, colSpan: preColSpan, dontShowRow: true }
+          const nullObj = {
+            type: 'placeHolderColumn',
+            order: subRowIndex,
+            noBoarder: true,
+            needSplit: true,
+            colSpan: preColSpan,
+            dontShowRow: true
+          }
           subRowIndex++
           waitForAddArr.push(nullObj)
           total = 0
@@ -304,7 +322,7 @@ export default {
       }
     },
     // 扫描配置，如果有插槽则拼接插槽
-    scanConfigSlot (config) {
+    scanConfigSlot(config) {
       const columnsArr = config.columns
       for (let i = 0; i < columnsArr.length; i++) {
         for (let j = 0; j < columnsArr[i].length; j++) {
@@ -365,7 +383,7 @@ export default {
               config.slotsDeclare = []
             }
 
-            config.data = { ...config.data, ...this.configFromWeb[targetName].data }
+            config.data = {...config.data, ...this.configFromWeb[targetName].data}
             this.configFromWeb = {}
           }
         }
@@ -373,7 +391,7 @@ export default {
       this.config = config
     },
     // 扫描所有插槽名
-    scanConfigName (config, resut) {
+    scanConfigName(config, resut) {
       if (config.slotsDeclare) {
         config.slotsDeclare.forEach(name => {
           resut.push(name)
@@ -381,7 +399,7 @@ export default {
       }
     },
     // 获取插槽
-    getConfigAndJoin (config, outerLock) {
+    getConfigAndJoin(config, outerLock) {
       // 检查主配置插槽声明是否合法
       const check = this.checkSlotDefine(config)
       const waitForDownloadSlotName = []
@@ -394,8 +412,7 @@ export default {
 
         // 挨个获取插槽
         waitForDownloadSlotName.forEach(configName => {
-          getConfigByName(configName, undefined, res => {
-            console.warn('res', res)
+          getConfigByName(configName, 'af-system', res => {
             this.configFromWeb[configName] = res
             count++
           })
@@ -407,7 +424,7 @@ export default {
             clearInterval(timer)
             this.scanConfigSlot(config)
             if (config.slotsDeclare.length > 0) {
-              const lock = { status: true }
+              const lock = {status: true}
               this.getConfigAndJoin(config, lock)
               const innerTimer = setInterval(() => {
                 if (!lock.status) {
@@ -426,8 +443,8 @@ export default {
       }
     },
     // 获取配置之后的初始化
-    configInit () {
-      const lock = { status: true }
+    configInit() {
+      const lock = {status: true}
 
       this.getConfigAndJoin(this.config, lock)
 
@@ -436,8 +453,10 @@ export default {
           clearInterval(this.timer)
           console.log('拼接完成', this.config)
           this.originalConfig = Object.assign({}, this.config)
-          // 扫描配置文件中有没有rowSpan，进行格式化调整
-          this.formatConfigRow(this.config)
+          if (!this.dontFormat) {
+            // 扫描配置文件中有没有rowSpan，进行格式化调整
+            this.formatConfigRow(this.config)
+          }
           this.activeConfig = this.config
           this.$nextTick(() => {
             this.scanFinish = true
@@ -446,12 +465,12 @@ export default {
       }, 100)
     }
   },
-  beforeMount () {
+  beforeMount() {
     if (this.localConfig) {
       this.config = this.localConfig
       this.configInit()
     } else {
-      getConfigByName(this.configName, undefined, res => {
+      getConfigByName(this.configName, 'af-system', res => {
         this.config = res
         this.configInit()
       })
@@ -461,10 +480,11 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.tools{
+.tools {
   text-align: center;
   cursor: pointer;
-  .toolsItem{
+
+  .toolsItem {
     display: inline-block;
   }
 }