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

package/dist/@kdcloudjs/table.css

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

package/dist/@kdcloudjs/table.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.2.0-canary.4
+ *   @kdcloudjs/table v1.2.0-canary.6
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -813,10 +813,16 @@ var getCompLangMsg = function getCompLangMsg(compLangMsgParams, customGetLangMsg
 __webpack_require__.r(__webpack_exports__);
 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: '确定'
 };
 /* harmony default export */ __webpack_exports__["default"] = (locale);
 
@@ -3709,6 +3715,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`
       // 设置滚动条高度
@@ -5989,6 +5998,7 @@ function filter() {
     var inputFiltersMap = new Map(inputFilters.map(function (filterItem) {
       return [filterItem.code, _objectSpread({}, filterItem)];
     }));
+    var localeText = pipeline.ctx.localeText;
 
     function processColumns(columns) {
       return columns.map(dfs);
@@ -6048,7 +6058,8 @@ function filter() {
             stopClickEventPropagation: stopClickEventPropagation,
             stopESCKeyDownEventPropagation: stopESCKeyDownEventPropagation,
             hideFilterPopupHeader: hideFilterPopupHeader,
-            getPopupParent: getPopupParent
+            getPopupParent: getPopupParent,
+            localeText: localeText
           })]); // result.headerCellProps = mergeCellProps(col.headerCellProps, {
           //   style: {
           //     paddingRight: '18px'
@@ -7109,11 +7120,13 @@ var _templateObject;
 var DefaultFilterContentStyle = styled_components__WEBPACK_IMPORTED_MODULE_7__["default"].div(_templateObject || (_templateObject = _babel_runtime_helpers_taggedTemplateLiteral__WEBPACK_IMPORTED_MODULE_2___default()(["\n  display: flex;\n  flex-direction: column;\n  background-color: #ffffff;\n  border-radius: 2px;\n  width: 100%;\n\n  ", "\n  .filter-option-list {\n    display: flex;\n    flex-direction: column;\n    margin-top: 8px;\n    ul {\n      margin: 0;\n      padding: 0;\n      li {\n        display: flex;\n        position: relative;\n        flex-shrink: 0;\n        height: 32px;\n        align-items: center;\n        border-radius: 2px;\n        font-size: 12px;\n        color: var(--color);\n        padding: 0 12px;\n        overflow: hidden;\n        cursor: pointer;\n        &:hover{\n          background-color: var(--primary-color-level1);\n        }\n      }\n      li.active{\n        background-color: var(--primary-color-level1);\n      }\n    }\n  }\n\n  .filter-search {\n    display: flex;\n    padding: 6px 12px;\n\n    .filter-search-inner {\n      width: 100%;\n      font-size: 12px;\n      color: #333333;\n      height: 28px;\n      line-height: 28px;\n      padding: 0 8px;\n      outline: none;\n      background-color: #FAFAFA;\n      border-radius: 2px;\n      border: 1px solid var(--strong-border-color);\n      &:hover{\n        border-color: var(--primary-color)\n      } \n      &:focus{\n        border-color: var(--primary-color)\n      }  \n    }\n  }\n\n  .filter-footer {\n    display: flex;\n    flex-direction: row;\n    padding: 8px 12px;\n    justify-content: space-between;\n\n    .filter-btn {\n      text-align: center;\n      font-size: 12px;\n      width: 60px;\n      height: 24px;\n      line-height: 24px;\n    }\n    \n  }\n"])), _base_styles__WEBPACK_IMPORTED_MODULE_10__["ButtonCSS"]);
 
 function DefaultFilterContent(_ref) {
-  var _cx2;
+  var _localeText$resetFilt, _cx2, _localeText$confirmFi;
 
   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 _React$useState = react__WEBPACK_IMPORTED_MODULE_6___default.a.useState((filterModel === null || filterModel === void 0 ? void 0 : filterModel.filterCondition) || 'contain'),
       _React$useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_React$useState, 2),
@@ -7166,16 +7179,18 @@ function DefaultFilterContent(_ref) {
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement(DefaultFilterContentStyle, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("div", {
     className: "filter-option-list"
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("ul", null, _util__WEBPACK_IMPORTED_MODULE_9__["DEFAULT_FILTER_OPTIONS"].map(function (option, index) {
+    var _localeText$option$ke;
+
     return (
       /*#__PURE__*/
       // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
       react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("li", {
-        key: index,
+        key: option.key,
         className: option.key === selectedValue ? 'active' : '',
         onClick: function onClick() {
           return handleClick(option);
         }
-      }, option.title)
+      }, (_localeText$option$ke = localeText[option.key]) !== null && _localeText$option$ke !== void 0 ? _localeText$option$ke : option.title)
     );
   }))), selectedValue !== 'notIsNull' && selectedValue !== 'isNull' && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("div", {
     className: "filter-search"
@@ -7194,12 +7209,12 @@ function DefaultFilterContent(_ref) {
       'filter-btn': true
     }, _base_styles__WEBPACK_IMPORTED_MODULE_10__["Classes"].button, true)),
     onClick: reset
-  }, "\u91CD\u7F6E"), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("button", {
+  }, (_localeText$resetFilt = localeText.resetFilter) !== null && _localeText$resetFilt !== void 0 ? _localeText$resetFilt : '重置'), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("button", {
     className: classnames__WEBPACK_IMPORTED_MODULE_8___default()((_cx2 = {
       'filter-btn': true
     }, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_cx2, _base_styles__WEBPACK_IMPORTED_MODULE_10__["Classes"].button, true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_cx2, _base_styles__WEBPACK_IMPORTED_MODULE_10__["Classes"].buttonPrimary, true), _cx2)),
     onClick: confirm
-  }, "\u786E\u5B9A")));
+  }, (_localeText$confirmFi = localeText.confirmFilter) !== null && _localeText$confirmFi !== void 0 ? _localeText$confirmFi : '确定')));
 }
 
 /* harmony default export */ __webpack_exports__["default"] = (DefaultFilterContent);
@@ -7349,7 +7364,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__WEBPACK_IMPORTED_MODULE_3___default.a.useState(false),
       _React$useState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_React$useState3, 2),
@@ -7376,7 +7392,8 @@ function Filter(_ref2) {
         setFilterModel: setFilterModel,
         filterModel: filterModel,
         isFilterActive: isFilterActive,
-        hidePanel: hidePanel
+        hidePanel: hidePanel,
+        localeText: localeText
       });
     }
   };