@arim-aisdc/public-components 0.0.21 → 0.0.23

package/dist/components/TableMax/TableHeader/index.less

@@ -193,24 +193,7 @@ table {
   height: 300px;
   width: 2px;
   position: fixed;
-  // z-index: 99999;
+  z-index: 99999;
   background-color: #000;
-  // float: right;
-  // display: inline-block;
-  // float: right;
 }
 
-.column-divide-line {
-  height: 300px;
-  width: 2px;
-  // z-index: 999;
-  background-color: #000;
-  // float: right;
-  position: fixed;
-  // float: right;
-  display: none;
-  // z-index: 99999;
-  // display: inline-block;
-
-  // display: none;
-}

package/dist/components/TableMax/components/ColumnSetting/index.js

@@ -97,6 +97,23 @@ var SettingItem = function SettingItem(_ref) {
         return [];
     }
   };
+
+  // 从左侧固定列中删除某一列
+  var deleteFromLeft = function deleteFromLeft() {
+    var left = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var toDeleteId = arguments.length > 1 ? arguments[1] : undefined;
+    var newLeft = _toConsumableArray(left);
+    var index = newLeft.findIndex(function (item) {
+      return item === toDeleteId;
+    });
+    newLeft.splice(index, 1);
+    if (newLeft.length === [getRowCanExpand(), canSelection && !selectionWithoutChecked].filter(function (item) {
+      return item === true;
+    }).length) {
+      return [];
+    }
+    return newLeft;
+  };
   var columnPinningChange = function columnPinningChange(value) {
     console.log(value);
     var _ref2 = table.getState().columnPinning || {
@@ -106,42 +123,52 @@ var SettingItem = function SettingItem(_ref) {
       left = _ref2.left,
       right = _ref2.right;
     if (value === 'right') {
+      // 固定到右侧
       right.unshift(column.id);
+
+      // 如果之前是固定在左侧了，就从left中删掉
+      var newLeft = left;
+      if (left && left.includes(column.id)) {
+        newLeft = deleteFromLeft(left, column.id);
+      }
       table.setColumnPinning({
-        left: left,
+        left: newLeft,
         right: cloneDeep(right)
       });
-      return;
-    }
-    if (value === 'left') {
+    } else if (value === 'left') {
+      // 固定到左侧
       if (left.length === 0) {
-        column.id !== ColumnType.Expander && getRowCanExpand() && left.push(ColumnType.Expander);
-        column.id !== ColumnType.Selection && canSelection && !selectionWithoutChecked && left.push(ColumnType.Selection);
+        if (column.id !== ColumnType.Expander && getRowCanExpand()) {
+          left.push(ColumnType.Expander);
+        }
+        if (column.id !== ColumnType.Selection && canSelection && !selectionWithoutChecked) {
+          left.push(ColumnType.Selection);
+        }
       }
       left.push(column.id);
+
+      // 如果已经是固定在右侧了，就从右侧中删掉
+      if (right && right.includes(column.id)) {
+        var indexInRight = right.findIndex(function (item) {
+          return item === column.id;
+        });
+        right.splice(indexInRight, 1);
+      }
       table.setColumnPinning({
         left: cloneDeep(left),
-        right: right
+        right: cloneDeep(right)
       });
-      return;
-    }
-    if (value === false) {
+    } else if (value === false) {
       if (right && right.includes(column.id)) {
         column.pin(false);
         return;
       }
       if (left && left.includes(column.id)) {
-        var index = left.findIndex(function (item) {
-          return item === column.id;
-        });
-        left.splice(index, 1);
+        var _newLeft = deleteFromLeft(left, column.id);
         table.setColumnPinning({
-          left: left.length === [getRowCanExpand(), canSelection || selectionWithoutChecked].filter(function (item) {
-            return item === true;
-          }).length ? [] : cloneDeep(left),
+          left: _newLeft,
           right: right
         });
-        return;
       }
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",