af-mobile-client-vue3 1.5.86 → 1.5.88

package/.env.development

@@ -1 +1,2 @@
 NODE_ENV=development
+VITE_RSA_PRIVATE_KEY=MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIRrmftLDHCQqREEJ132Onu+W3vmFbdF7QD751SrcDDGDTfzuz1zBuElvkHhuDBb7KZkXrCIe+MhvX2IvxcLObl3faX+evYlnfj2HRbF0hIpQLuIq22tL06ZcV5w7wqLxUZRpFElIFm8gZTkUvfKXVuHw89e4daDVhU5hK3GHNGTAgMBAAECgYABiINrFaE1E8pkBYx1JJA5yuhL73aUktfd2TeCU00vFg6kyrWCI85Sa2RKu/6CJNZWeOFgdubEUv7a22tRrNIZb3yUMaqtTwSso78mspIOJqjWXTkTH9WPElfTcdpdIse/lgZtPz6egxkuhadSvwrM9Y6NgusiW/5+x95Ct08iOQJBAN5aK+7uISURvGQj2EaRtgGEd8+d4oHl+BYvvTeG3qSgUikHQW3j0sp4gXPw2kxw6sjVgLFOc4FB6LGqwzOTzokCQQCYdYG8ty3Uo/ebUlNzeJFxHXjy/KvBSytAUzAXkRu3nZrkEaPQsi3dgOkZgk+F1fMDzfQ4EbDIU6xvqOoZXHg7AkATCW9XfoXR8anKfRMoP5Nwn9HOMbtR2cmaxK2TknV/bMZ8AsYETYwfj5+tuIJIJybC2RyykX/sIiN1CqS5xr7ZAkArj19rMRdaKyMi8MnBM1Cy9g3Jt2HHj5ejAGG8SgyWUOShh1y70z0BjcSMMkxQXAncK2s83ekZw7aADM4eQupjAkARRgTwwMOnn3IoKmQusKhZk0uxilZ4Zc2LH6Z4GiWnvteM0W8Zw4Z1lJUcjgQq3dGqL2RdmzeQZ+HgPIOXrZVK

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.5.86",
+  "version": "1.5.88",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {

package/src/components/data/UserDetail/index.vue

@@ -2,13 +2,14 @@
 import type { RecordEntry } from './recordEntries'
 import type { BaseUser, ConfigItem } from './types'
 import useLoading from '@af-mobile-client-vue3/hooks/useLoading'
+import { getConfigByNameAsync } from '@af-mobile-client-vue3/services/api/common'
 import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
 import { Button as VanButton, Empty as VanEmpty, Loading as VanLoading } from 'vant'
-import { computed, onActivated, ref, watch } from 'vue'
+import { computed, onActivated, onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import InfoDisplay from '../InfoDisplay/index.vue'
 import { getCacheUserDetail, getRecentBusinessTime } from './api'
-import { defaultRecordEntries } from './recordEntries'
+// import { defaultRecordEntries } from './recordEntries'
 
 interface Props {
   userInfoId: string // 用户ID（必传）
@@ -37,7 +38,7 @@ const props = withDefaults(defineProps<Props>(), {
   showBottomButtons: false,
   showHeader: false,
   headerTitle: '用户档案详情',
-  recordEntries: () => defaultRecordEntries,
+  recordEntries: () => [],
 })
 
 const emit = defineEmits<Emits>()
@@ -47,6 +48,41 @@ const router = useRouter()
 const user = ref<BaseUser | null>(null)
 const { loading: userLoading, startLoading: startUserLoading, endLoading: endUserLoading } = useLoading(false)
 const userError = ref<string | null>(null)
+const allRecords = ref<RecordEntry[]>([])
+const fixedUserDetails = ref<ConfigItem[]>([
+  { label: '联系电话', field: 'f_user_phone' },
+  { label: '用户类型', field: 'f_user_type' },
+  { label: '用户地址', field: 'f_address', full: true },
+  { label: '表具类型', field: 'f_meter_type' },
+  { label: '表具编号', field: 'f_meternumber' },
+  {
+    label: '卡号',
+    field: 'f_card_id',
+    condition: data => data.f_meter_type?.includes('卡表') || data.f_hascard === '是',
+  },
+  {
+    label: '账户余额',
+    field: 'f_balance',
+    format: value => `¥ ${value}`,
+    condition: data => !data.f_meter_type?.includes('物联网表') || (data.f_meter_type?.includes('物联网表') && data.f_user_balance > 0),
+  },
+  {
+    label: '表上余额',
+    field: 'f_balance_amount',
+    condition: data => data.f_meter_type?.includes('物联网表'),
+  },
+  { label: '购气次数', field: 'f_times' },
+  {
+    label: '累计购气(m³)',
+    field: 'f_total_gas',
+    format: value => `${value}m³`,
+  },
+  {
+    label: '阀控状态',
+    field: 'f_valve_state',
+    condition: data => data.f_meter_type?.includes('物联网表'),
+  },
+])
 
 // 控制用户信息展开收起
 const showUserInfo = ref(false)
@@ -77,40 +113,7 @@ const userDetailConfig = computed<ConfigItem[]>(() => {
   if (!user.value)
     return []
 
-  return [
-    { label: '联系电话', field: 'f_user_phone' },
-    { label: '用户类型', field: 'f_user_type' },
-    { label: '用户地址', field: 'f_address', full: true },
-    { label: '表具类型', field: 'f_meter_type' },
-    { label: '表具编号', field: 'f_meternumber' },
-    {
-      label: '卡号',
-      field: 'f_card_id',
-      condition: data => data.f_meter_type?.includes('卡表') || data.f_hascard === '是',
-    },
-    {
-      label: '账户余额',
-      field: 'f_balance',
-      format: value => `¥ ${value}`,
-      condition: data => !data.f_meter_type?.includes('物联网表') || (data.f_meter_type?.includes('物联网表') && data.f_user_balance > 0),
-    },
-    {
-      label: '表上余额',
-      field: 'f_balance_amount',
-      condition: data => data.f_meter_type?.includes('物联网表'),
-    },
-    { label: '购气次数', field: 'f_times' },
-    {
-      label: '累计购气(m³)',
-      field: 'f_total_gas',
-      format: value => `${value}m³`,
-    },
-    {
-      label: '阀控状态',
-      field: 'f_valve_state',
-      condition: data => data.f_meter_type?.includes('物联网表'),
-    },
-  ].filter(item => !item.condition || item.condition(user.value))
+  return fixedUserDetails.value.filter(item => !item?.condition || item?.condition(user.value))
 })
 
 // 筛选符合当前用户表具类型的记录入口
@@ -118,9 +121,13 @@ const filteredRecordEntries = computed(() => {
   if (!user.value?.f_meter_type)
     return []
 
-  return props.recordEntries.filter(entry =>
-    entry.forMeterTypes.includes(user.value!.f_meter_type),
-  )
+  return props?.recordEntries || props?.recordEntries?.length === 0
+    ? allRecords.value.filter(entry =>
+        entry.forMeterTypes.includes(user.value!.f_meter_type),
+      )
+    : props.recordEntries.filter(entry =>
+        entry.forMeterTypes.includes(user.value!.f_meter_type),
+      )
 })
 
 // 获取用户详情
@@ -243,6 +250,17 @@ watch(() => props.userInfoId, async (newId) => {
     }
   }
 }, { immediate: true })
+
+onMounted(async () => {
+  const config: any = await getConfigByNameAsync('userInfoAndListConfig', 'af-revenue')
+  if (config) {
+    fixedUserDetails.value = config.info.map((item1: { field: string }) => {
+      const found = fixedUserDetails.value.find(item2 => item1.field === item2.field)
+      return found || item1
+    })
+    allRecords.value = config.records || []
+  }
+})
 </script>
 
 <template>

package/src/components/data/UserDetail/recordEntries.ts

@@ -1,4 +1,8 @@
 // 记录入口默认配置
+// 此处如果导入getConfigByNameAsync，则项目无法启动且无法提交
+// import { getConfigByNameAsync } from '@af-mobile-client-vue3/services/api/common'
+// import { ref } from 'vue'
+
 export interface RecordEntry {
   id: string
   title: string
@@ -11,7 +15,7 @@ export interface RecordEntry {
   forMeterTypes: string[]
 }
 
-// 默认记录入口配置
+// 默认记录入口配置（静态默认值，用于插件初始化等场景）
 export const defaultRecordEntries: RecordEntry[] = [
   {
     id: 'OperateRecords',
@@ -157,3 +161,18 @@ export const defaultRecordEntries: RecordEntry[] = [
     forMeterTypes: ['气量卡表', '金额卡表', '物联网表', '机表'],
   },
 ]
+
+// 响应式记录入口配置，可被 API 数据更新
+// export const recordEntries = ref<RecordEntry[]>([...defaultRecordEntries])
+
+/**
+ * 从 API 获取记录入口配置并更新 recordEntries
+ * @returns API 返回的配置数据
+ */
+// export async function initRecordEntries() {
+//   const data = await getConfigByNameAsync('userInfoAndListConfig', 'af-revenue')
+//   if (data) {
+//     recordEntries.value = data?.records as RecordEntry[]
+//   }
+//   return data
+// }

package/src/components/data/XReportGrid/XReportDemo.vue

@@ -1,33 +1,33 @@
-<script setup lang="ts">
-import { onMounted, ref } from 'vue'
-import XReport from './XReport.vue'
-
-const mainRef = ref()
-
-onMounted(() => {
-  // 初始化逻辑
-})
-</script>
-
-<template>
-  <div id="test">
-    <van-card :bordered="false">
-      <XReport
-        ref="mainRef"
-        :use-oss-for-img="false"
-        config-name="nurseWorkstationCover"
-        server-name="af-his"
-        :show-img-in-cell="true"
-        :display-only="true"
-        :edit-mode="false"
-        :show-save-button="false"
-        :no-padding="true"
-        :dont-format="true"
-      />
-    </van-card>
-  </div>
-</template>
-
-<style scoped>
-
-</style>
+<script setup lang="ts">
+import { onMounted, ref } from 'vue'
+import XReport from './XReport.vue'
+
+const mainRef = ref()
+
+onMounted(() => {
+  // 初始化逻辑
+})
+</script>
+
+<template>
+  <div id="test">
+    <van-card :bordered="false">
+      <XReport
+        ref="mainRef"
+        :use-oss-for-img="false"
+        config-name="nurseWorkstationCover"
+        server-name="af-his"
+        :show-img-in-cell="true"
+        :display-only="true"
+        :edit-mode="false"
+        :show-save-button="false"
+        :no-padding="true"
+        :dont-format="true"
+      />
+    </van-card>
+  </div>
+</template>
+
+<style scoped>
+
+</style>

package/src/components/data/XReportGrid/print.js

@@ -1,184 +1,184 @@
-// print.js
-
-export function printElement(elementToPrint) {
-  // 创建一个新的浏览器窗口
-  const printWindow = window.open('', '_blank', 'height=1024,width=768')
-  // 设置新窗口的文档内容
-  printWindow.document.write(`
-    <html>
-      <head>
-        <title>Print</title>
-        <style>
-          @page {
-            size: auto;
-            margin: 0mm;
-          }
-          html, body {
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            height: 100%;
-          }
-          #print-container {
-            display: none
-          }
-          .img{
-            width: 95%;
-            height: 180px;
-            object-fit: cover;
-          }
-          .reportMain {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-              margin-bottom: 1%;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-              text-align: center;
-            }
-          }
-          .reportMainForDisplay {
-            text-align: center;
-            margin: 10% auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-around;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .reportMainNoPadding {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .tools{
-            position: fixed;
-            right: 2%;
-            text-align: right;
-            width: 60%;
-            cursor: pointer;
-            .toolsItem{
-              width: 15%;
-              margin-right: 3%;
-              display: inline-block;
-            }
-          }
-        </style>
-      </head>
-      <body>
-        <!-- 将需要打印的元素内容复制到新窗口中 -->
-        ${elementToPrint.innerHTML}
-      </body>
-    </html>
-  `)
-  // 延迟执行打印，以确保新窗口的内容已加载完成
-  printWindow.document.close() // 关闭文档流，确保内容完全加载
-  setTimeout(() => {
-    printWindow.print() // 调用打印方法
-    printWindow.close()
-  }, 500) // 延迟500毫秒后执行打印
-}
+// print.js
+
+export function printElement(elementToPrint) {
+  // 创建一个新的浏览器窗口
+  const printWindow = window.open('', '_blank', 'height=1024,width=768')
+  // 设置新窗口的文档内容
+  printWindow.document.write(`
+    <html>
+      <head>
+        <title>Print</title>
+        <style>
+          @page {
+            size: auto;
+            margin: 0mm;
+          }
+          html, body {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            height: 100%;
+          }
+          #print-container {
+            display: none
+          }
+          .img{
+            width: 95%;
+            height: 180px;
+            object-fit: cover;
+          }
+          .reportMain {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+              margin-bottom: 1%;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+              text-align: center;
+            }
+          }
+          .reportMainForDisplay {
+            text-align: center;
+            margin: 10% auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-around;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .reportMainNoPadding {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .tools{
+            position: fixed;
+            right: 2%;
+            text-align: right;
+            width: 60%;
+            cursor: pointer;
+            .toolsItem{
+              width: 15%;
+              margin-right: 3%;
+              display: inline-block;
+            }
+          }
+        </style>
+      </head>
+      <body>
+        <!-- 将需要打印的元素内容复制到新窗口中 -->
+        ${elementToPrint.innerHTML}
+      </body>
+    </html>
+  `)
+  // 延迟执行打印，以确保新窗口的内容已加载完成
+  printWindow.document.close() // 关闭文档流，确保内容完全加载
+  setTimeout(() => {
+    printWindow.print() // 调用打印方法
+    printWindow.close()
+  }, 500) // 延迟500毫秒后执行打印
+}