vue2-client 1.15.93 → 1.15.96

package/src/base-client/components/his/threeTestOrders/editor.vue

@@ -1,111 +1,111 @@
-<template>
-  <!-- 根据实际部署环境修改 editor.html 的路径 -->
-  <iframe
-    src="/his/editor/editor.html"
-    width="100%"
-    height="800"
-    frameborder="0"
-    @load="onIframeLoad"
-    ref="editorIframe">
-  </iframe>
-</template>
-
-<script setup>
-
-import { ref, onBeforeUnmount } from 'vue'
-
-const editorIframe = ref(null)
-const checkEditorTimer = ref(null)
-const checkCount = ref(0)
-const editor = ref(null)
-const iframeWindow = ref(null)
-// 对外暴露的获取editor方法
-const getEditor = () => {
-  if (editor.value) {
-    return editor.value
-  }
-  if (iframeWindow.value && iframeWindow.value.editor) {
-    editor.value = iframeWindow.value.editor
-    return editor.value
-  }
-  if (editorIframe.value && editorIframe.value.contentWindow && editorIframe.value.contentWindow.editor) {
-    editor.value = editorIframe.value.contentWindow.editor
-    return editor.value
-  }
-  return null
-}
-// 创建体温单方法
-const createVitalSigns = (data) => {
-  const editorObj = getEditor()
-  if (!editorObj) {
-    throw new Error('editor对象未初始化，无法创建体温单')
-  }
-  if (typeof editorObj.createVitalSigns === 'function') {
-    return editorObj.createVitalSigns(data)
-  } else {
-    throw new Error('editor对象未包含createVitalSigns方法')
-  }
-}
-
-// 检查editor对象是否已初始化
-const startEditorCheck = (frameWindow, iframe) => {
-  if (checkEditorTimer.value) {
-    clearInterval(checkEditorTimer.value)
-  }
-  checkCount.value = 0
-  checkEditorTimer.value = setInterval(() => {
-    checkCount.value++
-    try {
-      const editorObj = frameWindow.editor
-      if (editorObj && typeof editorObj.createVitalSigns === 'function') {
-        clearInterval(checkEditorTimer.value)
-        editor.value = editorObj
-        // 将editor对象暴露到全局
-        window.iframeEditor = editorObj
-        window.iframeWindow = frameWindow
-        // 触发事件
-        emit('editor-ready', editorObj)
-        emit('load', { target: iframe, editor: editorObj })
-        // 发送消息通知
-        window.parent.postMessage({ type: 'editorReady' }, '*')
-      }
-    } catch (err) {
-      console.error('检查editor对象时出错:', err)
-    }
-    if (checkCount.value >= 20) {
-      clearInterval(checkEditorTimer.value)
-      console.error('Editor 对象加载失败')
-    }
-  }, 500)
-}
-// iframe加载完成的处理
-const onIframeLoad = (e) => {
-  const iframe = e.target
-  const frameWindow = iframe.contentWindow
-  iframeWindow.value = frameWindow
-  if (!frameWindow) {
-    console.error('无法访问 iframe 内容')
-    return
-  }
-  startEditorCheck(frameWindow, iframe)
-}
-// 组件销毁前清理
-onBeforeUnmount(() => {
-  if (checkEditorTimer.value) {
-    clearInterval(checkEditorTimer.value)
-  }
-})
-// 暴露方法给父组件
-defineExpose({ getEditor, createVitalSigns })
-
-// 定义事件
-const emit = defineEmits(['editor-ready', 'load'])
-</script>
-
-<style scoped>
-iframe {
-  border: none;
-  width: 100%;
-  min-height: 800px;
-}
-</style>
+<template>
+  <!-- 根据实际部署环境修改 editor.html 的路径 -->
+  <iframe
+    src="/his/editor/editor.html"
+    width="100%"
+    height="800"
+    frameborder="0"
+    @load="onIframeLoad"
+    ref="editorIframe">
+  </iframe>
+</template>
+
+<script setup>
+
+import { ref, onBeforeUnmount } from 'vue'
+
+const editorIframe = ref(null)
+const checkEditorTimer = ref(null)
+const checkCount = ref(0)
+const editor = ref(null)
+const iframeWindow = ref(null)
+// 对外暴露的获取editor方法
+const getEditor = () => {
+  if (editor.value) {
+    return editor.value
+  }
+  if (iframeWindow.value && iframeWindow.value.editor) {
+    editor.value = iframeWindow.value.editor
+    return editor.value
+  }
+  if (editorIframe.value && editorIframe.value.contentWindow && editorIframe.value.contentWindow.editor) {
+    editor.value = editorIframe.value.contentWindow.editor
+    return editor.value
+  }
+  return null
+}
+// 创建体温单方法
+const createVitalSigns = (data) => {
+  const editorObj = getEditor()
+  if (!editorObj) {
+    throw new Error('editor对象未初始化，无法创建体温单')
+  }
+  if (typeof editorObj.createVitalSigns === 'function') {
+    return editorObj.createVitalSigns(data)
+  } else {
+    throw new Error('editor对象未包含createVitalSigns方法')
+  }
+}
+
+// 检查editor对象是否已初始化
+const startEditorCheck = (frameWindow, iframe) => {
+  if (checkEditorTimer.value) {
+    clearInterval(checkEditorTimer.value)
+  }
+  checkCount.value = 0
+  checkEditorTimer.value = setInterval(() => {
+    checkCount.value++
+    try {
+      const editorObj = frameWindow.editor
+      if (editorObj && typeof editorObj.createVitalSigns === 'function') {
+        clearInterval(checkEditorTimer.value)
+        editor.value = editorObj
+        // 将editor对象暴露到全局
+        window.iframeEditor = editorObj
+        window.iframeWindow = frameWindow
+        // 触发事件
+        emit('editor-ready', editorObj)
+        emit('load', { target: iframe, editor: editorObj })
+        // 发送消息通知
+        window.parent.postMessage({ type: 'editorReady' }, '*')
+      }
+    } catch (err) {
+      console.error('检查editor对象时出错:', err)
+    }
+    if (checkCount.value >= 20) {
+      clearInterval(checkEditorTimer.value)
+      console.error('Editor 对象加载失败')
+    }
+  }, 500)
+}
+// iframe加载完成的处理
+const onIframeLoad = (e) => {
+  const iframe = e.target
+  const frameWindow = iframe.contentWindow
+  iframeWindow.value = frameWindow
+  if (!frameWindow) {
+    console.error('无法访问 iframe 内容')
+    return
+  }
+  startEditorCheck(frameWindow, iframe)
+}
+// 组件销毁前清理
+onBeforeUnmount(() => {
+  if (checkEditorTimer.value) {
+    clearInterval(checkEditorTimer.value)
+  }
+})
+// 暴露方法给父组件
+defineExpose({ getEditor, createVitalSigns })
+
+// 定义事件
+const emit = defineEmits(['editor-ready', 'load'])
+</script>
+
+<style scoped>
+iframe {
+  border: none;
+  width: 100%;
+  min-height: 800px;
+}
+</style>

