@lemon-fe/kits 1.0.0 → 1.0.1

package/es/components/DataGrid/cell-editors/Select.d.ts

@@ -16,7 +16,7 @@ export declare type SelectEditorParams = Pick<SelectProps<any, BaseOptionType>,
      */
     action?: 'next' | 'stop' | 'none';
 };
-declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any> & Pick<SelectProps<any, BaseOptionType>, "disabled" | "options" | "virtual" | "showSearch" | "listHeight" | "allowClear" | "mode"> & {
+declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any, any> & Pick<SelectProps<any, BaseOptionType>, "disabled" | "mode" | "showSearch" | "allowClear" | "options" | "virtual" | "listHeight"> & {
     fieldNames?: {
         label: string;
         value: string;
@@ -28,6 +28,6 @@ declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, a
     /**
      * 完成选择后的单元格切换行为，默认为next
      */
-    action?: "stop" | "next" | "none" | undefined;
+    action?: "stop" | "none" | "next" | undefined;
 } & React.RefAttributes<ICellEditorReactComp>>;
 export default _default;

package/es/components/DataGrid/index.d.ts

@@ -82,7 +82,7 @@ export default class DataGrid<TData extends Record<string, any>> extends Compone
     private updateColumnDefs;
     private getFullColumnDef;
     private getColumnDefs;
-    private isClientMode;
+    isClientMode(): boolean;
     private clearReadyQueue;
     afterReady(cb: () => void): void;
     private isPreserveSelected;

package/es/components/DataGrid/index.js

@@ -98,7 +98,7 @@ import CellIndexRender from "./renderer/CellIndexRenderer";
 import CellRenderer from "./renderer/CellRenderer";
 import DetailCellRenderer from "./renderer/DetailCellRenderer";
 import HeaderRenderer from "./renderer/HeaderRenderer";
-import { prefix, getColField, isColumn, withSyncRender, Store, Selection, columnTypes } from "./utils";
+import { prefix, getColField, isColumn, withSyncRender, Store, Selection, columnTypes, isColumnDef } from "./utils";
 
 var add = function add(a, b) {
   return new BigNumber(a).plus(b);
@@ -327,8 +327,15 @@ var DataGrid = /*#__PURE__*/function (_Component) {
                     rowSelection.onChange(result[0], result[1].filter(Boolean));
                   }
                 });
+                api.addEventListener('paginationChanged', function () {
+                  if (_this.isClientMode()) {
+                    _this.setState({
+                      page: api.paginationGetCurrentPage() + 1
+                    });
+                  }
+                });
 
-              case 10:
+              case 11:
               case "end":
                 return _context.stop();
             }
@@ -524,8 +531,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     });
 
     _this.state = _objectSpread({
-      loading: false,
-      useDataSource: props.dataSource !== undefined
+      loading: false
     }, _this.getPagination());
     _this.store = new Store({
       errors: new Map(),
@@ -887,13 +893,15 @@ var DataGrid = /*#__PURE__*/function (_Component) {
             pageSize = _this$state.pageSize;
         var totalPages = Math.ceil(dataSource.length / pageSize) || 1;
         var newPage = page > totalPages ? totalPages : page;
-        this.setState({
-          total: dataSource.length,
-          page: newPage
-        }, function () {
-          if (newPage !== page && _this4.isClientMode()) {
+
+        if (newPage !== page && this.isClientMode()) {
+          this.afterReady(function () {
             _this4.api.paginationGoToPage(newPage - 1);
-          }
+          });
+        }
+
+        this.setState({
+          total: dataSource.length
         });
       }
     }
@@ -909,8 +917,6 @@ var DataGrid = /*#__PURE__*/function (_Component) {
             defs = _this5$getColumnDefs2[0],
             leafColIds = _this5$getColumnDefs2[1];
 
-        _this5.api.setColumnDefs(defs);
-
         if (state) {
           var newState = _toConsumableArray(state);
 
@@ -929,18 +935,41 @@ var DataGrid = /*#__PURE__*/function (_Component) {
               });
             }
           });
-          /**
-           * 初始化的时候，需要使用存储的columnState，不仅仅是顺序，其他情况由于在defs里已经有列的状态控制了
-           */
 
-          _this5.columnApi.applyColumnState({
-            state: allState ? newState : newState.map(function (item) {
+          if (allState) {
+            /**
+             * 表格初始化列抖动问题：先调用setColumnDefs，后applyColumnState，会产生列移动动画，所以先处理一遍colDefs，将需要隐藏的列默认隐藏
+             */
+            defs.forEach(function (col) {
+              if (isColumnDef(col)) {
+                var colState = state.find(function (item) {
+                  return item.colId === col.colId;
+                });
+
+                if (colState !== undefined && colState.hide) {
+                  col.initialHide = true;
+                }
+              }
+            });
+          } else {
+            /**
+             * 初始化的时候，需要使用存储的columnState的所有属性，但其他情况由于在defs里已经有列的状态控制了，所以只需要应用排序不需要其他状态
+             */
+            newState = newState.map(function (item) {
               return {
                 colId: item.colId
               };
-            }),
+            });
+          }
+
+          _this5.api.setColumnDefs(defs);
+
+          _this5.columnApi.applyColumnState({
+            state: newState,
             applyOrder: true
           });
+        } else {
+          _this5.api.setColumnDefs(defs);
         }
       });
     }
