vue2-client 1.8.100 → 1.8.102

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.8.102 -2024-3-14 @张振宇**
+- microapp环境下使用 replace 跳转路由
+
+**1.8.101 -2024-3-14 @江超**
+- 已解决：XTable显示来自配置中心的字典徽标
+
 **1.8.94 - 1.8.96 -2024-3-12 @江超**
 - 兼容hideInMenu的写法
 - 修改引用报错

package/package.json

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

package/src/App.vue

@@ -101,7 +101,7 @@ export default {
           }
         })
         console.log('microApp', window.microApp)
-        this.$router.push({ path: baseApp })
+        this.$router.replace({ path: baseApp })
       }
     },
     setLanguage (lang) {

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

@@ -37,17 +37,21 @@ export default {
       required: false
     }
   },
-  computed: {
-    dictionary () {
-      return this.$appdata.getParam(this.badgeKey, this.value)
-    }
-  },
+  computed: {},
   data () {
     return {
+      dictionary: undefined
     }
   },
-  mounted () {
-
+  created () {
+    const result = this.$appdata.getParam(this.badgeKey, this.value)
+    if (result) {
+      this.dictionary = result
+      return
+    }
+    this.$appdata.getDictValue(this.badgeKey, this.value, res => {
+      this.dictionary = res
+    })
   },
   methods: {
     badgeFilter (key, value) {

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

@@ -85,6 +85,11 @@ export default {
       form: undefined,
       // 校验
       rules: {},
+      // 图标样式
+      iconStyle: {
+        position: 'relative',
+        top: '1px'
+      },
       // 表单项集合
       formItems: [],
       // 是否显示

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

@@ -81,6 +81,11 @@ export default {
     return {
       // 加载状态
       loading: false,
+      // 图标样式
+      iconStyle: {
+        position: 'relative',
+        top: '1px'
+      },
       loadError: false,
       // 实际查询配置内容
       realQueryConfig: {}

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

@@ -181,6 +181,11 @@ export default {
       editLoading: false,
       // 按钮状态
       buttonState: {},
+      // 图标样式
+      iconStyle: {
+        position: 'relative',
+        top: '1px'
+      },
       // 当前环境
       env: 'prod'
     }

package/src/base-client/components/system/QueryParamsDetailsView/QueryParamsDetailsView.vue

@@ -91,6 +91,11 @@ export default {
       screenWidth: document.documentElement.clientWidth,
       // Tab页签
       tabActiveKey: '1',
+      // 图标样式
+      iconStyle: {
+        position: 'relative',
+        top: '1px'
+      },
       // 是否显示生成查询配置抽屉
       createQueryVisible: false,
       // 设备类型详情

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

@@ -1,6 +1,7 @@
 import { manageApi, post } 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 GetAppDataService = {
   install (Vue) {
@@ -52,15 +53,34 @@ const GetAppDataService = {
     const object = JSON.parse(str)
     return object[key]
   },
-  getParam (key, value) {
+  getDictValue (dictKey, value, callback) {
+    getConfigByName(dictKey, undefined, result => {
+      for (const item of result.value) {
+        if (item.value == value) {
+          callback({
+            status: item.status || 'none',
+            text: item.label
+          })
+        }
+      }
+      callback({
+        status: 'none',
+        text: item.label
+      })
+    })
+  },
+  getParam (key, value, callback) {
     const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
     const object = JSON.parse(str)
-    const result = object[key]
-    if (result && Object.prototype.hasOwnProperty.call(result, value)) {
-      return result[value]
-    } else {
-      return null
+    if (object && object[key]) {
+      const result = object[key]
+      if (Object.prototype.hasOwnProperty.call(result, value)) {
+        return result[value]
+      } else {
+        return null
+      }
     }
+    return null
   },
   getParams () {
     const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)

package/src/components/TableSetting/TableSetting.vue

@@ -45,6 +45,11 @@ export default {
   },
   data () {
     return {
+      // 图标样式
+      iconStyle: {
+        position: 'relative',
+        top: '1px'
+      },
       allKey: [],
       indeterminate: true,
       checkAll: false,