vue2-client 1.18.22 → 1.18.24

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

@@ -1,63 +1,177 @@
 <template>
   <a-row id="XDescriptionGroup" :gutter="24">
-    <a-col :span="4" v-if="showLeftTab && realData.length">
-      <a-tabs tab-position="left" v-model="activeTab" @change="scrollToGroup">
-        <template v-for="(item,index) in realData">
-          <a-tab-pane
-            :tab="item.title"
-            :key="index"
-            v-if="item.title">
-          </a-tab-pane>
-        </template>
-      </a-tabs>
-    </a-col>
-    <a-col :span="showLeftTab ? 20 : 24" ref="descriptionsGroupContext" class="descriptionsGroupContext">
-      <div
-        class="descriptions-item"
-        :ref="`descriptions-item-${realDataIndex}`"
-        :key="realDataIndex"
-        v-for="(realDataItem, realDataIndex) in realData">
-        <template v-if="!loadError">
-          <!--    带有子的详情      -->
-          <template
-            v-if="realDataItem.title && groups[realDataIndex]?.type ==='array'"
-          >
-            <div class="ant-descriptions-title">{{ realDataItem.title }}</div>
-            <div class="descriptions-array-item">
-              <a-descriptions
-                v-for="(arrayItem,arrayIndex) in realDataItem.column"
-                :column="isMobile ? 1 : column"
-                size="small"
-                :key="arrayIndex"
-                :title="arrayItem.title">
-                {{ arrayItem }}
-                <template v-for="(item, index) in arrayItem.column">
-                  <!--    大多数情况 循环下 空值省略不展示，todo 后期可能加配置处理      -->
+    <!-- left 模式：左侧导航 + 右侧内容 -->
+    <template v-if="tabMode === 'left'">
+      <a-col :span="4" v-if="realData.length">
+        <a-tabs tab-position="left" v-model="activeTab" @change="scrollToGroup">
+          <template v-for="(item,index) in realData">
+            <a-tab-pane
+              :tab="item.title"
+              :key="index"
+              v-if="item.title">
+            </a-tab-pane>
+          </template>
+        </a-tabs>
+      </a-col>
+      <a-col :span="realData.length ? 20 : 24" ref="descriptionsGroupContext" class="descriptionsGroupContext">
+        <div
+          class="descriptions-item"
+          :ref="`descriptions-item-${realDataIndex}`"
+          :key="realDataIndex"
+          v-for="(realDataItem, realDataIndex) in realData">
+          <!-- 渲染所有分组内容 -->
+          <template v-if="!loadError">
+            <!-- 带有子的详情 -->
+            <template
+              v-if="realDataItem.title && groups[realDataIndex]?.type ==='array'"
+            >
+              <div class="ant-descriptions-title">{{ realDataItem.title }}</div>
+              <div class="descriptions-array-item">
+                <a-descriptions
+                  v-for="(arrayItem,arrayIndex) in realDataItem.column"
+                  :column="isMobile ? 1 : column"
+                  size="small"
+                  :key="arrayIndex"
+                  :title="arrayItem.title">
+                  <template v-for="(item, index) in arrayItem.column">
+                    <!-- 大多数情况 循环下 空值省略不展示，todo 后期可能加配置处理 -->
+                    <a-descriptions-item
+                      :key="index"
+                      v-if="item.value"
+                      :label="item.key">
+                      {{ formatText(item.value) }}
+                    </a-descriptions-item>
+                  </template>
+                </a-descriptions>
+              </div>
+            </template>
+            <a-descriptions
+              v-else-if="realDataItem.title"
+              :column="isMobile ? 1 : column"
+              :title="realDataItem.title">
+              <a-descriptions-item
+                v-for="(item, index) in realDataItem.column"
+                :key="index"
+                :span="item.span || 1"
+                v-if="shouldShowField(item, data)">
+                <template #label>
+                  {{ item.key }}
+                  <span v-if="isFieldRequired(item, data)" style="color: red;"> *</span>
+                </template>
+                <span :style="getFieldStyle(item, data)">{{ formatFieldValue(item.value, item, data) || '--' }}</span>
+              </a-descriptions-item>
+            </a-descriptions>
+          </template>
+        </div>
+      </a-col>
+    </template>
+
+    <!-- top 模式：顶部横向 tab -->
+    <template v-else-if="tabMode === 'top'">
+      <a-col :span="24" v-if="realData.length">
+        <a-tabs v-model="activeTab" size="small" :tabBarStyle="{ margin: 0, padding: '0 8px' }">
+          <a-tab-pane v-for="(item,index) in realData" :key="index" :tab="item.title">
+            <div class="tab-content-scroll">
+              <!-- 只渲染当前激活的分组内容 -->
+              <template v-if="!loadError && realData[activeTab]">
+                <!-- 带有子的详情 -->
+                <template
+                  v-if="realData[activeTab].title && groups[activeTab]?.type ==='array'"
+                >
+                  <div class="ant-descriptions-title" v-if="tabMode !== 'top'">{{ realData[activeTab].title }}</div>
+                  <div class="descriptions-array-item">
+                    <a-descriptions
+                      v-for="(arrayItem,arrayIndex) in realData[activeTab].column"
+                      :column="isMobile ? 1 : column"
+                      size="small"
+                      :key="arrayIndex"
+                      :title="arrayItem.title">
+                      <template v-for="(fieldItem, fieldIndex) in arrayItem.column">
+                        <a-descriptions-item
+                          :key="fieldIndex"
+                          v-if="fieldItem.value"
+                          :label="fieldItem.key">
+                          {{ formatText(fieldItem.value) }}
+                        </a-descriptions-item>
+                      </template>
+                    </a-descriptions>
+                  </div>
+                </template>
+                <a-descriptions
+                  v-else-if="realData[activeTab].title"
+                  :column="isMobile ? 1 : column"
+                  :title="tabMode === 'top' ? undefined : realData[activeTab].title">
                   <a-descriptions-item
