@lemon-fe/kits 1.0.0-136 → 1.0.0-138

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

@@ -44,10 +44,10 @@ export default class DataGrid<TData extends Record<string, any>> extends Compone
     };
     static EmptyCol: ColType<any>;
     static Editors: {
-        Text: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & import("./typings").TextEditorParams & React.RefAttributes<import("@ag-grid-community/react").ICellEditorReactComp>>;
+        Text: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & import("./typings").TextEditorParams<any> & React.RefAttributes<import("@ag-grid-community/react").ICellEditorReactComp>>;
         Date: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & import("./typings").DateEditorParams & React.RefAttributes<import("@ag-grid-community/react").ICellEditorReactComp>>;
         Number: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & import("./typings").NumberEditorParams<any> & React.RefAttributes<import("@ag-grid-community/react").ICellEditorReactComp>>;
-        Select: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "mode" | "allowClear" | "options" | "virtual" | "showSearch" | "listHeight"> & {
+        Select: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "allowClear" | "mode" | "options" | "virtual" | "showSearch" | "listHeight"> & {
             fieldNames?: {
                 label: string;
                 value: string;
@@ -65,7 +65,7 @@ export default class DataGrid<TData extends Record<string, any>> extends Compone
     private syncColRender;
     private syncSelection;
     private syncRowData;
-    private getColumDefs;
+    private getColumnDefs;
     private isClientMode;
     private clearReadyQueue;
     private afterReady;
@@ -100,6 +100,10 @@ export default class DataGrid<TData extends Record<string, any>> extends Compone
     private getMemoizedDetailCellParams;
     private getRowStyle;
     private cellFocused;
+    /**
+     *  防止点击checkbox之外的地方，导致其他行清空选中
+     */
+    private cellClicked;
     /**
      * 在表格失去焦点后，聚焦失去焦点的单元格
      * @returns

package/es/components/DataGrid/index.js

@@ -286,9 +286,12 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "cellEditingStop", function (evt) {
+      var onCellEditingStopped = _this.props.onCellEditingStopped;
       var data = evt.data;
 
       _this.validateRecord(data);
+
+      onCellEditingStopped === null || onCellEditingStopped === void 0 ? void 0 : onCellEditingStopped(evt);
     });
 
     _defineProperty(_assertThisInitialized(_this), "blurTimer", null);
@@ -394,8 +397,23 @@ var DataGrid = /*#__PURE__*/function (_Component) {
       };
     });
 
+    _defineProperty(_assertThisInitialized(_this), "cellClicked", function (evt) {
+      var _this$props4 = _this.props,
+          onCellClicked = _this$props4.onCellClicked,
+          suppressRowClickSelection = _this$props4.suppressRowClickSelection;
+      onCellClicked === null || onCellClicked === void 0 ? void 0 : onCellClicked(evt);
+
+      if (!suppressRowClickSelection && evt.node.selectable) {
+        if (evt.column.getColId() !== '__selection__') {
+          evt.node.setSelected(true, true);
+        } else if (!evt.node.isSelected()) {
+          evt.node.setSelected(true, false);
+        }
+      }
+    });
+
     _this.state = _objectSpread({
-      colDefs: _this.getColumDefs(),
+      colDefs: _this.getColumnDefs(),
       loading: false
     }, _this.getPagination());
     _this.store = new Store({
@@ -417,9 +435,9 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   _createClass(DataGrid, [{
     key: "getPagination",
     value: function getPagination() {
-      var _this$props4 = this.props,
-          pagination = _this$props4.pagination,
-          fetch = _this$props4.fetch;
+      var _this$props5 = this.props,
+          pagination = _this$props5.pagination,
+          fetch = _this$props5.fetch;
       var page = 1;
       var pageSize = 50;
       var total = 0;
@@ -452,16 +470,16 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     value: function componentDidUpdate(prevProps) {
       var _prevProps$rowSelecti;
 
-      var _this$props5 = this.props,
-          columns = _this$props5.columns,
-          rowSelection = _this$props5.rowSelection,
-          dataSource = _this$props5.dataSource,
-          context = _this$props5.context;
+      var _this$props6 = this.props,
+          columns = _this$props6.columns,
+          rowSelection = _this$props6.rowSelection,
+          dataSource = _this$props6.dataSource,
+          context = _this$props6.context;
 
       if (columns !== prevProps.columns) {
         this.syncColRender();
         this.setState({
-          colDefs: this.getColumDefs()
+          colDefs: this.getColumnDefs()
         });
       }
 
@@ -595,17 +613,17 @@ var DataGrid = /*#__PURE__*/function (_Component) {
       }
     }
   }, {
-    key: "getColumDefs",
-    value: function getColumDefs() {
+    key: "getColumnDefs",
+    value: function getColumnDefs() {
       var _this3 = this;
 
-      var _this$props6 = this.props,
-          _this$props6$columns = _this$props6.columns,
-          columns = _this$props6$columns === void 0 ? [] : _this$props6$columns,
-          rowActions = _this$props6.rowActions,
-          rowSelection = _this$props6.rowSelection,
-          _this$props6$defaultC = _this$props6.defaultColDef,
-          defaultCol = _this$props6$defaultC === void 0 ? {} : _this$props6$defaultC;
+      var _this$props7 = this.props,
+          _this$props7$columns = _this$props7.columns,
+          columns = _this$props7$columns === void 0 ? [] : _this$props7$columns,
+          rowActions = _this$props7.rowActions,
+          rowSelection = _this$props7.rowSelection,
+          _this$props7$defaultC = _this$props7.defaultColDef,
+          defaultCol = _this$props7$defaultC === void 0 ? {} : _this$props7$defaultC;
 
       var map = function map(cols) {
         return cols.map(function (item) {
@@ -800,6 +818,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
             checkboxSelection: checkboxSelection,
             showDisabledCheckboxes: true,
             headerCheckboxSelection: rowSelection.type !== 'radio',
+            spanHeaderHeight: true,
             resizable: false,
             sortable: false,
             suppressAutoSize: true,
@@ -1254,25 +1273,25 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     value: function render() {
       var _this10 = this;
 
-      var _this$props7 = this.props,
-          rowKey = _this$props7.rowKey,
-          fetch = _this$props7.fetch,
-          dataSource = _this$props7.dataSource,
-          rowActions = _this$props7.rowActions,
-          columns = _this$props7.columns,
-          autoLoad = _this$props7.autoLoad,
-          loadingProp = _this$props7.loading,
-          summary = _this$props7.summary,
-          detailCell = _this$props7.detailCell,
-          pagination = _this$props7.pagination,
-          rowSelection = _this$props7.rowSelection,
-          columnTypesProp = _this$props7.columnTypes,
-          defaultColDefProp = _this$props7.defaultColDef,
-          componentsProp = _this$props7.components,
-          sideBarProp = _this$props7.sideBar,
-          detailCellRendererParams = _this$props7.detailCellRendererParams,
-          context = _this$props7.context,
-          restProps = _objectWithoutProperties(_this$props7, _excluded4);
+      var _this$props8 = this.props,
+          rowKey = _this$props8.rowKey,
+          fetch = _this$props8.fetch,
+          dataSource = _this$props8.dataSource,
+          rowActions = _this$props8.rowActions,
+          columns = _this$props8.columns,
+          autoLoad = _this$props8.autoLoad,
+          loadingProp = _this$props8.loading,
+          summary = _this$props8.summary,
+          detailCell = _this$props8.detailCell,
+          pagination = _this$props8.pagination,
+          rowSelection = _this$props8.rowSelection,
+          columnTypesProp = _this$props8.columnTypes,
+          defaultColDefProp = _this$props8.defaultColDef,
+          componentsProp = _this$props8.components,
+          sideBarProp = _this$props8.sideBar,
+          detailCellRendererParams = _this$props8.detailCellRendererParams,
+          context = _this$props8.context,
+          restProps = _objectWithoutProperties(_this$props8, _excluded4);
 
       var _this$state2 = this.state,
           colDefs = _this$state2.colDefs,
@@ -1327,12 +1346,19 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         style: restProps.domLayout === 'autoHeight' ? {
           height: 'auto'
         } : undefined,
-        onBlur: this.handleBlur,
+        onBlur: function onBlur(e) {
+          if (e.currentTarget.contains(e.relatedTarget)) {
+            return;
+          }
+
+          _this10.handleBlur();
+        },
         onFocus: this.handleFocus
       }, /*#__PURE__*/React.createElement(AgGridReact, _extends({
         singleClickEdit: true,
         suppressPaginationPanel: true,
         suppressCopyRowsToClipboard: true,
+        suppressRowClickSelection: true,
         loadingOverlayComponent: this.LoadingOverlay,
         noRowsOverlayComponent: this.NoRowsOverlay,
         getMainMenuItems: this.getMainMenuItems,
@@ -1350,6 +1376,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         onCellValueChanged: this.cellValueChanged,
         onCellEditingStopped: this.cellEditingStop,
         onCellFocused: this.cellFocused,
+        onCellClicked: this.cellClicked,
         pagination: enablePagination,
         paginationPageSize: pageSize,
         columnDefs: colDefs,

package/es/components/Layout/index.less

@@ -6,6 +6,7 @@
   background: #fff;
 
   .@{ant-prefix}-modal-body & {
+    margin: -@padding-md;
     background: transparent;
   }
 
@@ -44,7 +45,6 @@
 
     &-body {
       height: 100%;
-      padding: @padding-md 0 @padding-md @padding-md;
       overflow-x: hidden;
     }
 
@@ -154,8 +154,4 @@
   & + .@{prefixCls}-section {
     padding-top: 0;
   }
-
-  .@{ant-prefix}-modal-body & {
-    margin: -@padding-md;
-  }
 }

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

@@ -1,5 +1,5 @@
-import type { ReactElement, ReactNode } from 'react';
 import type { ModalProps } from 'antd/lib/modal';
+import type { ReactElement, ReactNode } from 'react';
 export interface BasePopupProps {
     allowClear?: boolean;
     disabled?: boolean;

package/es/components/Popup/index.js

@@ -26,11 +26,11 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-import React, { useState, cloneElement, useRef, useEffect, useContext } from 'react';
 import { Modal, Input, message, ConfigProvider } from 'antd';
-import { prefixClassName } from "../utils";
-import SearchIcon from "../Icons/Search";
+import React, { useState, cloneElement, useRef, useEffect, useContext } from 'react';
 import Icons from "../Icons";
+import SearchIcon from "../Icons/Search";
+import { prefixClassName } from "../utils";
 var prefix = prefixClassName('popup');
 
 function Popup(props) {

package/es/components/Popup/index.less

@@ -2,9 +2,6 @@
   cursor: pointer;
 
   &-wrapper {
-    width: 100%;
-    height: 100%;
-
     .@{ant-prefix}-input-suffix {
       position: relative;
 

package/es/components/SiderTree/index.less

@@ -7,6 +7,15 @@
     flex-direction: column;
     box-sizing: border-box;
     height: 100%;
+
+    .@{ant-prefix}-tree-list-scrollbar {
+      right: -@padding-md !important;
+      display: block !important;
+    }
+
+    .@{ant-prefix}-tree-list-scrollbar-thumb {
+      background: #ddd !important;
+    }
   }
 
   &-menu-popover {
@@ -114,8 +123,7 @@
   }
 
   &-footer {
-    margin-top: 12px;
-    padding: 0 12px;
+    margin-top: @padding-md;
   }
 
   &-empty {
@@ -139,6 +147,25 @@
   }
 }
 
-.@{prefixCls}-layout-left .@{prefixCls}-tree-wrapper:first-child .@{prefixCls}-tree-header {
-  padding-right: 12px + @space-h;
+.@{prefixCls}-layout-left {
+  .@{prefixCls}-tree-wrapper {
+    padding: @padding-md;
+
+    &:first-child .@{prefixCls}-tree-header {
+      margin-right: @padding-md;
+    }
+  }
+
+  .@{prefixCls}-tree-tabs {
+    padding: @padding-md;
+  }
+
+  .@{ant-prefix}-tabs-tabpane > .@{prefixCls}-tree-wrapper {
+    padding: 0;
+  }
+
+  .@{prefixCls}-tree-body {
+    margin-right: -@padding-md;
+    padding-right: @padding-md;
+  }
 }

package/es/hooks/useBatchOperator/index.js

@@ -459,12 +459,10 @@ export default function useBatchOperate(options) {
     var otherOpts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var root = document.createDocumentFragment();
     var getPrefixCls = ctx.getPrefixCls,
-        iconPrefixCls = ctx.iconPrefixCls,
-        locale = ctx.locale;
+        iconPrefixCls = ctx.iconPrefixCls;
     render( /*#__PURE__*/React.createElement(ConfigProvider, {
       prefixCls: getPrefixCls(),
-      iconPrefixCls: iconPrefixCls,
-      locale: locale
+      iconPrefixCls: iconPrefixCls
     }, /*#__PURE__*/React.createElement(BatchOperate, _extends({
       rows: rows
     }, options, otherOpts, {

package/es/index.d.ts

@@ -4,8 +4,8 @@ export * from '@lemon-fe/utils';
 export { default as zhCN } from 'antd/es/locale/zh_CN';
 export * from './constants';
 export { default as init } from './init';
-export { default as BaseTable, } from './components/BaseTable';
-export type { BaseTableProps, ColumnsType, ColumnGroupType, ColumnType } from './components/BaseTable/typings';
+export { default as BaseTable } from './components/BaseTable';
+export type { BaseTableProps, ColumnsType, ColumnGroupType, ColumnType, } from './components/BaseTable/typings';
 export { default as EditableTable } from './components/EditableTable';
 export { default as EditableCell } from './components/EditableTable/EditableCell';
 export { default as EditableTableFormItem } from './components/EditableTable/EditableTableFormItem';

package/es/styles/overrides.less

@@ -68,6 +68,7 @@ a[title='站长统计'] {
 @modal-header-padding-horizontal: 0;
 @modal-header-padding-vertical: 0;
 @modal-header-border-width: 0;
+@modal-header-title-line-height: 24px;
 @modal-body-padding: 0;
 @modal-footer-padding-horizontal: 0;
 @modal-footer-padding-vertical: 0;
@@ -79,16 +80,16 @@ a[title='站长统计'] {
   padding: @padding-md;
 }
 
-.@{ant-prefix}-modal-header {
-  margin-bottom: @padding-md;
+.@{ant-prefix}-modal-confirm .@{ant-prefix}-modal-content {
+  padding: 20px;
 }
 
-.@{ant-prefix}-modal-footer {
-  margin-top: @padding-md;
+.@{ant-prefix}-modal-header {
+  padding-bottom: @padding-md;
 }
 
-.@{ant-prefix}-confirm .@{ant-prefix}-body {
-  padding: 20px;
+.@{ant-prefix}-modal-footer {
+  padding-top: @padding-md;
 }
 
 .@{ant-prefix}-modal-confirm-body > .anticon {
@@ -232,6 +233,7 @@ a[title='站长统计'] {
   &-indent {
     &-unit {
       width: @tree-node-indent-width;
+      vertical-align: top;
     }
   }
 

package/package.json

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