vue2-client 1.18.68 → 1.19.0

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/base-client/components/common/XReport/XReportHospitalizationDemo.vue

@@ -1,45 +0,0 @@
-<template>
-  <div id="xreport-hosp-demo">
-    <a-space style="margin-bottom: 12px;">
-      <a-button type="primary" @click="doInit">手动初始化</a-button>
-    </a-space>
-    <XReport
-      ref="reportRef"
-      :edit-mode="true"
-      :show-save-button="true"
-      :show-img-in-cell="false"
-      :use-oss-for-img="false"
-      server-name="af-his"
-      @updateImg="onUpdateImg"/>
-  </div>
-</template>
-
-<script setup>
-import { ref } from 'vue'
-import XReport from '@vue2-client/base-client/components/common/XReport'
-
-const reportRef = ref(null)
-
-const payload = {
-  arr: [
-    { BQ: '病房区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
-    { BQ: '感染科', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
-    { BQ: '骨科病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
-    { BQ: '呼吸科病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
-    { BQ: '急症科病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
-    { BQ: '内科二病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 }
-  ]
-}
-
-const doInit = async () => {
-  if (!reportRef.value || !reportRef.value.init) return
-  await reportRef.value.init({
-    configName: 'hospitalizationStatsReport',
-    configData: payload
-  })
-}
-
-const onUpdateImg = data => {
-  console.warn('updateImg:', data)
-}
-</script>