-                    :key="index"
-                    v-if="item.value"
-                    :label="item.key">
-                    {{ formatText(item.value) }}
+                    v-for="(fieldItem, fieldIndex) in realData[activeTab].column"
+                    :key="fieldIndex"
+                    :span="fieldItem.span || 1"
+                    v-if="shouldShowField(fieldItem, data)">
+                    <template #label>
+                      {{ fieldItem.key }}
+                      <span v-if="isFieldRequired(fieldItem, data)" style="color: red;"> *</span>
+                    </template>
+                    <span :style="getFieldStyle(fieldItem, fieldItem.value, data)">{{ formatFieldValue(fieldItem.value, fieldItem, data) || '--' }}</span>
                   </a-descriptions-item>
-                </template>
-              </a-descriptions>
+                </a-descriptions>
+              </template>
             </div>
+          </a-tab-pane>
+        </a-tabs>
+      </a-col>
+    </template>
+
+    <!-- none 模式：无 tab，直接展示所有内容 -->
+    <template v-else>
+      <a-col :span="24" class="descriptionsGroupContext">
+        <div
+          class="descriptions-item"
+          :key="realDataIndex"
+          v-for="(realDataItem, realDataIndex) in realData">
+          <!-- 渲染所有分组内容 -->
+          <template v-if="!loadError">
+            <!-- 带有子的详情 -->
+            <template
+              v-if="realDataItem.title && groups[realDataIndex]?.type ==='array'"
+            >
+              <div class="ant-descriptions-title">{{ realDataItem.title }}</div>
+              <div class="descriptions-array-item">
+                <a-descriptions
+                  v-for="(arrayItem,arrayIndex) in realDataItem.column"
+                  :column="isMobile ? 1 : column"
+                  size="small"
+                  :key="arrayIndex"
+                  :title="arrayItem.title">
+                  <template v-for="(item, index) in arrayItem.column">
+                    <a-descriptions-item
+                      :key="index"
+                      v-if="item.value"
+                      :label="item.key">
+                      {{ formatText(item.value) }}
+                    </a-descriptions-item>
+                  </template>
+                </a-descriptions>
+              </div>
+            </template>
+            <a-descriptions
+              v-else-if="realDataItem.title"
+              :column="isMobile ? 1 : column"
+              :title="realDataItem.title">
+              <a-descriptions-item
+                v-for="(item, index) in realDataItem.column"
+                :key="index"
+                :span="item.span || 1"
+                v-if="shouldShowField(item, data)">
+                <template #label>
+                  {{ item.key }}
+                  <span v-if="isFieldRequired(item, data)" style="color: red;"> *</span>
+                </template>
+                <span :style="getFieldStyle(item, item.value, data)">{{ formatFieldValue(item.value, item, data) || '--' }}</span>
+              </a-descriptions-item>
+            </a-descriptions>
           </template>
