@kdcloudjs/table 1.1.5 → 1.1.6-0

package/lib/table/pipeline/features/columnResizeWidth.js

@@ -11,13 +11,15 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.COLUMN_RESIZE_KEY = void 0;
+exports.RESIZED_COLUMN_KEY = exports.LAST_RESIZED_COLUMN_KEY = exports.COLUMN_SIZE_KEY = void 0;
 exports.columnResize = columnResize;
 
-var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
+var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
 
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
 
+var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
+
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/taggedTemplateLiteral"));
@@ -55,8 +57,12 @@ function disableSelect(event) {
 }
 
 var stateKey = 'columnResize';
-var COLUMN_RESIZE_KEY = 'columnResize';
-exports.COLUMN_RESIZE_KEY = COLUMN_RESIZE_KEY;
+var COLUMN_SIZE_KEY = 'columnResize';
+exports.COLUMN_SIZE_KEY = COLUMN_SIZE_KEY;
+var RESIZED_COLUMN_KEY = 'resizedColumn';
+exports.RESIZED_COLUMN_KEY = RESIZED_COLUMN_KEY;
+var LAST_RESIZED_COLUMN_KEY = 'lastResizedColumn';
+exports.LAST_RESIZED_COLUMN_KEY = LAST_RESIZED_COLUMN_KEY;
 
 function columnResize() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -82,10 +88,10 @@ function columnResize() {
           columnSize[code] = fallbackSize;
         }
       }
-    }); // 为了autofill时能取到最新值，实时存储一份最新的columnSize
+    }); // 实时存储一份最新的columnSize，与autoFill共用一份数据
     // 存在state里可能存到取不到最新的
 
-    pipeline.setFeatureOptions(COLUMN_RESIZE_KEY, columnSize);
+    pipeline.setFeatureOptions(COLUMN_SIZE_KEY, columnSize);
 
     var onChangeSize = function onChangeSize(nextColumnSize) {
       window.requestAnimationFrame(function () {
@@ -97,7 +103,9 @@ function columnResize() {
     };
 
     var handleDoubleClick = function handleDoubleClick(e, col) {
-      opts === null || opts === void 0 ? void 0 : opts.doubleClickCallback(e, col);
+      var _a;
+
+      (_a = opts.doubleClickCallback) === null || _a === void 0 ? void 0 : _a.call(opts, e, col);
     };
 
     var handleMouseDown = function handleMouseDown(e, col) {
@@ -105,7 +113,14 @@ function columnResize() {
       var changedColumnSize = {};
       var startX = e.clientX;
       var children = col.children,
-          code = col.code;
+          code = col.code,
+          _col$features = col.features,
+          features = _col$features === void 0 ? {} : _col$features;
+      var minWidth = features.minWidth,
+          maxWidth = features.maxWidth;
+      var realMinSize = typeof minWidth === 'number' ? minWidth : minSize;
+      var realMaxSize = typeof maxWidth === 'number' ? maxWidth : maxSize;
+      var columnSize = pipeline.getFeatureOptions(COLUMN_SIZE_KEY);
       var recordColumnSize = columnSize;
       e.stopPropagation();
       var nextSize$ = (0, _rxjs.fromEvent)(window, 'mousemove').pipe(op.takeUntil((0, _rxjs.fromEvent)(window, 'mouseup')), op.map(function (e) {
@@ -126,17 +141,17 @@ function columnResize() {
             var currentDeltaWidth = Math.round(deltaSum * startSize / childrenWidthSum);
 
             if (index < leafChildColumns.length - 1) {
-              nextColumnSize[code] = clamp(minSize, startSize + currentDeltaWidth, maxSize);
+              nextColumnSize[code] = clamp(realMinSize, startSize + currentDeltaWidth, realMaxSize);
               changedColumnSize[code] = nextColumnSize[code];
               deltaRemaining -= currentDeltaWidth;
             } else {
-              nextColumnSize[code] = clamp(minSize, startSize + deltaRemaining, maxSize);
+              nextColumnSize[code] = clamp(realMinSize, startSize + deltaRemaining, realMaxSize);
               changedColumnSize[code] = nextColumnSize[code];
             }
           });
         } else {
           var startSize = columnSize[code];
-          nextColumnSize[code] = clamp(minSize, startSize + deltaSum, maxSize);
+          nextColumnSize[code] = clamp(realMinSize, startSize + deltaSum, realMaxSize);
           changedColumnSize[code] = nextColumnSize[code];
         }
 
@@ -144,7 +159,16 @@ function columnResize() {
         return nextColumnSize;
       }));
       nextSize$.subscribe({
-        next: onChangeSize,
+        next: function next(nextColumnSize) {
+          onChangeSize(nextColumnSize); // 由于COLUMN_RESIZE_KEY记录的是全量的列宽，此处记录被改变过的列宽
+
+          var resizedColumnSet = pipeline.getFeatureOptions(RESIZED_COLUMN_KEY) || new _set.default();
+          (0, _keys.default)(changedColumnSize).forEach(function (code) {
+            resizedColumnSet.add(code, changedColumnSize[code]);
+          });
+          pipeline.setFeatureOptions(RESIZED_COLUMN_KEY, resizedColumnSet);
+          pipeline.setFeatureOptions(LAST_RESIZED_COLUMN_KEY, code);
+        },
         complete: function complete() {
           var _context;
 

package/lib/table/pipeline/pipeline.js

@@ -318,8 +318,9 @@ function useTablePipeline(ctx) {
       state = _useState2[0],
       setState = _useState2[1];
 
-  var ref = (0, _react.useRef)({});
-  ref.current.featureOptions = {};
+  var ref = (0, _react.useRef)({
+    featureOptions: {}
+  });
   return new TablePipeline({
     state: state,
     setState: setState,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/table",
-  "version": "1.1.5",
+  "version": "1.1.6-0",
   "description": "金蝶 react table 组件",
   "title": "table",
   "keywords": [