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

package/dist/@kdcloudjs/table.css

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.1.6-canary.1
+ *   @kdcloudjs/table v1.1.6-canary.3
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.

package/dist/@kdcloudjs/table.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.1.6-canary.1
+ *   @kdcloudjs/table v1.1.6-canary.3
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -3879,13 +3879,13 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
           last: footerDataSource.length - 1,
           limit: Infinity
         }
-      }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_27___default.a.createElement("div", {
+      }), footerDataSource.length > 0 ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_27___default.a.createElement("div", {
         className: _styles__WEBPACK_IMPORTED_MODULE_38__["Classes"].verticalScrollPlaceholder,
         style: this.hasScrollY ? {
           width: this.getScrollBarWidth(),
           visibility: 'initial'
         } : undefined
-      }));
+      }) : null);
     }
   }, {
     key: "renderLockShadows",
@@ -4970,10 +4970,13 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_11__);
 /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! core-js/modules/web.dom-collections.for-each.js */ "./node_modules/core-js/modules/web.dom-collections.for-each.js");
 /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_12__);
-/* harmony import */ var _base_calculations__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../../base/calculations */ "./components/table/base/calculations.tsx");
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../../utils */ "./components/table/utils/index.tsx");
-/* harmony import */ var _base_styles__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../../base/styles */ "./components/table/base/styles.ts");
-/* harmony import */ var _columnResizeWidth__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./columnResizeWidth */ "./components/table/pipeline/features/columnResizeWidth.tsx");
+/* harmony import */ var core_js_modules_es_array_find_index_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! core-js/modules/es.array.find-index.js */ "./node_modules/core-js/modules/es.array.find-index.js");
+/* harmony import */ var core_js_modules_es_array_find_index_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_find_index_js__WEBPACK_IMPORTED_MODULE_13__);
+/* harmony import */ var _base_calculations__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../../base/calculations */ "./components/table/base/calculations.tsx");
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../../utils */ "./components/table/utils/index.tsx");
+/* harmony import */ var _base_styles__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../../base/styles */ "./components/table/base/styles.ts");
+/* harmony import */ var _columnResizeWidth__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./columnResizeWidth */ "./components/table/pipeline/features/columnResizeWidth.tsx");
+
 
 
 
