vue2-client 1.4.18 → 1.4.20

package/CHANGELOG.md

@@ -1,7 +1,13 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.4.18 -2022-09-28 @江超**
+**1.4.20 -2022-09-28 @江超**
+- 功能修改：
+- `AppData`修复没有设置徽标时，字典类型数据显示异常的问题
+- `XFormItem`移除综合筛选框
+- `CreateQueryItem`修复一个小问题
+
+**1.4.18 - 1.4.19 -2022-09-28 @江超**
 - 功能修改：
 - V4登录获取路由提取到后端处理
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.4.18",
+  "version": "1.4.20",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/base-client/components/common/CreateQuery/CreateQueryItem.vue

@@ -384,7 +384,7 @@ export default {
     },
     // 作用域插槽是否禁用
     slotTypeDisabled () {
-      return this.item.selectType === 'key' && this.item.selectKey
+      return this.item.selectKey && this.item.selectType === 'key'
     },
     // 字段名称是否禁用
     keyDisabled () {

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

@@ -1,31 +1,7 @@
 <template>
-  <!-- 综合筛选 -->
-  <x-form-col
-    v-if="attr.type === 'select' && attr.model === 'rowIdValue'"
-    :xl="xl"
-    :xxl="xxl">
-    <a-form-model-item
-      :ref="attr.model"
-      :label="attr.name"
-      :prop="attr.model">
-      <a-input v-model="form[attr.model]" :disabled="disabled">
-        <a-select
-          slot="addonBefore"
-          v-model="form['rowIdName']"
-          :getPopupContainer=" triggerNode => { return triggerNode.parentNode } "
-          style="width: 100px">
-          <a-select-option
-            v-for="(item,index) in attr.keys"
-            :key="index"
-            :value="item.value">{{ item.label }}
-          </a-select-option>
-        </a-select>
-      </a-input>
-    </a-form-model-item>
-  </x-form-col>
   <!-- 输入框 -->
   <x-form-col
-    v-else-if="attr.type === 'input'"
+    v-if="attr.type === 'input'"
     :xl="xl"
     :xxl="xxl">
     <a-form-model-item

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

@@ -14,11 +14,15 @@ const GetAppDataService = {
       for (const key of Object.keys(params)) {
         badgeItemArray[key] = {}
         for (const item of params[key]) {
-          if (item.status) {
-            badgeItemArray[key][item.value] = {
-              status: item.status,
-              text: item.text
-            }
+          let status
+          if (!item.status) {
+            status = 'none'
+          } else {
+            status = item.status
+          }
+          badgeItemArray[key][item.value] = {
+            status: status,
+            text: item.text
           }
         }
       }

package/src/components/menu/menu.js

@@ -240,7 +240,7 @@ export default {
       let matches = this.$route.matched
       const route = matches[matches.length - 1]
       let chose = this.routesMap[route.path]
-      if (chose.meta && chose.meta.highlight) {
+      if (chose && chose.meta && chose.meta.highlight) {
         chose = this.routesMap[chose.meta.highlight]
         const resolve = this.$router.resolve({ path: chose.fullPath })
         matches = (resolve.resolved && resolve.resolved.matched) || matches