vue2-client 1.8.152 → 1.8.154

package/CHANGELOG.md

@@ -1,6 +1,9 @@
 # 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.152",
+  "version": "1.8.154",
   "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"
+            :form="form[groupItem.model]"
             :images="images"
             :service-name="serviceName"
             mode="新增/修改"
@@ -137,6 +137,8 @@ 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
           })
@@ -189,7 +191,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)
+        this.setFormProps(formData, item, null)
       }
       // 设置表单分组项目相关参数
       for (let i = 0; i < this.groupJsonData.length; i++) {
@@ -197,14 +199,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)
+          this.setFormProps(formData[groupItem.model], item, item.prop)
         }
       }
       // 设置动态简易表单项的相关参数
       for (const key in this.simpleFormJsonData) {
         for (const item of this.simpleFormJsonData[key].value) {
           item.model = key + '@' + item.model
-          this.setFormProps(formData, item)
+          this.setFormProps(formData, item, null)
         }
       }
 
@@ -220,11 +222,15 @@ export default {
       }
       this.loaded = true
     },
-    setFormProps (formData, item) {
+    setFormProps (formData, item, groupItem) {
       formData[item.model] = undefined
       // 处理表单校验情况
       if (item.rule) {
-        this.rules[item.model] = []
+        if (groupItem) {
+          this.rules[groupItem] = []
+        } else {
+          this.rules[item.model] = []
+        }
         const required = item.rule.required ? item.rule.required === true || item.rule.required === 'true' : false
         let trigger
         let message
@@ -250,11 +256,19 @@ export default {
               message = '请输入' + item.name
               trigger = 'blur'
           }
-          this.rules[item.model].push({
-            required: true,
-            message: message,
-            trigger: trigger
-          })
+          if (groupItem) {
+            this.rules[groupItem].push({
+              required: true,
+              message: message,
+              trigger: trigger
+            })
+          } else {
+            this.rules[item.model].push({
+              required: true,
+              message: message,
+              trigger: trigger
+            })
+          }
         }
 
         switch (item.rule.type) {
@@ -279,18 +293,33 @@ export default {
                 defaultValue = 0.0
                 break
             }
-            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'
-            })
+            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'
+              })
+            }
             break
         }
       }

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