@@ -5007,8 +5010,8 @@ var autoFillTableWidth = function autoFillTableWidth() {
         // 保存剩余的flex总和和剩余宽度总和宽度
         var residualFlexCount = flexCount;
         var residualFlexWidth = remainingWidth;
-        var columnSize = pipeline.getFeatureOptions(_columnResizeWidth__WEBPACK_IMPORTED_MODULE_16__["COLUMN_SIZE_KEY"]) || {};
-        pipeline.mapColumns(Object(_utils__WEBPACK_IMPORTED_MODULE_14__["makeRecursiveMapper"])(function (col, recursiveFlatMapInfo) {
+        var columnSize = pipeline.getFeatureOptions(_columnResizeWidth__WEBPACK_IMPORTED_MODULE_17__["COLUMN_SIZE_KEY"]) || {};
+        pipeline.mapColumns(Object(_utils__WEBPACK_IMPORTED_MODULE_15__["makeRecursiveMapper"])(function (col, recursiveFlatMapInfo) {
           var isLeaf = recursiveFlatMapInfo.isLeaf;
 
           if (isLeaf && isValidFlexColumn(col, pipeline)) {
@@ -5031,7 +5034,7 @@ var autoFillTableWidth = function autoFillTableWidth() {
 
           return col;
         }));
-        pipeline.setFeatureOptions(_columnResizeWidth__WEBPACK_IMPORTED_MODULE_16__["COLUMN_SIZE_KEY"], columnSize);
+        pipeline.setFeatureOptions(_columnResizeWidth__WEBPACK_IMPORTED_MODULE_17__["COLUMN_SIZE_KEY"], columnSize);
       }
     } else {
       // 未设置了flex宽度，创建占位列
@@ -5044,7 +5047,7 @@ var autoFillTableWidth = function autoFillTableWidth() {
       if (fillColumns) {
         fillColumns.width = width;
       } else {
-        var rightNestedLockCount = Object(_base_calculations__WEBPACK_IMPORTED_MODULE_13__["getLeftNestedLockCount"])(columns.slice().reverse());
+        var rightNestedLockCount = Object(_base_calculations__WEBPACK_IMPORTED_MODULE_14__["getLeftNestedLockCount"])(columns.slice().reverse());
         var spliceIndex = columns.length - rightNestedLockCount;
         var _fillColumns = {
           name: '',
@@ -5055,7 +5058,7 @@ var autoFillTableWidth = function autoFillTableWidth() {
           },
           getCellProps: function getCellProps(value, record, rowIndex) {
             return {
-              className: _base_styles__WEBPACK_IMPORTED_MODULE_15__["Classes"].emptyColCell
+              className: _base_styles__WEBPACK_IMPORTED_MODULE_16__["Classes"].emptyColCell
             };
           }
         };
@@ -5074,7 +5077,7 @@ var autoFillTableWidth = function autoFillTableWidth() {
 
       function dfs(columns, result) {
         columns.forEach(function (col) {
-          if (Object(_utils__WEBPACK_IMPORTED_MODULE_14__["isLeafNode"])(col)) {
+          if (Object(_utils__WEBPACK_IMPORTED_MODULE_15__["isLeafNode"])(col)) {
             if (isValidFlexColumn(col, pipeline)) {
               result.set(FLEX_COLUMN_COUNT, result.get(FLEX_COLUMN_COUNT) + col.features.flex);
             }
@@ -5095,8 +5098,8 @@ function getColumnWidthSum(pipeline) {
       var width = col.width,
           code = col.code;
 
-      if (Object(_utils__WEBPACK_IMPORTED_MODULE_14__["isLeafNode"])(col) && code !== FILL_COLUMN_CODE) {
-        var resizeColumn = pipeline.getFeatureOptions(_columnResizeWidth__WEBPACK_IMPORTED_MODULE_16__["COLUMN_SIZE_KEY"]);
+      if (Object(_utils__WEBPACK_IMPORTED_MODULE_15__["isLeafNode"])(col) && code !== FILL_COLUMN_CODE) {
+        var resizeColumn = pipeline.getFeatureOptions(_columnResizeWidth__WEBPACK_IMPORTED_MODULE_17__["COLUMN_SIZE_KEY"]);
         return acc + (resizeColumn && resizeColumn[code] || width);
       } else {
         return acc + dfs(col.children);
@@ -5112,17 +5115,29 @@ function getTableRemainingWidth(pipeline) {
   return remainingWidth > 0 ? remainingWidth : 0;
 }
 
+function isAfterLastResizeCol(column, pipeline) {
+  var lastResizedColumnCode = pipeline.getFeatureOptions(_columnResizeWidth__WEBPACK_IMPORTED_MODULE_17__["LAST_RESIZED_COLUMN_KEY"]);
+  if (lastResizedColumnCode === undefined) return true;
+  var lastResizedColumnIndex = pipeline.getColumns().findIndex(function (col) {
+    return col.code === lastResizedColumnCode;
+  });
+  var colIndex = pipeline.getColumns().findIndex(function (col) {
+    return col.code === column.code;
+  });
+  return colIndex > lastResizedColumnIndex;
+}
+
 function isValidFlexColumn(col, pipeline) {
   var _col$features2;
 
-  var resizeColumn = pipeline.getFeatureOptions(_columnResizeWidth__WEBPACK_IMPORTED_MODULE_16__["RESIZED_COLUMN_KEY"]); // 拖拽列自动禁止flex
+  var resizeColumn = pipeline.getFeatureOptions(_columnResizeWidth__WEBPACK_IMPORTED_MODULE_17__["RESIZED_COLUMN_KEY"]); // 拖拽列自动禁止flex
 
   if (resizeColumn !== null && resizeColumn !== void 0 && resizeColumn.has(col.code)) {
     return false;
   }
 
   var flex = (_col$features2 = col.features) === null || _col$features2 === void 0 ? void 0 : _col$features2.flex;
-  return typeof flex === 'number' && flex > 0;
+  return typeof flex === 'number' && flex > 0 && isAfterLastResizeCol(col, pipeline);
 }
 
 function clamp(min, x, max) {
@@ -6330,13 +6345,14 @@ function columnRangeHover() {
 /*!******************************************************************!*\
   !*** ./components/table/pipeline/features/columnResizeWidth.tsx ***!
   \******************************************************************/
-/*! exports provided: COLUMN_SIZE_KEY, RESIZED_COLUMN_KEY, columnResize */
+/*! exports provided: COLUMN_SIZE_KEY, RESIZED_COLUMN_KEY, LAST_RESIZED_COLUMN_KEY, columnResize */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "COLUMN_SIZE_KEY", function() { return COLUMN_SIZE_KEY; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RESIZED_COLUMN_KEY", function() { return RESIZED_COLUMN_KEY; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LAST_RESIZED_COLUMN_KEY", function() { return LAST_RESIZED_COLUMN_KEY; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "columnResize", function() { return columnResize; });
 /* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.symbol.js */ "./node_modules/core-js/modules/es.symbol.js");
 /* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_0__);
@@ -6416,6 +6432,7 @@ function disableSelect(event) {
 var stateKey = 'columnResize';
 var COLUMN_SIZE_KEY = 'columnResize';
 var RESIZED_COLUMN_KEY = 'resizedColumn';
+var LAST_RESIZED_COLUMN_KEY = 'lastResizedColumn';
 function columnResize() {
   var _opts$minSize, _opts$fallbackSize, _opts$maxSize;
 
@@ -6520,6 +6537,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 changedColumnSizes = Object.keys(changedColumnSize).map(function (code) {