vue2-client 1.12.52 → 1.12.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.12.52",
+  "version": "1.12.54",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XCollapse/XCollapse.vue

@@ -1,154 +1,154 @@
-<template>
-  <div>
-    <a-collapse
-      :activeKey="activeKey"
-      @change="handleChange"
-    >
-      <a-collapse-panel
-        v-for="(panel, panelIndex) in config.showData"
-        :key="panelIndex.toString()"
-        :show-arrow="false"
-      >
-        <template #header>
-          <div class="header-content">
-            <span
-              class="header-text"
-              :style="config.titleStyle"
-            >
-              {{ panel.title }}
-            </span>
-            <span
-              v-for="(item, headerIndex) in panel.title2 || []"
-              :key="headerIndex"
-              class="info-item"
-              :style="config.title2Style"
-            >
-              <span>{{ item.key }}:</span>
-              <span>{{ item.value }}</span>
-            </span>
-            <span
-              class="time-item"
-              :style="config.title3Style"
-            >
-              {{ panel.title3 }}
-            </span>
-          </div>
-        </template>
-        <!-- 根据类型显示不同内容 -->
-        <template v-if="panel.type === 'picture'">
-          <img :src="panel.configName" alt="图片" style="width: 100%; max-width: 500px;"/>
-        </template>
-        <template v-else-if="panel.type === 'cover'">
-          <x-report
-            :use-oss-for-img="false"
-            :config-name="panel.configName"
-            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">
-          </x-report>
-        </template>
-      </a-collapse-panel>
-    </a-collapse>
-  </div>
-</template>
-
-<script>
-import XReport from '@vue2-client/base-client/components/common/XReportGrid'
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XCollapse',
-  components: {
-    XReport
-  },
-  inject: ['getConfigByName'],
-  data () {
-    return {
-      activeKey: [],
-      config: {}
-    }
-  },
-  props: {
-    // json名
-    queryParamsName: {
-      type: Object,
-      default: 'openPrescriptionConfig'
-    },
-  },
-  created () {
-    this.getData(this.queryParamsName)
-  },
-  methods: {
-    async getData (config) {
-      getConfigByName(config, 'af-his', res => {
-        this.config = res
-        runLogic(res.mainLogic, {}, 'af-his').then(result => {
-          console.log(result)
-          this.config.showData = result
-          this.activeKey = this.config.showData.map((_, panelIndex) => panelIndex.toString())
-        })
-      })
-    },
-    handleChange (keys) {
-      this.activeKey = keys
-    },
-  },
-  watch: {
-    queryParamsName: {
-      handler (newValue) {
-        console.log(newValue)
-        this.getData(newValue)
-      },
-      deep: true
-    }
-  }
-}
-</script>
-
-<style scoped>
-.header-content {
-  display: flex;
-  align-items: center;
-  gap: 24px;
-}
-
-.header-text {
-  margin-right: 16px;
-  font-size: 16px;
-  font-weight: 800; /* 默认加粗 */
-}
-
-.info-item {
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  font-size: 12px;
-  color: #888888;
-}
-
-.time-item {
-  margin-left: auto;
-  text-align: right;
-}
-
-/* 覆盖 ant-design-vue 的默认样式 */
-:deep(.ant-collapse-header) {
-  align-items: center !important;
-}
-
-:deep(.ant-collapse-header-text) {
-  flex: 1;
-}
-
-:deep(.ant-collapse-content > .ant-collapse-content-box) {
-  padding: 0;
-}
-
-:deep(.ant-card-body) {
-  padding: 8px;
-}
-</style>
+<template>
+  <div>
+    <a-collapse
+      :activeKey="activeKey"
+      @change="handleChange"
+    >
+      <a-collapse-panel
+        v-for="(panel, panelIndex) in config.showData"
+        :key="panelIndex.toString()"
+        :show-arrow="false"
+      >
+        <template #header>
+          <div class="header-content">
+            <span
+              class="header-text"
+              :style="config.titleStyle"
+            >
+              {{ panel.title }}
+            </span>
+            <span
+              v-for="(item, headerIndex) in panel.title2 || []"
+              :key="headerIndex"
+              class="info-item"
+              :style="config.title2Style"
+            >
+              <span>{{ item.key }}:</span>
+              <span>{{ item.value }}</span>
+            </span>
+            <span
+              class="time-item"
+              :style="config.title3Style"
+            >
+              {{ panel.title3 }}
+            </span>
+          </div>
+        </template>
+        <!-- 根据类型显示不同内容 -->
+        <template v-if="panel.type === 'picture'">
+          <img :src="panel.configName" alt="图片" style="width: 100%; max-width: 500px;"/>
+        </template>
+        <template v-else-if="panel.type === 'cover'">
+          <x-report
+            :use-oss-for-img="false"
+            :config-name="panel.configName"
+            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">
+          </x-report>
+        </template>
+      </a-collapse-panel>
+    </a-collapse>
+  </div>
+</template>
+
+<script>
+import XReport from '@vue2-client/base-client/components/common/XReportGrid'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XCollapse',
+  components: {
+    XReport
+  },
+  inject: ['getConfigByName'],
+  data () {
+    return {
+      activeKey: [],
+      config: {}
+    }
+  },
+  props: {
+    // json名
+    queryParamsName: {
+      type: Object,
+      default: 'openPrescriptionConfig'
+    },
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  methods: {
+    async getData (config) {
+      getConfigByName(config, 'af-his', res => {
+        this.config = res
+        runLogic(res.mainLogic, {}, 'af-his').then(result => {
+          console.log(result)
+          this.config.showData = result
+          this.activeKey = this.config.showData.map((_, panelIndex) => panelIndex.toString())
+        })
+      })
+    },
+    handleChange (keys) {
+      this.activeKey = keys
+    },
+  },
+  watch: {
+    queryParamsName: {
+      handler (newValue) {
+        console.log(newValue)
+        this.getData(newValue)
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.header-content {
+  display: flex;
+  align-items: center;
+  gap: 24px;
+}
+
+.header-text {
+  margin-right: 16px;
+  font-size: 16px;
+  font-weight: 800; /* 默认加粗 */
+}
+
+.info-item {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  font-size: 12px;
+  color: #888888;
+}
+
+.time-item {
+  margin-left: auto;
+  text-align: right;
+}
+
+/* 覆盖 ant-design-vue 的默认样式 */
+:deep(.ant-collapse-header) {
+  align-items: center !important;
+}
+
+:deep(.ant-collapse-header-text) {
+  flex: 1;
+}
+
+:deep(.ant-collapse-content > .ant-collapse-content-box) {
+  padding: 0;
+}
+
+:deep(.ant-card-body) {
+  padding: 8px;
+}
+</style>

package/src/base-client/components/common/XConversation/XConversation.vue

@@ -149,7 +149,7 @@ export default {
     },
     async sendMessage () {
       if (this.renderConfig.type === 'AI') {
-        // 验证 chatId 和 aiModel
+        //  验证 chatId 和 aiModel
         if (!this.renderConfig.chatId || !this.renderConfig.aiModel) {
           this.$message.error('chatId 和 aiModel 不能为空,请检查调用逻辑')
           return
@@ -157,27 +157,27 @@ export default {
       }
       if (!this.inputMessage.trim()) return
 
-      // 添加用户消息
-      this.messages.push({ type: 'user', text: this.inputMessage })
+       // 添加用户消息
+       this.messages.push({ type: 'user', text: this.inputMessage })
 
-      // 清空输入框
-      const userMessage = this.inputMessage
-      this.inputMessage = ''
-      // 模拟机器人的回复
-      // 通过logic获取消息
-      if (this.renderConfig.logicName) {
-        const response = await runLogic(this.renderConfig.logicName, {
-          question: userMessage,
-          additionalInfo: this.additionalInfo
-        }, this.serviceName)
+       // 清空输入框
+       const userMessage = this.inputMessage
+       this.inputMessage = ''
+       // 模拟机器人的回复
+       // 通过logic获取消息
+       if (this.renderConfig.logicName) {
+         const response = await runLogic(this.renderConfig.logicName, {
+           question: userMessage,
+           additionalInfo: this.additionalInfo
+         }, this.serviceName)
 
-        // 遍历并保存 additionalInfo
-        console.log(response)
-        if (response.additionalInfo) {
-          Object.entries(response.additionalInfo).forEach(([key, value]) => {
-            // 如果值是字符串类型，尝试转换为数字
-            if (typeof value === 'string' && !isNaN(value)) {
-              const numberValue = Number(value)
+         // 遍历并保存 additionalInfo
+         console.log(response)
+         if (response.additionalInfo) {
+           Object.entries(response.additionalInfo).forEach(([key, value]) => {
+             // 如果值是字符串类型，尝试转换为数字
+             if (typeof value === 'string' && !isNaN(value)) {
+               const numberValue = Number(value)
               // 检查转换后的值是否是有限数字
               if (isFinite(numberValue)) {
                 this.additionalInfo[key] = numberValue

package/src/base-client/components/his/XSidebar/XSidebar.vue

@@ -49,7 +49,7 @@ export default {
     return {
       isOpen: true,
       // 定义主内容区域的最大和最小宽度百分比
-      mainWithData: [{ max: 17, min: 17 }, { max: 78, min: 56 }]
+      mainWithData: [{ max: 80, min: 56 }]
     }
   },
   mounted () {
@@ -82,9 +82,7 @@ export default {
           return []
         }
         // 获取a-row中的所有a-col
-        const allCol1 = Array.from(row.querySelectorAll('.ant-col-4'))
-        const allCol2 = Array.from(row.querySelectorAll('.ant-col-14'))
-        const allCols = [...allCol1, ...allCol2]
+        const allCols = Array.from(row.querySelectorAll('.ant-col-14'))
         // 过滤掉当前a-col，返回其他所有a-col
         return allCols.filter(col => col !== currentCol)
       } catch (error) {
@@ -97,31 +95,37 @@ export default {
         try {
           // 获取所有同级a-col
           const otherCols = this.getSiblingCols()
-          console.log('otherCols =', otherCols)
-          // 如果找到同级列，调整它们的宽度
           if (otherCols.length > 0) {
-            // 获取当前组件所在的a-col
             let currentCol = this.$el.parentNode
             while (currentCol && !currentCol.className.includes('ant-col')) {
               currentCol = currentCol.parentNode
             }
             if (currentCol) {
               // 更新当前列的宽度
-              const drawerWidth = isOpen ? 25 : 2
-              currentCol.style.flex = `0 0 ${drawerWidth}%`
-              currentCol.style.maxWidth = `${drawerWidth}%`
-              // 根据mainWithData设置其他列的宽度
+              const drawerWidth = isOpen ? 27 : 2
+              // 强制更新样式
+              currentCol.style.cssText = `
+            flex: 0 0 ${drawerWidth}% !important;
+            max-width: ${drawerWidth}% !important;
+            transition: all 0.3s;`
+              // 触发XTab组件重新计算宽度
+              this.$nextTick(() => {
+                const tabComponent = this.$el.querySelector('.ant-tabs')
+                if (tabComponent) {
+                  tabComponent.style.width = '100%'
+                  window.dispatchEvent(new Event('resize'))
+                }
+              })
+              // 更新其他列宽度
               otherCols.forEach((col, index) => {
-                // 确保不超出mainWithData数组范围
                 if (index < this.mainWithData.length) {
-                  // 抽屉打开用min值，关闭用max值
                   const widthValue = isOpen ? this.mainWithData[index].min : this.mainWithData[index].max
-                  col.style.flex = `0 0 ${widthValue}%`
-                  col.style.maxWidth = `${widthValue}%`
+                  col.style.cssText = `
+                flex: 0 0 ${widthValue}% !important;
+                max-width: ${widthValue}% !important;
+                transition: all 0.3s;`
                 }
               })
-              // 触发重新计算
-              window.dispatchEvent(new Event('resize'))
             }
           }
         } catch (error) {
@@ -191,7 +195,5 @@ export default {
 .drawer-content {
   height: 100%;
   overflow-y: auto;
-  padding: 20px;
-  padding-left: 44px; /* 为开关留出空间 */
 }
 </style>

package/src/router/async/router.map.js

@@ -1,118 +1,116 @@
-const { homePage } = require('../../config')
-// 视图组件
-const view = {
-  tabs: () => import('@vue2-client/layouts/tabs'),
-  blank: () => import('@vue2-client/layouts/BlankView'),
-  page: () => import('@vue2-client/layouts/PageView'),
-  // his-web$ceshiGrid?type=GridView&configName=RxPreparedMed
-  gridView: () => import('@vue2-client/layouts/GridView'),
-  login: () => import('@vue2-client/pages/login/Login'),
-  loginv3: () => import('@vue2-client/pages/login/LoginV3')
-}
-// 动态路由对象定义
-const routerResource = {}
-// --------------------------------------基本视图组件--------------------------------------
-// 空白视图
-routerResource.blank = view.blank
-// 单页面视图
-routerResource.singlePage = view.blank
-// 栅格配置视图
-routerResource.gridView = view.gridView
-
-// --------------------------------------仪表盘--------------------------------------
-routerResource.dashboard = view.blank
-// 工作台
-routerResource.workplace = () =>
-  import('@vue2-client/pages/dashboard/workplace')
-// --------------------------------------系统配置--------------------------------------
-routerResource.system = view.blank
-// 字典管理
-routerResource.dictionaryManage = () => import('@vue2-client/pages/system/dictionary')
-// 文件管理
-routerResource.fileManager = () => import('@vue2-client/pages/system/file')
-// 登录日志
-routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
-// 操作日志
-routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
-// 系统问题反馈工单
-routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
-// 通用服务评价
-routerResource.ServiceReview = () => import('@vue2-client/pages/ServiceReview')
-// 系统设置
-routerResource.settings = () => import('@vue2-client/pages/system/settings')
-// AMIS示例页面
-routerResource.amisDemo = () => import('@vue2-client/pages/AMisDemo/AMisDemo')
-// 页面编辑器
-routerResource.editablePage = () => import('@vue2-client/pages/lowCode/lowCodeEditor.vue')
-// 数据检索
-routerResource.dynamicStatistics = () => import('@vue2-client/pages/DynamicStatistics')
-// 数据检索(新)
-routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynamicStatistics')
-// 示例页面
-routerResource.example = {
-  path: 'example',
-  name: '示例主页面',
-  // component: () => import('@vue2-client/base-client/components/common/XCollapse/XCollapse.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XDataCard/XDataCard.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XCheckList/XCheckList.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XPrint/Demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/AI/demo.vue'),
-  // component: () => import('@vue2-client/components/g2Charts/demo.vue'),
-  // component: () => import('@vue2-client/pages/LogicCallExample/index.vue'),
-}
-// routerResource.example = () =>
-//    import('@vue2-client/pages/Example')
-routerResource.XReportView = () => import('@vue2-client/pages/XReportView')
-
-routerResource.XReportGrid = () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo')
-
-routerResource.XTab = () => import('@vue2-client/base-client/components/common/XTab/XTabDemo')
-
-// 基础路由组件注册
-const routerMap = {
-  login: {
-    authority: '*',
-    path: '/login',
-    component: process.env.VUE_APP_LOGIN_VERSION === 'V3'
-      ? view.loginv3 : view.login
-  },
-  root: {
-    path: '/',
-    name: '首页',
-    redirect: homePage,
-    component: process.env.VUE_APP_SINGLE_PAPER === 'TRUE' ? view.blank : view.tabs,
-  },
-  exp403: {
-    authority: '*',
-    name: 'exp403',
-    path: '403',
-    component: () =>
-      import('@vue2-client/pages/exception/403')
-  },
-  exp404: {
-    name: 'exp404',
-    path: '404',
-    component: () =>
-      import('@vue2-client/pages/exception/404')
-  },
-  exp500: {
-    name: 'exp500',
-    path: '500',
-    component: () =>
-      import('@vue2-client/pages/exception/500')
-  }
-}
-Object.assign(routerMap, routerResource)
-export default routerMap
+const { homePage } = require('../../config')
+// 视图组件
+const view = {
+  tabs: () => import('@vue2-client/layouts/tabs'),
+  blank: () => import('@vue2-client/layouts/BlankView'),
+  page: () => import('@vue2-client/layouts/PageView'),
+  // his-web$ceshiGrid?type=GridView&configName=RxPreparedMed
+  gridView: () => import('@vue2-client/layouts/GridView'),
+  login: () => import('@vue2-client/pages/login/Login'),
+  loginv3: () => import('@vue2-client/pages/login/LoginV3')
+}
+// 动态路由对象定义
+const routerResource = {}
+// --------------------------------------基本视图组件--------------------------------------
+// 空白视图
+routerResource.blank = view.blank
+// 单页面视图
+routerResource.singlePage = view.blank
+// 栅格配置视图
+routerResource.gridView = view.gridView
+
+// --------------------------------------仪表盘--------------------------------------
+routerResource.dashboard = view.blank
+// 工作台
+routerResource.workplace = () =>
+  import('@vue2-client/pages/dashboard/workplace')
+// --------------------------------------系统配置--------------------------------------
+routerResource.system = view.blank
+// 字典管理
+routerResource.dictionaryManage = () => import('@vue2-client/pages/system/dictionary')
+// 文件管理
+routerResource.fileManager = () => import('@vue2-client/pages/system/file')
+// 登录日志
+routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
+// 操作日志
+routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
+// 系统问题反馈工单
+routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
+// 通用服务评价
+routerResource.ServiceReview = () => import('@vue2-client/pages/ServiceReview')
+// 系统设置
+routerResource.settings = () => import('@vue2-client/pages/system/settings')
+// AMIS示例页面
+routerResource.amisDemo = () => import('@vue2-client/pages/AMisDemo/AMisDemo')
+// 页面编辑器
+routerResource.editablePage = () => import('@vue2-client/pages/lowCode/lowCodeEditor.vue')
+// 数据检索
+routerResource.dynamicStatistics = () => import('@vue2-client/pages/DynamicStatistics')
+// 数据检索(新)
+routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynamicStatistics')
+// 示例页面
+routerResource.example = {
+  path: 'example',
+  name: '示例主页面',
+  // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
+  component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
+  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XCheckList/XCheckList.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XPrint/Demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/AI/demo.vue'),
+  // component: () => import('@vue2-client/components/g2Charts/demo.vue'),
+  // component: () => import('@vue2-client/pages/LogicCallExample/index.vue'),
+}
+// routerResource.example = () =>
+//    import('@vue2-client/pages/Example')
+routerResource.XReportView = () => import('@vue2-client/pages/XReportView')
+
+routerResource.XReportGrid = () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo')
+
+routerResource.XTab = () => import('@vue2-client/base-client/components/common/XTab/XTabDemo')
+
+// 基础路由组件注册
+const routerMap = {
+  login: {
+    authority: '*',
+    path: '/login',
+    component: process.env.VUE_APP_LOGIN_VERSION === 'V3'
+      ? view.loginv3 : view.login
+  },
+  root: {
+    path: '/',
+    name: '首页',
+    redirect: homePage,
+    component: process.env.VUE_APP_SINGLE_PAPER === 'TRUE' ? view.blank : view.tabs,
+  },
+  exp403: {
+    authority: '*',
+    name: 'exp403',
+    path: '403',
+    component: () =>
+      import('@vue2-client/pages/exception/403')
+  },
+  exp404: {
+    name: 'exp404',
+    path: '404',
+    component: () =>
+      import('@vue2-client/pages/exception/404')
+  },
+  exp500: {
+    name: 'exp500',
+    path: '500',
+    component: () =>
+      import('@vue2-client/pages/exception/500')
+  }
+}
+Object.assign(routerMap, routerResource)
+export default routerMap

package/src/base-client/components/common/XCollapse/XCollapseDemo.vue

@@ -1,15 +0,0 @@
-<template>
-  <x-collapse :query-params-name="openPrescriptionConfig" />
-</template>
-
-<script>
-import XCollapse from '@vue2-client/base-client/components/common/XCollapse/XCollapse.vue'
-export default {
-  name: 'Demo',
-  components: { XCollapse }
-}
-</script>
-
-<style scoped>
-
-</style>