af-mobile-client-vue3 1.0.84-2 → 1.0.84-3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.0.84-2",
+  "version": "1.0.84-3",
   "description": "Vue + Vite component lib",
   "license": "MIT",
   "engines": {

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

@@ -502,6 +502,8 @@ function addOption() {
       display: flex;
       align-items: center;
       justify-content: center;
+      height: 100%;  // 确保高度与搜索框一致
+      padding: var(--van-search-padding);  // 使用与搜索框相同的内边距
     }
     :deep(.van-search__content) {
       border-radius: 8px;
@@ -534,8 +536,9 @@ function addOption() {
     }
 
     :deep(.van-dropdown-menu__item) {
-      align-items: flex-start;
-      justify-content: flex-start;
+      display: flex;
+      align-items: center;
+      justify-content: center;
     }
   }
 

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

@@ -106,7 +106,7 @@ onMounted(() => {
     <VanDropdownMenu :close-on-click-outside="false">
       <VanDropdownItem ref="listFilterMenu">
         <template #title>
-          <VanIcon name="filter-o" size="20" />
+          <VanIcon name="filter-o" size="23" />
         </template>
         <div class="order-condition">
           <template v-if="props.orderList.length > 0">

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

@@ -1,51 +1,24 @@
-<template>
-  <van-dialog
-    v-model:show="visible"
-    :before-close="close"
-    :confirm-loading="loading"
-    width="80%"
-    :show-confirm-button="true"
-    confirm-text="提交"
-    @confirm="onSubmit"
-    v-bind="attr"
-  >
-    <div v-if="showReport" style="max-height: 70vh; overflow-y: auto; overflow-x: hidden;">
-      <XReport
-        ref="mainRef"
-        :env="env"
-        :use-oss-for-img="false"
-        :config-name="configName"
-        :show-img-in-cell="true"
-        :display-only="displayOnly"
-        :edit-mode="false"
-        :show-save-button="false"
-        :dont-format="true"
-        @update-img="updateImg"
-        @select-row="selectRow"
-      />
-    </div>
-  </van-dialog>
-</template>
-
 <script setup lang="ts">
-import { ref, provide, inject, computed } from 'vue'
+import { inject, provide, ref } from 'vue'
 import { storeToRefs } from 'pinia'
-import { useUserStore } from '@/stores/modules/user'
 import { Dialog as VanDialog, showDialog } from 'vant'
-import { executeStrFunctionByContext } from '@/utils/runEvalFunction'
-import { runLogic } from '@/services/api/common'
-import { getMicroData, getWindow, isMicroAppEnv, microDispatch } from '@/utils/microAppUtils'
-import { getRealKeyData } from '@/utils/util'
-import XReport from '../XReport.vue'
+import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
+import { executeStrFunctionByContext } from '@af-mobile-client-vue3/utils/runEvalFunction'
+import XReport from '@af-mobile-client-vue3/components/data/XReportGrid/XReport.vue'
 
 // Props
 const props = defineProps({
   env: {
     type: String,
-    default: 'prod'
-  }
+    default: 'prod',
+  },
 })
 
+// Emits
+const emit = defineEmits<{
+  (e: 'close'): void
+  (e: 'selectRow', keys: any[], rows: any[]): void
+}>()
 // 状态管理
 const showReport = ref(true)
 const configName = ref('')
@@ -79,7 +52,7 @@ provide('isInAModal', () => true)
 provide('currUser', currUser)
 
 // Methods
-const init = (params: {
+function init(params: {
   configName?: string
   serverName?: string
   displayOnly?: boolean
@@ -87,7 +60,7 @@ const init = (params: {
   outEnv?: Record<string, any>
   mixinData?: Record<string, any>
   attr?: Record<string, any>
-}) => {
+}) {
   const {
     configName: initConfigName = 'medicalRecordCover',
     serverName: initServerName = process.env.VUE_APP_SYSTEM_NAME,
@@ -95,7 +68,7 @@ const init = (params: {
     selectedId: initSelectedId = null,
     outEnv: initOutEnv = {},
     mixinData: initMixinData = {},
-    attr: initAttr = {}
+    attr: initAttr = {},
   } = params
 
   configName.value = initConfigName
@@ -104,51 +77,49 @@ const init = (params: {
   visible.value = true
   attr.value = initAttr
 
-  if (initSelectedId) {
+  if (initSelectedId)
     selectedId.value = initSelectedId
-  }
+
   mixinData.value = initMixinData
   outEnv.value = initOutEnv
 }
 
-const getSelectedId = () => {
+function getSelectedId() {
   if (typeof selectedId.value === 'object') {
-    if (selectedId.value?.selectedId) {
+    if (selectedId.value?.selectedId)
       return selectedId.value.selectedId
-    }
-    if (Object.keys(selectedId.value).length > 0) {
+
+    if (Object.keys(selectedId.value).length > 0)
       return selectedId.value[Object.keys(selectedId.value)[0]]
-    }
   }
   return selectedId.value
 }
 
-const selectRow = (selectedRowKeys: any[], selectedRows: any[]) => {
+function selectRow(selectedRowKeys: any[], selectedRows: any[]) {
   console.log('XAddReport')
   emit('selectRow', selectedRowKeys, selectedRows)
 }
 
-const close = () => {
+function close() {
   loading.value = false
   visible.value = false
   emit('close')
 }
 
-const getComponentByName = (name: string) => {
+function getComponentByName(name: string) {
   const innerRef = getParentComponentByName?.(name)
-  if (innerRef) {
+  if (innerRef)
     return innerRef
-  }
+
   return mainRef.value?.getComponentByName(name)
 }
 
-const onSubmit = async () => {
+async function onSubmit() {
   if (mainRef.value?.config?.confirmFunction) {
     console.info('执行自定义确认逻辑')
     let func = mainRef.value.config.confirmFunction
-    if (func && func.startsWith('function')) {
+    if (func && func.startsWith('function'))
       func = func.replace('function', 'async function')
-    }
 
     try {
       const result = await executeStrFunctionByContext(null, func, [])
@@ -161,48 +132,71 @@ const onSubmit = async () => {
 
       if (result?.name) {
         const waitRefreshRef = getComponentByName(result.name)
-        if (waitRefreshRef) {
+        if (waitRefreshRef)
           waitRefreshRef.refresh()
-        } else {
+        else
           console.warn(`未找到组件${result.name}无法刷新`)
-        }
       }
 
-      if (result?.messageType) {
+      if (result?.messageType)
         messageType = result.messageType
-      }
 
       if (result?.message) {
         showDialog({
           message: result.message,
-          type: messageType
+          type: messageType,
         })
       }
 
       close()
-    } catch (error) {
+    }
+    catch (error) {
       console.error('确认逻辑执行失败:', error)
       close()
     }
-  } else {
+  }
+  else {
     console.warn('未配置modal确认按钮逻辑')
     close()
   }
 }
 
-const updateImg = (data: any) => {
+function updateImg(data: any) {
   console.log(data)
 }
 
-// Emits
-const emit = defineEmits<{
-  (e: 'close'): void
-  (e: 'selectRow', keys: any[], rows: any[]): void
-}>()
-
 // 暴露方法
 defineExpose({
   init,
-  getComponentByName
+  getComponentByName,
 })
 </script>
+
+<template>
+  <VanDialog
+    v-model:show="visible"
+    :before-close="close"
+    :confirm-loading="loading"
+    width="80%"
+    :show-confirm-button="true"
+    confirm-text="提交"
+    v-bind="attr"
+    @confirm="onSubmit"
+  >
+    <div v-if="showReport" style="max-height: 70vh; overflow-y: auto; overflow-x: hidden;">
+      <XReport
+        ref="mainRef"
+        :env="env"
+        :use-oss-for-img="false"
+        :config-name="configName"
+        :show-img-in-cell="true"
+        :display-only="displayOnly"
+        :edit-mode="false"
+        :show-save-button="false"
+        :dont-format="true"
+        @update-img="updateImg"
+        @select-row="selectRow"
+      />
+    </div>
+  </VanDialog>
+</template>

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

@@ -93,7 +93,7 @@ const props = defineProps({
   },
   isWidget: {
     type: Boolean,
-    default: false,
+    default: true,
   },
   useOssForImg: {
     type: Boolean,
@@ -137,17 +137,24 @@ const globalData = ref({})
 // Computed
 const widget = computed(() => props.isWidget)
 
-// Provide
-// provide('runLogic', runLogic)
-// provide('openDialog', openDialog)
-// provide('registerComponent', registerComponent)
-// provide('getComponentByName', getComponentByName)
-// provide('getParentComponentByName', getComponentByName)
-// provide('getConfigByName', getConfigByName)
-// provide('isWidget', widget)
-// // provide('currUser', currUser)
-// provide('getGlobalData', getGlobalData)
-// provide('setGlobalData', setGlobalData)
+// 在provide之前定义getGlobalData函数
+const getGlobalData = () => globalData.value
+
+const setGlobalData = (obj: any) => {
+  globalData.value = obj
+}
+
+// 然后再进行provide
+provide('runLogic', runLogic)
+provide('openDialog', openDialog)
+provide('registerComponent', registerComponent)
+provide('getComponentByName', getComponentByName)
+provide('getParentComponentByName', getComponentByName)
+provide('getConfigByName', getConfigByName)
+provide('isWidget', widget)
+// provide('currUser', currUser)
+provide('setGlobalData', setGlobalData)
+provide('getGlobalData', getGlobalData)
 
 // Methods
 function slotRendered() {
@@ -238,12 +245,6 @@ function getComponentByName(componentName: string) {
   return XReportDesign.value?.[componentName]
 }
 
-const getGlobalData = () => globalData.value
-
-function setGlobalData(obj: any) {
-  globalData.value = obj
-}
-
 // 对话框操作
 function openDialog(configName: string, selectedId: any, mixinData: any, outEnv = {}, attr = {}) {
   console.log('openDialog', configName, selectedId)

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

@@ -1,46 +1,23 @@
-<template>
-  <van-popup
-    v-model:show="visible"
-    position="right"
-    :style="{ width: '85vw', height: '100%' }"
-    @close="close"
-    v-bind="attr"
-  >
-    <XReport
-      ref="mainRef"
-      :env="env"
-      :use-oss-for-img="false"
-      :config-name="configName"
-      :show-img-in-cell="true"
-      :display-only="displayOnly"
-      :edit-mode="false"
-      :show-save-button="false"
-      :dont-format="true"
-      @update-img="updateImg"
-      @select-row="selectRow"
-    />
-  </van-popup>
-</template>
-
 <script setup lang="ts">
-import { ref, provide, inject } from 'vue'
+import { inject, provide, ref } from 'vue'
 import { storeToRefs } from 'pinia'
-import { useUserStore } from '@/stores/modules/user'
 import { Popup as VanPopup } from 'vant'
-import { executeStrFunctionByContext } from '@/utils/runEvalFunction'
-import { runLogic } from '@/services/api/common'
-import { getMicroData, getWindow, isMicroAppEnv, microDispatch } from '@/utils/microAppUtils'
-import { getRealKeyData } from '@/utils/util'
-import XReport from '../XReport.vue'
+import XReport from '@af-mobile-client-vue3/components/data/XReportGrid/XReport.vue'
+import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 
 // Props
 const props = defineProps({
   env: {
     type: String,
-    default: 'prod'
-  }
+    default: 'prod',
+  },
 })
 
+// Emits
+const emit = defineEmits<{
+  (e: 'close'): void
+  (e: 'selectRow', keys: any[], rows: any[]): void
+}>()
 // 状态管理
 const configName = ref('')
 const displayOnly = ref(true)
@@ -73,7 +50,7 @@ provide('isInAModal', () => true)
 provide('currUser', currUser)
 
 // Methods
-const init = (params: {
+function init(params: {
   configName?: string
   serverName?: string
   displayOnly?: boolean
@@ -81,7 +58,7 @@ const init = (params: {
   outEnv?: Record<string, any>
   mixinData?: Record<string, any>
   attr?: Record<string, any>
-}) => {
+}) {
   const {
     configName: initConfigName = '',
     serverName: initServerName = process.env.VUE_APP_SYSTEM_NAME,
@@ -89,7 +66,7 @@ const init = (params: {
     selectedId: initSelectedId = null,
     outEnv: initOutEnv = {},
     mixinData: initMixinData = {},
-    attr: initAttr = {}
+    attr: initAttr = {},
   } = params
 
   configName.value = initConfigName
@@ -98,57 +75,74 @@ const init = (params: {
   visible.value = true
   attr.value = initAttr
 
-  if (initSelectedId) {
+  if (initSelectedId)
     selectedId.value = initSelectedId
-  }
+
   mixinData.value = initMixinData
   outEnv.value = initOutEnv
 }
 
-const getSelectedId = () => {
+function getSelectedId() {
   if (typeof selectedId.value === 'object') {
-    if (selectedId.value?.selectedId) {
+    if (selectedId.value?.selectedId)
       return selectedId.value.selectedId
-    }
-    if (Object.keys(selectedId.value).length > 0) {
+
+    if (Object.keys(selectedId.value).length > 0)
       return selectedId.value[Object.keys(selectedId.value)[0]]
-    }
   }
   return selectedId.value
 }
 
-const selectRow = (selectedRowKeys: any[], selectedRows: any[]) => {
+function selectRow(selectedRowKeys: any[], selectedRows: any[]) {
   console.log('XReportDrawer')
   emit('selectRow', selectedRowKeys, selectedRows)
 }
 
-const close = () => {
+function close() {
   loading.value = false
   visible.value = false
   emit('close')
 }
 
-const getComponentByName = (name: string) => {
+function getComponentByName(name: string) {
   const innerRef = getParentComponentByName?.(name)
-  if (innerRef) {
+  if (innerRef)
     return innerRef
-  }
+
   return mainRef.value?.getComponentByName(name)
 }
 
-const updateImg = (data: any) => {
+function updateImg(data: any) {
   console.log(data)
 }
 
-// Emits
-const emit = defineEmits<{
-  (e: 'close'): void
-  (e: 'selectRow', keys: any[], rows: any[]): void
-}>()
-
 // 暴露方法
 defineExpose({
   init,
-  getComponentByName
+  getComponentByName,
 })
 </script>
+
+<template>
+  <VanPopup
+    v-model:show="visible"
+    position="right"
+    :style="{ width: '85vw', height: '100%' }"
+    v-bind="attr"
+    @close="close"
+  >
+    <XReport
+      ref="mainRef"
+      :env="env"
+      :use-oss-for-img="false"
+      :config-name="configName"
+      :show-img-in-cell="true"
+      :display-only="displayOnly"
+      :edit-mode="false"
+      :show-save-button="false"
+      :dont-format="true"
+      @update-img="updateImg"
+      @select-row="selectRow"
+    />
+  </VanPopup>
+</template>

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

@@ -564,21 +564,24 @@ defineExpose({
 }
 
 .tdNoBorder {
-  border-left: 1px solid #000;
-  border-right: 1px solid #000;
+  border: none;
+  //border-left: 1px solid #000;
+  //border-right: 1px solid #000;
   padding: 8px;
 }
-
+// 手机端显示边框线很奇怪 先去掉
 .tdWithBorder {
-  border: 1px solid #000;
+  border: none;
+  //border: 1px solid #000;
   padding: 8px;
 }
 
 .tdWithNoTopBorder {
-  border-top-style: none;
-  border-left: 1px solid #000;
-  border-right: 1px solid #000;
-  border-bottom: 1px solid #000;
+  border: none;
+  //border-top-style: none;
+  //border-left: 1px solid #000;
+  //border-right: 1px solid #000;
+  //border-bottom: 1px solid #000;
   padding: 8px;
 }
 

package/src/layout/GridView/index.vue

@@ -0,0 +1,16 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import XReport from '@af-mobile-client-vue3/components/data/XReportGrid/XReport.vue'
+import { useRoute } from 'vue-router'
+
+const route = useRoute()
+const serverName = ref(import.meta.env.VITE_APP_SYSTEM_NAME)
+const configName = ref(route.query.configName ? route.query.configName as string : 'ReportGridTest')
+</script>
+
+<template>
+  <XReport :config-name="configName" :server-name="serverName" />
+</template>
+
+<style scoped lang="less">
+</style>

package/src/router/routes.ts

@@ -13,6 +13,7 @@ import SingleLayout from '@af-mobile-client-vue3/layout/SingleLayout.vue'
 import XFormGroupView from '@af-mobile-client-vue3/views/component/XFormGroupView/index.vue'
 import XSignatureView from '@af-mobile-client-vue3/views/component/XSignatureView/index.vue'
 import XReportGridView from '@af-mobile-client-vue3/views/component/XReportGridView/index.vue'
+import GridView from '@af-mobile-client-vue3/layout/GridView/index.vue'
 import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
 import XReport from '@af-mobile-client-vue3/components/data/XReportGrid/XReport.vue'
 
@@ -101,7 +102,7 @@ const routes: Array<RouteRecordRaw> = [
         component: XSignatureView,
       },
       {
-        path: '/XReportGridView',
+        path: '/Component/XReportGridView',
         name: 'XReportGridView',
         component: XReportGridView,
       },
@@ -110,6 +111,11 @@ const routes: Array<RouteRecordRaw> = [
         name: 'XReport',
         component: XReport,
       },
+      {
+        path: '/GridView',
+        name: 'GridView',
+        component: GridView,
+      },
     ],
   },
   {

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

@@ -1,13 +1,17 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import XReport from '@af-mobile-client-vue3/components/data/XReportGrid/XReport.vue'
+import { useRoute } from 'vue-router'
 
+const route = useRoute()
+const serverName = ref('af-gaslink')
 // const configName = ref('detailsaddChargesCover')
-const configName = ref('outpatientNurseCover')
+const configName = ref(route.query.configName ? route.query.configName : 'ReportGridTest')
+console.log('route==configName', configName)
 </script>
 
 <template>
-  <XReport :config-name="configName" server-name="af-his" />
+  <XReport :config-name="configName" :server-name="serverName" />
 </template>
 
 <style scoped lang="less">

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

@@ -1,10 +0,0 @@
-import type { App } from 'vue'
-import XReport from './XReport.vue'
-
-export { XReport }
-
-export default {
-  install(app: App) {
-    app.component('XReport', XReport)
-  }
-}