af-mobile-client-vue3 1.3.75 → 1.3.77

package/package.json

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

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

@@ -455,7 +455,27 @@ function handleFunctionStyle(funcString, record) {
     return {}
   }
 }
+function handleFunctionShow(funcString, record) {
+  if (!funcString) {
+    return true
+  }
 
+  try {
+    // 同步执行函数
+    const obj = executeStrFunctionByContext(currInst, funcString, [record])
+    // 如果返回的是对象，则直接返回
+    // 如果返回的是布尔值，则直接返回
+    if (typeof obj === 'boolean') {
+      return obj
+    }
+    // 其他情况返回空对象
+    return true
+  }
+  catch (error) {
+    console.error('Error in handleFunctionShow:', error)
+    return true
+  }
+}
 // 逆序排列主要按钮
 const reversedMainActions = computed(() => {
   return [...mainActions.value].reverse()
@@ -881,10 +901,8 @@ function handleCheckboxChange(item: any, checked: boolean) {
               </VanRow>
               <VanRow gutter="20" class="card_item_details" @click="handleCardClick(item, $event)">
                 <VanCol v-for="column of detailColumns" :key="`details_${column.dataIndex}`" :span="column.span">
-                  <p>
-                    <span :style="handleFunctionStyle(column.styleFunctionForTitle, item)">
-                      {{ (column.showLabel === undefined || column.showLabel) ? `${column.title}: ` : '' }}
-                    </span>
+                  <p v-if="handleFunctionShow(column.showFormItemFuncForMobile, item)">
+                    {{ (column.showLabel === undefined || column.showLabel) ? `${column.title}: ` : '' }}
                     <XBadge
                       :style="handleFunctionStyle(column.styleFunctionForValue, item)"
                       :dict-name="column.dictName"
@@ -904,6 +922,7 @@ function handleCheckboxChange(item: any, checked: boolean) {
                         :key="`tag_${column.dataIndex}`"
                       >
                         <VanTag
+                          :show="handleFunctionShow(column.showFormItemFuncForMobile, item)"
                           :text-color="column.tagColor"
                           :color="column.tagBorderColor"
                           size="large"
@@ -931,7 +950,7 @@ function handleCheckboxChange(item: any, checked: boolean) {
                 @click="handleCardClick(item, $event)"
               >
                 <VanCol v-for="column of footColumns" :key="`foot_${column.dataIndex}`" :span="12">
-                  <p>
+                  <p v-if="handleFunctionShow(column.showFormItemFuncForMobile, item)">
                     <span :style="handleFunctionStyle(column.styleFunctionForTitle, item)">
                       {{ (column.showLabel === undefined || column.showLabel) ? `${column.title}: ` : '' }}
                     </span>

package/src/components/data/XFormGroup/doc/DeviceForm.vue

@@ -119,4 +119,4 @@ onUnmounted(() => {
     color: #ff976a;
   }
 }
-</style>
+</style>

package/src/components/data/XFormGroup/doc/UserForm.vue

@@ -99,4 +99,4 @@ onUnmounted(() => {
 .user-form {
   padding: 16px;
 }
-</style>
+</style>

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毫秒后执行打印
+}

package/src/utils/timeUtil.ts

@@ -1,29 +1,27 @@
-// 时间工具：提供简单的日期时间格式化
-
-export function pad2(num: number): string {
-  return num < 10 ? `0${num}` : `${num}`
-}
-
-/**
- * 按照简单占位符格式化当前时间
- * 支持占位：YYYY MM DD HH mm ss
- * @param format 默认 'YYYY-MM-DD HH:mm:ss'
- */
-export function formatNow(format: string = 'YYYY-MM-DD HH:mm:ss'): string {
-  const d = new Date()
-  const map: Record<string, string> = {
-    YYYY: `${d.getFullYear()}`,
-    MM: pad2(d.getMonth() + 1),
-    DD: pad2(d.getDate()),
-    HH: pad2(d.getHours()),
-    mm: pad2(d.getMinutes()),
-    ss: pad2(d.getSeconds()),
-  }
-  let out = format
-  Object.keys(map).forEach((k) => {
-    out = out.replace(new RegExp(k, 'g'), map[k])
-  })
-  return out
-}
-
-
+// 时间工具：提供简单的日期时间格式化
+
+export function pad2(num: number): string {
+  return num < 10 ? `0${num}` : `${num}`
+}
+
+/**
+ * 按照简单占位符格式化当前时间
+ * 支持占位：YYYY MM DD HH mm ss
+ * @param format 默认 'YYYY-MM-DD HH:mm:ss'
+ */
+export function formatNow(format: string = 'YYYY-MM-DD HH:mm:ss'): string {
+  const d = new Date()
+  const map: Record<string, string> = {
+    YYYY: `${d.getFullYear()}`,
+    MM: pad2(d.getMonth() + 1),
+    DD: pad2(d.getDate()),
+    HH: pad2(d.getHours()),
+    mm: pad2(d.getMinutes()),
+    ss: pad2(d.getSeconds()),
+  }
+  let out = format
+  Object.keys(map).forEach((k) => {
+    out = out.replace(new RegExp(k, 'g'), map[k])
+  })
+  return out
+}

package/src/views/component/XFormGroupView/index.vue

@@ -6,8 +6,8 @@ import { ref } from 'vue'
 import { useRoute } from 'vue-router'
 
 // 纯表单
-const configName = ref('appapplyuserinfoFormGroup')
-const serviceName = ref('af-apply')
+const configName = ref('form_check_test')
+const serviceName = ref('af-system')
 
 // const configName = ref("计划下发Form")
 // const serviceName = ref("af-linepatrol")
@@ -16,20 +16,16 @@ const serviceName = ref('af-apply')
 // const configName = ref('lngChargeAuditMobileFormGroup')
 // const serviceName = ref('af-gaslink')
 
-const formData = ref({ t_userinfo: { f_user_name: 111 } })
+const formData = ref({})
 const formGroup = ref(null)
 const route = useRoute()
 const isInit = ref(false)
 function submit(_result) {
-  showDialog({ message: '提交成功' })
-  history.back()
-}
-const myXForm = ref([])
-function setRef(value: any) {
-  console.log('myXForm', myXForm)
-  formGroup.value.setRef(myXForm.value)
-  console.log(formGroup)
+  showDialog({ message: '提交成功' }).then(() => {
+    history.back()
+  })
 }
+
 // 表单组——数据
 // function initComponents () {
 //   runLogic('getlngChargeAuditMobileFormGroupData', {id: 29}, 'af-gaslink').then((res) => {
@@ -59,16 +55,11 @@ function setRef(value: any) {
 // onBeforeMount(() => {
 //   initComponents()
 // })
-function a() {
-}
 </script>
 
 <template>
   <NormalDataLayout id="XFormGroupView" title="纯表单">
     <template #layout_content>
-      <button @click="a">
-        修改
-      </button>
       <!--      v-if="isInit" -->
       <XFormGroup
         ref="formGroup"
@@ -77,11 +68,7 @@ function a() {
         :group-form-data="formData"
         mode="新增"
         @submit="submit"
-      >
-        <!--        <template #device="{ setRef, removeRef, item, formData }">
-          <XFormView :setRef="setRef" :formGroupName="'myXForm'"/>
-        </template> -->
-      </XFormGroup>
+      />
     </template>
   </NormalDataLayout>
 </template>

package/src/views/component/XFormView/index.vue

@@ -3,10 +3,22 @@ import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
 import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
 import { ref } from 'vue'
 
-const configName = ref('lngSecurityChecktestForm')
-const serviceName = ref('af-safecheck')
+const configName = ref('ceshiForm')
+const serviceName = ref('af-system')
 
 const formGroupAddConstruction = ref(null)
+const formData = ref({
+  'YYYY': '2025-09-08 16:03:22',
+  'YYYY-MM': '2025-09-08 16:03:22',
+  'YYYY-MM-DD': '2025-09-08 16:03:22',
+  'YYYY-MM-DDHH': '2025-09-08 16:03:22',
+  'YYYY-MM-DDHHMM': '2025-09-08 16:03:22',
+  'YYYY-MM-DDHHMMSS': '2025-09-08 16:03:22',
+})
+
+function onSubmit(data: any) {
+  console.warn('提交表单', data)
+}
 </script>
 
 <template>
@@ -14,10 +26,11 @@ const formGroupAddConstruction = ref(null)
     <template #layout_content>
       <XForm
         ref="formGroupAddConstruction"
-        mode="新增"
+        mode="修改"
         :config-name="configName"
         :service-name="serviceName"
-        :form-readonly="false"
+        :form-data="formData"
+        @on-submit="onSubmit"
       />
     </template>
   </NormalDataLayout>

package/src/stores/modules/homeApp/README.md

@@ -1,124 +0,0 @@
-# HomeApp Store 使用说明
-
-## 概述
-`useHomeAppStore` 是一个专门用于管理首页应用列表的 Pinia store，与 `useSettingStore` 配合使用。
-
-## 特性
-- 独立管理 `homeAppList` 数据
-- 提供完整的 CRUD 操作
-- 与 setting store 自动同步数据
-- 支持类型安全的 TypeScript 接口
-
-## 基本使用
-
-### 1. 导入和使用
-```typescript
-import { useHomeAppStore } from '@/stores'
-
-const homeAppStore = useHomeAppStore()
-```
-
-### 2. 获取应用列表
-```typescript
-// 获取所有应用
-const apps = homeAppStore.getHomeAppList()
-
-// 直接访问响应式数据
-const apps = homeAppStore.homeAppList
-```
-
-### 3. 添加应用
-```typescript
-homeAppStore.addHomeApp({
-  id: 'new-app',
-  name: '新应用',
-  icon: '/icon.png',
-  url: 'https://example.com',
-  description: '应用描述'
-})
-```
-
-### 4. 更新应用
-```typescript
-homeAppStore.updateHomeApp('app-id', {
-  name: '更新后的名称',
-  description: '新的描述'
-})
-```
-
-### 5. 删除应用
-```typescript
-homeAppStore.removeHomeApp('app-id')
-```
-
-### 6. 清空列表
-```typescript
-homeAppStore.clearHomeAppList()
-```
-
-## 数据同步
-
-### 自动同步
-- 当 `useSettingStore.init()` 被调用时，`homeAppList` 会自动同步到 `useHomeAppStore`
-- 无需手动同步，数据会自动保持一致
-
-### 手动同步
-```typescript
-import { useSettingStore, useHomeAppStore } from '@/stores'
-
-const settingStore = useSettingStore()
-const homeAppStore = useHomeAppStore()
-
-// 手动同步数据
-homeAppStore.setHomeAppList(settingStore.getSetting()?.homeAppList || [])
-```
-
-## 在组件中使用
-
-### Vue 组件示例
-```vue
-<template>
-  <div class="home-apps">
-    <div 
-      v-for="app in homeAppStore.homeAppList" 
-      :key="app.id"
-      class="app-item"
-      @click="openApp(app)"
-    >
-      <img :src="app.icon" :alt="app.name" />
-      <span>{{ app.name }}</span>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useHomeAppStore } from '@/stores'
-
-const homeAppStore = useHomeAppStore()
-
-function openApp(app) {
-  // 处理应用点击
-  window.open(app.url, '_blank')
-}
-</script>
-```
-
-## 注意事项
-
-1. **初始化顺序**：确保先调用 `useSettingStore.init()`，再使用 `useHomeAppStore`
-2. **数据一致性**：两个 store 中的数据会自动保持同步
-3. **类型安全**：使用 TypeScript 接口确保类型安全
-4. **响应式**：所有数据都是响应式的，可以直接在模板中使用
-
-## 接口定义
-
-```typescript
-export interface HomeApp {
-  id: string          // 应用唯一标识
-  name: string        // 应用名称
-  icon: string        // 应用图标
-  url: string         // 应用链接
-  description?: string // 应用描述（可选）
-  [key: string]: any  // 其他属性
-}
-```