n20-project-component 1.0.9 → 1.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-project-component",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "PC 端 Vue 2 + Element UI 组件库",
   "main": "dist/n20-project-component.umd.min.js",
   "module": "dist/n20-project-component.common.js",

package/src/components/ProFilterView/AdvancedFilter/index.vue

@@ -325,6 +325,7 @@ export default {
       this.stVisible = true
       this.form.type = 1
       this.form.keyIds = this.checkList
+      this.$set(this.form, 'viewName', '')
     },
     getDefaultCheck() {
       let _checkList = this.filterList

package/src/components/ProFilterView/index.vue

@@ -4,7 +4,7 @@
       <slot name="leftContent"></slot>
       <div class="flex-box flex-v">
         <el-popover
-          v-if="bussId"
+          v-if="_bussId"
           ref="viewPopover"
           v-model="viewPopoverVisible"
           popper-class="pro-filter-view-popover"
@@ -12,7 +12,7 @@
           trigger="click"
           class="m-r-s"
         >
-          <el-button slot="reference" class="botton" :class="{ activiti: selectedItem !== '无视图' }">
+          <el-button slot="reference" class="botton" :class="{ activiti: !!selectItem.viewId }">
             <div class="flex-box flex-v m-r">
               <i class="v3-icon-inbox"></i>
               <div class="popover-title" style="margin: 0 8px" :title="selectedItem">{{ selectedItem }}</div>
@@ -25,13 +25,13 @@
             <div class="filter-view-wrapper">
               <cl-drag-list class="flex-item" :list="filteredList" :hide-delete="true" @change="handleDragSort">
                 <template v-slot="{ item }">
-                  <div class="proFilterView-list-item" :class="{ 'is-selected': selectedItem === item.viewName }">
+                  <div class="proFilterView-list-item" :class="{ 'is-selected': selectItem.viewId === item.viewId }">
                     <span class="proFilterView-list-item__name" :title="item.viewName" @click="handleSelect(item)">{{
                       item.viewName
                     }}</span>
-                    <i v-if="selectedItem === item.viewName" class="el-icon-check selected-icon"></i>
+                    <i v-if="selectItem.viewId === item.viewId" class="el-icon-check selected-icon"></i>
                     <el-dropdown
-                      v-if="selectedItem !== item.viewName && item.viewName !== '无视图'"
+                      v-if="item.viewId && selectItem.viewId !== item.viewId"
                       trigger="click"
                       class="proFilterView-list-item__more"
                       @command="command => handleCommand(command, item)"
@@ -53,7 +53,7 @@
             </div>
           </div>
         </el-popover>
-        <el-button v-if="bussId && selectItem" class="activiti m-l-s" @click="edit(selectItem, true)">
+        <el-button v-if="_bussId && selectItem" class="activiti m-l-s" @click="edit(selectItem, true)">
           <div class="flex-box flex-v">
             <i class="v3-icon-find"></i>
             <div style="margin-left: 8px">
@@ -74,7 +74,7 @@
       :class="{ 'is-hidden': !filterExpanded }"
       :visible.sync="filterExpanded"
       :filter-id="filterId"
-      :buss-id="bussId"
+      :buss-id="_bussId"
       :model="searchValue"
       :filter-list="filterList"
       :filter-readonly="!!selectItem"
@@ -114,6 +114,7 @@
     </cl-advanced-filter>
     <cl-dialog
       v-drag
+      v-if="visible"
       width="85%"
       :visible.sync="visible"
       :title="isAdd ? $lc('新建视图') : $lc('编辑视图')"
@@ -184,6 +185,10 @@ export default {
       type: String,
       default: '',
     },
+    isDiffByUser: {
+      type: Boolean,
+      default: true,
+    },
     filterId: {
       type: String,
       default: '',
@@ -222,9 +227,14 @@ export default {
       searchValue: {},
       viewId: undefined,
       isRefresh: false,
+      noneViewSearchValue: {}, // 无视图时的筛选值
     };
   },
   computed: {
+    _bussId() {
+      const userNo = sessionStorage.getItem('userNo');
+      return this.bussId ? (this.isDiffByUser ? this.bussId + '_' + userNo : this.bussId) : '';
+    },
     /**
      * 本地搜索过滤视图列表
      * @returns {Array} 根据 searchKeyword 过滤后的视图列表；searchKeyword 为空时返回完整列表
@@ -304,8 +314,8 @@ export default {
     },
   },
   mounted() {
-    // 只有在有 bussId 时才获取视图列表
-    if (this.bussId) {
+    // 只有在有 _bussId 时才获取视图列表
+    if (this._bussId) {
       this.getFilterList();
     }
     // 合并初始筛选值：slot 字段使用默认值，其他字段使用 initialValue 传入的值
@@ -408,15 +418,15 @@ export default {
         'clear',
       );
     },
-    // 通过bussId拿取视图列表
+    // 通过_bussId拿取视图列表
     getFilterList(viewId) {
-      // 如果没有 bussId，不获取视图列表
-      if (!this.bussId) {
+      // 如果没有 _bussId，不获取视图列表
+      if (!this._bussId) {
         return;
       }
 
       axios
-        .get(`/bems/query/viewColumn/getViewInfo`, { bussId: this.bussId })
+        .get(`/bems/query/viewColumn/getViewInfo`, { bussId: this._bussId })
         .then(res => {
           const list = (res.data || []).map(item => {
             item.keyIds = this.safeParse(item.keyIds, []);
@@ -446,12 +456,12 @@ export default {
     },
     // 新增
     add() {
-      let keyIds = this.filterList.filter(v => v.required).map(v => v.id);
-      
       this.isRefresh = false;
       this.viewPopoverVisible = false;
       this.visible = true;
       this.isAdd = true;
+      
+      let keyIds = this.filterList.filter(v => v.required || v.static).map(v => v.id);
       this.form = {
         userNo: sessionStorage.getItem('userNo'),
         pageNo: this.filterId,
@@ -469,6 +479,7 @@ export default {
       this.visible = true;
       this.isAdd = false;
       this.dialogFilterKey++;
+
       // 浅拷贝，避免修改 form 时污染原始 item
       this.form = { ...item };
       this.viewId = item.viewId;
@@ -490,7 +501,7 @@ export default {
     },
     // 保存视图
     saveSt() {
-      if (!this.bussId) {
+      if (!this._bussId) {
         this.$message.warning('缺少业务ID，无法保存视图');
         return;
       }
@@ -514,7 +525,7 @@ export default {
         const obj = {
           viewName: this.form.viewName,
           viewType: '0',
-          bussId: this.bussId,
+          bussId: this._bussId,
           viewConfig: this.form.viewConfig,
           keyIds: JSON.stringify(keyIds),
           viewId: this.viewId,
@@ -547,12 +558,17 @@ export default {
     },
     // 选中视图
     handleSelect(item) {
+      // 上一个选中的是“无视图”
+      if (!this.selectItem.viewId) {
+        this.noneViewSearchValue = JSON.parse(JSON.stringify(this.searchValue || {}));
+      }
+
       this.viewPopoverVisible = false;
       this.selectItem = item;
       this.selectedItem = item.viewName;
-      if (item.viewName === '无视图') {
+      if (!item.viewId) {
         this.selectItem = '';
-        this.searchValue = { ...this.getInitialSearchValue, ...JSON.parse(JSON.stringify(this.initialValue || {})) };
+        this.searchValue = { ...this.noneViewSearchValue };
         // 无视图时恢复原来的筛选逻辑
         this.$nextTick(() => {
           const filterRef = this.$refs.filter;

package/src/components/ProFilterView/style/iconfont.css

@@ -8,7 +8,7 @@
        url('./v3-iconfont.ttf') format('truetype');
 }
 
-/* n20 系列图标字体 (来自 iconFont) */
+/* n20 系列图标字体（独立字体文件，与 n20-common-lib 的 core-lib-iconfont 不同，不冲突） */
 @font-face {
   font-family: "n20-iconfont";
   src: url('./n20-iconfont.woff2') format('woff2'),
@@ -50,12 +50,23 @@
   content: "\e6f4";
 }
 
+.v3-icon-plus:before {
+  content: "\e6eb";
+}
+
+.v3-icon-delete:before {
+  content: "\e6ec";
+}
+
+.v3-icon-search:before {
+  content: "\e6de";
+}
+
+.v3-icon-folder-add:before {
+  content: "\e775";
+}
+
 /* ProFilterView 使用的 n20 系列图标 */
 .n20-icon-xiala-moren:before {
   content: "\e66c";
 }
-
-/* Element UI 图标 (el-icon-check) */
-/* .el-icon-check:before {
-  content: "\e611";
-} */