af-mobile-client-vue3 1.3.72 → 1.3.73

package/package.json

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

package/src/components/core/ImageUploader/index.vue

@@ -2,6 +2,7 @@
 // import cameraIcon from '@af-mobile-client-vue3/assets/img/component/camera.png'
 import { deleteFile, upload } from '@af-mobile-client-vue3/services/api/common'
 import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
+import { formatNow } from '@af-mobile-client-vue3/utils/timeUtil'
 import {
   ActionSheet,
   Icon as VanIcon,
@@ -9,12 +10,21 @@ import {
 } from 'vant'
 import { ref } from 'vue'
 
+interface WatermarkConfig {
+  fontSize?: number | string
+  color?: string
+  alpha?: number
+  userName?: string
+  format?: string
+  customLines?: string[]
+}
+
 const props = defineProps({
   imageList: Array<any>,
   outerIndex: { default: undefined },
   authority: { default: 'user' },
   uploadMode: { default: 'server' },
-  attr: { type: Object as () => { addOrEdit?: string, acceptCount?: number, uploadImage?: boolean }, default: () => ({}) },
+  attr: { type: Object as () => { addOrEdit?: string, acceptCount?: number, uploadImage?: boolean, watermark?: WatermarkConfig }, default: () => ({}) },
   mode: { default: '新增' }, // 预览
   // 整体只读：只允许预览，禁止拍照/上传/删除
   readonly: { type: Boolean, default: false },
@@ -103,6 +113,20 @@ function uploadFileViaHttp(file: File, previewUrl: string, temp: any) {
   })
 }
 
+function buildWatermarkText() {
+  const wm = (props.attr as any)?.watermark ?? {}
+  const user = wm.userName ?? ''
+  const time = formatNow(wm.format || 'YYYY-MM-DD HH:mm:ss')
+  const lines: string[] = []
+  if (user)
+    lines.push(`拍摄人：${user}`)
+  if (time)
+    lines.push(`拍摄时间：${time}`)
+  if (Array.isArray(wm.customLines) && wm.customLines.length > 0)
+    lines.push(...wm.customLines.filter((v: any) => typeof v === 'string' && v !== ''))
+  return lines.join('\n')
+}
+
 function handleBrowserFiles(files: FileList | null) {
   if (!files || files.length === 0)
     return
@@ -125,7 +149,22 @@ function handleBrowserFiles(files: FileList | null) {
 function triggerCamera() {
   mobileUtil.execute({
     funcName: 'takePicture',
-    param: {},
+    param: (() => {
+      const param: any = {}
+      const watermark = (props.attr as any)?.watermark
+      if (watermark) {
+        const txt = buildWatermarkText()
+        if (txt)
+          param.watermark = txt
+        if (watermark.fontSize !== undefined && String(watermark.fontSize) !== '')
+          param.watermarkFontSize = watermark.fontSize
+        if (watermark.color)
+          param.watermarkColor = watermark.color
+        if (watermark.alpha !== undefined && String(watermark.alpha) !== '')
+          param.watermarkAlpha = watermark.alpha
+      }
+      return param
+    })(),
     callbackFunc: (result: any) => {
       if (result.status === 'success') {
         handlePhotoUpload(result.data)

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

@@ -64,6 +64,8 @@ const props = withDefaults(defineProps<{
   formReadonly?: boolean
   // 控制上传——异步/同步
   isAsyncUpload?: boolean
+  // 可选：自定义水印内容数组（将拼接在组件默认行之后）
+  watermarkCustomLines?: string[]
 }>(), {
   configName: undefined,
   groupTitle: undefined,
@@ -78,6 +80,7 @@ const props = withDefaults(defineProps<{
   isGroupForm: false,
   formReadonly: false,
   isAsyncUpload: false,
+  watermarkCustomLines: () => [],
 })
 
 const emits = defineEmits(['onSubmit', 'xFormItemEmitFunc'])
@@ -99,6 +102,8 @@ const formConfig = ref<GroupFormItems | null>(null)
 const formGroupName = ref<string>('default')
 const myServiceName = ref('')
 const tableName = ref('')
+// 水印基础配置（从配置中心加载）
+const watermarkBaseConfig = ref<any | null>(null)
 
 // 计算属性（获取全部表单项信息）
 const realJsonData = computed(() => {
@@ -179,6 +184,11 @@ async function initializeForm() {
       console.warn('未提供配置名称或表单配置，等待 init 函数调用')
       resetForm()
     }
+
+    // 按需加载水印配置
+    await loadWatermarkConfig()
+    // 应用水印到图片类表单项
+    applyWatermarkToItems()
   }
   catch (error) {
     console.error('表单初始化失败:', error)
@@ -319,7 +329,7 @@ onBeforeMount(() => {
 })
 
 // 支持函数调用方式初始化
-function init(params: InitParams) {
+async function init(params: InitParams) {
   const {
     formItems,
     formData = {},
@@ -332,7 +342,7 @@ function init(params: InitParams) {
   try {
     if (props.configName) {
       // 通过 props 中的配置名称初始化
-      loadFormConfig()
+      await loadFormConfig()
     }
     else if (formItems) {
       // 直接使用传入的配置初始化
@@ -344,6 +354,7 @@ function init(params: InitParams) {
       if (formItems.tableName) {
         tableName.value = formItems.tableName.split(' ')[0] || ''
       }
+      applyWatermarkToItems()
     }
     else {
       console.warn('init 函数调用时既没有 props.configName 也没有 formItems')
@@ -359,6 +370,36 @@ function init(params: InitParams) {
   }
 }
 
+// 加载水印基础配置
+async function loadWatermarkConfig(configName?: string): Promise<void> {
+  return new Promise((resolve) => {
+    getConfigByName('PhotoWatermarkConfig', (result) => {
+      watermarkBaseConfig.value = result || null
+      resolve()
+    }, props.serviceName)
+  })
+}
+
+// 将水印配置应用到图片/文件类表单项（attr.type === 'image' | 'file'）
+function applyWatermarkToItems() {
+  if (!formConfig.value || !Array.isArray(formConfig.value.formJson))
+    return
+  const userName = userStore.getUserInfo()?.name
+  const base = watermarkBaseConfig.value
+  const baseWatermark = base?.watermark ?? base ?? {}
+
+  formConfig.value.formJson = formConfig.value.formJson.map((item: any) => {
+    if (item && (item.type === 'image' || item.type === 'file')) {
+      item.watermark = {
+        ...baseWatermark,
+        userName,
+        customLines: props.watermarkCustomLines,
+      }
+    }
+    return item
+  })
+}
+
 function loadParamLogicNameData(paramLogicName) {
   // 如果有 paramLogicName，自动请求并赋值
   if (paramLogicName && (!props.formData || (props.formData && Object.keys(props.formData).length === 0))) {

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