n20-project-component 1.0.8 → 1.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-project-component",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "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
@@ -554,6 +555,8 @@ export default {
      */
     getFilterList() {
       if (!this.filterId) {
+        console.log(this.checkIds, 1122);
+        
         if (this.checkIds.length === 0) {
           this.GroupData = []
         } else {

package/src/components/ProFilterView/index.vue

@@ -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)"
@@ -114,6 +114,7 @@
     </cl-advanced-filter>
     <cl-dialog
       v-drag
+      v-if="visible"
       width="85%"
       :visible.sync="visible"
       :title="isAdd ? $lc('新建视图') : $lc('编辑视图')"
@@ -446,12 +447,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 +470,8 @@ export default {
       this.visible = true;
       this.isAdd = false;
       this.dialogFilterKey++;
+      console.log(this.form, 123);
+      
       // 浅拷贝，避免修改 form 时污染原始 item
       this.form = { ...item };
       this.viewId = item.viewId;
@@ -547,10 +550,12 @@ export default {
     },
     // 选中视图
     handleSelect(item) {
+      console.log(item, 111);
+      
       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 || {})) };
         // 无视图时恢复原来的筛选逻辑
@@ -629,9 +634,6 @@ export default {
 </script>
 
 <style scoped>
-@import './style/iconfont.css';
-@import './style/style.scss';
-
 .filter.is-hidden {
   padding: 4px;
   border-bottom: none !important;

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

@@ -56,6 +56,6 @@
 }
 
 /* Element UI 图标 (el-icon-check) */
-.el-icon-check:before {
+/* .el-icon-check:before {
   content: "\e611";
-}
+} */