-          <a-descriptions
-            v-else-if="realDataItem.title"
-            :column="isMobile ? 1 : column"
-            :title="realDataItem.title">
-            <a-descriptions-item
-              v-for="(item, index) in realDataItem.column"
-              :key="index"
-              :span="item.span || 1"
-              :label="item.key">
-              <nobr>{{ item.value || '--' }}</nobr>
-            </a-descriptions-item>
-          </a-descriptions>
-        </template>
-      </div>
-    </a-col>
+        </div>
+      </a-col>
+    </template>
   </a-row>
 </template>
 <script>
@@ -65,6 +179,7 @@
 import { mapState } from 'vuex'
 import { getRealKeyData } from '@vue2-client/utils/formatter'
 import { getConfigByName } from '@vue2-client/services/api/common'
+import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
 
 export default {
@@ -79,40 +194,6 @@ export default {
       required: true,
       default: undefined
     },
-    // 展示列配置 格式 {title:[{key,name}]}  {描述列表标题:[{字段名,字段中文名}]}
-    // {
-    //   "groups": {
-    //     "表具信息": {
-    //       "f_gasbrand": "气表品牌"
-    //     },
-    //     "客户信息": {
-    //       "f_userinfo_code": "用户编号"
-    //     },
-    //     "设备信息":{
-    //       "type": "array",
-    //       "value": {
-    //       "f_devices_num": "设备数量",
-    //        "f_devices_type": "设备类型",
-    //        },
-    //       "key": "devices"
-    //     }
-    //   }
-    // }
-    // 数据模式结构
-    // "groups": [{
-    //   "name": "客户信息",
-    //   "fields": [
-    //    {
-    //      "name": "备注",
-    //      "key": "f_comments",
-    //      "span": 3
-    //    },
-    //    {
-    //      "name": "地址",
-    //      "key": "f_address",
-    //      "span": 3
-    //    }]
-    // }]
     configName: {
       type: String,
       required: true,
@@ -123,22 +204,7 @@ export default {
       type: String,
       default: process.env.VUE_APP_SYSTEM_NAME
     },
-    // 每列显示数量
-    column: {
-      type: Number,
-      default: 3
-    },
-    // 处理 key tuf_f_userinfo_id -> f_userinfo_id
-    getRealData: {
-      type: Boolean,
-      default: false
-    },
-    // 是否展示左侧tab
-    showLeftTab: {
-      type: Boolean,
-      default: false
-    }
-  },
+      },
   mounted () {
   },
   beforeDestroy () {
@@ -158,7 +224,11 @@ export default {
       realData: [],
       // 获取到的配置组
       groups: {},
-      activeTab: 0
+      activeTab: 0,
+      // 从配置中获取的值
+      column: 3, // 默认值
+      getRealData: false, // 默认值
+      tabMode: 'left', // 默认值
     }
   },
   computed: {
@@ -169,12 +239,15 @@ export default {
       this.loading = true
       if (this.configName) {
         this.getConfig()
-        this.$nextTick(() => {
-          const formGroupContext = this.$refs.descriptionsGroupContext?.$el
-          if (formGroupContext && formGroupContext.addEventListener) {
-            formGroupContext.addEventListener('scroll', this.onScroll)
-          }
-        })
+        // 只在 left 模式启用滚动监听
+        if (this.tabMode === 'left') {
+          this.$nextTick(() => {
+            const formGroupContext = this.$refs.descriptionsGroupContext?.$el
+            if (formGroupContext && formGroupContext.addEventListener) {
+              formGroupContext.addEventListener('scroll', this.onScroll)
+            }
+          })
+        }
       } else {
         this.loading = false
         this.loadError = true
@@ -189,32 +262,13 @@ export default {
     getConfig () {
       getConfigByName(this.configName, this.serviceName, (res) => {
         if (res.groups) {
-          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
-                  }))
-                }
-              }
-
-              // 处理普通旧格式配置
-              return {
-                name: groupName,
-                fields: Object.entries(groupConfig).map(([fieldKey, fieldValue]) => ({
-                  key: fieldKey,
-                  name: typeof fieldValue === 'string' ? fieldValue : fieldValue.name,
-                  ...(typeof fieldValue === 'object' ? fieldValue : {})
-                }))
-              }
-            })
+          // 从配置中获取 column、getRealData 和 tabMode
+          this.column = res.column !== undefined ? res.column : 3
+          this.getRealData = res.getRealData !== undefined ? res.getRealData : false
+          this.tabMode = res.tabMode !== undefined ? res.tabMode : 'left'
 
+          // 解析分组配置
+          const groups = this.parseGroupsConfig(res.groups)
           this.groups = groups
           this.realData = groups.map(group => {
             const dataItem = { title: group.name }
@@ -233,7 +287,12 @@ export default {
               dataItem.column = group.fields.map(field => ({
                 key: field.name,
                 value: this.getRealKeyData(this.data, field.key),
-                span: field.span
+                span: field.span,
+                // 存储字段函数配置
+                showIf: field.showIf,
+                styleFunc: field.styleFunc,
+                formatFunc: field.formatFunc,
+                requireFunc: field.requireFunc
               }))
             }
 
@@ -242,10 +301,142 @@ export default {
         }
       })
     },
