@kdcloudjs/table 1.1.6-canary.2 → 1.1.6-canary.4

package/es/table/base/table.js

@@ -394,13 +394,13 @@ export var BaseTable = /*#__PURE__*/function (_React$Component) {
           last: footerDataSource.length - 1,
           limit: Infinity
         }
-      }), /*#__PURE__*/React.createElement("div", {
+      }), footerDataSource.length > 0 ? /*#__PURE__*/React.createElement("div", {
         className: Classes.verticalScrollPlaceholder,
         style: this.hasScrollY ? {
           width: this.getScrollBarWidth(),
           visibility: 'initial'
         } : undefined
-      }));
+      }) : null);
     }
   }, {
     key: "renderLockShadows",

package/es/table/pipeline/features/autoFill.js

@@ -4,10 +4,11 @@ import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instanc
 import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 import _spliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/splice";
 import _Map from "@babel/runtime-corejs3/core-js-stable/map";
+import _findIndexInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find-index";
 import { getLeftNestedLockCount } from '../../base/calculations';
 import { isLeafNode, makeRecursiveMapper } from '../../utils';
 import { Classes } from '../../base/styles';
-import { COLUMN_SIZE_KEY, RESIZED_COLUMN_KEY } from './columnResizeWidth';
+import { COLUMN_SIZE_KEY, LAST_RESIZED_COLUMN_KEY, RESIZED_COLUMN_KEY } from './columnResizeWidth';
 export var FILL_COLUMN_CODE = '$_fill_column_&';
 export var tableWidthKey = 'tableWidth';
 
@@ -134,6 +135,23 @@ function getTableRemainingWidth(pipeline) {
   return remainingWidth > 0 ? remainingWidth : 0;
 }
 
+function isAfterLastResizeCol(column, pipeline) {
+  var _context, _context2;
+
+  var lastResizedColumnCode = pipeline.getFeatureOptions(LAST_RESIZED_COLUMN_KEY);
+  if (lastResizedColumnCode === undefined) return true;
+
+  var lastResizedColumnIndex = _findIndexInstanceProperty(_context = pipeline.getColumns()).call(_context, function (col) {
+    return col.code === lastResizedColumnCode;
+  });
+
+  var colIndex = _findIndexInstanceProperty(_context2 = pipeline.getColumns()).call(_context2, function (col) {
+    return col.code === column.code;
+  });
+
+  return colIndex > lastResizedColumnIndex;
+}
+
 function isValidFlexColumn(col, pipeline) {
   var _a;
 
@@ -144,7 +162,7 @@ function isValidFlexColumn(col, pipeline) {
   }
 
   var flex = (_a = col.features) === null || _a === void 0 ? void 0 : _a.flex;
-  return typeof flex === 'number' && flex > 0;
+  return typeof flex === 'number' && flex > 0 && isAfterLastResizeCol(col, pipeline);
 }
 
 function clamp(min, x, max) {

package/es/table/pipeline/features/columnResizeWidth.d.ts

@@ -22,5 +22,6 @@ export interface ColumnResizeOptions {
 }
 export declare const COLUMN_SIZE_KEY = "columnResize";
 export declare const RESIZED_COLUMN_KEY = "resizedColumn";
+export declare const LAST_RESIZED_COLUMN_KEY = "lastResizedColumn";
 export declare function columnResize(opts?: ColumnResizeOptions): (pipeline: TablePipeline) => TablePipeline;
 export {};

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

@@ -27,6 +27,7 @@ function disableSelect(event) {
 var stateKey = 'columnResize';
 export var COLUMN_SIZE_KEY = 'columnResize';
 export var RESIZED_COLUMN_KEY = 'resizedColumn';
+export var LAST_RESIZED_COLUMN_KEY = 'lastResizedColumn';
 export function columnResize() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
@@ -134,6 +135,7 @@ export function columnResize() {
           });
 
           pipeline.setFeatureOptions(RESIZED_COLUMN_KEY, resizedColumnSet);
+          pipeline.setFeatureOptions(LAST_RESIZED_COLUMN_KEY, code);
         },
         complete: function complete() {
           var _context;

package/lib/table/base/table.js

@@ -443,13 +443,13 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
           last: footerDataSource.length - 1,
           limit: Infinity
         }
-      }), /*#__PURE__*/_react.default.createElement("div", {
+      }), footerDataSource.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
         className: _styles.Classes.verticalScrollPlaceholder,
         style: this.hasScrollY ? {
           width: this.getScrollBarWidth(),
           visibility: 'initial'
         } : undefined
-      }));
+      }) : null);
     }
   }, {
     key: "renderLockShadows",

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

@@ -19,6 +19,8 @@ var _splice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-sta
 
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/map"));
 
+var _findIndex = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find-index"));
+
 var _calculations = require("../../base/calculations");
 
 var _utils = require("../../utils");
@@ -153,6 +155,20 @@ function getTableRemainingWidth(pipeline) {
   return remainingWidth > 0 ? remainingWidth : 0;
 }
 
+function isAfterLastResizeCol(column, pipeline) {
+  var _context, _context2;
+
+  var lastResizedColumnCode = pipeline.getFeatureOptions(_columnResizeWidth.LAST_RESIZED_COLUMN_KEY);
+  if (lastResizedColumnCode === undefined) return true;
+  var lastResizedColumnIndex = (0, _findIndex.default)(_context = pipeline.getColumns()).call(_context, function (col) {
+    return col.code === lastResizedColumnCode;
+  });
+  var colIndex = (0, _findIndex.default)(_context2 = pipeline.getColumns()).call(_context2, function (col) {
+    return col.code === column.code;
+  });
+  return colIndex > lastResizedColumnIndex;
+}
+
 function isValidFlexColumn(col, pipeline) {
   var _a;
 
@@ -163,7 +179,7 @@ function isValidFlexColumn(col, pipeline) {
   }
 
   var flex = (_a = col.features) === null || _a === void 0 ? void 0 : _a.flex;
-  return typeof flex === 'number' && flex > 0;
+  return typeof flex === 'number' && flex > 0 && isAfterLastResizeCol(col, pipeline);
 }
 
 function clamp(min, x, max) {

package/lib/table/pipeline/features/columnResizeWidth.d.ts

@@ -22,5 +22,6 @@ export interface ColumnResizeOptions {
 }
 export declare const COLUMN_SIZE_KEY = "columnResize";
 export declare const RESIZED_COLUMN_KEY = "resizedColumn";
+export declare const LAST_RESIZED_COLUMN_KEY = "lastResizedColumn";
 export declare function columnResize(opts?: ColumnResizeOptions): (pipeline: TablePipeline) => TablePipeline;
 export {};

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

@@ -11,7 +11,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.RESIZED_COLUMN_KEY = exports.COLUMN_SIZE_KEY = void 0;
+exports.RESIZED_COLUMN_KEY = exports.LAST_RESIZED_COLUMN_KEY = exports.COLUMN_SIZE_KEY = void 0;
 exports.columnResize = columnResize;
 
 var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
@@ -61,6 +61,8 @@ 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] : {};
@@ -165,6 +167,7 @@ function columnResize() {
             resizedColumnSet.add(code, changedColumnSize[code]);
           });
           pipeline.setFeatureOptions(RESIZED_COLUMN_KEY, resizedColumnSet);
+          pipeline.setFeatureOptions(LAST_RESIZED_COLUMN_KEY, code);
         },
         complete: function complete() {
           var _context;

package/package.json

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