af-mobile-client-vue3 1.2.40 → 1.2.41

package/package.json

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

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

@@ -2,7 +2,7 @@
 import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
 import { getConfigByName } from '@af-mobile-client-vue3/services/api/common'
 import { Button as VanButton, Tab as VanTab, Tabs as VanTabs } from 'vant'
-import { computed, defineEmits, defineProps, onBeforeMount, onMounted, ref, useSlots, watch } from 'vue'
+import { defineEmits, defineProps, onBeforeMount, onMounted, ref, watch } from 'vue'
 
 const props = withDefaults(defineProps<{
   configName?: string
@@ -33,17 +33,7 @@ const submitGroup = ref(false)
 const submitSimple = ref(false)
 const isInit = ref(false)
 const initStatus = ref(false)
-const propsData = ref<Partial<Form>>({})
-
-const slots = useSlots()
-const renderableGroupItems = computed(() => {
-  return groupItems.value.filter((item) => {
-    if (item.formGroupType === 'slot') {
-      return !!(item.slotName && slots[item.slotName])
-    }
-    return true
-  })
-})
+const propsData = ref<Form>({})
 
 // 组件初始化函数
 function init(params: Form) {
@@ -60,7 +50,7 @@ function init(params: Form) {
     if (result?.groups) {
       groupItems.value = result.groups
       result.groups.forEach((group) => {
-        if (!formData.value[group.groupName] && group.formGroupType !== 'slot')
+        if (!formData.value[group.groupName])
           formData.value[group.groupName] = {}
         if (group.showSubmitBtn)
           submitGroup.value = true
@@ -80,39 +70,11 @@ onBeforeMount(() => {
   if (!initStatus.value)
     init(props)
 })
-interface XFormLike {
-  validate: () => Promise<void>
-  formGroupName?: string
-  form?: any
-  getFormData?: () => object
-}
-const xFormListRef = ref<XFormLike[]>([])
-
-// 注册表单实例，避免重复
-function setRef(refValue: XFormLike) {
-  if (refValue && !xFormListRef.value.includes(refValue)) {
-    xFormListRef.value.push(refValue)
-  }
-}
-// 注销表单实例
-function removeRef(refValue: XFormLike) {
-  const idx = xFormListRef.value.indexOf(refValue)
-  if (idx !== -1)
-    xFormListRef.value.splice(idx, 1)
-}
-
+const xFormListRef = ref([])
 async function submit() {
   for (const res of xFormListRef.value) {
-    try {
-      await res.validate()
-      if (res.formGroupName && typeof res.getFormData === 'function') {
-        formData.value[res.formGroupName] = res.getFormData()
-      }
-    }
-    catch (msg) {
-      console.log('error:', msg)
-      return
-    }
+    await res.validate()
+    formData.value[res.formGroupName] = res.form
   }
   emit('submit', formData.value)
 }
@@ -125,14 +87,14 @@ onMounted(() => {
   offsetTop.value = Number.parseInt(navBarHeight, 10) || 60 + 10
 })
 
-defineExpose({ init, removeRef, xFormListRef })
+defineExpose({ init })
 </script>
 
 <template>
   <div v-if="isInit" id="x-form-group">
     <VanTabs :scrollspy="propsData.isScrollspy" sticky :offset-top="offsetTop">
       <VanTab
-        v-for="(item, index) in renderableGroupItems"
+        v-for="(item, index) in groupItems"
         :key="item.groupName ? (item.groupName + index) : index"
         :title="item.describe ? item.describe : item.tableName "
       >
@@ -144,28 +106,17 @@ defineExpose({ init, removeRef, xFormListRef })
             <span class="form-group-bar" />
             <span class="form-group-text">{{ item.describe }}</span>
           </div>
-          <template v-if="item.formGroupType === 'slot'">
-            <slot
-              :name="item.slotName"
-              :item="item"
-              :form-data="item.groupName ? formData[item.groupName] : formData"
-              :set-ref="setRef"
-              :remove-ref="removeRef"
-            />
-          </template>
-          <template v-else>
-            <XForm
-              ref="xFormListRef"
-              :mode="props.mode"
-              :is-group-form="true"
-              :group-form-items="item"
-              :form-data="item.groupName ? formData[item.groupName] : formData"
-              :form-name="item.groupName"
-              :service-name="props.serviceName"
-              :submit-button="submitSimple"
-              @on-submit="submit"
-            />
-          </template>
+          <XForm
+            ref="xFormListRef"
+            :is-group-form="true"
+            :mode="props.mode"
+            :group-form-items="item"
+            :form-data="item.groupName ? formData[item.groupName] : formData"
+            :form-name="item.groupName"
+            :service-name="props.serviceName"
+            :submit-button="submitSimple"
+            @on-submit="submit"
+          />
         </div>
       </VanTab>
     </VanTabs>

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

@@ -187,6 +187,27 @@ function getDefaultValue() {
   const getDefaultByType = () => {
     const def = mode !== '查询' ? attr.formDefault : attr.queryFormDefault
 
+    if (['treeSelect', 'select', 'checkbox'].includes(attr.type) && ['curOrgId', 'curDepId', 'curUserId'].includes(def)) {
+      if (def === 'curOrgId') {
+        if (attr.type === 'treeSelect') {
+          treeValue.value = userState.f.resources.orgs
+        }
+        return attr.type === 'select' ? userState.f.resources.orgid : [userState.f.resources.orgid]
+      }
+      if (def === 'curDepId') {
+        if (attr.type === 'treeSelect') {
+          treeValue.value = userState.f.resources.deps
+        }
+        return attr.type === 'select' ? userState.f.resources.depids : [userState.f.resources.depids]
+      }
+      if (def === 'curUserId') {
+        if (attr.type === 'treeSelect') {
+          treeValue.value = userState.f.resources.name
+        }
+        return attr.type === 'select' ? userState.f.resources.id : [userState.f.resources.id]
+      }
+    }
+
     // 数组类型默认值
     const arrayTypes = ['uploader', 'checkbox', 'file', 'area', 'image', 'treeSelect']
     if (arrayTypes.includes(attr.type)) {
@@ -716,10 +737,34 @@ defineExpose({
   reset,
 })
 
+// 数据处理
+function cleanEmptyChildren(options, fieldNames = { text: 'label', value: 'value', children: 'children' }) {
+  if (!Array.isArray(options))
+    return options
+
+  const childrenKey = fieldNames.children || 'children'
+
+  return options.map((option) => {
+    // 深拷贝选项，避免修改原始数据
+    const newOption = { ...option }
+
+    // 如果存在children属性且是空数组
+    if (newOption[childrenKey] && Array.isArray(newOption[childrenKey]) && newOption[childrenKey].length === 0) {
+      delete newOption[childrenKey]
+    }
+    // 如果存在children属性且非空，则递归处理
+    else if (newOption[childrenKey] && Array.isArray(newOption[childrenKey])) {
+      newOption[childrenKey] = cleanEmptyChildren(newOption[childrenKey], fieldNames)
+    }
+    return newOption
+  })
+}
+
 // 级联选择完成事件
-function onTreeSelectFinish(value) {
-  treeValue.value = value.value
-  modelData.value = [value.value]
+function onTreeSelectFinish({ selectedOptions }) {
+  const index = selectedOptions.length - 1
+  treeValue.value = selectedOptions[index].label
+  modelData.value = [selectedOptions[index].value]
   showTreeSelect.value = false
 }
 
@@ -1217,7 +1262,7 @@ function emitFunc(func, data) {
       overlay-class="date-picker-overlay"
     >
       <VanCascader
-        :options="option"
+        :options="cleanEmptyChildren(option, attr.customFieldName ? attr.customFieldName : { text: 'label', value: 'value', children: 'children' })"
         :field-names="attr.customFieldName ? attr.customFieldName : { text: 'label', value: 'value', children: 'children' }"
         :title="attr.name"
         :closeable="true"

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