@kdcloudjs/table 1.2.0-canary.5 → 1.2.0-canary.6-hotfix.1

package/es/locale/locale.d.ts

@@ -26,10 +26,14 @@ declare class LocaleCache {
      */
     setLocalesData(locale: string, localeData?: LocaleDataType): {
         locale: string;
-        'global.selectholder': string;
-        'global.placeholder': string;
-        'global.cancel': string;
-        'global.confirm': string;
+        contain: string;
+        notContain: string;
+        equal: string;
+        notEqual: string;
+        isNull: string;
+        notIsNull: string;
+        resetFilter: string;
+        confirmFilter: string;
     };
     /**
      * 获取当前语言包数据

package/es/locale/zh-CN.d.ts

@@ -1,8 +1,12 @@
 declare const locale: {
     locale: string;
-    'global.selectholder': string;
-    'global.placeholder': string;
-    'global.cancel': string;
-    'global.confirm': string;
+    contain: string;
+    notContain: string;
+    equal: string;
+    notEqual: string;
+    isNull: string;
+    notIsNull: string;
+    resetFilter: string;
+    confirmFilter: string;
 };
 export default locale;

package/es/locale/zh-CN.js

@@ -1,8 +1,14 @@
 var locale = {
   locale: 'zh-CN',
-  'global.selectholder': '请选择',
-  'global.placeholder': '请输入...',
-  'global.cancel': '取消',
-  'global.confirm': '确定'
+  // Text Filter
+  contain: '包含',
+  notContain: '不包含',
+  equal: '等于',
+  notEqual: '不等于',
+  isNull: '为空',
+  notIsNull: '不为空',
+  // filter button
+  resetFilter: '重置',
+  confirmFilter: '确定'
 };
 export default locale;

package/es/table/base/table.js

@@ -222,6 +222,9 @@ export var BaseTable = /*#__PURE__*/function (_React$Component) {
       var tableBodyHtmlTable = this.domHelper.getTableBodyHtmlTable();
       var innerTableWidth = tableBodyHtmlTable.offsetWidth;
       var artTableWidth = artTable.offsetWidth;
+      var artTableHeight = artTable.offsetHeight; // 表格隐藏后，不需要对表格的滚动条做额外的逻辑处理
+
+      if (artTableWidth === 0 && artTableHeight === 0) return;
       var stickyScrollHeightProp = this.props.stickyScrollHeight;
       var stickyScrollHeight = stickyScrollHeightProp === 'auto' ? this.getScrollBarWidth() : stickyScrollHeightProp; // stickyScroll.style.marginTop = `-${stickyScrollHeight + 1}px`
       // 设置滚动条高度

package/es/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/es/table/pipeline/features/columnFilter.js

@@ -37,6 +37,7 @@ export function filter() {
     var inputFiltersMap = new _Map(_mapInstanceProperty(inputFilters).call(inputFilters, function (filterItem) {
       return [filterItem.code, _extends({}, filterItem)];
     }));
+    var localeText = pipeline.ctx.localeText;
 
     function processColumns(columns) {
       return _mapInstanceProperty(columns).call(columns, dfs);
@@ -97,7 +98,8 @@ export function filter() {
             stopClickEventPropagation: stopClickEventPropagation,
             stopESCKeyDownEventPropagation: stopESCKeyDownEventPropagation,
             hideFilterPopupHeader: hideFilterPopupHeader,
-            getPopupParent: getPopupParent
+            getPopupParent: getPopupParent,
+            localeText: localeText
           })]); // result.headerCellProps = mergeCellProps(col.headerCellProps, {
           //   style: {
           //     paddingRight: '18px'

package/es/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/es/table/pipeline/features/filter/DefaultFilterContent.js

@@ -19,7 +19,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.useState((filterModel === null || filterModel === void 0 ? void 0 : filterModel.filterCondition) || 'contain'),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -72,16 +76,18 @@ function DefaultFilterContent(_ref) {
   return /*#__PURE__*/React.createElement(DefaultFilterContentStyle, null, /*#__PURE__*/React.createElement("div", {
     className: 'filter-option-list'
   }, /*#__PURE__*/React.createElement("ul", null, _mapInstanceProperty(DEFAULT_FILTER_OPTIONS).call(DEFAULT_FILTER_OPTIONS, function (option, index) {
+    var _a;
+
     return (
       /*#__PURE__*/
       // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
       React.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.createElement("div", {
     className: 'filter-search'
@@ -100,12 +106,12 @@ function DefaultFilterContent(_ref) {
       'filter-btn': true
     }, Classes.button, true)),
     onClick: reset
-  }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement("button", {
+  }, (_a = localeText.resetFilter) !== null && _a !== void 0 ? _a : '重置'), /*#__PURE__*/React.createElement("button", {
     className: cx((_cx2 = {
       'filter-btn': true
     }, _defineProperty(_cx2, Classes.button, true), _defineProperty(_cx2, Classes.buttonPrimary, true), _cx2)),
     onClick: confirm
-  }, "\u786E\u5B9A")));
+  }, (_b = localeText.confirmFilter) !== null && _b !== void 0 ? _b : '确定')));
 }
 
 export default DefaultFilterContent;

