vue2-client 1.18.69 → 1.19.0

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

@@ -1,113 +1,113 @@
-<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
-  }
-  // 关闭文书工具栏
-  iframe.contentWindow.editor.option.toolbar = false
-  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
+  }
+  // 关闭文书工具栏
+  iframe.contentWindow.editor.option.toolbar = false
+  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/base-client/plugins/AppData.js

@@ -1,131 +1,146 @@
-import { manageApi, post } from '@vue2-client/services/api'
+import { manageApi } from '@vue2-client/services/api'
 import { handleTree } from '@vue2-client/utils/util'
 import { indexedDB } from '@vue2-client/utils/indexedDB'
 import { getConfigByName } from '@vue2-client/services/api/common'
 
+// 字典缓存
+const dictCache = new Map()
+
 const GetAppDataService = {
   install (Vue) {
-    // 给vue增添对话框显示方法
     Vue.$appdata = Vue.prototype.$appdata = GetAppDataService
   },
+
   async load () {
-    const params = {}
-    await post(manageApi.getDictionaryValue, {}).then((res) => {
-      Object.assign(params, res)
-      const badgeItemArray = {}
-      for (const key of Object.keys(params)) {
-        badgeItemArray[key] = {}
-        for (const item of params[key]) {
-          let status
-          if (!item.status) {
-            status = 'none'
-          } else {
-            status = item.status
-          }
-          badgeItemArray[key][item.value] = {
-            status: status,
-            text: item.text
-          }
-        }
-      }
-      // 追加参数
-      localStorage.setItem(process.env.VUE_APP_DICTIONARY_KEY, JSON.stringify(params))
-      localStorage.setItem(process.env.VUE_APP_BADGE_KEY, JSON.stringify(badgeItemArray))
-    })
+    localStorage.setItem(
+      process.env.VUE_APP_DICTIONARY_KEY,
+      JSON.stringify({})
+    )
+    localStorage.setItem(
+      process.env.VUE_APP_BADGE_KEY,
+      JSON.stringify({})
+    )
   },
+
   // 返回树形省市区
   async getDivisionsOhChinaForTree () {
-    // 获取省市区数据
     return new Promise((resolve, reject) => {
       try {
-        indexedDB.getByWeb('divisionsOhChina', manageApi.getDivisionsOhChina, {}, res => {
-          resolve(res)
-        }, processRes => {
-          return handleTree(processRes, 'code', 'parentcode')
-        })
+        indexedDB.getByWeb(
+          'divisionsOhChina',
+          manageApi.getDivisionsOhChina,
+          {},
+          res => resolve(res),
+          processRes => handleTree(processRes, 'code', 'parentcode')
+        )
       } catch (e) {
         reject(e)
       }
     })
   },
-  // 旧版获取配置中心字典
-  getDictionaryList (key) {
-    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
-    const object = JSON.parse(str)
-    return object[key]
-  },
-  async getDictValue (dictKey, value, func, isDev = false, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-    const processResult = (result) => {
-      if (!result.value) {
-        return {
-          status: 'none',
-          text: value
-        }
-      }
-      const item = result.value.find(item => item.value == value)
-      if (item) {
-        return {
-          status: item.status || 'none',
-          text: item.label
-        }
-      }
+  // 用于徽标解析字典值
+  parseDictValue (dictList, value) {
+    if (!Array.isArray(dictList)) {
       return {
         status: 'none',
         text: value
       }
     }
-    if (func) {
-      getConfigByName(dictKey, serviceName, result => {
-        func(processResult(result))
-      }, isDev)
+
+    const item = dictList.find(i => i.value == value)
+    if (item) {
+      return {
+        status: item.status || 'none',
+        text: item.label
+      }
+    }
+
+    return {
+      status: 'none',
+      text: value
+    }
+  },
+
+  // 获取徽标字典值
+  async getDictValue (
+    dictKey,
+    value,
+    callback,
+    isDev = false,
+    serviceName = process.env.VUE_APP_SYSTEM_NAME
+  ) {
+    const dictList = await this.getDictByKeyAsync(
+      dictKey,
+      serviceName,
+      isDev
+    )
+    const result = this.parseDictValue(dictList, value)
+
+    if (typeof callback === 'function') {
+      callback(result)
     } else {
-      const result = await new Promise((resolve) => {
-        getConfigByName(dictKey, serviceName, resolve, isDev)
-      })
-      return processResult(result)
+      return result
     }
   },
+
   // 获取琉璃字典（Callback 版本）
-  getDictByKey(dictKey, serviceName, callback, isDev) {
-    this.getDictByKeyAsync(dictKey, serviceName, isDev).then(callback)
-  },
-  // 获取琉璃字典（Promise 版本）
-  getDictByKeyAsync(dictKey, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
-    return new Promise(resolve => {
-      getConfigByName(dictKey, serviceName, res => resolve(res.value), isDev)
-    })
+  getDictByKey (dictKey, serviceName, callback, isDev) {
+    this.getDictByKeyAsync(dictKey, serviceName, isDev)
+      .then(res => {
+        if (typeof callback === 'function') {
+          callback(res)
+        }
+      })
   },
 
-  getParam (key, value, callback) {
-    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
-    const object = JSON.parse(str)
-    if (object && object[key]) {
-      const result = object[key]
-      if (Object.prototype.hasOwnProperty.call(result, value)) {
-        return result[value]
-      } else {
-        return { status: 'none', text: value }
-      }
+  // 获取琉璃字典（Promise 版本，核心实现）
+  async getDictByKeyAsync (
+    dictKey,
+    serviceName = process.env.VUE_APP_SYSTEM_NAME,
+    isDev = false
+  ) {
+    const cacheKey = `${serviceName}:${dictKey}`
+
+    if (dictCache.has(cacheKey)) {
+      return dictCache.get(cacheKey)
     }
-    return null
+
+    const dictList = await new Promise(resolve => {
+      getConfigByName(
+        dictKey,
+        serviceName,
+        res => resolve(res?.value || []),
+        isDev
+      )
+    })
+
+    dictCache.set(cacheKey, dictList)
+    return dictList
   },
+
   getParams () {
     const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
-    return JSON.parse(str)
+    return str ? JSON.parse(str) : {}
   },
+
   getSingleValues () {
     const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
-    return JSON.parse(str)
+    return str ? JSON.parse(str) : {}
   },
+
   getWebConfigByKey (key) {
     const str = localStorage.getItem(process.env.VUE_APP_WEB_CONFIG_KEY)
+    if (!str) return undefined
     const object = JSON.parse(str)
-    return object[key]
+    return object?.[key]
   },
+
   getStylesByKey (key) {
     const str = localStorage.getItem(process.env.VUE_APP_WEB_STYLES_KEY)
+    if (!str) return undefined
     const object = JSON.parse(str)
-    return object[key]
-  },
+    return object?.[key]
+  }
 }
+
 export default GetAppDataService

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

@@ -1125,7 +1125,7 @@ export default {
             if (stepDefine.formType === 'select') {
               let dictList
               if (stepDefine.selectType === 'key') {
-                dictList = this.$appdata.getDictionaryList(stepDefine.selectKey)
+                dictList = []
               } else if (stepDefine.selectType === 'config') {
                 const configName = stepDefine.selectKey.substring(7)
                 dictList = await this.$appdata.getDictByKeyAsync(configName)

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

@@ -787,7 +787,7 @@ export default {
                 if (stepDefine.formType === 'select') {
                   let dictList
                   if (stepDefine.selectType === 'key') {
-                    dictList = this.$appdata.getDictionaryList(stepDefine.selectKey)
+                    dictList = []
                   } else if (stepDefine.selectType === 'config') {
                     const configName = stepDefine.selectKey.substring(7)
                     dictList = await this.$appdata.getDictByKeyAsync(configName)

package/src/pages/userInfoDetailManage/ExceptionRecordQuery/index.vue

@@ -1,45 +1,45 @@
-<script>
-export default {
-  name: 'ExceptionQuery',
-  components: {
-    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
-  },
-  props: {
-    currUserInfo: {
-      type: Object,
-      default: () => undefined
-    }
-  },
-  mounted () {
-    this.$refs.xFormTable.refresh(true)
-  },
-  data () {
-    return {
-      // 查询配置名称
-      queryParamsName: 'ExceptionRecordQueryCRUD',
-      fixedQueryForm: { ex_f_userfiles_id: this.currUserInfo.f_userfiles_id },
-      // 新增表单固定值
-      fixedAddForm: {},
-      // 是否显示详情抽屉
-      detailVisible: false,
-      // 当前记录
-      record: {}
-    }
-  }
-}
-</script>
-
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="异常查询"
-      :queryParamsName="queryParamsName"
-      :fixedQueryForm="fixedQueryForm"
-      ref="xFormTable">
-    </x-form-table>
-  </a-card>
-</template>
-
-<style scoped>
-
-</style>
+<script>
+export default {
+  name: 'ExceptionQuery',
+  components: {
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
+  },
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  mounted () {
+    this.$refs.xFormTable.refresh(true)
+  },
+  data () {
+    return {
+      // 查询配置名称
+      queryParamsName: 'ExceptionRecordQueryCRUD',
+      fixedQueryForm: { ex_f_userfiles_id: this.currUserInfo.f_userfiles_id },
+      // 新增表单固定值
+      fixedAddForm: {},
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {}
+    }
+  }
+}
+</script>
+
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="异常查询"
+      :queryParamsName="queryParamsName"
+      :fixedQueryForm="fixedQueryForm"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<style scoped>
+
+</style>