@kdcloudjs/table 1.2.0-canary.5 → 1.2.0-canary.7

package/lib/table/base/table.js

@@ -311,10 +311,14 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
 
       if (_lastHasScrollY !== this.hasScrollY) {
         (_b = (_a = this.props).setTableWidth) === null || _b === void 0 ? void 0 : _b.call(_a, this.domHelper.tableBody.clientWidth);
-      } // 设置子节点宽度
+      }
 
+      var _this$lastInfo = this.lastInfo,
+          leftLockTotalWidth = _this$lastInfo.leftLockTotalWidth,
+          rightLockTotalWidth = _this$lastInfo.rightLockTotalWidth;
+      var lockTotalWidth = leftLockTotalWidth + rightLockTotalWidth; // 设置子节点宽度
 
-      stickyScrollItem.style.width = "".concat(innerTableWidth, "px");
+      stickyScrollItem.style.width = "".concat(innerTableWidth - lockTotalWidth, "px");
     }
   }, {
     key: "renderTableHeader",
@@ -482,13 +486,25 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
           stickyBottom = _this$props5.stickyBottom;
       var hasScroll = this.state.hasScroll;
       return /*#__PURE__*/_react.default.createElement("div", {
-        className: (0, _classnames.default)(_styles.Classes.stickyScroll, _styles.Classes.horizontalScrollContainer),
+        className: (0, _classnames.default)(_styles.Classes.horizontalScrollContainer, _styles.Classes.horizontalStickyScrollContainer)
+      }, /*#__PURE__*/_react.default.createElement("div", {
+        className: (0, _classnames.default)(_styles.Classes.horizontalScrollLeftSpacer),
+        style: {
+          width: info.leftLockTotalWidth
+        }
+      }), /*#__PURE__*/_react.default.createElement("div", {
+        className: (0, _classnames.default)(_styles.Classes.stickyScroll),
         style: {
           display: hasStickyScroll && hasScroll ? 'block' : 'none',
           bottom: stickyBottom
         }
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: _styles.Classes.stickyScrollItem
+      })), /*#__PURE__*/_react.default.createElement("div", {
+        className: (0, _classnames.default)(_styles.Classes.horizontalScrollRightSpacer),
+        style: {
+          width: info.rightLockTotalWidth
+        }
       }));
     }
   }, {
@@ -813,9 +829,9 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
     key: "adjustNeedRenderLock",
     value: function adjustNeedRenderLock() {
       var needRenderLock = this.state.needRenderLock;
-      var _this$lastInfo = this.lastInfo,
-          flat = (0, _flat.default)(_this$lastInfo),
-          hasLockColumn = _this$lastInfo.hasLockColumn;
+      var _this$lastInfo2 = this.lastInfo,
+          flat = (0, _flat.default)(_this$lastInfo2),
+          hasLockColumn = _this$lastInfo2.hasLockColumn;
 
       if (hasLockColumn) {
         var _context;

package/lib/table/interfaces.d.ts

@@ -90,6 +90,9 @@ export interface FilterPanelProps {
 export interface DefaultFilterPanelProps extends FilterPanelProps {
     setFilterModel(filterItem?: Pick<FilterItem, 'filter' | 'filterCondition'>): void;
     filterModel: FilterItem;
+    localeText: {
+        [key: string]: string;
+    };
 }
 export interface CustomeFilterPanelProps extends FilterPanelProps {
     setFilter(filter?: any[]): void;

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

@@ -63,6 +63,7 @@ function filter() {
     var inputFiltersMap = new _map.default((0, _map2.default)(inputFilters).call(inputFilters, function (filterItem) {
       return [filterItem.code, (0, _extends2.default)({}, filterItem)];
     }));
+    var localeText = pipeline.ctx.localeText;
 
     function processColumns(columns) {
       return (0, _map2.default)(columns).call(columns, dfs);
@@ -120,7 +121,8 @@ function filter() {
             stopClickEventPropagation: stopClickEventPropagation,
             stopESCKeyDownEventPropagation: stopESCKeyDownEventPropagation,
             hideFilterPopupHeader: hideFilterPopupHeader,
-            getPopupParent: getPopupParent
+            getPopupParent: getPopupParent,
+            localeText: localeText
           })]); // result.headerCellProps = mergeCellProps(col.headerCellProps, {
           //   style: {
           //     paddingRight: '18px'

package/lib/table/pipeline/features/filter/DefaultFilterContent.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { DefaultFilterPanelProps } from '../../../interfaces';
-declare function DefaultFilterContent({ setFilterModel, filterModel, hidePanel }: DefaultFilterPanelProps): JSX.Element;
+declare function DefaultFilterContent({ setFilterModel, filterModel, hidePanel, localeText }: DefaultFilterPanelProps): JSX.Element;
 export default DefaultFilterContent;

package/lib/table/pipeline/features/filter/DefaultFilterContent.js

@@ -48,7 +48,11 @@ function DefaultFilterContent(_ref) {
 
   var setFilterModel = _ref.setFilterModel,
       filterModel = _ref.filterModel,
-      hidePanel = _ref.hidePanel;
+      hidePanel = _ref.hidePanel,
+      _ref$localeText = _ref.localeText,
+      localeText = _ref$localeText === void 0 ? {} : _ref$localeText;
+
+  var _a, _b;
 
   var _React$useState = _react.default.useState((filterModel === null || filterModel === void 0 ? void 0 : filterModel.filterCondition) || 'contain'),
       _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
@@ -102,16 +106,18 @@ function DefaultFilterContent(_ref) {
   return /*#__PURE__*/_react.default.createElement(DefaultFilterContentStyle, null, /*#__PURE__*/_react.default.createElement("div", {
     className: 'filter-option-list'
   }, /*#__PURE__*/_react.default.createElement("ul", null, (0, _map.default)(_util.DEFAULT_FILTER_OPTIONS).call(_util.DEFAULT_FILTER_OPTIONS, function (option, index) {
+    var _a;
+
     return (
       /*#__PURE__*/
       // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
       _react.default.createElement("li", {
-        key: index,
+        key: option.key,
         className: option.key === selectedValue ? 'active' : '',
         onClick: function onClick() {
           return handleClick(option);
         }
-      }, option.title)
+      }, (_a = localeText[option.key]) !== null && _a !== void 0 ? _a : option.title)
     );
   }))), selectedValue !== 'notIsNull' && selectedValue !== 'isNull' && /*#__PURE__*/_react.default.createElement("div", {
     className: 'filter-search'
@@ -130,12 +136,12 @@ function DefaultFilterContent(_ref) {
       'filter-btn': true
     }, _styles.Classes.button, true)),
     onClick: reset
-  }, "\u91CD\u7F6E"), /*#__PURE__*/_react.default.createElement("button", {
+  }, (_a = localeText.resetFilter) !== null && _a !== void 0 ? _a : '重置'), /*#__PURE__*/_react.default.createElement("button", {
     className: (0, _classnames.default)((_cx2 = {
       'filter-btn': true
     }, (0, _defineProperty2.default)(_cx2, _styles.Classes.button, true), (0, _defineProperty2.default)(_cx2, _styles.Classes.buttonPrimary, true), _cx2)),
     onClick: confirm
-  }, "\u786E\u5B9A")));
+  }, (_b = localeText.confirmFilter) !== null && _b !== void 0 ? _b : '确定')));
 }
 
 var _default = DefaultFilterContent;