+    /**
+     * 解析分组配置数据，支持新旧两种配置格式
+     * @param {Object|Array} groupsConfig - 分组配置对象或数组
+     * @returns {Array} 解析后的分组数组
+     *
+     * 配置格式说明：
+     *
+     * 旧模式 - 对象格式 (Object):
+     * {
+     *   "表具信息": {
+     *     "f_gasbrand": "气表品牌",           // 简单字段配置
+     *     "f_meter_type": "表具类型"
+     *   },
+     *   "设备信息": {
+     *     "type": "array",                    // 数组类型标识
+     *     "key": "devices",                   // type为array时必填：数据源key
+     *     "value": {                          // type为array时的字段配置
+     *       "f_devices_num": "设备数量",
+     *       "f_devices_type": "设备类型"
+     *     }
+     *   },
+     *   "客户信息": {
+     *     "f_user_code": {                    // 字段可配置为对象
+     *       "name": "用户编号",
+     *       "span": 2                         // 可选：列跨度
+     *     },
+     *     "f_user_name": "用户姓名"           // 简单字段配置
+     *   }
+     * }
+     *
+     * 新模式 - 数组格式 (Array):
+     * [{
+     *   "name": "客户信息",
+     *   "fields": [
+     *     {
+     *       "name": "用户编号",
+     *       "key": "f_user_code",
+     *       "span": 3
+     *     }
+     *   ]
+     * }, {
+     *   "name": "设备信息",
+     *   "type": "array",                    // 数组类型标识
+     *   "key": "devices",                   // type为array时必填：数据源key
+     *   "fields": [
+     *     {
+     *       "name": "设备数量",
+     *       "key": "f_devices_num"
+     *     },
+     *     {
+     *       "name": "设备类型",
+     *       "key": "f_devices_type"
+     *     }
+     *   ]
+     * }]
+     */
+    parseGroupsConfig (groupsConfig) {
+      // 如果已经是数组格式，直接返回
+      if (Array.isArray(groupsConfig)) {
+        return groupsConfig
+      }
+
+      // 解析对象格式配置
+      return Object.entries(groupsConfig).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
+            }))
+          }
+        }
+
+        // 处理普通配置（支持新旧格式）
+        return {
+          name: groupName,
+          fields: Object.entries(groupConfig).map(([fieldKey, fieldValue]) => ({
+            key: fieldKey,
+            name: typeof fieldValue === 'string' ? fieldValue : fieldValue.name,
+            showIf: typeof fieldValue === 'object' ? fieldValue.showIf : undefined,
+            styleFunc: typeof fieldValue === 'object' ? fieldValue.styleFunc : undefined,
+            formatFunc: typeof fieldValue === 'object' ? fieldValue.formatFunc : undefined,
+            requireFunc: typeof fieldValue === 'object' ? fieldValue.requireFunc : undefined,
+            ...(typeof fieldValue === 'object' ? fieldValue : {})
+          }))
+        }
+      })
+    },
     // 文字格式化
     formatText (value) {
       return value ?? '--'
     },
