@lemon-fe/kits 1.0.0-52 → 1.0.0-54

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

@@ -2,7 +2,19 @@
 import type { GridStore } from './typings';
 import type DataGrid from './';
 export declare function useGridStore<T>(getter: (state: GridStore) => T): T;
+interface UseGrid<TData> {
+    /**
+     * @param 执行函数
+     */
+    <T>(cb: (curr: DataGrid<TData>) => T): T;
+    /**
+     * @param 执行函数
+     * @param isAsync 是否启用异步形式
+     */
+    (cb: (curr: DataGrid<TData>) => void, isAsync?: boolean): void;
+}
 export declare function useDataGrid<TData>(): {
     ref: import("react").RefObject<DataGrid<TData>>;
-    use: (cb: (current: DataGrid<TData>) => void) => void;
+    use: UseGrid<TData>;
 };
+export {};

package/es/components/DataGrid/hooks.js

@@ -10,7 +10,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
+import { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import shallowEqual from 'shallowequal';
 import GridStoreContext from "./context/GridStore";
 export function useGridStore(getter) {
@@ -52,7 +52,16 @@ export function useDataGrid() {
       mounted.current = false;
     };
   }, []);
-  var use = useCallback(function (cb) {
+
+  var use = function use(cb, isAsync) {
+    if (!isAsync) {
+      if (ref.current === null || !ref.current.ready()) {
+        throw new Error('Grid尚未初始化，请使用异步形式');
+      }
+
+      return cb(ref.current);
+    }
+
     if (ref.current !== null) {
       var grid = ref.current;
 
@@ -68,7 +77,8 @@ export function useDataGrid() {
 
       delay();
     }
-  }, []);
+  };
+
   return useMemo(function () {
     return {
       ref: ref,

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

@@ -46,13 +46,13 @@ export default class DataGrid<TData> extends Component<DataGridProps<TData>, Dat
         Text: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any> & import("./typings").TextEditorParams & React.RefAttributes<import("@ag-grid-community/react").ICellEditorReactComp>>;
         Date: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any> & import("./typings").DateEditorParams & React.RefAttributes<import("@ag-grid-community/react").ICellEditorReactComp>>;
         Number: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any> & import("./typings").NumberEditorParams & React.RefAttributes<import("@ag-grid-community/react").ICellEditorReactComp>>;
-        Select: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "options" | "virtual" | "showSearch" | "listHeight" | "allowClear" | "mode"> & {
+        Select: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "mode" | "allowClear" | "options" | "virtual" | "showSearch" | "listHeight"> & {
             fieldNames?: {
                 label: string;
                 value: string;
             } | undefined;
             valueByOption?: boolean | undefined;
-            action?: "stop" | "next" | "none" | undefined;
+            action?: "stop" | "none" | "next" | undefined;
         } & React.RefAttributes<import("@ag-grid-community/react").ICellEditorReactComp>>;
         Wrapper: typeof EditorWrapper;
     };
@@ -68,7 +68,6 @@ export default class DataGrid<TData> extends Component<DataGridProps<TData>, Dat
     private afterReady;
     private updateRowData;
     private getDataFromServer;
-    private sort;
     private pagination;
     private init;
     private LoadingOverlay;

package/es/components/DataGrid/index.js

@@ -68,6 +68,7 @@ import { AgGridReact } from '@ag-grid-community/react';
 import shallowEqual from 'shallowequal';
 import { ModuleRegistry, GridApi, ColumnApi } from '@ag-grid-community/core';
 import { InfiniteRowModelModule } from '@ag-grid-community/infinite-row-model';
+import { ClientSideRowModelModule } from '@ag-grid-community/client-side-row-model';
 import { get, set } from 'lodash';
 import Scheme from 'async-validator';
 import GridStoreContext from "./context/GridStore";
@@ -76,8 +77,6 @@ import { ClipboardModule } from "./modules/clipboard";
 import { MenuModule } from "./modules/menu";
 import { ColumnsToolPanelModule } from "./modules/column-tool-panel";
 import { SideBarModule } from "./modules/side-bar";
-import { ServerSideRowModelModule } from "./modules/server-side-row-model";
-import { ClientSideRowModelModule } from "./modules/client-side-row-model";
 import { Spin, Pagination, Empty } from 'antd';
 import { prefix, getColField, isColumn, withSyncRender, Store, Selection, columnTypes } from "./utils";
 import HeaderRenderer from "./renderer/HeaderRenderer";
@@ -89,7 +88,7 @@ import NumberEditor from "./cell-editors/Number";
 import SelectEditor from "./cell-editors/Select";
 import RowEditor, { RowEditorData } from "./cell-editors/Row";
 import EditorWrapper from "./cell-editors/Wrapper";
-ModuleRegistry.registerModules([ClientSideRowModelModule, RowGroupingModule, InfiniteRowModelModule, ClipboardModule, MenuModule, SideBarModule, ColumnsToolPanelModule, ServerSideRowModelModule], false);
+ModuleRegistry.registerModules([ClientSideRowModelModule, RowGroupingModule, InfiniteRowModelModule, ClipboardModule, MenuModule, SideBarModule, ColumnsToolPanelModule], false);
 var defaultColDef = {
   resizable: true,
   width: 140,
@@ -175,8 +174,10 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         _this.getDataFromServer();
       }
 
-      api.addEventListener('sortChanged', function (evt) {
-        _this.sort(evt);
+      api.addEventListener('sortChanged', function () {
+        if (!_this.isClientMode()) {
+          _this.getDataFromServer();
+        }
       }); // 用于同步selection
 
       api.addEventListener('rowSelected', function (_ref) {
@@ -765,7 +766,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           }).map(function (item) {
             return {
               field: item.colId,
-              order: item.sort === 'desc' ? 'descend' : 'ascend'
+              order: item.sort
             };
           })
         }).then(function (res) {
@@ -818,16 +819,6 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         });
       }
     }
-  }, {
-    key: "sort",
-    value: function sort(evt) {
-      if (this.isClientMode()) {
-        var model = this.api.getModel();
-        model.onSortChanged(evt);
-      } else {
-        this.getDataFromServer();
-      }
-    }
   }, {
     key: "pagination",
     value: function pagination(page, pageSize) {
@@ -1092,7 +1083,11 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         context: context,
         rowSelection: rowSelection !== undefined ? rowSelection.type !== 'radio' ? 'multiple' : 'single' : undefined,
         components: _objectSpread(_objectSpread({}, defaultComponents), componentsProp),
-        defaultColDef: _objectSpread(_objectSpread({}, defaultColDef), defaultColDefProp),
+        defaultColDef: _objectSpread(_objectSpread({
+          comparator: this.isClientMode() ? undefined : function () {
+            return 0;
+          }
+        }, defaultColDef), defaultColDefProp),
         columnTypes: _objectSpread(_objectSpread({}, columnTypes), columnTypesProp)
       })), /*#__PURE__*/React.createElement("div", {
         className: prefix('bottom')

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

@@ -32,7 +32,7 @@ export default function CellIndexRender(props) {
     };
   }, []);
 
