af-mobile-client-vue3 1.3.58 → 1.3.60

package/package.json

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

package/public/favicon.svg

@@ -1,4 +1,4 @@
-<svg t="1709866807903" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4913" width="32" height="32">
-  <path d="M512 598.528a111.232 111.232 0 0 0-111.232 111.2064V870.4h222.464v-160.6656c0-61.44-49.792-111.232-111.232-111.232z m0 58.0608c-30.72 0-55.6032 24.9088-55.6032 55.6288v105.0368h111.2064v-105.0368c0-30.72-24.8832-55.6288-55.6032-55.6288z" fill="#FB4D31" p-id="4914"></path>
-  <path d="M542.08 270.208l45.2608-78.5408a24.5248 24.5248 0 0 0 0-25.6A26.4448 26.4448 0 0 0 564.1472 153.6a26.3424 26.3424 0 0 0-22.5792 13.44L512 217.6256l-29.5424-50.5344c-4.5824-8.192-13.184-13.312-22.5536-13.4912a26.4448 26.4448 0 0 0-23.2448 12.4928 24.5248 24.5248 0 0 0 0 25.6l45.2352 78.5152L156.928 832.768a24.4736 24.4736 0 0 0 0.3328 25.088c4.8384 7.8336 13.3888 12.544 22.5792 12.5184h664.3456c9.3184 0 17.92-4.7616 22.6304-12.4672a24.4736 24.4736 0 0 0 0.3072-25.088l-325.0176-562.688v0.0512zM619.52 816.64h-33.3568c-12.3648 0-9.6768 0.1024-65.0496 0H512c-55.3728 0.1024-24.704 0-61.7984 0H225.28L512 322.1248 798.72 816.64h-179.2z" fill="#000000" p-id="4915"></path>
-</svg>
+<svg t="1709866807903" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4913" width="32" height="32">
+  <path d="M512 598.528a111.232 111.232 0 0 0-111.232 111.2064V870.4h222.464v-160.6656c0-61.44-49.792-111.232-111.232-111.232z m0 58.0608c-30.72 0-55.6032 24.9088-55.6032 55.6288v105.0368h111.2064v-105.0368c0-30.72-24.8832-55.6288-55.6032-55.6288z" fill="#FB4D31" p-id="4914"></path>
+  <path d="M542.08 270.208l45.2608-78.5408a24.5248 24.5248 0 0 0 0-25.6A26.4448 26.4448 0 0 0 564.1472 153.6a26.3424 26.3424 0 0 0-22.5792 13.44L512 217.6256l-29.5424-50.5344c-4.5824-8.192-13.184-13.312-22.5536-13.4912a26.4448 26.4448 0 0 0-23.2448 12.4928 24.5248 24.5248 0 0 0 0 25.6l45.2352 78.5152L156.928 832.768a24.4736 24.4736 0 0 0 0.3328 25.088c4.8384 7.8336 13.3888 12.544 22.5792 12.5184h664.3456c9.3184 0 17.92-4.7616 22.6304-12.4672a24.4736 24.4736 0 0 0 0.3072-25.088l-325.0176-562.688v0.0512zM619.52 816.64h-33.3568c-12.3648 0-9.6768 0.1024-65.0496 0H512c-55.3728 0.1024-24.704 0-61.7984 0H225.28L512 322.1248 798.72 816.64h-179.2z" fill="#000000" p-id="4915"></path>
+</svg>

package/scripts/verifyCommit.js

