@lemon-fe/components 1.2.9-alpha.0 → 1.2.9-alpha.2

package/es/data-grid/index.d.ts

@@ -71,6 +71,11 @@ declare class InternalDataGrid<TData extends Record<string, any>> extends Compon
     private updateRowData;
     private getSummaryRowData;
     private loadingTiming;
+    /**
+     *
+     * @param flag
+     * @param ignoreClientMode 为了解决明细页面出现2个loading动画的问题，非远程模式加载列定制数据的时候暂定出现表格内部加载动画
+     */
     private loadingChange;
     private getDataFromServer;
     private pagination;

package/es/data-grid/index.js

@@ -307,9 +307,10 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
               });
               api.addEventListener('selectionChanged', function () {
                 var rowSelection = _this.props.rowSelection;
-                if (_this.selected.isDirty() && rowSelection !== undefined && rowSelection.onChange !== undefined) {
+                if (_this.selected.isDirty()) {
+                  var _rowSelection$onChang;
                   var result = _this.selected.flush();
-                  rowSelection.onChange(result[0], result[1].filter(Boolean));
+                  rowSelection === null || rowSelection === void 0 || (_rowSelection$onChang = rowSelection.onChange) === null || _rowSelection$onChang === void 0 || _rowSelection$onChang.call(rowSelection, result[0], result[1].filter(Boolean));
                 }
               });
               api.addEventListener('paginationChanged', function () {
@@ -667,13 +668,13 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               window.addEventListener('blur', this.handleFocus);
-              this.loadingChange(true);
+              this.loadingChange(true, true);
 
               // 放在componentDidMount 执行时间比onGridReady早
               _context3.next = 4;
               return this.customColumnData;
             case 4:
-              this.loadingChange(false);
+              this.loadingChange(false, true);
             case 5:
             case "end":
               return _context3.stop();
@@ -1275,8 +1276,15 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
     }
   }, {
     key: "loadingChange",
-    value: function loadingChange(flag) {
+    value:
+    /**
+     *
+     * @param flag
+     * @param ignoreClientMode 为了解决明细页面出现2个loading动画的问题，非远程模式加载列定制数据的时候暂定出现表格内部加载动画
+     */
+    function loadingChange(flag) {
       var _this5 = this;
+      var ignoreClientMode = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       if (this.loadingTiming) {
         clearTimeout(this.loadingTiming);
         this.loadingTiming = null;
@@ -1286,9 +1294,13 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
         if (onLoading) {
           onLoading(flag);
         } else {
-          _this5.setState({
-            loading: flag
-          });
+          if (_this5.isClientMode() && ignoreClientMode) {
+            // noop
+          } else {
+            _this5.setState({
+              loading: flag
+            });
+          }
         }
         _this5.loadingTiming = null;
       }, 16);

package/es/data-grid/index.less

@@ -320,7 +320,6 @@
   &-bottom {
     display: flex;
     align-items: center;
-    justify-content: space-between;
     margin-top: @space-v;
     background-color: var(--ag-background-color);
 
@@ -330,6 +329,7 @@
   }
 
   &-selected {
+    margin-right: @padding-md;
     color: #333;
 
     a {

package/es/data-grid/locale/en_US.js

@@ -35,7 +35,7 @@ var locale = {
     dataSourceSummaryDataText: 'Total value calculated based on the formula from the data source',
     addFieldText: 'Add Field'
   },
-  maxWordText: '${headName} can not exceed ${maxLength} words',
+  maxWordText: '${headerName} can not exceed ${maxLength} words',
   operationSuccessText: 'Success',
   displayText: 'Show',
   searchText: 'Search',

package/es/data-grid/locale/zh_CN.js

@@ -35,7 +35,7 @@ var locale = {
   validate: {
     fieldErrorText: '${field}输入错误'
   },
-  maxWordText: '${headName}最多${maxLength}个字符',
+  maxWordText: '${headerName}最多${maxLength}个字符',
   operationSuccessText: '操作成功',
   displayText: '显示',
   searchText: '按回车进行搜索',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.2.9-alpha.0",
+  "version": "1.2.9-alpha.2",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -67,5 +67,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "9eac3b4183e52b0c97cd2864b209a3d97af08f29"
+  "gitHead": "0469d8fe24ae91bdca653d05ff6700fd9e438e6c"
 }