zartui 2.0.80 → 2.0.81

package/es/table/index.less

@@ -1,73 +1,134 @@
 @import '../style/var';
+
 .@{base-prefix}-table {
-  position: relative;
-  border-radius: @table-border-radius;
-  scrollbar-width: none; /* firefox */
-  -ms-overflow-style: none; /* IE 10+ */
-  &::-webkit-scrollbar {
-    display: none;
-    width: 0;
-    height: 0;
+  table {
+    border-collapse: separate;
+    border-spacing: 0;
+    width: 100%;
+    table-layout: auto;
+    box-sizing: border-box;
   }
-  &__normal-box {
-    display: flex;
-    overflow-x: scroll;
-    position: relative;
+
+  &--fixed {
+    overflow: auto scroll;
+
+    &::-webkit-scrollbar {
+      width: 0;
+      height: 0;
+    }
+
+    table {
+      table-layout: fixed;
+    }
 
   }
-  &__fixed-left-box {
-    display: flex;
-    position: absolute;
-    top: 0;
-    left: -1px;
+
+  &--thead-fixed {
+    position: sticky !important;
     z-index: 2;
   }
-  &__fixed-right-box {
-    display: flex;
-    position: absolute;
-    top: 0;
-    right: -1px;
+
+  &--fix-left {
+    position: sticky !important;
     z-index: 2;
   }
-  &__fixed-left-box.shadow::after {
-    content: "";
-    position: absolute;
-    top: 0;
-    right: -10px;
-    width: 10px;
-    height: 100%;
-    opacity: 0.06;
-    background-image: linear-gradient(90deg, #000000 0%, rgba(0,0,0,0.00) 100%);
+
+  &--bordered {
+    border-left: 1px solid #f0f0f0;
+
+    >table {
+      border-top: 1px solid #f0f0f0;
+    }
+
+    .@{base-prefix}-table__thead {
+      >tr {
+        >th {
+          border-right: 1px solid #f0f0f0;
+          border-bottom: 1px solid #f0f0f0;
+        }
+      }
+    }
+
+    .@{base-prefix}-table__tbody {
+      >tr {
+        >td {
+          border-bottom: 1px solid #f0f0f0;
+          border-right: 1px solid #f0f0f0;
+        }
+      }
+    }
   }
-  &__fixed-right-box.shadow::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: -10px;
-    width: 10px;
-    height: 100%;
-    opacity: 0.06;
-    background-image: linear-gradient(90deg, #000000 0%, rgba(0,0,0,0.00) 100%);
+
+  &__thead {
+    >tr {
+      >th {
+        box-sizing: border-box;
+        overflow-wrap: break-word;
+        height: @table-head-height;
+        font-weight: 600;
+        font-size: @table-head-font-size;
+        color: @table-head-color;
+        text-align: center;
+        line-height: @table-head-height;
+        background: @table-head-background;
+      }
+    }
   }
+
   &__head {
-    flex-shrink: 0;
+    display: flex;
+    justify-content: center;
+  }
+
+  &__head-sort {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    color: @table-sort-default-color;
   }
-  &__head-item {
-    height: @table-head-height;
-    font-weight: 600;
-    font-size: @table-head-font-size;
-    text-align: center;
-    line-height: @table-head-height;
+
+  &__sort-active {
+    color: @blue;
+  }
+
+  &__tbody {
+    >tr {
+      >td {
+        box-sizing: border-box;
+        overflow-wrap: break-word;
+        height: @table-row-height;
+        font-size: @table-row-font-size;
+        color: @table-row-color;
+        text-align: center;
+        line-height: @table-row-height;
+        background: @table-row-background;
+      }
+    }
   }
-  &__table-data {
-    height: @table-row-height;
-    font-size: @table-row-font-size;
-    text-align: center;
-    line-height: @table-row-height;
+
+  &--striped {
+    .@{base-prefix}-table__tbody {
+      >tr:nth-child(even) {
+        >td {
+          background: @table-body-background;
+        }
+      }
+    }
   }
-  &.@{base-prefix}-table--no-border {
-    .@{base-prefix}-table__normal-box::after, .@{base-prefix}-table__fixed-head::after, .@{base-prefix}-table__head::after, .@{base-prefix}-table__head-item::after, .@{base-prefix}-table__table-data::after {
-        border: none;
+
+  &--left-last {
+    border-right: none !important;
+
+    &::after {
+      content: "";
+      position: absolute;
+      top: 0;
+      right: -10px;
+      width: 10px;
+      height: 100%;
+      opacity: 0.06;
+      background-image: linear-gradient(90deg, #000000 0%, rgba(0, 0, 0, 0) 100%);
     }
   }
 }

package/es/table/style/index.js

@@ -1,2 +1,4 @@
 import '../../style/base.css';
+import '../../info/index.css';
+import '../../icon/index.css';
 import '../index.css';

package/es/table/style/less.js

@@ -1,2 +1,4 @@
 import '../../style/base.less';
+import '../../info/index.less';
+import '../../icon/index.less';
 import '../index.less';

package/es/table/type.js

@@ -0,0 +1,6 @@
+export var SortOrderEnum;
+
+(function (SortOrderEnum) {
+  SortOrderEnum["ASCEND"] = "ascend";
+  SortOrderEnum["DESCEND"] = "descend";
+})(SortOrderEnum || (SortOrderEnum = {}));

package/es/utils/router.js

@@ -2,7 +2,8 @@
  * Vue Router support
  */
 function isRedundantNavigation(err) {
-  return err.name === 'NavigationDuplicated' || err.message && err.message.indexOf('redundant navigation') !== -1;
+  return err.name === 'NavigationDuplicated' || // compatible with vue-router@3.3
+  err.message && err.message.indexOf('redundant navigation') !== -1;
 }
 
 export function route(router, config) {

package/lib/dropdown-item/index.js

@@ -9,6 +9,8 @@ var _utils = require("../utils");
 
 var _event = require("../utils/dom/event");
 
+var _deepClone = require("../utils/deep-clone");
+
 var _portal = require("../mixins/portal");
 
 var _relation = require("../mixins/relation");
@@ -36,6 +38,7 @@ var _default2 = createComponent({
   }), (0, _relation.ChildrenMixin)('ztDropdownMenu')],
   props: {
     value: null,
+    resetDefaultValue: null,
     title: String,
     disabled: Boolean,
     titleClass: String,
@@ -159,11 +162,17 @@ var _default2 = createComponent({
       }
     },
     select: function select(value) {
+      // 标识是否是取消选中这一元素
+      var isCancelSelect = true;
+
       if (this.innerValue.indexOf(value) >= 0) {
         this.innerValue.splice(this.innerValue.indexOf(value), 1);
       } else {
         this.innerValue.push(value);
+        isCancelSelect = false;
       }
+
+      this.$emit('item-select', value, isCancelSelect);
     },
     isSelect: function isSelect(value) {
       if (this.innerValue.indexOf(value) >= 0) {
@@ -173,13 +182,23 @@ var _default2 = createComponent({
       return false;
     },
     reset: function reset() {
-      this.innerValue = [];
+      if (Array.isArray(this.resetDefaultValue)) {
+        this.innerValue = (0, _deepClone.deepClone)(this.resetDefaultValue);
+      } else {
+        this.innerValue = [];
+      }
+
+      this.$emit('reset', this.innerValue);
     },
     confirm: function confirm() {
       this.showPopup = false;
       this.$emit('input', this.innerValue);
       this.$emit('change', this.innerValue);
       this.$emit('confirm', this.innerValue);
+    },
+    // @exposed-api 给灵珑侧提供的实现修改已选中值的函数
+    updateInnerValue: function updateInnerValue(updateValue) {
+      this.innerValue = updateValue;
     }
   },
   render: function render() {
@@ -248,6 +267,8 @@ var _default2 = createComponent({
                 _this3.$emit('input', option.value);
 
                 _this3.$emit('change', option.value);
+
+                _this3.$emit('item-select', option.value);
               }
             }
           }