lw-cdp-ui 1.1.43 → 1.1.45

package/dist/components/lwLayout/components/tags.vue

@@ -6,7 +6,7 @@
           :class="[isActive(tag)?'active':'',tag.meta.affix?'affix':'' ]"
           @contextmenu.prevent="openContextMenu($event, tag)">
         <router-link :to="tag">
-          <span>{{ tag.meta.title }}</span>
+          <span>{{ getIdName(tag) }}</span>
           <el-icon v-if="!tag.meta.affix"
                    @click.prevent.stop='closeSelectedTag(tag)'><el-icon-close /></el-icon>
         </router-link>
@@ -54,7 +54,13 @@ export default {
       menu: this.$router.sc_getMenu()
     }
   },
-  props: {},
+  props: {
+    // 标签是否显示ID
+    tagShowID: {
+      type: Boolean,
+      default: false
+    }
+  },
   computed: {
     tagList() {
       return this.$store.state.viewTags.viewTags
@@ -292,6 +298,21 @@ export default {
       this.$store.commit('removeKeepLive', keep)
       this.closeSelectedTag(this.$route, false)
       this.$router.push(path)
+    },
+    // 显示ID
+    getIdName(tag) {
+      if (tag.query?.id && this.tagShowID) {
+        let str = tag.meta.title
+        if (str.includes(':') || str.includes('：')) {
+          return tag.meta.title
+        } else {
+          return `${tag.meta.title}:${tag.query.id}`
+        }
+        
+      } else {
+        return tag.meta.title
+      }
+      
     }
   }
 }

package/dist/components/lwLayout/index.vue

@@ -56,7 +56,7 @@
       <Side-m v-if="ismobile"></Side-m>
       <div class="aminui-body el-container">
         <Topbar v-if="!ismobile"></Topbar>
-        <Tags v-if="!ismobile && layoutTags"></Tags>
+        <Tags v-if="!ismobile && layoutTags" :tagShowID="tagShowID"></Tags>
         <div class="adminui-main"
              id="adminui-main">
           <slot name="routerView">
@@ -117,7 +117,7 @@
               </template>
             </userbar>
           </div>
-          <Tags v-if="!ismobile && layoutTags"></Tags>
+          <Tags v-if="!ismobile && layoutTags" :tagShowID="tagShowID"></Tags>
           <div class="adminui-main"
                id="adminui-main">
             <slot name="routerView">
@@ -170,7 +170,7 @@
     </header>
     <section class="aminui-wrapper">
       <div class="aminui-body el-container">
-        <Tags v-if="!ismobile && layoutTags"></Tags>
+        <Tags v-if="!ismobile && layoutTags" :tagShowID="tagShowID"></Tags>
         <div class="adminui-main"
              id="adminui-main">
           <slot name="routerView">
@@ -245,7 +245,7 @@
             </template>
           </userbar>
         </Topbar>
-        <Tags v-if="!ismobile && layoutTags"></Tags>
+        <Tags v-if="!ismobile && layoutTags" :tagShowID="tagShowID"></Tags>
         <div class="adminui-main"
              id="adminui-main">
           <slot name="routerView">
@@ -299,6 +299,11 @@ export default {
       type: Boolean,
       default: true
     },
+    // 标签是否显示ID
+    tagShowID: {
+      type: Boolean,
+      default: false
+    }
   },
   components: {
     Aside,

package/dist/components/lwTableSelect/index.vue

@@ -128,10 +128,14 @@ export default {
         [this.defaultProps.pageSize]: this.pageSize,
         [this.defaultProps.keyword]: this.keyword
       }
-      console.log(this.formData)
-      this.formData.expression = this.$expression(this.formData) 
+      let expression = this.$expression(this.formData)
+      if (expression) {
+        this.formData.expression = ` ${this.params.expression} AND ${expression}`
+      } else {
+        this.formData.expression = this.params.expression
+      }
       Object.assign(reqData, this.params, this.formData)
-      
+
       var res = await this.apiObj(reqData);
       var parseData = config.parseData(res)
       this.tableData = parseData.rows;