-  if (index === null) {
+  if (index === null || node.isRowPinned()) {
     return null;
   }
 

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

@@ -69,7 +69,7 @@ export declare type PaginationType = {
     onChange?: (current: number, pageSize: number) => void;
 };
 export declare type SelectionType = AgGridReactProps['rowSelection'];
-export declare type SortOrder = 'descend' | 'ascend' | null;
+export declare type SortOrder = 'desc' | 'asc';
 export declare type SortType = {
     field: string;
     order: SortOrder;

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

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import type { Moment } from 'moment';
 import type { RangePickerProps } from 'antd/lib/date-picker';
-declare type Value = {
+export declare type DurationPickerValue = {
     type: string;
     option: string;
     dates?: [string, string];
@@ -19,8 +19,8 @@ interface Props extends Omit<RangePickerProps, 'value' | 'onChange'> {
     types: DateType[];
     options?: Option[];
     dateFormat?: string;
-    value?: Value;
-    onChange?: (value: Value) => void;
+    value?: DurationPickerValue;
+    onChange?: (value: DurationPickerValue) => void;
 }
-export default function DurationPicker(props: Props): JSX.Element;
-export {};
+declare function DurationPicker(props: Props): JSX.Element;
+export default DurationPicker;

package/es/components/DurationPicker/index.js

@@ -68,7 +68,8 @@ var defaultOptions = [{
     return [moment().add(-29, 'days').startOf('day'), moment().endOf('day')];
   }
 }];
-export default function DurationPicker(props) {
+
+function DurationPicker(props) {
   var _result$type, _result$option, _result$option2;
 
   var _props$prefixCls = props.prefixCls,
@@ -82,7 +83,7 @@ export default function DurationPicker(props) {
       onChange = props.onChange,
       restProps = _objectWithoutProperties(props, _excluded);
 
-  var defaultValue = useMemo(function () {
+  var defaultDurationPickerValue = useMemo(function () {
     if (valueProp === undefined) {
       var _options$0$value, _options$;
 
@@ -98,14 +99,14 @@ export default function DurationPicker(props) {
     return valueProp;
   }, []);
 
-  var _useState = useState(defaultValue),
+  var _useState = useState(defaultDurationPickerValue),
       _useState2 = _slicedToArray(_useState, 2),
       value = _useState2[0],
-      setValue = _useState2[1];
+      setDurationPickerValue = _useState2[1];
 
   useEffect(function () {
     if (valueProp !== undefined) {
-      setValue(valueProp);
+      setDurationPickerValue(valueProp);
     }
   }, [valueProp]);
   var result = useMemo(function () {
@@ -127,46 +128,46 @@ export default function DurationPicker(props) {
 
   var handleChangeType = function handleChangeType(item) {
     if (value.type !== item.value) {
-      var newValue = _objectSpread(_objectSpread({}, value), {}, {
+      var newDurationPickerValue = _objectSpread(_objectSpread({}, value), {}, {
         type: item.value
       });
 
-      setValue(newValue);
+      setDurationPickerValue(newDurationPickerValue);
 
       if (onChange) {
-        onChange(newValue);
+        onChange(newDurationPickerValue);
       }
     }
   };
 
   var handleChangeOption = function handleChangeOption(item) {
     if (value.option !== item.label) {
-      var newValue = _objectSpread(_objectSpread({}, value), {}, {
+      var newDurationPickerValue = _objectSpread(_objectSpread({}, value), {}, {
         dates: item.value !== null ? item.value().map(function (date) {
           return date.format(dateFormat);
         }) : undefined,
         option: item.label
       });
 
-      setValue(newValue);
+      setDurationPickerValue(newDurationPickerValue);
 
       if (onChange) {
-        onChange(newValue);
+        onChange(newDurationPickerValue);
       }
     }
   };
 
   var handleChangeDates = function handleChangeDates(dates) {
-    var newValue = _objectSpread(_objectSpread({}, value), {}, {
+    var newDurationPickerValue = _objectSpread(_objectSpread({}, value), {}, {
       dates: dates ? dates.map(function (item) {
         return item.format(dateFormat);
       }) : undefined
     });
 
-    setValue(newValue);
+    setDurationPickerValue(newDurationPickerValue);
 
     if (onChange) {
-      onChange(newValue);
+      onChange(newDurationPickerValue);
     }
   };
 
@@ -201,4 +202,6 @@ export default function DurationPicker(props) {
     onChange: handleChangeDates,
     disabled: ((_result$option2 = result.option) === null || _result$option2 === void 0 ? void 0 : _result$option2.value) !== null
   }, restProps))));
-}
+}
+
+export default DurationPicker;

package/es/components/Popup/index.js

@@ -104,6 +104,7 @@ function Popup(props) {
       return;
     }
 
+    setValue(valueProp);
     setOpen(true);
   };
 

package/es/index.d.ts

@@ -18,6 +18,7 @@ export type { FilterItemType } from './components/Filter/typings';
 export { default as Section } from './components/Section';
 export { default as Layout } from './components/Layout';
 export { default as DurationPicker } from './components/DurationPicker';
+export type { DurationPickerValue } from './components/DurationPicker';
 export { default as ColorPicker } from './components/ColorPicker';
 export { default as Popup } from './components/Popup';
 export type { BasePopupProps } from './components/Popup';

package/package.json

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

package/es/components/DataGrid/modules/client-side-row-model/clientSideRowModel/clientSideNodeManager.d.ts

@@ -1,35 +0,0 @@
-import { Beans, ColumnModel, EventService, GridOptionsWrapper, RowDataTransaction, RowNode, RowNodeTransaction, SelectionService } from "@ag-grid-community/core";
-export declare class ClientSideNodeManager {
-    private static TOP_LEVEL;
-    private readonly rootNode;
-    private gridOptionsWrapper;
-    private eventService;
-    private columnModel;
-    private selectionService;
-    private beans;
-    private nextId;
-    private static ROOT_NODE_ID;
-    private isRowMasterFunc?;
-    private suppressParentsInRowNodes;
-    private doingTreeData;
-    private doingMasterDetail;
-    private allNodesMap;
-    constructor(rootNode: RowNode, gridOptionsWrapper: GridOptionsWrapper, eventService: EventService, columnModel: ColumnModel, selectionService: SelectionService, beans: Beans);
-    postConstruct(): void;
-    getCopyOfNodesMap(): {
-        [id: string]: RowNode;
-    };
-    getRowNode(id: string): RowNode | undefined;
-    setRowData(rowData: any[]): RowNode[] | undefined;
-    updateRowData(rowDataTran: RowDataTransaction, rowNodeOrder: {
-        [id: string]: number;
-    } | null | undefined): RowNodeTransaction;
-    private updateSelection;
-    private executeAdd;
-    private executeRemove;
-    private executeUpdate;
-    private lookupRowNode;
-    private createNode;
-    private setMasterForRow;
-    private isExpanded;
-}