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

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;

package/es/components/DataGrid/index.js

@@ -395,7 +395,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     });
 
     _this.state = _objectSpread({
-      colDefs: _this.getColumDefs(),
+      colDefs: _this.getColumnDefs(),
       loading: false
     }, _this.getPagination());
     _this.store = new Store({
@@ -461,7 +461,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
       if (columns !== prevProps.columns) {
         this.syncColRender();
         this.setState({
-          colDefs: this.getColumDefs()
+          colDefs: this.getColumnDefs()
         });
       }
 
@@ -595,8 +595,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
       }
     }
   }, {
-    key: "getColumDefs",
-    value: function getColumDefs() {
+    key: "getColumnDefs",
+    value: function getColumnDefs() {
       var _this3 = this;
 
       var _this$props6 = this.props,
@@ -800,6 +800,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
             checkboxSelection: checkboxSelection,
             showDisabledCheckboxes: true,
             headerCheckboxSelection: rowSelection.type !== 'radio',
+            spanHeaderHeight: true,
             resizable: false,
             sortable: false,
             suppressAutoSize: true,
@@ -1327,7 +1328,13 @@ 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,

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/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

@@ -79,16 +79,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 +232,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-137",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",