@@ -1,19 +1,19 @@
-import fs from 'node:fs'
-
-// import process from 'node:process'
-
-const msg = fs.readFileSync('.git/COMMIT_EDITMSG', 'utf-8').trim()
-
-const commitRE = /^(?:revert: )?(?:feat|fix|docs|dx|style|refactor|perf|test|workflow|build|ci|chore|types|wip|release)(?:\(.+\))?: .{1,50}/
-// const mergeRe = /^(Merge pull request|Merge branch)/
-
-if (!commitRE.test(msg)) {
-  // if (!mergeRe.test(msg)) {
-  // console.log('git commit unpass')
-  // console.error('git commit error, needs title(scope): desc')
-  // process.exit(1)
-  // }
-}
-else {
-  console.log('git commit pass')
-}
+import fs from 'node:fs'
+
+// import process from 'node:process'
+
+const msg = fs.readFileSync('.git/COMMIT_EDITMSG', 'utf-8').trim()
+
+const commitRE = /^(?:revert: )?(?:feat|fix|docs|dx|style|refactor|perf|test|workflow|build|ci|chore|types|wip|release)(?:\(.+\))?: .{1,50}/
+// const mergeRe = /^(Merge pull request|Merge branch)/
+
+if (!commitRE.test(msg)) {
+  // if (!mergeRe.test(msg)) {
+  // console.log('git commit unpass')
+  // console.error('git commit error, needs title(scope): desc')
+  // process.exit(1)
+  // }
+}
+else {
+  console.log('git commit pass')
+}

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

@@ -15,6 +15,8 @@ const props = defineProps({
   uploadMode: { default: 'server' },
   attr: { type: Object as () => { addOrEdit?: string, acceptCount?: number, uploadImage?: boolean }, default: () => ({}) },
   mode: { default: '新增' }, // 预览
+  // 整体只读：只允许预览，禁止拍照/上传/删除
+  readonly: { type: Boolean, default: false },
 })
 const emit = defineEmits(['updateFileList', 'updateAllFileList'])
 