package/lib/table/pipeline/features/filter/Filter.d.ts

@@ -15,6 +15,9 @@ interface FilterProps {
     stopESCKeyDownEventPropagation?: boolean;
     hideFilterPopupHeader?: boolean;
     getPopupParent?: (triggerElement: HTMLElement) => HTMLElement;
+    localeText?: {
+        [key: string]: string;
+    };
 }
-declare function Filter({ size, style, className, FilterPanelContent, filterIcon, setFilter, setFilterModel, filterModel, isFilterActive, stopClickEventPropagation, stopESCKeyDownEventPropagation, hideFilterPopupHeader, getPopupParent }: FilterProps): JSX.Element;
+declare function Filter({ size, style, className, FilterPanelContent, filterIcon, setFilter, setFilterModel, filterModel, isFilterActive, stopClickEventPropagation, stopESCKeyDownEventPropagation, hideFilterPopupHeader, getPopupParent, localeText }: FilterProps): JSX.Element;
 export default Filter;

package/lib/table/pipeline/features/filter/Filter.js

@@ -110,7 +110,8 @@ function Filter(_ref2) {
       stopClickEventPropagation = _ref2.stopClickEventPropagation,
       stopESCKeyDownEventPropagation = _ref2.stopESCKeyDownEventPropagation,
       hideFilterPopupHeader = _ref2.hideFilterPopupHeader,
-      getPopupParent = _ref2.getPopupParent;
+      getPopupParent = _ref2.getPopupParent,
+      localeText = _ref2.localeText;
 
   var _React$useState3 = _react.default.useState(false),
       _React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
@@ -138,7 +139,8 @@ function Filter(_ref2) {
         setFilterModel: setFilterModel,
         filterModel: filterModel,
         isFilterActive: isFilterActive,
-        hidePanel: hidePanel
+        hidePanel: hidePanel,
+        localeText: localeText
       });
     }
   };

package/package.json

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