n20-common-lib 3.0.78 → 3.0.79

package/package.json

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

package/src/assets/css/page-header.scss

@@ -1,6 +1,5 @@
 .n20-page-header {
   display: flex;
-  justify-content: space-between;
   line-height: 20px;
   padding: 12px 16px;
 

package/src/assets/css/table.scss

@@ -1,249 +1,244 @@
-.el-table--small {
-  font-size: 14px;
-}
-
-.el-table--mini {
-  font-size: 12px;
-}
-
-.el-table th {
-  font-weight: $--font-weight-primary;
-}
-
-.el-table--small .el-table__cell {
-  padding: 8px 0;
-}
-
-.el-table .cell {
-  padding-left: 8px;
-  padding-right: 8px;
-}
-
-.el-table--small,
-.el-table--mini {
-  .el-table__cell {
-    .el-button--text {
-      padding-top: 2px;
-      padding-bottom: 2px;
-    }
-
-    .el-link {
-      line-height: initial;
-    }
-  }
-}
-
-.el-table--mini {
-  .el-table__cell {
-    padding: 2px 0;
-
-    .cell {
-      padding-left: 4px;
-      padding-right: 4px;
-      // line-height: 18px;
-    }
-
-    .el-button--mini,
-    .el-link {
-      font-size: 12px;
-    }
-  }
-}
-
-.el-table {
-  /* 排序 */
-  .caret-wrapper {
-    display: inline-flex;
-    flex-direction: row-reverse;
-    align-items: center;
-    width: 16px;
-    height: 16px;
-    line-height: 16px;
-    vertical-align: middle;
-  }
-
-  .sort-caret.ascending,
-  .sort-caret.descending {
-    width: 8px;
-    height: 16px;
-    border: none;
-    font-style: normal;
-    position: static;
-
-    &:hover {
-      color: $--color-primary-light-6;
-    }
-
-    &:before {
-      content: '\e61c';
-      font-family: 'core-lib-iconfont';
-      font-size: 12px;
-      line-height: 12px;
-      position: relative;
-      right: 3px;
-      bottom: 1px;
-    }
-  }
-
-  .sort-caret.descending:before {
-    content: '\e61d';
-    position: relative;
-    right: 1px;
-    bottom: 1px;
-  }
-
-  .ascending .sort-caret.ascending,
-  .descending .sort-caret.descending {
-    color: $--color-primary;
-  }
-}
-
-/* 过滤 */
-.el-table-filter__bottom {
-  text-align: center;
-}
-
-.el-table__column-filter-trigger {
-  height: 16px;
-  line-height: 16px;
-  vertical-align: middle;
-  position: relative;
-  bottom: 1px;
-
-  i {
-    font-size: 16px;
-    transform: scale(1);
-  }
-}
-
-.table-header-popover.el-popover {
-  padding: 16px;
-}
-
-/* 附件上传hover颜色 */
-.base-table_default {
-  .el-table__body .hover-active:hover > td {
-    background-color: #ff3c2f10 !important;
-  }
-}
-
-.vxe-table .vxe-cell--sort {
-  display: inline-flex !important;
-  flex-direction: row-reverse !important;
-  align-items: center !important;
-  width: 16px !important;
-  height: 16px !important;
-  line-height: 16px !important;
-  vertical-align: middle !important;
-  cursor: pointer;
-  padding-right: 4px !important;
-  .vxe-sort--asc-btn,
-  .vxe-sort--desc-btn {
-    width: 6px;
-    height: 10px;
-    color: #333;
-    border: none;
-    font-style: normal;
-    position: static;
-  }
-}
-
-.vxe-header--row {
-  color: #333;
-  background-color: #f5f5f5;
-}
-
-.vxe-cell--filter .vxe-filter--btn {
-  color: #666;
-  font-weight: $--font-weight-primary;
-  cursor: pointer;
-  font-size: 16px;
-}
-
-.is--filter-active .vxe-cell--filter .vxe-filter--btn {
-  color: $--color-primary;
-}
-
-.is--filter-active .vxe-cell--title {
-  color: $--color-primary;
-}
-
-.vxe-table--render-default.size--small {
-  font-size: 14px !important;
-}
-
-.vxe-table--render-default.size--mini {
-  font-size: 14px !important;
-}
-
-.vxe-header--row th,
-th.vxe-header--column {
-  position: relative;
-  font-weight: $--font-weight-primary;
-}
-
-.vxe-table--tooltip-wrapper {
-  z-index: 9999 !important;
-}
-
-.cell-default-set-- .vxe-table--body-wrapper .vxe-body--row .vxe-body--column .vxe-cell .vxe-cell--label:empty::before {
-  content: '--';
-}
-
-.n20-table-pro.vxe-table--render-default {
-  font-family: PingFang SC, Microsoft YaHei, Arial, sans-serif !important;
-  color: #333;
-}
-
-.vxe-table-custom-wrap.vxe-body--column.col--ellipsis:not(.col--actived) > .vxe-cell,
-.vxe-table--render-default .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis:not(.col--actived) > .vxe-cell,
-.vxe-table--render-default .vxe-table-custom-wrap.vxe-header--column.col--ellipsis:not(.col--actived) > .vxe-cell {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: wrap !important;
-}
-
-.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-body--column.col--ellipsis > .vxe-cell,
-.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis > .vxe-cell,
-.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-header--column.col--ellipsis > .vxe-cell {
-  max-height: 100%;
-}
-
-.vxe-header--column {
-  .vxe-cell {
-    justify-content: center !important;
-  }
-}
-// 强制显示 vxe-table 滚动条
-.vxe-table--body-inner-wrapper::-webkit-scrollbar,
-.vxe-table--footer-inner-wrapper::-webkit-scrollbar,
-.vxe-table--header-inner-wrapper::-webkit-scrollbar {
-  display: block !important;
-  width: 8px;
-  height: 8px;
-}
-
-.vxe-table--body-inner-wrapper::-webkit-scrollbar-thumb,
-.vxe-table--footer-inner-wrapper::-webkit-scrollbar-thumb,
-.vxe-table--header-inner-wrapper::-webkit-scrollbar-thumb {
-  background-color: #d3d9e6;
-  border-radius: 4px;
-}
-
-@import '../../components/TableSetSize/style.scss';
-
-.el-table-set-size-item {
-  .icon-mini {
-    background-image: url('../../components/TableSetSize/small.png');
-  }
-
-  .icon-mini {
-    background-image: url('../../components/TableSetSize/mini.png');
-  }
-}
-
-.el-table th.el-table__cell > .cell {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
+.el-table--small {
+  font-size: 14px;
+}
+
+.el-table--mini {
+  font-size: 12px;
+}
+
+.el-table th {
+  font-weight: $--font-weight-primary;
+}
+
+.el-table--small .el-table__cell {
+  padding: 8px 0;
+}
+
+.el-table .cell {
+  padding-left: 8px;
+  padding-right: 8px;
+}
+
+.el-table--small,
+.el-table--mini {
+  .el-table__cell {
+    .el-button--text {
+      padding-top: 2px;
+      padding-bottom: 2px;
+    }
+
+    .el-link {
+      line-height: initial;
+    }
+  }
+}
+
+.el-table--mini {
+  .el-table__cell {
+    padding: 2px 0;
+
+    .cell {
+      padding-left: 4px;
+      padding-right: 4px;
+      // line-height: 18px;
+    }
+
+    .el-button--mini,
+    .el-link {
+      font-size: 12px;
+    }
+  }
+}
+
+.el-table {
+  /* 排序 */
+  .caret-wrapper {
+    display: inline-flex;
+    flex-direction: row-reverse;
+    align-items: center;
+    width: 16px;
+    height: 16px;
+    line-height: 16px;
+    vertical-align: middle;
+  }
+
+  .sort-caret.ascending,
+  .sort-caret.descending {
+    width: 8px;
+    height: 16px;
+    border: none;
+    font-style: normal;
+    position: static;
+
+    &:hover {
+      color: $--color-primary-light-6;
+    }
+
+    &:before {
+      content: '\e61c';
+      font-family: 'core-lib-iconfont';
+      font-size: 12px;
+      line-height: 12px;
+      position: relative;
+      right: 3px;
+      bottom: 1px;
+    }
+  }
+
+  .sort-caret.descending:before {
+    content: '\e61d';
+    position: relative;
+    right: 1px;
+    bottom: 1px;
+  }
+
+  .ascending .sort-caret.ascending,
+  .descending .sort-caret.descending {
+    color: $--color-primary;
+  }
+}
+
+/* 过滤 */
+.el-table-filter__bottom {
+  text-align: center;
+}
+
+.el-table__column-filter-trigger {
+  height: 16px;
+  line-height: 16px;
+  vertical-align: middle;
+  position: relative;
+  bottom: 1px;
+
+  i {
+    font-size: 16px;
+    transform: scale(1);
+  }
+}
+
+.table-header-popover.el-popover {
+  padding: 16px;
+}
+
+/* 附件上传hover颜色 */
+.base-table_default {
+  .el-table__body .hover-active:hover > td {
+    background-color: #ff3c2f10 !important;
+  }
+}
+
+.vxe-table .vxe-cell--sort {
+  display: inline-flex !important;
+  flex-direction: row-reverse !important;
+  align-items: center !important;
+  width: 16px !important;
+  height: 16px !important;
+  line-height: 16px !important;
+  vertical-align: middle !important;
+  cursor: pointer;
+  padding-right: 4px !important;
+  .vxe-sort--asc-btn,
+  .vxe-sort--desc-btn {
+    width: 6px;
+    height: 10px;
+    color: #333;
+    border: none;
+    font-style: normal;
+    position: static;
+  }
+}
+
+.vxe-header--row {
+  color: #333;
+  background-color: #f5f5f5;
+}
+
+.vxe-cell--filter .vxe-filter--btn {
+  color: #666;
+  font-weight: $--font-weight-primary;
+  cursor: pointer;
+  font-size: 16px;
+}
+
+.is--filter-active .vxe-cell--filter .vxe-filter--btn {
+  color: $--color-primary;
+}
+
+.is--filter-active .vxe-cell--title {
+  color: $--color-primary;
+}
+
+.vxe-table--render-default.size--small {
+  font-size: 14px !important;
+}
+
+.vxe-table--render-default.size--mini {
+  font-size: 14px !important;
+}
+
+.vxe-header--row th,
+th.vxe-header--column {
+  position: relative;
+  font-weight: $--font-weight-primary;
+}
+
+.vxe-table--tooltip-wrapper {
+  z-index: 9999 !important;
+}
+
+.cell-default-set-- .vxe-table--body-wrapper .vxe-body--row .vxe-body--column .vxe-cell .vxe-cell--label:empty::before {
+  content: '--';
+}
+
+.n20-table-pro.vxe-table--render-default {
+  font-family: PingFang SC, Microsoft YaHei, Arial, sans-serif !important;
+  color: #333;
+}
+
+.vxe-table-custom-wrap.vxe-body--column.col--ellipsis:not(.col--actived) > .vxe-cell,
+.vxe-table--render-default .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis:not(.col--actived) > .vxe-cell,
+.vxe-table--render-default .vxe-table-custom-wrap.vxe-header--column.col--ellipsis:not(.col--actived) > .vxe-cell {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: wrap !important;
+}
+
+.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-body--column.col--ellipsis > .vxe-cell,
+.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis > .vxe-cell,
+.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-header--column.col--ellipsis > .vxe-cell {
+  max-height: 100%;
+}
+
+.vxe-header--column {
+  .vxe-cell {
+    justify-content: center !important;
+  }
+}
+
+.vxe-table--body-wrapper,
+.vxe-table--fixed-left-body-wrapper,
+.vxe-table--fixed-right-body-wrapper,
+.vxe-table--footer-wrapper,
+.vxe-table--header-wrapper {
+  overflow: hidden;
+  outline: 0;
+  scrollbar-width: auto !important;
+  -webkit-overflow-scrolling: touch;
+}
+@import '../../components/TableSetSize/style.scss';
+
+.el-table-set-size-item {
+  .icon-mini {
+    background-image: url('../../components/TableSetSize/small.png');
+  }
+
+  .icon-mini {
+    background-image: url('../../components/TableSetSize/mini.png');
+  }
+}
+
+.el-table th.el-table__cell > .cell {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}

package/src/components/ProFilterView/index.vue

@@ -597,6 +597,23 @@ export default {
         }
         this.searchForm = { ...this.getInitialSearchValue }
       }
+    },
+    /**
+     * 重置组件状态到初始值
+     * 供下游调用以恢复组件初始状态
+     */
+    resetState() {
+      this.val = ''
+      this.selectedItem = '无视图'
+      this.selectItem = ''
+      this.searchValue = { ...this.getInitialSearchValue, ...this.initialValue }
+      this.searchForm = { ...this.getInitialSearchValue }
+      this.conditionGroups = []
+      this.multiple = this.defaultExpanded
+      this.checkData = []
+      this.keyIds = []
+      this.viewId = undefined
+      this._savedViewConfigs = {}
     }
   }
 }

