vxe-table 3.8.24 → 3.8.25

package/packages/table/src/methods.js

@@ -1904,7 +1904,7 @@ const Methods = {
     const leftList = []
     const centerList = []
     const rightList = []
-    const { collectColumn, tableFullColumn, isGroup, columnStore, sXOpts, scrollXStore } = this
+    const { collectColumn, tableFullColumn, isGroup, columnStore, sXOpts, scrollXStore, fullColumnIdData } = this
     // 如果是分组表头，如果子列全部被隐藏，则根列也隐藏
     if (isGroup) {
       const leftGroupList = []
@@ -1989,6 +1989,13 @@ const Methods = {
       this.clearMergeFooterItems()
     }
     this.scrollXLoad = scrollXLoad
+    visibleColumn.forEach((column, index) => {
+      const colid = column.id
+      const rest = fullColumnIdData[colid]
+      if (rest) {
+        rest._index = index
+      }
+    })
     this.visibleColumn = visibleColumn
     this.handleTableColumn()
     return this.updateFooter().then(() => {

package/styles/variable.scss

@@ -23,26 +23,26 @@ $vxe-danger-color: #f56c6c !default;
 /*layout*/
 $vxe-layout-background-color: #fff !default;
 
-$vxe-font-lighten-color: lighten($vxe-font-color, 10%) !default;
-$vxe-primary-lighten-color: lighten($vxe-primary-color, 10%) !default;
-$vxe-success-lighten-color: lighten($vxe-success-color, 10%) !default;
-$vxe-info-lighten-color: lighten($vxe-info-color, 10%) !default;
-$vxe-warning-lighten-color: lighten($vxe-warning-color, 10%) !default;
-$vxe-danger-lighten-color: lighten($vxe-danger-color, 10%) !default;
-
-$vxe-font-darken-color: darken($vxe-font-color, 10%) !default;
-$vxe-primary-darken-color: darken($vxe-primary-color, 10%) !default;
-$vxe-success-darken-color: darken($vxe-success-color, 10%) !default;
-$vxe-info-darken-color: darken($vxe-info-color, 10%) !default;
-$vxe-warning-darken-color: darken($vxe-warning-color, 10%) !default;
-$vxe-danger-darken-color: darken($vxe-danger-color, 10%) !default;
+$vxe-font-lighten-color: #797b80 !default;
+$vxe-primary-lighten-color: #73b8ff !default;
+$vxe-success-lighten-color: #85cf60!default;
+$vxe-info-lighten-color: #abadb1 !default;
+$vxe-warning-lighten-color: #ecb869 !default;
+$vxe-danger-lighten-color: #f89c9c !default;
+
+$vxe-font-darken-color: #47494c !default;
+$vxe-primary-darken-color: #0d84ff !default;
+$vxe-success-darken-color: #529b2e !default;
+$vxe-info-darken-color: #767980 !default;
+$vxe-warning-darken-color: #d48a1b !default;
+$vxe-danger-darken-color: #f56c6c !default;
 
 $vxe-font-disabled-color: #BFBFBF !default;
-$vxe-primary-disabled-color: lighten($vxe-primary-color, 20%) !default;
-$vxe-success-disabled-color: lighten($vxe-success-color, 20%) !default;
-$vxe-info-disabled-color: lighten($vxe-info-color, 20%) !default;
-$vxe-warning-disabled-color: lighten($vxe-warning-color, 20%) !default;
-$vxe-danger-disabled-color: lighten($vxe-danger-color, 20%) !default;
+$vxe-primary-disabled-color: #a6d2ff !default;
+$vxe-success-disabled-color: #a3db87 !default;
+$vxe-info-disabled-color: #c5c7ca !default;
+$vxe-warning-disabled-color: l#d48a1b !default;
+$vxe-danger-disabled-color: #f5a8a8 !default;
 
 /*input/radio/checkbox*/
 $vxe-input-border-color: #dcdfe6 !default;