@lemon-fe/kits 1.0.0-51 → 1.0.0-53

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, 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,9 +77,12 @@ export function useDataGrid() {
 
       delay();
     }
-  }, []);
-  return {
-    ref: ref,
-    use: use
   };
+
+  return useMemo(function () {
+    return {
+      ref: ref,
+      use: use
+    };
+  }, []);
 }

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/Popup/index.js

@@ -1,6 +1,6 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
-var _excluded = ["value", "onChange", "component", "children", "formatLabel", "disabled", "allowClear", "autoFocus", "showLabel", "beforeOk", "beforeOkCheck", "placeholder", "onClick", "disabledTip", "bordered", "emptyValue", "onCancel", "modal"];
+var _excluded = ["value", "onChange", "component", "children", "formatLabel", "disabled", "allowClear", "autoFocus", "showLabel", "beforeOk", "beforeOkCheck", "placeholder", "onClick", "disabledTip", "bordered", "emptyValue", "onCancel", "modal", "open"];
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
@@ -56,6 +56,7 @@ function Popup(props) {
       emptyValue = props.emptyValue,
       onCancel = props.onCancel,
       modal = props.modal,
+      openProp = props.open,
       restProps = _objectWithoutProperties(props, _excluded);
 
   var _useState = useState(valueProp),
@@ -72,6 +73,12 @@ function Popup(props) {
   useEffect(function () {
     setValue(valueProp);
   }, [valueProp]);
+  useEffect(function () {
+    /** 当作为modal使用， 打开Modal时同步一次value */
+    if (modal && openProp) {
+      setValue(valueProp);
+    }
+  }, [openProp]);
 
   var _useContext = useContext(ConfigProvider.ConfigContext),
       getPrefixCls = _useContext.getPrefixCls;
@@ -97,7 +104,6 @@ function Popup(props) {
       return;
     }
 
-    setValue(valueProp);
     setOpen(true);
   };
 
@@ -183,7 +189,7 @@ function Popup(props) {
 
   var modalElm = /*#__PURE__*/React.createElement(Modal, _extends({
     destroyOnClose: true,
-    open: open,
+    open: openProp !== null && openProp !== void 0 ? openProp : open,
     width: 994,
     centered: true,
     onCancel: handleCancel,

package/es/components/SelectView/index.js

@@ -1,11 +1,3 @@
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -14,6 +6,14 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -123,7 +123,7 @@ export default function SelectView(props) {
 
   var handleChangeData = function handleChangeData(keys, records) {
     var keySet = new Set(keys);
-    var newRows = records.filter(function (item) {
+    var newRows = [].concat(_toConsumableArray(data), _toConsumableArray(records)).filter(function (item) {
       var curKey = getRowKey(item);
 
       if (keySet.has(curKey)) {
@@ -204,15 +204,13 @@ export default function SelectView(props) {
       title: '',
       dataIndex: '_delete_',
       width: 32,
-      render: function render(_1, _2, _3, _ref2) {
-        var context = _ref2.context,
-            node = _ref2.node;
+      render: function render(_1, row, _3, _ref2) {
+        var api = _ref2.api;
         return /*#__PURE__*/React.createElement(DeleteTwoTone, {
           onClick: function onClick() {
-            var id = node.id;
-            var keys = new Set(_toConsumableArray(context.dataKeys));
-            keys.delete(id);
-            handleChangeData(keys, context.data);
+            api.applyTransaction({
+              remove: [row]
+            });
           }
         });
       }
@@ -248,6 +246,7 @@ export default function SelectView(props) {
       className: "".concat(prefixCls, "-body")
     }, /*#__PURE__*/React.createElement(DataGrid, {
       dataSource: data,
+      onDataSourceChange: setData,
       columns: mSelectedCols,
       rowKey: rowKey,
       pagination: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.0-51",
+  "version": "1.0.0-53",
   "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;
-}