@@ -263,6 +265,8 @@ const actionOptions = [
 ]
 
 function handleUploadAreaClick() {
+  if (props.readonly)
+    return
   if (props.attr?.uploadImage) {
     showActionSheet.value = true
   }
@@ -333,10 +337,10 @@ function handleActionSelect(option: any) {
       ref="uploaderRef"
       v-model="imageList"
       :show-upload="false"
-      :deletable="(props.attr?.addOrEdit !== 'readonly' && props.authority === 'admin') && props.mode !== '预览'"
-      :multiple="props.authority === 'admin'"
+      :deletable="!props.readonly && (props.attr?.addOrEdit !== 'readonly' && props.authority === 'admin') && props.mode !== '预览'"
+      :multiple="!props.readonly && props.authority === 'admin'"
       :preview-image="true"
-      :before-delete="props.attr?.addOrEdit !== 'readonly' && props.authority === 'admin' ? deleteFileFunction : undefined"
+      :before-delete="!props.readonly && props.attr?.addOrEdit !== 'readonly' && props.authority === 'admin' ? deleteFileFunction : undefined"
     />
     <ActionSheet
       v-model:show="showActionSheet"

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

@@ -23,4 +23,4 @@ export interface ConfigItem {
   format?: (value: string | number) => string
   template?: string
   condition?: (data: any) => boolean
-}
+}

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

@@ -60,6 +60,8 @@ const props = withDefaults(defineProps<{
   isHandleFormKey?: boolean
   paramLogicNameParam?: any
   isGroupForm?: boolean
+  // 整体表单只读：为 true 时，所有表单项不可交互
+  formReadonly?: boolean
 }>(), {
   configName: undefined,
   groupTitle: undefined,
@@ -72,6 +74,7 @@ const props = withDefaults(defineProps<{
   isHandleFormKey: true,
   paramLogicNameParam: {},
   isGroupForm: false,
+  formReadonly: false,
 })
 
 const emits = defineEmits(['onSubmit', 'xFormItemEmitFunc'])
@@ -608,6 +611,7 @@ defineExpose({ init, form, formGroupName, validate, asyncSubmit, setForm, getFor
           :rules="rules"
           :service-name="myServiceName"
           :get-data-params="myGetDataParams"
+          :form-readonly="props.formReadonly"
           @set-form="setForm"
           @x-form-item-emit-func="emitFunc"
         />
@@ -624,7 +628,7 @@ defineExpose({ init, form, formGroupName, validate, asyncSubmit, setForm, getFor
         <div class="map-mask" />
       </div>
     </div>
-    <div v-if="resolvedSubmitButton && props.mode !== '预览'" class="form-footer-fixed">
+    <div v-if="resolvedSubmitButton && props.mode !== '预览' && !props.formReadonly" class="form-footer-fixed">
       <VanButton class="action-btn" round block type="primary" native-type="submit">
         {{ props.groupFormItems?.btnName ? props.groupFormItems.btnName : '提交' }}
       </VanButton>

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/XFormItem/index.vue

@@ -44,6 +44,11 @@ const props = defineProps({
   form: {
     type: Object,
   },
+  // 整表只读：来自 XForm，统一控制交互
+  formReadonly: {
+    type: Boolean,
+    default: false,
+  },
   datePickerFilter: {
     type: Function,
     default: () => true,
@@ -512,7 +517,7 @@ const labelAlign = computed(() => {
 })
 // 是否只读
 const readonly = computed(() => {
-  return attr.addOrEdit === 'readonly' || mode === '预览'
+  return props.formReadonly || attr.addOrEdit === 'readonly' || mode === '预览'
 })
 // 提示内容
 const placeholder = computed(() => {
@@ -982,6 +987,7 @@ function findOptionInTree(options, value) {
           authority="admin"
           :attr="attr"
           :mode="props.mode"
+          :readonly="readonly"
           @update-file-list="updateFile"
         />
       </template>
@@ -1089,7 +1095,7 @@ function findOptionInTree(options, value) {
       :is-link="true"
       :placeholder="attr.placeholder ? attr.placeholder : `请选择${attr.name}`"
       :rules="[{ required: attr.rule.required === 'true', message: `请选择${attr.name}` }]"
-      @click="showDatePicker = true"
+      @click="readonly ? null : (showDatePicker = true)"
     />
     <VanPopup v-model:show="showDatePicker" position="bottom" teleport="body" overlay-class="date-picker-overlay">
       <VanPickerGroup
@@ -1126,7 +1132,7 @@ function findOptionInTree(options, value) {
       :label-align="labelAlign"
       :input-align="attr.inputAlign ? attr.inputAlign : 'left'"
       :rules="[{ required: attr.rule.required === 'true', message: '请选择' }]"
-      @click="showTimePicker = true"
+      @click="readonly ? null : (showTimePicker = true)"
     />
     <VanPopup v-model:show="showTimePicker" position="bottom" teleport="body" overlay-class="date-picker-overlay">
       <VanTimePicker
@@ -1154,7 +1160,7 @@ function findOptionInTree(options, value) {
       :input-align="attr.inputAlign ? attr.inputAlign : 'left'"
       :rules="[{ required: attr.rule.required === 'true', message: '请选择' }]"
       :required="attr.rule.required === 'true'"
-      @click="readonly ? null : showArea = true"
+      @click="readonly ? null : (showArea = true)"
     />
     <VanPopup v-model:show="showArea" position="bottom" teleport="body" overlay-class="date-picker-overlay">
       <VanArea
@@ -1250,7 +1256,7 @@ function findOptionInTree(options, value) {
       :placeholder="placeholder"
       :rules="[{ required: attr.rule.required === 'true', message: '请选择地址' }]"
       :required="attr.rule.required === 'true'"
-      @click="readonly ? null : showAddressPicker = true"
+      @click="readonly ? null : (showAddressPicker = true)"
     />
     <VanPopup
       v-model:show="showAddressPicker"
@@ -1279,7 +1285,7 @@ function findOptionInTree(options, value) {
       :placeholder="attr.placeholder ? attr.placeholder : `请选择${attr.name}`"
       :rules="[{ required: attr.rule.required === 'true', message: `请选择${attr.name}` }]"
       :required="attr.rule.required === 'true'"
-      @click="readonly ? null : showTreeSelect = true"
+      @click="readonly ? null : (showTreeSelect = true)"
     />
     <VanPopup
       v-model:show="showTreeSelect"

package/src/components/data/XReportGrid/XAddReport/index.ts

@@ -7,4 +7,4 @@ export default {
   install(app: App) {
     app.component('XAddReport', XAddReport)
   },
-}
+}

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/XReportDrawer/index.ts

@@ -7,4 +7,4 @@ export default {
   install(app: App) {
     app.component('XReportDrawer', XReportDrawer)
   },
-}
+}

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