package/src/layouts/BlankView.vue

@@ -26,9 +26,9 @@ export default {
     ...mapState('setting', ['cachePage', 'animate'])
   },
   created () {
-    this.loadCacheConfig(this.$router?.options?.routes)
   },
   mounted () {
+    this.loadCacheConfig(this.$router?.options?.routes)
     if (window.__MICRO_APP_ENVIRONMENT__) {
       this.isMicroAppEnv = true
       window.microApp.addDataListener((data) => {
@@ -44,9 +44,11 @@ export default {
     // 加载需要排除缓存的路由配置
     loadCacheConfig (routes, pCache = true) {
       routes.forEach(item => {
-        const cacheAble = item.meta?.page?.cacheAble ?? pCache ?? true
+        const cacheAble = item.meta?.keepAlive ?? pCache ?? true
         if (!cacheAble) {
-          this.excludeKeys.push(new RegExp(`${item.path.replace(/:[^/]*/g, '[^/]*')}(\\?.*)?\\d*$`))
+          // 确保路径以 / 开头
+          const path = item.path.startsWith('/') ? item.path : '/' + item.path
+          this.excludeKeys.push(new RegExp(`^${path.replace(/:[^/]*/g, '[^/]*')}(\\?.*)?\\d*::.+$`))
         }
         if (item.children) {
           this.loadCacheConfig(item.children, cacheAble)

package/src/pages/WorkflowDetail/WorkflowDetail.vue

@@ -114,16 +114,16 @@
 
 <script>
 import { mapState } from 'vuex'
-import workflowBaseInformation from './WorkflowPageDetail/WorkFlowBaseInformation.vue'
-import WorkFlowHandle from './WorkflowPageDetail/WorkFlowHandle.vue'
+import workflowBaseInformation from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowBaseInformation.vue'
+import WorkFlowHandle from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue'
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import { postByServiceName } from '@vue2-client/services/api/restTools'
 import { workFlowViewApi } from '@vue2-client/services/api/workFlow'
-import WorkflowLog from './WorkflowPageDetail/WorkflowLog.vue'
-import LeaveMessage from './WorkflowPageDetail/LeaveMessage'
+import WorkflowLog from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/WorkflowLog.vue'
+import LeaveMessage from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/LeaveMessage.vue'
 import XUploadFilesView from '@vue2-client/base-client/components/common/XUploadFilesView/index.vue'
 import FileItemGroup from '@vue2-client/components/FileImageItem/FileItemGroup.vue'
-import worklog from './WorkflowPageDetail/worklog.vue'
+import worklog from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/worklog.vue'
 
 export default {
   name: 'WorkflowDetail',

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowBaseInformation.vue

@@ -134,7 +134,7 @@ import { formatDate } from '@vue2-client/utils/util'
 import { postByServiceName } from '@vue2-client/services/api/restTools'
 import moment from 'moment'
 import { workFlowViewApi } from '@vue2-client/services/api/workFlow'
-import WorkOrderParentDetails from './WorkOrderParentDetails'
+import WorkOrderParentDetails from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/WorkOrderParentDetails'
 
 export default {
   name: 'ApplyBaseInformation',

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowBaseInformationDetails.vue

@@ -106,7 +106,7 @@ import { formatDate } from '@vue2-client/utils/util'
 import { postByServiceName } from '@vue2-client/services/api/restTools'
 import moment from 'moment'
 import { workFlowViewApi } from '@vue2-client/services/api/workFlow'
-import WorkOrderParentDetails from './WorkOrderParentDetails'
+import WorkOrderParentDetails from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/WorkOrderParentDetails'
 
 export default {
   name: 'ApplyBaseInformation',

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -272,16 +272,16 @@ import { formatDate } from '@vue2-client/utils/util'
 import { mapState } from 'vuex'
 import moment from 'moment'
 import FilePreview from '@vue2-client/components/FilePreview'
-import WorkFlowTimeline from './WorkFlowTimeline.vue'
+import WorkFlowTimeline from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowTimeline.vue'
 import { FileItem, ImageItem } from '@vue2-client/components/FileImageItem'
-import WorkflowListResolution from './WorkflowListResolution'
+import WorkflowListResolution from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/WorkflowListResolution'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import * as util from '@vue2-client/utils/util'
 import { getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
 import LogicRunner from '@vue2-client/logic/LogicRunner'
 import XTab from '@vue2-client/base-client/components/common/XTab/XTab.vue'
-import WorkFlowPreview from './WorkFlowPreview'
-import WorkflowPersonSelector from './components/WorkflowPersonSelector.vue'
+import WorkFlowPreview from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowPreview'
+import WorkflowPersonSelector from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/components/WorkflowPersonSelector.vue'
 
 export default {
   name: 'WorkFlowHandle',

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowTimeline.vue

@@ -156,7 +156,7 @@
 
 <script>
 import { formatDate } from '@vue2-client/utils/util'
-import TrimTextTail from './TrimTextTail'
+import TrimTextTail from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/TrimTextTail'
 
 export default {
   components: { TrimTextTail },

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkOrderParentDetails.vue

@@ -60,13 +60,11 @@
 
 <script>
 import { mapState } from 'vuex'
-import workflowBaseInformationDetails from './WorkFlowBaseInformationDetails.vue'
-import workflowHandle from './WorkFlowHandle.vue'
+import workflowBaseInformationDetails from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowBaseInformationDetails.vue'
+import workflowHandle from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue'
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import { postByServiceName } from '@vue2-client/services/api/restTools'
 import { workFlowViewApi } from '@vue2-client/services/api/workFlow'
-import ApplyWorkflowLog from './WorkflowLog.vue'
-import WorkflowLog from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/WorkflowLog.vue'
 import LeaveMessage from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/LeaveMessage.vue'
 // import LeaveMessage from '@vue2-client/components/LeaveMessage'
 
@@ -74,11 +72,9 @@ export default {
   name: 'WorkOrderParentDetails',
   components: {
     LeaveMessage,
-    WorkflowLog,
     workflowBaseInformationDetails,
     workflowHandle,
     XFormTable,
-    ApplyWorkflowLog
   },
   data () {
     return {

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkflowListResolution.vue

@@ -26,8 +26,8 @@
 
 <script>
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-import WorkflowDetail from '../WorkflowDetail.vue'
-import WorkflowDetailResso from './WorkflowDetailResso'
+import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
+import WorkflowDetailResso from '@vue2-client/pages/WorkflowDetail//WorkflowPageDetail/WorkflowDetailResso.vue'
 import { mapState } from 'vuex'
 import moment from 'moment'
 import { workFlowViewApi } from '@vue2-client/services/api/workFlow'

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

@@ -60,12 +60,13 @@ path: 'example',
   // 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/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/XRate/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
+  component: () => import('@vue2-client/base-client/components/his/XImportExcelButton/XFrontImportExcelDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/XPageViewExample/index.vue'),

package/src/utils/routerUtil.js

@@ -449,7 +449,14 @@ function parsefunc (func) {
         try {
           const params = new URLSearchParams(queryString)
           for (const [key, value] of params.entries()) {
-            route.meta[key] = value
+            // 转换字符串布尔值为实际的布尔值
+            if (value === 'true') {
+              route.meta[key] = true
+            } else if (value === 'false') {
+              route.meta[key] = false
+            } else {
+              route.meta[key] = value
+            }
           }
           if (route.meta.path) {
             route.path = route.meta.path
@@ -533,7 +540,14 @@ function parsefuncOA (func) {
         try {
           const params = new URLSearchParams(queryString)
           for (const [key, value] of params.entries()) {
-            route.meta[key] = value
+            // 转换字符串布尔值为实际的布尔值
+            if (value === 'true') {
+              route.meta[key] = true
+            } else if (value === 'false') {
+              route.meta[key] = false
+            } else {
+              route.meta[key] = value
+            }
           }
           if (route.meta.path) {
             route.path = route.meta.path

package/.history/public/his/editor/editor_20250606134713.html

@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8"/>
-        <link rel="shortcut icon" href="./favicon.svg" type="image/svg+xml"/>
-        <link rel="stylesheet" href="./vender/jquery/zTreeStyle/zTreeStyle.css" type="text/css">
-        <script src = "./vender/jquery/jquery.js"></script>
-        <script src = "./vender/date97/WdatePicker.js"></script>
-        <script src = "./vender/jquery/jquery.ztree.core.min.js"></script>
-        <script src = "./vender/jquery/jquery.ztree.exedit.min.js"></script>
-        <script src = "./vender/jquery/jquery.ztree.exhide.min.js"></script>
-        <script src = "./vender/codemirror.js"></script>
-        <script src = "./vender/fabric.js"></script>
-        <script src="./vender/editor.js"></script>
-        <script>
-          $(function() {
-            //配置项可以不设置，会使用默认设置
-            let option = {
-                license:'QO1pepfLYwDNqGvW21ensj0psE9CxBxf5MSRD1q2sCvclYGGtk6clTZEIth12i4SvvvDC04ZNcHe3uQuNtBUFcAk7sHUwAdYvffM2aZis/jpZqrm1rDGk1NHYsheD6DroF+m3jZ5Izh/LxRjzZJfaHHejfrn5InFoSqErfPm4gY=',
-                mode:'form',  //默认模式 form:表单模式，design:设计模式
-                pdfUrl:'https://www.x-emr.cn/pdf/post',  //pdf生成服务
-                dictionary: [  //知识库
-                    {name: '体征', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=20', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '症状', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=20', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '卫生信息数据元', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=40', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '电子病历数据集', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=50', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '国家医保标准', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=80', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '省数据平台标准', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=90', itemUrl:'https://www.x-emr.cn/dictitem'},
-                ]
-            }
-
-            //从模块的Editor组件中获取mode，doc，lang属性 (该段代码可删除)
-            let mode = window.frameElement.getAttribute('mode')
-            let doc = window.frameElement.getAttribute('doc')
-            let lang = window.frameElement.getAttribute('lang')
-            mode? option.mode = mode: null
-            lang? option.lang = lang: null
-
-            //初始化编辑器（初始化代码可以放入组件的load事件中）
-            editor.init(option).then(()=>{
-                doc? editor.loadUrl(doc) : null
-            })
-
-          })
-      </script>
-    </head>
-    <body>
-        <!-- 默认id 为editor -->
-        <div id="editor" style="width:100%; height:100%;"></div>
-    </body>
-</html>