n20-common-lib 3.0.45 → 3.0.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "3.0.45",
+  "version": "3.0.47",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/AdvancedFilter/formItemRender.vue

@@ -56,7 +56,7 @@ export default {
       this.$emit('enter')
     },
     handleChange(value) {
-      // this.$emit('change', { field: this.item.value, value })
+      this.$emit('change', { field: this.item.value, value })
     },
     handleVisibleChange(value) {
       if (!value) {

package/src/components/AdvancedFilter/index.vue

@@ -65,7 +65,7 @@
           {{ '查询' | $lc }}</span
         >
         <span
-          v-if="filterId"
+          v-if="bussId"
           class="m-l-s"
           style="
             display: inline-block;
@@ -233,6 +233,12 @@ export default {
     saveSt() {
       this.$refs.stform.validate(async (valid) => {
         if (valid) {
+          // 如果没有 bussId，不保存视图
+          if (!this.bussId) {
+            this.$message.warning('缺少业务ID，无法保存视图')
+            return
+          }
+
           // 保存筛选视图
           const obj = {
             viewName: this.form.viewName,

package/src/components/ProFilterView/index.vue

@@ -4,11 +4,12 @@
       <slot name="leftContent"></slot>
       <div class="flex-box flex-v">
         <el-popover
+          v-if="bussId"
           v-model="stVisible"
           popper-class="pro-filter-view-popover"
           placement="bottom-start"
           trigger="click"
-          class="m-r"
+          class="m-r-s"
         >
           <el-button slot="reference" class="botton" :class="{ activiti: selectedItem !== '无视图' }">
             <div class="flex-box flex-v m-r">
@@ -51,7 +52,7 @@
             </div>
           </div>
         </el-popover>
-        <el-button v-if="selectItem" class="activiti m-r" @click="edit(selectItem, true)">
+        <el-button v-if="bussId && selectItem" class="activiti m-r" @click="edit(selectItem, true)">
           <div class="flex-box flex-v">
             <!-- <img src="./find.svg" alt="" /> -->
             <i class="v3-icon-find"></i>
@@ -294,8 +295,10 @@ export default {
   },
   created() {},
   mounted() {
-    // 默认勾选全部
-    this.getFilterList()
+    // 只有在有 bussId 时才获取视图列表
+    if (this.bussId) {
+      this.getFilterList()
+    }
     // 合并初始筛选值：slot 字段使用默认值，其他字段使用 initialValue 传入的值
     this.searchValue = { ...this.getInitialSearchValue, ...this.initialValue }
   },
@@ -316,7 +319,7 @@ export default {
       })
     },
     changeFn(value) {
-      console.log('changeFn', value)
+      this.$emit('changeFn', value)
     },
     filterFn() {
       this.$emit('filter', this.filterObj)
@@ -338,8 +341,13 @@ export default {
         }
       })
     },
-    // 通过filterId拿取视图列表
+    // 通过bussId拿取视图列表
     getFilterList(viewId) {
+      // 如果没有 bussId，不获取视图列表
+      if (!this.bussId) {
+        return
+      }
+
       let list = []
       axios
         .get(`/bems/query/viewColumn/getViewInfo`, { bussId: this.bussId })
@@ -422,6 +430,12 @@ export default {
     },
     // 保存视图
     saveSt() {
+      // 如果没有 bussId，不保存视图
+      if (!this.bussId) {
+        this.$message.warning('缺少业务ID，无法保存视图')
+        return
+      }
+
       let viewConfig
       let keyIds
       if (this.form.viewType === '0') {

package/src/components/ShowColumn/index.vue

@@ -225,7 +225,7 @@
     <div slot="footer" class="flex-box flex-lr">
       <el-button plain @click="reset">{{ '恢复默认' | $lc }}</el-button>
       <div>
-        <el-button type="primary" plain @click="setChange">{{ '取消' | $lc }}</el-button>
+        <el-button type="primary" plain @click="visible = false">{{ '取消' | $lc }}</el-button>
         <el-button type="primary" @click="setChange">{{ '确定' | $lc }}</el-button>
       </div>
     </div>