package/src/components/TableOperate/index.vue

@@ -11,19 +11,14 @@
       ></i>
     </div>
     <div v-if="showSetsize" class="el-table-set-size-item m-r-0">
-      <el-dropdown @command="setSize">
-        <i
-          v-title="$lc('行高')"
-          class="v3-icon-line-height pointer color-white"
-          :class="hoverIconKey === 'height' ? 'color-white' : ''"
-          @mouseenter="hoverIconKey = 'height'"
-          @mouseleave="hoverIconKey = null"
-        ></i>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="small">{{ _lang === 'zh' ? '默认' : 'small' }}</el-dropdown-item>
-          <el-dropdown-item command="mini">{{ _lang === 'zh' ? '紧凑' : 'mini' }}</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
+      <i
+        v-title="sizeC === 'mini' ? $lc('默认') : $lc('紧凑')"
+        class="pointer color-white"
+        :class="['v3-icon-auto-height', hoverIconKey === 'height' ? 'color-white' : '']"
+        @mouseenter="hoverIconKey = 'height'"
+        @mouseleave="hoverIconKey = null"
+        @click="setSize(sizeC === 'mini' ? 'small' : 'mini')"
+      ></i>
     </div>
     <div v-if="hasExpand" class="el-table-set-size-item m-r-0">
       <i