package/es/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/es/table/pipeline/features/filter/Filter.js

@@ -77,7 +77,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.useState(false),
       _React$useState4 = _slicedToArray(_React$useState3, 2),
@@ -104,7 +105,8 @@ function Filter(_ref2) {
         setFilterModel: setFilterModel,
         filterModel: filterModel,
         isFilterActive: isFilterActive,
-        hidePanel: hidePanel
+        hidePanel: hidePanel,
+        localeText: localeText
       });
     }
   };

package/lib/locale/locale.d.ts

@@ -26,10 +26,14 @@ declare class LocaleCache {
      */
     setLocalesData(locale: string, localeData?: LocaleDataType): {
         locale: string;
-        'global.selectholder': string;
-        'global.placeholder': string;
-        'global.cancel': string;
-        'global.confirm': string;
+        contain: string;
+        notContain: string;
+        equal: string;
+        notEqual: string;
+        isNull: string;
+        notIsNull: string;
+        resetFilter: string;
+        confirmFilter: string;
     };
     /**
      * 获取当前语言包数据

package/lib/locale/zh-CN.d.ts

@@ -1,8 +1,12 @@
 declare const locale: {
     locale: string;
-    'global.selectholder': string;
-    'global.placeholder': string;
-    'global.cancel': string;
-    'global.confirm': string;
+    contain: string;
+    notContain: string;
+    equal: string;
+    notEqual: string;
+    isNull: string;
+    notIsNull: string;
+    resetFilter: string;
+    confirmFilter: string;
 };
 export default locale;

package/lib/locale/zh-CN.js

@@ -6,10 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var locale = {
   locale: 'zh-CN',
-  'global.selectholder': '请选择',
-  'global.placeholder': '请输入...',
-  'global.cancel': '取消',
-  'global.confirm': '确定'
+  // Text Filter
+  contain: '包含',
+  notContain: '不包含',
+  equal: '等于',
+  notEqual: '不等于',
+  isNull: '为空',
+  notIsNull: '不为空',
+  // filter button
+  resetFilter: '重置',
+  confirmFilter: '确定'
 };
 var _default = locale;
 exports.default = _default;

package/lib/table/base/table.js

@@ -273,6 +273,9 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
       var tableBodyHtmlTable = this.domHelper.getTableBodyHtmlTable();
       var innerTableWidth = tableBodyHtmlTable.offsetWidth;
       var artTableWidth = artTable.offsetWidth;
+      var artTableHeight = artTable.offsetHeight; // 表格隐藏后，不需要对表格的滚动条做额外的逻辑处理
+
+      if (artTableWidth === 0 && artTableHeight === 0) return;
       var stickyScrollHeightProp = this.props.stickyScrollHeight;
       var stickyScrollHeight = stickyScrollHeightProp === 'auto' ? this.getScrollBarWidth() : stickyScrollHeightProp; // stickyScroll.style.marginTop = `-${stickyScrollHeight + 1}px`
       // 设置滚动条高度

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.6-hotfix.1",
   "description": "金蝶 react table 组件",
   "title": "table",
   "keywords": [
@@ -56,6 +56,7 @@
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --skip-unstable",
     "pub": "npm run test:all && npm run build && cross-env PUB_ENV=pub np --no-cleanup --no-tests",
     "pub:canary": "npm run build && cross-env PUB_ENV=pub np --no-cleanup --anyBranch --no-tests --tag=canary",
+    "pub:canary-hotfix": "npm run build && cross-env PUB_ENV=pub np --no-cleanup --anyBranch --no-tests --tag=canaryHotFix",
     "new": "node scripts/create-component.js",
     "kd-ui": "npm install @kingdee-ui/kui --registry http://npm.kingdee.com/"
   },