vue2-client 1.11.4 → 1.11.6

package/src/base-client/components/common/XDescriptions/XDescriptionsGroup.vue

@@ -98,6 +98,21 @@ export default {
     //     }
     //   }
     // }
+    // 数据模式结构
+    // "groups": [{
+    //   "name": "客户信息",
+    //   "fields": [
+    //    {
+    //      "name": "备注",
+    //      "key": "f_comments",
+    //      "span": 3
+    //    },
+    //    {
+    //      "name": "地址",
+    //      "key": "f_address",
+    //      "span": 3
+    //    }]
+    // }]
     configName: {
       type: String,
       required: true,
@@ -174,61 +189,56 @@ export default {
     getConfig () {
       getConfigByName(this.configName, this.serviceName, (res) => {
         if (res.groups) {
-          this.groups = res.groups
-          this.realData = Object.keys(res.groups).map((h) => {
-            const hObj = res.groups[h]
-            const dataItem = {}
-            dataItem.title = h
-            dataItem.column = []
-            if (hObj.type && hObj.type === 'array') {
-              // 从data 取出数组
-              const arrayData = this.data[hObj.key]
-              const arrayDataItem = arrayData.map((item, index) => {
-                const arrayItem = {
-                  title: `${h} ${index + 1}`,
-                  column: Object.keys(hObj.value).map((key) => {
-                    return {
-                      key: hObj.value[key],
-                      value: item[key]
-                    }
-                  })
+          const groups = Array.isArray(res.groups)
+            ? res.groups
+            : Object.entries(res.groups).map(([groupName, groupConfig]) => {
+              if (groupConfig.type === 'array') {
+                return {
+                  name: groupName,
+                  type: 'array',
+                  key: groupConfig.key,
+                  fields: Object.entries(groupConfig.value || {}).map(([k, v]) => ({
+                    key: k,
+                    name: v
+                  }))
                 }
-                // 如果所有 value 都是空的 return null todo 后期可能做成配置
-                const isAllNull = arrayItem.column.every((item) => {
-                  return item.value === null || item.value === ''
-                })
-                return isAllNull ? null : arrayItem
-              }).filter((item) => item)
-              if (arrayDataItem.length) {
-                dataItem.column = arrayDataItem
-                return dataItem
-              } else {
-                return null
               }
-            } else {
-              const tempData = Object.keys(hObj).map((key) => {
-                // 如果 hObj[key] 是 jsonobject
-                if (typeof hObj[key] === 'object') {
-                  return { key: hObj[key].name, value: this.getRealKeyData(this.data, key), span: hObj[key].span || 1 }
-                }
-                // 如果是数组形态
-                return { key: hObj[key], value: this.getRealKeyData(this.data, key) }
-              })
-              // 如果所有 value 都是空的 return null todo 后期可能做成配置
-              const isAllNull = tempData.every((item) => {
-                return item.value === null || item.value === ''
-              })
-              if (isAllNull) {
-                return null
-              } else {
-                dataItem.column = tempData
-                return dataItem
+
+              // 处理普通旧格式配置
+              return {
+                name: groupName,
+                fields: Object.entries(groupConfig).map(([fieldKey, fieldValue]) => ({
+                  key: fieldKey,
+                  name: typeof fieldValue === 'string' ? fieldValue : fieldValue.name,
+                  ...(typeof fieldValue === 'object' ? fieldValue : {})
+                }))
               }
+            })
+
+          this.groups = groups
+          this.realData = groups.map(group => {
+            const dataItem = { title: group.name }
+
+            if (group.type === 'array') {
+              // 处理数组类型数据
+              const arrayData = this.data[group.key] || []
+              dataItem.column = arrayData.map((item, index) => ({
+                title: `${group.name} ${index + 1}`,
+                column: group.fields.map(field => ({
+                  key: field.name,
+                  value: item[field.key]
+                }))
+              })).filter(Boolean)
+            } else {
+              dataItem.column = group.fields.map(field => ({
+                key: field.name,
+                value: this.getRealKeyData(this.data, field.key),
+                span: field.span
+              }))
             }
-          }).filter((item) => item)
-        } else {
-          this.loading = false
-          this.loadError = true
+
+            return dataItem.column.length > 0 ? dataItem : null
+          }).filter(Boolean)
         }
       })
     },

package/src/base-client/components/common/XDescriptions/demo.vue

@@ -1,6 +1,5 @@
 <script>
 import XDescriptionsGroup from '@vue2-client/base-client/components/common/XDescriptions/XDescriptionsGroup.vue'
-import { runLogic } from '@vue2-client/services/api/common'
 
 export default {
   name: 'Demo',
@@ -10,18 +9,20 @@ export default {
       visible: false,
       userinfo: {
         f_userinfo_code: '143400000003',
-        f_gasbrand: '测试表品牌'
+        f_gasbrand: '测试表品牌',
+        f_address: '11'
       }
     }
   },
   methods: {
     open () {
-      runLogic('querySingleUserDetail', {
-        f_userinfo_code: '143400000003'
-      }, 'af-revenue').then(res => {
-        this.userinfo = res
-        this.visible = true
-      })
+      // runLogic('querySingleUserDetail', {
+      //   f_userinfo_code: '143400000003'
+      // }, 'af-revenue').then(res => {
+      //   this.userinfo = res
+      //   this.visible = true
+      // })
+       this.visible = true
     }
   }
 }
@@ -40,7 +41,7 @@ export default {
       :visible="visible"
       @close="()=>{visible = false}"
     >
-      <x-descriptions-group config-name="用户详情描述列表" :showLeftTab="true" :data="userinfo" service-name="af-revenue"/>
+      <x-descriptions-group config-name="测试Config" :showLeftTab="true" :data="userinfo" service-name="af-system"/>
     </a-drawer>
   </div>
 </template>

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

@@ -11,7 +11,7 @@ export default {
     }
   },
   created () {
-    getConfigByNameAsync('addUserGeneralInfoFrom', 'af-revenue').then(res => {
+    getConfigByNameAsync('testFormGroup', 'af-revenue').then(res => {
       this.$refs.xFormGroupDemo.init({
         ...res,
         serviceName: 'af-revenue',
@@ -30,15 +30,8 @@ export default {
 </script>
 
 <template>
-  <a-modal
-    v-model="visible"
-    :bodyStyle="{height:'70vh'}"
-    :dialog-style="{ top: '30px' }"
-    title="测试表单组"
-    @ok="submitForm"
-    width="85vw">
-    <x-form-group ref="xFormGroupDemo"></x-form-group>
-  </a-modal>
+
+  <x-form-group ref="xFormGroupDemo"></x-form-group>
 </template>
 
 <style scoped lang="less">

package/src/base-client/components/common/XFormTable/demo.vue

@@ -1,60 +1,60 @@
-<template>
-  <a-card :bordered="false">
-    <!--    <a-button @click="()=>{queryParamsName = 'MeterBookUnallocatedUserCRUD'}">测试1</a-button>-->
-    <!--    <a-button @click="()=>{queryParamsName = 'MeterBookUnallocatedAreaCRUD'}">测试2</a-button>-->
-    <x-form-table
-      title="示例表单"
-      :queryParamsName="queryParamsName"
-      :fixedAddForm="fixedAddForm"
-      service-name="af-system"
-      @action="action"
-      @columnClick="columnClick"
-      ref="xFormTable">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
-import { microDispatch } from '@vue2-client/utils/microAppUtils'
-export default {
-  name: 'Demo',
-  components: {
-    XFormTable
-  },
-  data () {
-    return {
-      // 查询配置文件名
-      queryParamsName: 'ceshiCRUD',
-      // 查询配置左侧tree
-      // xTreeConfigName: 'addressType',
-      // 新增表单固定值
-      fixedAddForm: {},
-      // 是否显示详情抽屉
-      detailVisible: false,
-      // 当前记录
-      record: {}
-    }
-  },
-  methods: {
-    columnClick (key, value, record) {
-      microDispatch({ type: 'v3route', path: '/bingliguanli/dianzibingliluru', props: { selected: arguments[0].his_f_admission_id } })
-    },
-    action (record, id, actionType) {
-      this.detailVisible = true
-      console.log('触发了详情操作', record, id, actionType)
-    },
-    onClose () {
-      this.detailVisible = false
-      // 关闭详情之后重新查询表单
-      this.$refs.xFormTable.refreshTable(true)
-    }
-  },
-  computed: {
-  },
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <a-card :bordered="false">
+    <!--    <a-button @click="()=>{queryParamsName = 'MeterBookUnallocatedUserCRUD'}">测试1</a-button>-->
+    <!--    <a-button @click="()=>{queryParamsName = 'MeterBookUnallocatedAreaCRUD'}">测试2</a-button>-->
+    <x-form-table
+      title="示例表单"
+      :queryParamsName="queryParamsName"
+      :fixedAddForm="fixedAddForm"
+      service-name="af-system"
+      @action="action"
+      @columnClick="columnClick"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
+import { microDispatch } from '@vue2-client/utils/microAppUtils'
+export default {
+  name: 'Demo',
+  components: {
+    XFormTable
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'ceshiCRUD',
+      // 查询配置左侧tree
+      // xTreeConfigName: 'addressType',
+      // 新增表单固定值
+      fixedAddForm: {},
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {}
+    }
+  },
+  methods: {
+    columnClick (key, value, record) {
+      microDispatch({ type: 'v3route', path: '/bingliguanli/dianzibingliluru', props: { selected: arguments[0].his_f_admission_id } })
+    },
+    action (record, id, actionType) {
+      this.detailVisible = true
+      console.log('触发了详情操作', record, id, actionType)
+    },
+    onClose () {
+      this.detailVisible = false
+      // 关闭详情之后重新查询表单
+      this.$refs.xFormTable.refreshTable(true)
+    }
+  },
+  computed: {
+  },
+}
+</script>
+
+<style scoped>
+
+</style>