@@ -1353,11 +1382,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         return false;
       }
 
-      if (rowSelection.preserveSelectedRowKeys === undefined) {
-        return !this.isClientMode();
-      }
-
-      return rowSelection.preserveSelectedRowKeys;
+      return !!rowSelection.preserveSelectedRowKeys;
     }
   }, {
     key: "updateRowData",

package/es/components/DataGrid/renderer/CellIndexRenderer.js

@@ -48,10 +48,9 @@ export default function CellIndexRender(props) {
 
   var _grid$state = grid.state,
       page = _grid$state.page,
-      pageSize = _grid$state.pageSize,
-      useDataSource = _grid$state.useDataSource;
+      pageSize = _grid$state.pageSize;
 
-  if (useDataSource) {
+  if (grid.isClientMode()) {
     return index + 1;
   }
 

package/es/components/DataGrid/typings.d.ts

@@ -91,7 +91,6 @@ export declare type DataGridState<TData> = {
     total: number;
     loading: boolean;
     error?: Error;
-    useDataSource?: boolean;
 };
 export declare type GridStore = {
     errors: Map<string, Map<string, string[]>>;

package/es/components/DataGrid/utils.d.ts

@@ -1,8 +1,9 @@
-import type { ColDef } from '@ag-grid-community/core';
+import type { ColDef, ColGroupDef } from '@ag-grid-community/core';
 import { Subject } from '@lemon-fe/utils';
 import type { ColType, ColGroupType, PathType } from './typings';
 export declare const prefix: (val?: string | undefined) => string;
 export declare function isColumn<T>(col: ColGroupType<T> | ColType<T>): col is ColType<T>;
+export declare function isColumnDef<T>(col: ColGroupDef<T> | ColDef<T>): col is ColDef<T>;
 export declare function getColField(col: {
     field?: string;
     key?: string;

package/es/components/DataGrid/utils.js

@@ -32,6 +32,9 @@ export var prefix = prefixClassName('grid');
 export function isColumn(col) {
   return col.children === undefined;
 }
+export function isColumnDef(col) {
+  return col.children === undefined;
+}
 export function getColField(col) {
   return col.field || col.key || (Array.isArray(col.dataIndex) ? col.dataIndex.join('.') : col.dataIndex) || col.colId;
 }

package/es/components/SelectView/index.js

@@ -122,9 +122,10 @@ export default function SelectView(props) {
 
     if (list.current !== null) {
       if (mDataSource !== undefined) {
-        if (list.current.ready()) {
-          list.current.api.paginationGoToFirstPage();
-        }
+        var grid = list.current;
+        grid.afterReady(function () {
+          grid.api.paginationGoToFirstPage();
+        });
       } else {
         list.current.fetch();
       }

package/es/components/State/index.less

@@ -67,7 +67,7 @@
 
   &-type-default&-shape-default {
     &::before {
-      background-color: @color-disabled;
+      background-color: #c0c0c0;
     }
   }
 

package/es/init.js

@@ -159,6 +159,14 @@ export default function init() {
         pointerEvents: 'none'
       }
     })
+  });
+  TimePicker.RangePicker.defaultProps = _objectSpread(_objectSpread({}, TimePicker.RangePicker.defaultProps), {}, {
+    suffixIcon: /*#__PURE__*/React.createElement(Icons.Clock, {
+      style: {
+        pointerEvents: 'none'
+      }
+    }),
+    clearIcon: /*#__PURE__*/React.createElement(Clear, null)
   }); //@ts-ignore
 
   Menu.defaultProps = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",