vue2-client 1.8.104 → 1.8.106

package/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.8.103-1.8.104 -2024-3-14 @张振宇**
+**1.8.103-1.8.106 -2024-3-14 @张振宇**
 - 增加对话库功能
 - 修复xbadge不更新展示问题
 

package/package.json

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

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

@@ -1,7 +1,10 @@
 <template>
   <div v-if="dictionary && dictionary.status !== 'none'">
     <!-- 徽标存在时 -->
-    <a-badge v-if="dictionary.status !== 'gary'" :color="dictionary.status" :text="!isExternalText ? dictionary.text: null"/>
+    <a-badge
+      v-if="dictionary.status !== 'gary'"
+      :color="dictionary.status"
+      :text="!isExternalText ? dictionary.text: null"/>
     <a-badge v-else color="#D9D9D9" :text="!isExternalText ? dictionary.text: null"/>
     <span v-if="isExternalText">{{ dictionary.text }}</span>
   </div>
@@ -56,15 +59,13 @@ export default {
   },
   methods: {
     // todo 修改方式  想办法不使用回调方式
-    updateDictionary () {
+    async updateDictionary () {
       const result = this.$appdata.getParam(this.badgeKey, this.value)
       if (result) {
         this.dictionary = result
         return
       }
-      this.$appdata.getDictValue(this.badgeKey, this.value, undefined, res => {
-        this.dictionary = res
-      })
+      this.dictionary = await this.$appdata.getDictValue(this.badgeKey, this.value, undefined)
     },
     badgeFilter (key, value) {
       return this.$appdata.getParam(key, value)

package/src/base-client/plugins/AppData.js

@@ -53,21 +53,30 @@ const GetAppDataService = {
     const object = JSON.parse(str)
     return object[key]
   },
-  getDictValue (dictKey, value, func) {
-    getConfigByName(dictKey, undefined, result => {
-      for (const item of result.value) {
-        if (item.value == value) {
-          func({
-            status: item.status || 'none',
-            text: item.label
-          })
+  async getDictValue (dictKey, value, func) {
+    const processResult = (result) => {
+      const item = result.value.find(item => item.value == value)
+      if (item) {
+        return {
+          status: item.status || 'none',
+          text: item.label
         }
       }
-      func({
+      return {
         status: 'none',
         text: value
+      }
+    }
+    if (func) {
+      getConfigByName(dictKey, undefined, result => {
+        func(processResult(result))
       })
-    })
+    } else {
+      const result = await new Promise((resolve) => {
+        getConfigByName(dictKey, undefined, resolve)
+      })
+      return processResult(result)
+    }
   },
   getParam (key, value, callback) {
     const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)

package/src/pages/DynamicStatistics/QuestionHistoryAndFavorites.vue

@@ -182,7 +182,7 @@
 <script>
 import { indexedDB } from '@vue2-client/utils/indexedDB'
 import { formatDate } from '@vue2-client/utils/util'
-import { post } from '@/services/api'
+import { post } from '@vue2-client/services/api'
 
 export default {
   props: {

package/vue.config.js

@@ -73,7 +73,6 @@ module.exports = {
     config.resolve = {
       extensions: ['.js', '.vue', '.json'],
       alias: {
-        '@': path.resolve('src'),
         '@vue2-client': path.resolve('src')
       }
     }