@@ -1,161 +1,161 @@
-<template>
-  <div class="reportMain">
-    <table class="reportTable">
-      <tbody class="reportTable">
-        <tr v-if="config.title.type && config.title.type !== ''">
-          <th class="tdWithBorder" colspan="12">
-            <template v-if="config.title.type === 'titleKey'">
-              {{ config.data[config.title.value] }}
-            </template>
-            <template v-else-if="config.title.type === 'titleValue'">
-              {{ config.title.value }}
-            </template>
-          </th>
-        </tr>
-        <template v-for="(row, rowIndex) in config.content">
-          <template v-if="row.type === 'jsonKey'">
-            <tr :key="rowIndex">
-              <!--      表头        -->
-              <td class="tdWithBorder" colspan="6">
-                <template v-if="receivedFunction[rowIndex].labelFunction(config).type === 'key'">
-                  {{ config.data[receivedFunction[rowIndex].labelFunction(config).content] }}
-                </template>
-                <template v-else-if="receivedFunction[rowIndex].labelFunction(config).type === 'value'">
-                  {{ receivedFunction[rowIndex].labelFunction(config).content }}
-                </template>
-              </td>
-              <!--      内容        -->
-              <td class="tdWithBorder" colspan="6">
-                <template v-if="receivedFunction[rowIndex].valueFunction(config).type === 'key'">
-                  {{ config.data[receivedFunction[rowIndex].valueFunction(config).content] }}
-                </template>
-                <template v-else-if="receivedFunction[rowIndex].valueFunction(config).type === 'value'">
-                  {{ receivedFunction[rowIndex].valueFunction(config).content }}
-                </template>
-                <template v-else-if="receivedFunction[rowIndex].valueFunction(config).type === 'img'">
-                  <template v-for="(img, imgIndex) in receivedFunction[rowIndex].valueFunction(config).content">
-                    <span :key="imgIndex" class="imgText">
-                      <a-icon type="link"/>
-                      <span @click="openImgModal(img)">{{ formatImgName(img) }}</span>
-                      <br/>
-                    </span>
-                  </template>
-                </template>
-              </td>
-            </tr>
-          </template>
-          <template v-else-if="row.type === 'jsonArray'">
-            <tr :key="rowIndex + '' + jsonArrayItemIndex" v-for="(item, jsonArrayItemIndex) in config.data[row.jsonArrayDataIndex]">
-              <!--      表头        -->
-              <td class="tdWithBorder" colspan="6">
-                <template v-if="receivedFunction[rowIndex].labelFunction(config, item).type === 'key'">
-                  {{ item[receivedFunction[rowIndex].labelFunction(config, item).content] }}
-                </template>
-                <template v-if="receivedFunction[rowIndex].labelFunction(config, item).type === 'value'">
-                  {{ receivedFunction[rowIndex].labelFunction(config, item).content }}
-                </template>
-              </td>
-              <!--      内容        -->
-              <td class="tdWithBorder" colspan="6">
-                <template v-if="receivedFunction[rowIndex].valueFunction(config, item).type === 'key'">
-                  {{ item[receivedFunction[rowIndex].valueFunction(config, item).content] }}
-                </template>
-                <template v-if="receivedFunction[rowIndex].valueFunction(config, item).type === 'value'">
-                  {{ receivedFunction[rowIndex].valueFunction(config, item).content }}
-                </template>
-              </td>
-            </tr>
-          </template>
-        </template>
-      </tbody>
-    </table>
-    <a-modal
-      title="图片"
-      width="80%"
-      :visible="showImgModal"
-      @ok="handleShowImgOk"
-      @cancel="handleShowImgCancel"
-      :z-index="1001"
-      :destroyOnClose="true">
-      <div style="width: 100%;display: flex;justify-content: center;align-items: center">
-        <img :src="showImageSrc" alt="图片"/>
-      </div>
-    </a-modal>
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: 'XReportJsonRender',
-  props: {
-    config: {
-      type: Object,
-      required: true
-    }
-  },
-  data () {
-    return {
-      receivedFunction: [],
-      showImgModal: false,
-      showImageSrc: undefined
-    }
-  },
-  methods: {
-    handleShowImgOk () {
-      this.showImgModal = false
-      this.showImageSrc = undefined
-    },
-    handleShowImgCancel () {
-      this.showImgModal = false
-      this.showImageSrc = undefined
-    },
-    openImgModal (img) {
-      this.showImageSrc = img
-      this.showImgModal = true
-    },
-    formatImgName (imgSrc) {
-      return imgSrc.split('/').pop()
-    }
-  },
-  beforeMount () {
-    for (let i = 0; i < this.config.content.length; i++) {
-      this.receivedFunction.push({
-        // eslint-disable-next-line no-eval
-        labelFunction: eval('(' + this.config.content[i].customFunctionForLabel + ')'),
-        // eslint-disable-next-line no-eval
-        valueFunction: eval('(' + this.config.content[i].customFunctionForValue + ')')
-      })
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-.reportMain {
-  text-align: center;
-  margin: 0 auto;
-  font-size: 16px;
-  color: #000;
-  background-color: #fff;
-  padding: 15px;
-  border-radius: 8px;
-}
-.reportTitle {
-  font-weight: bold;
-}
-.reportTable {
-  width: 100%;
-  border-collapse: collapse;
-  table-layout:fixed;
-  word-break:break-all;
-}
-.tdWithBorder {
-  border: 1px solid #000;
-  padding: 8px;
-}
-.imgText:hover {
-  color: rgb( 24,144,255);
-  cursor: pointer;
-}
-</style>
+<template>
+  <div class="reportMain">
+    <table class="reportTable">
+      <tbody class="reportTable">
+        <tr v-if="config.title.type && config.title.type !== ''">
+          <th class="tdWithBorder" colspan="12">
+            <template v-if="config.title.type === 'titleKey'">
+              {{ config.data[config.title.value] }}
+            </template>
+            <template v-else-if="config.title.type === 'titleValue'">
+              {{ config.title.value }}
+            </template>
+          </th>
+        </tr>
+        <template v-for="(row, rowIndex) in config.content">
+          <template v-if="row.type === 'jsonKey'">
+            <tr :key="rowIndex">
+              <!--      表头        -->
+              <td class="tdWithBorder" colspan="6">
+                <template v-if="receivedFunction[rowIndex].labelFunction(config).type === 'key'">
+                  {{ config.data[receivedFunction[rowIndex].labelFunction(config).content] }}
+                </template>
+                <template v-else-if="receivedFunction[rowIndex].labelFunction(config).type === 'value'">
+                  {{ receivedFunction[rowIndex].labelFunction(config).content }}
+                </template>
+              </td>
+              <!--      内容        -->
+              <td class="tdWithBorder" colspan="6">
+                <template v-if="receivedFunction[rowIndex].valueFunction(config).type === 'key'">
+                  {{ config.data[receivedFunction[rowIndex].valueFunction(config).content] }}
+                </template>
+                <template v-else-if="receivedFunction[rowIndex].valueFunction(config).type === 'value'">
+                  {{ receivedFunction[rowIndex].valueFunction(config).content }}
+                </template>
+                <template v-else-if="receivedFunction[rowIndex].valueFunction(config).type === 'img'">
+                  <template v-for="(img, imgIndex) in receivedFunction[rowIndex].valueFunction(config).content">
+                    <span :key="imgIndex" class="imgText">
+                      <a-icon type="link"/>
+                      <span @click="openImgModal(img)">{{ formatImgName(img) }}</span>
+                      <br/>
+                    </span>
+                  </template>
+                </template>
+              </td>
+            </tr>
+          </template>
+          <template v-else-if="row.type === 'jsonArray'">
+            <tr :key="rowIndex + '' + jsonArrayItemIndex" v-for="(item, jsonArrayItemIndex) in config.data[row.jsonArrayDataIndex]">
+              <!--      表头        -->
+              <td class="tdWithBorder" colspan="6">
+                <template v-if="receivedFunction[rowIndex].labelFunction(config, item).type === 'key'">
+                  {{ item[receivedFunction[rowIndex].labelFunction(config, item).content] }}
+                </template>
+                <template v-if="receivedFunction[rowIndex].labelFunction(config, item).type === 'value'">
+                  {{ receivedFunction[rowIndex].labelFunction(config, item).content }}
+                </template>
+              </td>
+              <!--      内容        -->
+              <td class="tdWithBorder" colspan="6">
+                <template v-if="receivedFunction[rowIndex].valueFunction(config, item).type === 'key'">
+                  {{ item[receivedFunction[rowIndex].valueFunction(config, item).content] }}
+                </template>
+                <template v-if="receivedFunction[rowIndex].valueFunction(config, item).type === 'value'">
+                  {{ receivedFunction[rowIndex].valueFunction(config, item).content }}
+                </template>
+              </td>
+            </tr>
+          </template>
+        </template>
+      </tbody>
+    </table>
+    <a-modal
+      title="图片"
+      width="80%"
+      :visible="showImgModal"
+      @ok="handleShowImgOk"
+      @cancel="handleShowImgCancel"
+      :z-index="1001"
+      :destroyOnClose="true">
+      <div style="width: 100%;display: flex;justify-content: center;align-items: center">
+        <img :src="showImageSrc" alt="图片"/>
+      </div>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'XReportJsonRender',
+  props: {
+    config: {
+      type: Object,
+      required: true
+    }
+  },
+  data () {
+    return {
+      receivedFunction: [],
+      showImgModal: false,
+      showImageSrc: undefined
+    }
+  },
+  methods: {
+    handleShowImgOk () {
+      this.showImgModal = false
+      this.showImageSrc = undefined
+    },
+    handleShowImgCancel () {
+      this.showImgModal = false
+      this.showImageSrc = undefined
+    },
+    openImgModal (img) {
+      this.showImageSrc = img
+      this.showImgModal = true
+    },
+    formatImgName (imgSrc) {
+      return imgSrc.split('/').pop()
+    }
+  },
+  beforeMount () {
+    for (let i = 0; i < this.config.content.length; i++) {
+      this.receivedFunction.push({
+        // eslint-disable-next-line no-eval
+        labelFunction: eval('(' + this.config.content[i].customFunctionForLabel + ')'),
+        // eslint-disable-next-line no-eval
+        valueFunction: eval('(' + this.config.content[i].customFunctionForValue + ')')
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.reportMain {
+  text-align: center;
+  margin: 0 auto;
+  font-size: 16px;
+  color: #000;
+  background-color: #fff;
+  padding: 15px;
+  border-radius: 8px;
+}
+.reportTitle {
+  font-weight: bold;
+}
+.reportTable {
+  width: 100%;
+  border-collapse: collapse;
+  table-layout:fixed;
+  word-break:break-all;
+}
+.tdWithBorder {
+  border: 1px solid #000;
+  padding: 8px;
+}
+.imgText:hover {
+  color: rgb( 24,144,255);
+  cursor: pointer;
+}
+</style>

package/src/base-client/components/common/XReportSlot/index.md

@@ -1,48 +1,48 @@
-# XReportSlot 暂时废弃
-
-
-动态报表的插槽组件，可以递归使用
-
-
-## 何时使用
-
-> 当需要一个动态生成的报表时
-
-> 一般由XReportDesign嵌套使用，在XReportDesign中判断当前行如果类型是slot，
-> 则递归此组件
-
-引用方式：
-
-```javascript
-import XReportSlot from '@vue2-client/base-client/components/XReportSlot/XReportSlot'
-
-export default {
-    components: {
-      XReportSlot
-    }
-}
-```
-
-
-## API
-
-| 参数              | 说明                       | 类型     | 默认值  |
-|-----------------|--------------------------|--------|------|
-| config | 表格完整配置 | Object | 无（必填） |
-| forDisplay | 是否为展示页 | Boolean | false |
-| slotConfigName | 插槽名 | String | undefined |
-
-## 例子1
-----
-```vue
-<XReportSlot
-  :config="activatedConfig"
-  :slot-config-name="slotConfig"
-  :for-display="forDisplay">
-</XReportSlot>
-```
-## 注意事项
-> slotConfigName如果不填，则展示整个表格。
-> 如果填写，则仅展示插槽中的内容
-
-> 该组件可以递归调用
+# XReportSlot 暂时废弃
+
+
+动态报表的插槽组件，可以递归使用
+
+
+## 何时使用
+
+> 当需要一个动态生成的报表时
+
+> 一般由XReportDesign嵌套使用，在XReportDesign中判断当前行如果类型是slot，
+> 则递归此组件
+
+引用方式：
+
+```javascript
+import XReportSlot from '@vue2-client/base-client/components/XReportSlot/XReportSlot'
+
+export default {
+    components: {
+      XReportSlot
+    }
+}
+```
+
+
+## API
+
+| 参数              | 说明                       | 类型     | 默认值  |
+|-----------------|--------------------------|--------|------|
+| config | 表格完整配置 | Object | 无（必填） |
+| forDisplay | 是否为展示页 | Boolean | false |
+| slotConfigName | 插槽名 | String | undefined |
+
+## 例子1
+----
+```vue
+<XReportSlot
+  :config="activatedConfig"
+  :slot-config-name="slotConfig"
+  :for-display="forDisplay">
+</XReportSlot>
+```
+## 注意事项
+> slotConfigName如果不填，则展示整个表格。
+> 如果填写，则仅展示插槽中的内容
+
+> 该组件可以递归调用

package/src/base-client/plugins/AppData.js

@@ -93,7 +93,7 @@ const GetAppDataService = {
       if (Object.prototype.hasOwnProperty.call(result, value)) {
         return result[value]
       } else {
-        return null
+        return {status: 'none', text: value}
       }
     }
     return null