+    // 执行字段展示函数
+    shouldShowField (field, data) {
+      if (!field.showIf) return true
+      try {
+        return executeStrFunctionByContext(this, field.showIf, [data, field.key])
+      } catch (error) {
+        console.warn('showIf 函数执行错误:', error)
+        return true
+      }
+    },
+    // 获取字段样式
+    getFieldStyle (field, data) {
+      if (!field.styleFunc) return {}
+      try {
+        return executeStrFunctionByContext(this, field.styleFunc, [data, field.key])
+      } catch (error) {
+        console.warn('styleFunc 函数执行错误:', error)
+        return {}
+      }
+    },
+    // 格式化字段值
+    formatFieldValue (value, field, data) {
+      if (!field.formatFunc) return value
+      try {
+        return executeStrFunctionByContext(this, field.formatFunc, [data, field.key])
+      } catch (error) {
+        console.warn('formatFunc 函数执行错误:', error)
+        return value
+      }
+    },
+    // 判断字段是否必填（显示红色星号）
+    isFieldRequired (field, data) {
+      if (!field.requireFunc) return false
+      try {
+        return executeStrFunctionByContext(this, field.requireFunc, [data, field.key])
+      } catch (error) {
+        console.warn('requireFunc 函数执行错误:', error)
+        return false
+      }
+    },
     getRealKeyData (data, key) {
       if (this.getRealData) {
         return getRealKeyData(data)[key] || ''
@@ -254,6 +445,9 @@ export default {
       }
     },
     onScroll () {
+      // 只在 left 模式启用滚动联动
+      if (this.tabMode !== 'left') return
+
       const formGroupContext = this.$refs.descriptionsGroupContext.$el
       let groupItems = []
       if (formGroupContext && formGroupContext.querySelectorAll) {
@@ -310,5 +504,18 @@ export default {
     height: 100%;
     overflow-y: scroll;
   }
+
+  // top 模式样式
+  .tab-content-scroll {
+    overflow-y: auto;
+    padding: 8px;
+  }
+
+  // none 模式：移除分组间距
+  &:has(.tabMode-none) {
+    .descriptions-item {
+      margin-bottom: 4px;
+    }
+  }
 }
 </style>

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

@@ -8,10 +8,73 @@ export default {
     return {
       visible: false,
       userinfo: {
-        f_userinfo_code: '143400000003',
-        f_gasbrand: '测试表品牌',
-        f_address: '11'
-      }
+    f_userinfo_id: '1003',
+    f_user_id: 'U20230003',
+    f_userfiles_id: 'F20230003',
+
+    f_userinfo_code: '2023001236',
+    f_user_name: '王五',
+    f_name_pinyin: 'WW',
+    f_user_type: '商业用户',
+    f_balance: -250.00,
+    f_project_money: 0,
+    f_gas_type: '',
+    f_sys_balance: 0,
+    f_idnumber: '610104197801011234',
+    f_user_phone: '13500135000',
+    f_rent_phone: '',
+    f_user_state: '欠费',
+    f_comments: '欠费待催缴',
+    f_address: '陕西省西安市碑林区南关正街88号1层商铺',
+    f_open_date: '2015-09-20 14:00:00',
+    f_install_date: '2015-09-25 10:30:00',
+    f_people_num: 0,
+    f_user_level: 'C级',
+    f_olduserinfo_code: 'OLD2010001236',
+    f_contract_id: 'HT2015092000136',
+
+    f_customer: '',
+    f_meter_type: '机表',
+    f_meter_brand: '威星智能',
+    f_meter_style: 'WX-G10',
+    f_calculation: '',
+    f_collection_type: '',
+    f_table_state: '正常',
+    f_balance_amount: 0,
+    f_balance_gas: 0,
+    f_jval: 0,
+    f_arrears_fee: 250.00,
+    f_initial_base: 0,
+    f_meter_base: 15680.5,
+    f_times: 0,
+    f_iot_times: 0,
+    f_total_fee: 0,
+    f_total_fee_all: 0,
+    f_deduction_gas: 50.5,
+    f_total_gas_all: 0,
+    f_total_gas: 0,
+    f_write_totalfee: 0,
+    f_meternumber: 'WX2015090012345',
+    f_card_id: '',
+    f_hascard: '否',
+    f_metertitles: 'BF2015001236',
+    f_gasproperties: '商业用气',
+    f_price_name: '商业用气价格',
+    f_remanent_money: 150.00,
+    f_remanent_gas: 0,
+    f_aroundmeter: '南向',
+    f_book_name: '碑林区商业册',
+    f_book_code: 'BL-SY-01',
+    f_meter_book_sort: '45',
+    f_position: '门面房',
+    f_gas_person: '赵师傅',
+    f_gas_date: '2015-09-25 11:00:00',
+    f_inputtor: '孙抄表',
+    f_hand_date: '2024-01-10 09:00:00',
+    f_input_date: '2015-09-20 14:00:00',
+    comments: '商业用户，需要定期催缴'
+  }
+
     }
   },
   methods: {
@@ -30,18 +93,34 @@ export default {
 
 <template>
   <div>
-    <a-button @click="open">
-      展开详情
-    </a-button>
+    <a-space style="margin-bottom: 16px;">
+      <a-button @click="open">
+        弹出式展示
+      </a-button>
+    </a-space>
+
+    <!-- 卡片展示 -->
+    <a-card title="卡片展示" style="width: 300px;" size="small">
+      <x-descriptions-group
+        config-name="ChargeCenterUserDetailConfig"
+        :data="userinfo"
+        service-name="af-revenue"
+      />
+    </a-card>
+
+    <!-- 弹出式展示 -->
     <a-drawer
-      title="描述列表详情"
+      title="弹出式展示"
       placement="right"
       width="65vw"
-      :body-style="{height:'92%'}"
       :visible="visible"
       @close="()=>{visible = false}"
     >
-      <x-descriptions-group config-name="测试Config" :showLeftTab="true" :data="userinfo" service-name="af-system"/>
+      <x-descriptions-group
+        config-name="ChargeCenterUserDetailConfig"
+        :data="userinfo"
+        service-name="af-revenue"
+      />
     </a-drawer>
   </div>
 </template>