af-mobile-client-vue3 1.2.57 → 1.3.1

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

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import XBadge from '@af-mobile-client-vue3/components/data/XBadge/index.vue'
 import XCellListFilter from '@af-mobile-client-vue3/components/data/XCellListFilter/index.vue'
-import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
 import { getConfigByName, query } from '@af-mobile-client-vue3/services/api/common'
 import useUserStore from '@af-mobile-client-vue3/stores/modules/user'
 import { getRangeByType } from '@af-mobile-client-vue3/utils/queryFormDefaultRangePicker'
@@ -15,7 +14,6 @@ import {
   Icon as VanIcon,
   List as VanList,
   Popover as VanPopover,
-  Popup as VanPopup,
   PullRefresh as VanPullRefresh,
   Row as VanRow,
   Search as VanSearch,
@@ -25,7 +23,15 @@ import {
 import { computed, defineEmits, defineProps, getCurrentInstance, onBeforeMount, ref, useSlots, watch } from 'vue'
 import { useRouter } from 'vue-router'
 
-const { configName, serviceName, fixQueryForm, customAdd, customEdit } = withDefaults(defineProps<{
+const {
+  configName = '',
+  fixQueryForm = null,
+  idKey = 'o_id',
+  serviceName,
+  scanOptions,
+  customAdd = false,
+  customEdit = false,
+} = defineProps<{
   configName?: string
   fixQueryForm?: object
   idKey?: string
@@ -38,15 +44,7 @@ const { configName, serviceName, fixQueryForm, customAdd, customEdit } = withDef
   // 是否自定义新增、编辑按钮
   customAdd?: boolean
   customEdit?: boolean
-}>(), {
-  configName: '',
-  fixQueryForm: null,
-  idKey: 'o_id',
-  serviceName: undefined,
-  scanOptions: undefined,
-  customAdd: false,
-  customEdit: false,
-})
+}>()
 
 const emit = defineEmits<{
   (e: 'toDetail', item: any): void
@@ -151,9 +149,6 @@ const slots = useSlots()
 // 当前组件实例（不推荐使用，可能会在后续的版本更迭中调整，暂时用来绑定函数的上下文）
 const currInst = getCurrentInstance()
 
-// 控制抽屉显示
-const showDrawer = ref(false)
-
 // 列表底部的文字显示
 function finishedBottomText() {
   if (buttonState.value?.add && buttonState.value.add === true && (filterButtonPermissions('add').state === false || ((filterButtonPermissions('add').state === true && userState.f.resources.f_role_name.includes((filterButtonPermissions('add').roleStr))))))
@@ -469,7 +464,16 @@ function addOption() {
     emit('add')
   }
   else {
-    showDrawer.value = true
+    // 默认行为 - 导航到XForm页面
+    router.push({
+      name: 'XForm',
+      query: {
+        groupFormItems: JSON.stringify(groupFormItems.value),
+        serviceName,
+        formData: JSON.stringify({}),
+        mode: '新增',
+      },
+    })
   }
 }
 
@@ -744,23 +748,6 @@ defineExpose({
       </VanPullRefresh>
       <VanBackTop />
     </div>
-    <VanPopup v-model:show="showDrawer" position="bottom" :style="{ height: '90vh', borderTopLeftRadius: '10px', borderTopRightRadius: '10px', overflow: 'hidden', padding: 0 }">
-      <div class="drawer-header">
-        <span class="drawer-title">{{ title || '新增' }}</span>
-        <van-icon name="cross" class="drawer-close" @click="showDrawer = false" />
-      </div>
-      <div class="drawer-content-scroll">
-        <XForm
-          :config-name="configName"
-          :service-name="serviceName"
-          :form-data="{}"
-          :group-form-items="groupFormItems"
-          mode="新增"
-          @on-submit="showDrawer = false"
-          @close="showDrawer = false"
-        />
-      </div>
-    </VanPopup>
   </div>
 </template>
 
@@ -1081,37 +1068,4 @@ defineExpose({
     }
   }
 }
-.drawer-header {
-  position: sticky;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 2;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 48px;
-  border-bottom: 1px solid #f0f0f0;
-  background: #fff;
-  box-shadow: 0 2px 8px rgba(0,0,0,0.03);
-}
-.drawer-title {
-  font-size: 18px;
-  font-weight: 600;
-  color: #222;
-}
-.drawer-close {
-  position: absolute;
-  right: 16px;
-  top: 50%;
-  transform: translateY(-50%);
-  font-size: 22px;
-  color: #888;
-  cursor: pointer;
-}
-.drawer-content-scroll {
-  height: calc(90vh - 48px);
-  overflow-y: auto;
-  background: #fff;
-}
 </style>

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

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

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

@@ -33,21 +33,21 @@ function handleSubmit(result: any) {
         @submit="handleSubmit"
       >
         <!-- 用户信息插槽 -->
-        <template #user="{ setRef, removeRef, userFormData }">
+        <template #user="{ setRef, removeRef, formData }">
           <UserForm
             :set-ref="setRef"
             :remove-ref="removeRef"
             form-group-name="userInfo"
-            :form-data="userFormData"
+            :form-data="formData"
           />
         </template>
         <!-- 设备信息插槽 -->
-        <template #device="{ setRef, removeRef, deviceFormData }">
+        <template #device="{ setRef, removeRef, formData }">
           <DeviceForm
             :set-ref="setRef"
             :remove-ref="removeRef"
             form-group-name="deviceInfo"
-            :form-data="deviceFormData"
+            :form-data="formData"
           />
         </template>
       </XFormGroup>

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

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

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

@@ -10,12 +10,14 @@ const props = withDefaults(defineProps<{
   groupFormData?: object
   mode?: string
   isScrollspy?: boolean
+  formShow?: any
 }>(), {
   configName: '',
   serviceName: undefined,
   groupFormData: () => ({}),
   mode: '查询',
   isScrollspy: true,
+  formShow: undefined,
 })
 const emit = defineEmits(['submit', 'xFormItemEmitFunc'])
 
@@ -25,6 +27,7 @@ interface Form {
   groupFormData?: object
   mode?: string
   isScrollspy?: boolean
+  formShow?: any
 }
 
 const groupItems = ref([])
@@ -38,6 +41,12 @@ const propsData = ref<Partial<Form>>({})
 const slots = useSlots()
 const renderableGroupItems = computed(() => {
   return groupItems.value.filter((item) => {
+    if (props.formShow && (item.groupName || item.slotName)) {
+      const showKey = `show${item.groupName || item.slotName}`
+      if (props.formShow[showKey] === false) {
+        return false
+      }
+    }
     if (item.formGroupType === 'slot') {
       return !!(item.slotName && slots[item.slotName])
     }
@@ -53,6 +62,7 @@ function init(params: Form) {
     serviceName: props.serviceName,
     groupFormData: props.groupFormData,
     mode: props.mode,
+    formShow: props.formShow,
     ...params,
   }
   formData.value = propsData.value.groupFormData
@@ -141,7 +151,7 @@ defineExpose({ init, removeRef, xFormListRef })
       >
         <div
           class="x-form-group-item"
-          :class="{ 'is-last': index === groupItems.length - 1 }"
+          :class="{ 'is-last': index === renderableGroupItems.length - 1 }"
         >
           <div v-if="item.describe && propsData.isScrollspy && (item.groupName || item.slotName)" class="form-group-title">
             <span class="form-group-bar" />

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

@@ -2,7 +2,6 @@
 import type { FieldType } from 'vant'
 import type { Numeric } from 'vant/es/utils'
 import ImageUploader from '@af-mobile-client-vue3/components/core/ImageUploader/index.vue'
-import Uploader from '@af-mobile-client-vue3/components/core/Uploader/index.vue'
 import XGridDropOption from '@af-mobile-client-vue3/components/core/XGridDropOption/index.vue'
 import XMultiSelect from '@af-mobile-client-vue3/components/core/XMultiSelect/index.vue'
 import XSelect from '@af-mobile-client-vue3/components/core/XSelect/index.vue'
@@ -964,29 +963,9 @@ function findOptionInTree(options, value) {
     </VanField>
 
     <!-- 文件上传 -->
-    <VanField
-      v-if="attr.type === 'file' && showItem"
-      name="uploader"
-      :label="labelData"
-      :label-align="labelAlign"
-      :input-align="attr.inputAlign ? attr.inputAlign : 'left'"
-      :rules="[{ required: attr.rule.required === 'true', message: `请选择${attr.name}` }]"
-      :required="attr.rule.required === 'true'"
-    >
-      <template #input>
-        <!--      <van-uploader v-model="localValue" /> -->
-        <Uploader
-          upload-mode="server"
-          :image-list="(modelData as any[])"
-          authority="admin"
-          @update-file-list="updateFile"
-        />
-      </template>
-    </VanField>
-
     <!-- 图片上传, 手机端拍照 -->
     <VanField
-      v-if="attr.type === 'image' && showItem"
+      v-if="(attr.type === 'image' || attr.type === 'file') && showItem"
       name="image"
       :label="labelData"
       :label-align="labelAlign"
@@ -1000,6 +979,7 @@ function findOptionInTree(options, value) {
           :image-list="(modelData as any[])"
           authority="admin"
           :attr="attr"
+          :mode="props.mode"
           @update-file-list="updateFile"
         />
       </template>

package/src/components/data/XReportForm/XReportFormJsonRender.vue

@@ -81,10 +81,10 @@ initComponent()
 function initComponent() {
   for (let i = 0; i < props.jsonConfig.content.length; i++) {
     receivedFunction.push({
-      // eslint-disable-next-line no-eval
-      labelFunction: eval(`(${props.jsonConfig.content[i].customFunctionForLabel})`),
-      // eslint-disable-next-line no-eval
-      valueFunction: eval(`(${props.jsonConfig.content[i].customFunctionForValue})`),
+      // eslint-disable-next-line no-new-func
+      labelFunction: new Function(`return ${props.jsonConfig.content[i].customFunctionForLabel}`)(),
+      // eslint-disable-next-line no-new-func
+      valueFunction: new Function(`return ${props.jsonConfig.content[i].customFunctionForValue}`)(),
     })
   }
   formatConfig()
@@ -127,25 +127,25 @@ function initComponent() {
 </template>
 
 <style scoped lang="less">
-.main{
+.main {
   padding-top: 4vh;
   width: 100vw;
   height: 100vh;
   background-color: #eff2f5;
 
-  .title{
+  .title {
     padding-bottom: 2vh;
     color: rgb(50, 50, 51);
     text-align: center;
     margin: 0 0 3vh;
   }
 
-  .text_box{
+  .text_box {
     margin-top: 2vh;
     margin-bottom: 2vh;
   }
 
-  .main_text{
+  .main_text {
     padding-left: 16px;
     font-weight: 400;
     line-height: 1.6;
@@ -154,53 +154,53 @@ function initComponent() {
     font-size: 14px;
   }
 
-  .show_value_item{
+  .show_value_item {
     text-align: center;
     font-size: 1.2em;
   }
 
-  .cell_group{
+  .cell_group {
     margin-top: 2vh;
     margin-bottom: 2vh;
   }
 
-  .form_item{
+  .form_item {
     margin-top: 2vh;
   }
 
-  .button_group{
+  .button_group {
     text-align: center;
     margin-top: 3vh;
     margin-bottom: 3vh;
   }
 
-  .button_group>:first-child {
+  .button_group > :first-child {
     margin-right: 3vw;
   }
 
-  .divider{
+  .divider {
     color: #1989fa;
     border-color: #1989fa;
-    padding: 0 16px
+    padding: 0 16px;
   }
 
-  .submit_button{
+  .submit_button {
     background-color: #eff2f5;
     padding: 5vh;
   }
 }
 
-.skeleton{
-  margin-top: 5vh
+.skeleton {
+  margin-top: 5vh;
 }
-.my-cell-group{
-  margin: 0 0 10px 0
+.my-cell-group {
+  margin: 0 0 10px 0;
 }
 :deep(.van-collapse-item__content) {
   background-color: #eff2f5;
   padding: 10px 0;
 }
-:deep(.van-cell-group__title){
+:deep(.van-cell-group__title) {
   padding-top: 10px;
   padding-bottom: 10px;
 }
@@ -210,7 +210,7 @@ function initComponent() {
 :deep(.van-cell__title) {
   font-weight: 600;
 }
-:deep(.van-uploader__wrapper){
+:deep(.van-uploader__wrapper) {
   padding: 10px;
   display: flex;
   flex-wrap: wrap;

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

@@ -143,10 +143,7 @@ function isFieldEmpty(value: any): boolean {
   if (Array.isArray(value) && value.length === 0) {
     return true
   }
-  if (typeof value === 'object' && Object.keys(value).length === 0) {
-    return true
-  }
-  return false
+  return typeof value === 'object' && Object.keys(value).length === 0
 }
 
 // 表单校验
@@ -432,16 +429,28 @@ function getConfigAndJoin(config: configDefine, outerLock: getConfigLock): void
   }
 }
 
-function deserializeFunctionAndRun(functionStr, value) {
-  // eslint-disable-next-line no-eval
-  const fun = eval(`(${functionStr})`)
-  return fun(value, activatedConfig)
+function deserializeFunctionAndRun(functionStr: string, value: any) {
+  try {
+    // eslint-disable-next-line no-new-func
+    const fun = new Function('value', 'activatedConfig', `return (${functionStr})(value, activatedConfig)`)
+    return fun(value, activatedConfig)
+  }
+  catch (err) {
+    console.error('Failed to deserialize and run function:', err)
+    return null
+  }
 }
 
-function deserializeFunctionAndRunWithConfig(functionStr) {
-  // eslint-disable-next-line no-eval
-  const fun = eval(`(${functionStr})`)
-  return fun(activatedConfig)
+function deserializeFunctionAndRunWithConfig(functionStr: string) {
+  try {
+    // eslint-disable-next-line no-new-func
+    const fun = new Function('activatedConfig', `return (${functionStr})(activatedConfig)`)
+    return fun(activatedConfig)
+  }
+  catch (err) {
+    console.error('Failed to deserialize and run function with config:', err)
+    return null
+  }
 }
 
 // 将table配置的表格转换为适合Form展示的格式
@@ -1009,9 +1018,9 @@ function getNow() {
                 <van-cell-group v-else-if="row.type === 'signature'" inset style="margin-top: 4vh">
                   <van-field
                     :label="row.valueText ? `${row.valueText}:` : ''"
-                    readonly
+
                     rows="1"
-                    autosize
+                    autosize readonly
                   >
                     <template #button>
                       <XSignature v-model="activatedConfig.data[row.dataIndex]" />

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

@@ -33,7 +33,7 @@ const attr = ref({})
 
 // Store
 const userStore = useUserStore()
-const { user: currUser } = storeToRefs(userStore)
+const currUser = storeToRefs(userStore)
 
 // Refs
 const mainRef = ref()
@@ -142,7 +142,6 @@ async function onSubmit() {
       if (result?.message) {
         showDialog({
           message: result.message,
-          type: messageType,
         })
       }
 

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

@@ -295,7 +295,7 @@ function exportData() {
 }
 
 function printDocument() {
-  const printContent = window.rawDocument.getElementById('printReady')
+  const printContent = (window as any).rawDocument.getElementById('printReady')
   // printElement(printContent)
   showDialog({ message: '操作成功！' })
 }
@@ -321,8 +321,8 @@ function configInit() {
   activeConfig.value.columns.forEach((row: any[]) => {
     row.forEach((cell) => {
       if (cell.dynamicDataIndex === true) {
-        // eslint-disable-next-line no-eval
-        const func = eval(`(${cell.customFunctionForDynamicDataIndex})`)
+        // eslint-disable-next-line no-new-func
+        const func = new Function(`return ${cell.customFunctionForDynamicDataIndex}`)()
         cell.dataIndex = func(config.value)
       }
       if (['action', 'click'].includes(cell.eventType) && cell.customFunction && !cell.events) {

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/XReportDesign.vue

@@ -151,7 +151,7 @@ onMounted(() => {
 })
 
 // 监听
-watch(() => props.config, (newVal) => {
+watch(() => props.config, () => {
   // 配置变化时的处理
 }, { deep: true })
 
@@ -248,10 +248,10 @@ watch(() => activatedConfig.value, (val) => {
                   <span class="inputsDivItemLabel">{{ displayFormatStartText(item.format) }}</span>
                   <template v-if="!forDisplay">
                     <template v-if="item.inputReadOnly === true">
-                      <a-input v-model="data[item.dataIndex][index]" :style="`width:${item.inputWidth ? item.inputWidth : '100'}%`" :disabled="true" />
+                      <van-field v-model="data[item.dataIndex][index]" :style="`width:${item.inputWidth ? item.inputWidth : '100'}%`" :disabled="true" />
                     </template>
                     <template v-else>
-                      <a-input v-model="data[item.dataIndex][index]" :style="`width:${item.inputWidth ? item.inputWidth : '100'}%`" />
+                      <van-field v-model="data[item.dataIndex][index]" :style="`width:${item.inputWidth ? item.inputWidth : '100'}%`" />
                     </template>
                   </template>
                   <template v-else>
@@ -446,7 +446,7 @@ watch(() => activatedConfig.value, (val) => {
 </template>
 
 <style lang="less" scoped>
-.img{
+.img {
   width: 95%;
   height: 180px;
   object-fit: cover;
@@ -490,8 +490,8 @@ watch(() => activatedConfig.value, (val) => {
   .reportTable {
     width: 100%;
     border-collapse: collapse;
-    table-layout:fixed;
-    word-break:break-all;
+    table-layout: fixed;
+    word-break: break-all;
   }
 }
 .reportMainForDisplay {
@@ -532,8 +532,8 @@ watch(() => activatedConfig.value, (val) => {
   .reportTable {
     width: 100%;
     border-collapse: collapse;
-    table-layout:fixed;
-    word-break:break-all;
+    table-layout: fixed;
+    word-break: break-all;
   }
 }
 .reportMainNoPadding {
@@ -544,7 +544,7 @@ watch(() => activatedConfig.value, (val) => {
   // background-color: #fff;
   border-radius: 8px;
   height: auto;
-  min-height : 20vh;
+  min-height: 20vh;
   overflow-y: auto;
   overflow-x: hidden;
 
@@ -578,17 +578,17 @@ watch(() => activatedConfig.value, (val) => {
   .reportTable {
     width: 100%;
     border-collapse: collapse;
-    table-layout:fixed;
-    word-break:break-all;
+    table-layout: fixed;
+    word-break: break-all;
   }
 }
-.tools{
+.tools {
   position: fixed;
   right: 2%;
   text-align: right;
   width: 60%;
   cursor: pointer;
-  .toolsItem{
+  .toolsItem {
     width: 15%;
     margin-right: 3%;
     display: inline-block;

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

@@ -31,7 +31,7 @@ const attr = ref({})
 
 // Store
 const userStore = useUserStore()
-const { user: currUser } = storeToRefs(userStore)
+const currUser = storeToRefs(userStore)
 
 // Refs
 const mainRef = ref()