vue2-client 1.18.69 → 1.19.1

package/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.19.0 -2026-01-05 @江超**
+- 移除对旧字典的支持（暂时保留方法）
+
 **1.16.72 -2024-12-19 @张振宇**
 - 修复代码检查发现的错误
 - 优化 XAddNativeFormOA 组件中的变量作用域问题

package/package.json

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

package/src/base-client/components/common/HIS/HAddNativeForm/HAddNativeForm.vue

@@ -136,21 +136,7 @@ export default {
             console.warn(`Config '${configName}' did not return a valid 'value' array for options. Result:`, res)
           }
         } else {
-          // 全局字典
-          if (this.$appdata && typeof this.$appdata.getDictionaryList === 'function') {
-            const dictionaryList = this.$appdata.getDictionaryList(item.keyName)
-            if (Array.isArray(dictionaryList)) {
-              fetchedOptions = dictionaryList.map(opt => ({
-                label: opt.text,
-                value: opt.value + '',
-                ...opt // 将所有原始属性也添加到选项中
-              }))
-            } else {
-              console.warn(`Global dictionary '${item.keyName}' did not return an array. Result:`, dictionaryList)
-            }
-          } else {
-            console.error('$appdata.getDictionaryList is not available. Please ensure it\'s globally provided.')
-          }
+          // 移除对旧字典的解析
         }
       } catch (error) {
         console.error(`Error fetching options for item '${item.key}':`, error)

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

@@ -73,15 +73,7 @@ export default {
   methods: {
     // todo 修改方式  想办法不使用回调方式
     async updateDictionary () {
-      const result = this.$appdata.getParam(this.badgeKey, this.value)
-      if (result) {
-        this.dictionary = result
-        return
-      }
       this.dictionary = await this.$appdata.getDictValue(this.badgeKey, this.value, undefined, this.env === 'dev', this.serviceName)
-    },
-    badgeFilter (key, value) {
-      return this.$appdata.getParam(key, value)
     }
   }
 }

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -144,22 +144,6 @@
               </template>
             </a-select-option>
           </template>
-          <template v-else>
-            <a-select-option
-              v-for="item in $appdata.getDictionaryList(attr.keyName)"
-              :key="item.value"
-              :value="item.value + ''"
-            >
-              <!-- 徽标(badge) -->
-              <x-badge
-                :badge-key="attr.keyName"
-                :replaceText="item.text"
-                :value="item.value"
-                :service-name="serviceName"
-                :env="env"
-              />
-            </a-select-option>
-          </template>
         </template>
       </a-select>
       <a-select
@@ -259,15 +243,6 @@
               </template>
             </a-select-option>
           </template>
-          <template v-else>
-            <a-select-option
-              v-for="item in $appdata.getDictionaryList(attr.keyName)"
-              :key="item.value"
-              :value="item.value + ''"
-            >
-              {{ item.text }}
-            </a-select-option>
-          </template>
         </template>
       </a-select>
       <a-select
@@ -333,11 +308,6 @@
               {{ item.label }}
             </a-radio>
           </template>
-          <template v-else>
-            <a-radio v-for="(item, index) in $appdata.getDictionaryList(attr.keyName)" :key="index" :value="item.value">
-              {{ item.text }}
-            </a-radio>
-          </template>
         </template>
       </a-radio-group>
     </a-form-model-item>

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

@@ -12,7 +12,7 @@
         <div class="title-content">
           <div class="title-dot"></div>
           <a-icon v-if="attrs.icon && !attrs.customIcon" :type="attrs.icon" class="title-icon" />
-          <XIcon v-if="attrs.customIcon" :name="attrs.customIcon" class="title-icon" />
+          <XIcon v-if="attrs.customIcon" :name="attrs.customIcon" class="title-icon"/>
           <span>{{ config.label }}</span>
         </div>
         <div
@@ -33,7 +33,7 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted, useAttrs } from 'vue'
+import {ref, computed, onMounted, useAttrs} from 'vue'
 import XIcon from '../XIcon/XIcon.vue'
 
 const props = defineProps({
@@ -101,11 +101,36 @@ const isShowTopLine = computed(() => {
 const isShowBottomLine = computed(() => {
   return attrs.showBottomLine === 'true' || attrs.showBottomLine === true
 })
+// 暴露方法供外部调用，动态修改标题
+const updateTitle = (newTitle) => {
+  if (newTitle !== undefined && newTitle !== null) {
+    config.value.label = String(newTitle)
+    config.value.type = 'title'
+    config.value.line = ''
+    config.value.color = ''
+    config.value.lineLength = ''
+    config.value.clickName = ''
+    // 强制更新（以防万一）
+    config.value = {...config.value}
+  }
+}
+
+// 暴露方法供外部调用，动态修改 queryParamsName
+const updateQueryParamsName = (newParams) => {
+  parseConfig(newParams)
+}
+
 const handleClick = () => {
   if (config.value.clickName) {
     emit(config.value.clickName)
   }
 }
+
+// 暴露组件方法
+defineExpose({
+  updateTitle,
+  updateQueryParamsName
+})
 const parseConfig = (data) => {
   // 如果设置了title属性，直接使用title作为标签
   if (props.title) {
@@ -156,6 +181,7 @@ const parseConfig = (data) => {
   }
 }
 
+
 onMounted(() => {
   parseConfig(props.queryParamsName)
 })
@@ -181,6 +207,7 @@ onMounted(() => {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
 .underline {
   position: absolute;
   bottom: 0;
@@ -193,6 +220,7 @@ onMounted(() => {
 .x-button-container {
   text-align: right;
 }
+
 .x-title-center {
   &.x-title-container,
   .x-title-container {
@@ -201,6 +229,7 @@ onMounted(() => {
     }
   }
 }
+
 .x-title-littlefont {
   &.x-title-container,
   .x-title-container {
@@ -239,6 +268,7 @@ onMounted(() => {
     align-items: baseline;
   }
 }
+
 // 顶部分割线
 .top-line {
   width: 100%;
@@ -248,6 +278,7 @@ onMounted(() => {
   margin: 8px 0;
   opacity: 1;
 }
+
 .x-title-dot,
 .x-title-nodot {
   &.x-title-container,
@@ -271,12 +302,14 @@ onMounted(() => {
     }
   }
 }
+
 .x-title-yizhu-title {
   &.x-title-container,
   .x-title-container {
     margin-top: 3px;
     margin-left: 6px;
     margin-bottom: 7px;
+
     :deep(.x-title) {
       height: 26px;
       opacity: 1;
@@ -290,10 +323,12 @@ onMounted(() => {
     }
   }
 }
+
 .x-title-left-title {
   &.x-title-container,
   .x-title-container {
     margin: 15px auto 15px 6px;
+
     :deep(.x-title) {
       height: 26px;
       opacity: 1;
@@ -304,6 +339,7 @@ onMounted(() => {
     }
   }
 }
+
 // nodot 样式特有部分
 .x-title-nodot {
   &.x-title-container,
@@ -314,12 +350,14 @@ onMounted(() => {
     }
   }
 }
+
 .x-title-line-style {
   background: #0057FE;
   height: 2px;
 }
+
 .x-title-compact {
-  :deep(.x-title){
+  :deep(.x-title) {
     height: 23px;
     opacity: 1;
     font-family: "Source Han Sans";

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)