@@ -38,6 +33,19 @@
         @click="$emit('toggle-expand')"
       ></i>
     </div>
+    <div v-if="showPinBtn" class="el-table-set-size-item m-r-0">
+      <i
+        v-title="isOperateFixed ? $lc('取消固定') : $lc('固定操作列')"
+        class="pointer"
+        :class="[
+          isOperateFixed ? 'v3-icon-unlock' : 'v3-icon-lock',
+          hoverIconKey === 'pinOperate' ? 'color-white' : ''
+        ]"
+        @mouseenter="hoverIconKey = 'pinOperate'"
+        @mouseleave="hoverIconKey = null"
+        @click="$emit('toggle-operate-fixed', !isOperateFixed)"
+      ></i>
+    </div>
   </div>
 </template>
 
@@ -53,6 +61,14 @@ export default {
       type: Boolean,
       default: true
     },
+    showPinBtn: {
+      type: Boolean,
+      default: false
+    },
+    isOperateFixed: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -62,7 +78,7 @@ export default {
       default: () => ({
         border: false,
         size: 'mini',
-        stripe: true
+        stripe: false
       })
     },
     small: {
@@ -81,11 +97,11 @@ export default {
     },
     // 当前可见操作项数量
     activeItemCount() {
-      return [this.showColumn, this.showSetsize, this.hasExpand].filter(Boolean).length
+      return [this.showColumn, this.showSetsize, this.hasExpand, this.showPinBtn].filter(Boolean).length
     },
     // 根据可见项数动态计算宽度
     hoverWidth() {
-      const widthMap = { 3: '112px', 2: '88px', 1: '40px', 0: '0px' }
+      const widthMap = { 4: '136px', 3: '132px', 2: '88px', 1: '40px', 0: '0px' }
       return widthMap[this.activeItemCount] || '0px'
     }
   },