@lemon-fe/kits 1.0.0-164 → 1.0.0-166

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

@@ -2,11 +2,18 @@ import type { ICellEditorParams } from '@ag-grid-community/core';
 import type { ICellEditorReactComp } from '@ag-grid-community/react';
 import { type Moment } from 'moment';
 import React from 'react';
-export interface DateEditorParams {
-    format: string;
+export interface DateEditorParams<TData = any> {
+    format?: string;
     disabled?: boolean;
     disabledDate?: (current: Moment) => boolean;
     allowClear?: boolean;
+    /**
+     * 可以在不使用disabledDate的情况下，进行数值校验，可以用于错误提示
+     * @param newValue
+     * @param data
+     * @returns
+     */
+    isCancelAfterEnd?: (newValue: Moment | null, data: TData) => boolean;
 }
-declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any, any> & DateEditorParams & React.RefAttributes<ICellEditorReactComp>>;
+declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any, any> & DateEditorParams<any> & React.RefAttributes<ICellEditorReactComp>>;
 export default _default;

package/es/components/DataGrid/cell-editors/Date.js

@@ -29,7 +29,9 @@ export default /*#__PURE__*/forwardRef(function DateEditor(props, ref) {
       api = props.api,
       disabledDate = props.disabledDate,
       _props$allowClear = props.allowClear,
-      allowClear = _props$allowClear === void 0 ? false : _props$allowClear;
+      allowClear = _props$allowClear === void 0 ? false : _props$allowClear,
+      _isCancelAfterEnd = props.isCancelAfterEnd,
+      node = props.node;
 
   var _useState = useState(props.value ? moment(props.value, format) : null),
       _useState2 = _slicedToArray(_useState, 2),
@@ -50,12 +52,19 @@ export default /*#__PURE__*/forwardRef(function DateEditor(props, ref) {
 
   useImperativeHandle(ref, function () {
     return {
-      getValue: getValue
+      getValue: getValue,
+      isCancelAfterEnd: function isCancelAfterEnd() {
+        if (_isCancelAfterEnd) {
+          return _isCancelAfterEnd(value, node.data);
+        }
+
+        return false;
+      }
     };
   });
   return /*#__PURE__*/React.createElement(EditorWrapper, null, /*#__PURE__*/React.createElement(DatePicker, {
     onKeyDown: function onKeyDown(e) {
-      if (isEdited) {
+      if (isEdited.current) {
         navigateCell(_objectSpread(_objectSpread({}, props), {}, {
           event: e
         }));

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

@@ -48,7 +48,7 @@ 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<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>>;
+        Date: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & import("./typings").DateEditorParams<any> & 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" | "allowClear" | "mode" | "options" | "virtual" | "showSearch" | "listHeight"> & {
             fieldNames?: {

package/es/components/DataGrid/index.js

@@ -1,7 +1,7 @@
 var _excluded = ["validator"],
     _excluded2 = ["title", "dataIndex", "type", "render", "ellipsis", "cellRenderer", "cellRendererParams", "className", "sorter", "sortable", "editable", "suppressKeyboardEvent"],
     _excluded3 = ["title", "children"],
-    _excluded4 = ["rowKey", "fetch", "dataSource", "rowActions", "columns", "autoLoad", "loading", "summary", "detailCell", "pagination", "rowSelection", "columnTypes", "defaultColDef", "components", "sideBar", "detailCellRendererParams", "context", "showSearch"];
+    _excluded4 = ["rowKey", "fetch", "dataSource", "rowActions", "columns", "autoLoad", "loading", "summary", "detailCell", "pagination", "rowSelection", "columnTypes", "defaultColDef", "components", "sideBar", "detailCellRendererParams", "context", "showSearch", "cellDisplayFlex"];
 
 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); }
 
@@ -1315,7 +1315,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this10 = this;
+      var _this10 = this,
+          _classNames;
 
       var _this$props8 = this.props,
           rowKey = _this$props8.rowKey,
@@ -1336,6 +1337,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           detailCellRendererParams = _this$props8.detailCellRendererParams,
           context = _this$props8.context,
           showSearch = _this$props8.showSearch,
+          cellDisplayFlex = _this$props8.cellDisplayFlex,
           restProps = _objectWithoutProperties(_this$props8, _excluded4);
 
       var _this$state2 = this.state,
@@ -1393,7 +1395,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
       return /*#__PURE__*/React.createElement(GridStoreContext.Provider, {
         value: this.store
       }, /*#__PURE__*/React.createElement("div", {
-        className: classNames('ag-theme-lemon', "".concat(prefix()), _defineProperty({}, prefix('group-rows'), restProps.groupDisplayType === 'groupRows')),
+        className: classNames('ag-theme-lemon', "".concat(prefix()), (_classNames = {}, _defineProperty(_classNames, prefix('group-rows'), restProps.groupDisplayType === 'groupRows'), _defineProperty(_classNames, prefix('cell-flex'), cellDisplayFlex), _classNames)),
         style: restProps.domLayout === 'autoHeight' ? {
           height: 'auto'
         } : undefined,

package/es/components/DataGrid/index.less

@@ -15,6 +15,21 @@
   height: 100%;
   min-height: 0;
 
+  &-cell-flex {
+    .ag-cell {
+      display: flex;
+      align-items: center;
+    }
+
+    .ag-ltr .ag-right-aligned-cell {
+      justify-content: space-between;
+    }
+
+    .ag-rtl .ag-right-aligned-cell {
+      flex-direction: row-reverse;
+    }
+  }
+
   &-column-sorter {
     display: inline-flex;
     flex-direction: column;
@@ -36,6 +51,7 @@
   }
 
   &-center-aligned-cell {
+    justify-content: center;
     text-align: center;
   }
 

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

@@ -23,11 +23,14 @@ interface EditorParamsType<T extends string, K extends Record<string, any>> {
     params?: K;
     component?: string;
 }
-declare type EditorType<TData> = EditorParamsType<'text-editor', TextEditorParams> | EditorParamsType<'number-editor', NumberEditorParams<TData>> | EditorParamsType<'date-editor', DateEditorParams> | EditorParamsType<'select-editor', SelectEditorParams> | EditorParamsType<'row-editor', RowEditorParams<TData>>;
+declare type EditorType<TData> = EditorParamsType<'text-editor', TextEditorParams<TData>> | EditorParamsType<'number-editor', NumberEditorParams<TData>> | EditorParamsType<'date-editor', DateEditorParams<TData>> | EditorParamsType<'select-editor', SelectEditorParams> | EditorParamsType<'row-editor', RowEditorParams<TData>>;
 export interface ColType<TData> extends Omit<ColDef<TData>, 'editable'> {
     title?: ReactNode | ((params: IHeaderParams) => ReactNode);
     dataIndex?: string;
     className?: string;
+    /**
+     * @deprecated
+     */
     sorter?: boolean | ((a: TData, b: TData) => number);
     ellipsis?: boolean;
     /**
@@ -193,4 +196,8 @@ export interface DataGridProps<TData> extends Omit<AgGridReactProps<TData>, 'row
      * @description 显示底部搜索栏，只支持非远程模式
      */
     showSearch?: boolean | DataGridSearch;
+    /**
+     * @description 单元格是否表现成弹性盒子，从而便于垂直，此时也会导致文本ellipsis失效
+     */
+    cellDisplayFlex?: boolean;
 }

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

@@ -7,7 +7,7 @@ declare namespace Filter {
         title: string;
         value: Record<string | number, any>;
     }>(getData: (storageKey: string) => T[] | Promise<T[]>, setData: (storageKey: string, data: T[], action: {
-        type: "set" | "delete";
+        type: "delete" | "set";
         target: T;
     }) => void | Promise<void>) => void;
     var defaultProps: Partial<FilterProps<Record<string, any>>>;

package/es/components/Filter/index.js

@@ -109,8 +109,11 @@ function setStorage(getData, setData) {
   setStorageData = setData;
 }
 
+var defaultData = [];
+
 function Filter(props) {
-  var data = props.data,
+  var _props$data = props.data,
+      data = _props$data === void 0 ? defaultData : _props$data,
       defaultValueProp = props.defaultValue,
       onChange = props.onChange,
       value = props.value,

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

@@ -25,7 +25,7 @@ export interface FilterItemType<T = any> {
 export type ActionType = 'submit' | 'reset';
 
 export interface FilterProps<T extends Record<string, any> = Record<string, any>> {
-  data: FilterItemType<T>[];
+  data?: FilterItemType<T>[];
   defaultValue?: T;
   value?: T;
   /**

package/es/components/Popup/index.js

@@ -213,16 +213,15 @@ function Popup(props) {
     destroyOnClose: true,
     open: shouldModalOpen,
     width: 1000,
+    bodyStyle: {
+      height: 500
+    },
     centered: true,
     onCancel: handleCancel,
     afterClose: handleAfterClose,
     onOk: function onOk() {
       return handleOk();
     },
-    bodyStyle: {
-      height: 550,
-      padding: 0
-    },
     footer: renderFooter ? renderFooter({
       onCancel: handleCancel,
       onOk: function onOk() {

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

@@ -1,7 +1,7 @@
 import type { CSSProperties, ReactElement } from 'react';
-import type { ColType, PaginationType, SortType } from '../DataGrid/typings';
+import type { ColType, DataGridProps, PaginationType, SortType } from '../DataGrid/typings';
 import type { FilterProps } from '../Filter/typings';
-interface Props<RecordType, ParamsType extends Record<string, any>> {
+interface Props<RecordType, ParamsType extends Record<string, any>> extends Pick<DataGridProps<RecordType>, 'defaultColDef' | 'rowHeight' | 'cellDisplayFlex' | 'isRowSelectable'> {
     value?: RecordType[];
     onChange?: (value: RecordType[], rowDoubleClicked?: boolean) => void;
     /**

package/es/components/SelectView/index.js

@@ -26,7 +26,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import { Tabs, Button } from 'antd';
+import { Tabs } from 'antd';
 import { get } from 'lodash';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import DataGrid from "../DataGrid";
@@ -51,7 +51,11 @@ export default function SelectView(props) {
       dataSource = props.dataSource,
       rowFilter = props.rowFilter,
       loading = props.loading,
-      readOnly = props.readOnly;
+      readOnly = props.readOnly,
+      defaultColDef = props.defaultColDef,
+      rowHeight = props.rowHeight,
+      cellDisplayFlex = props.cellDisplayFlex,
+      isRowSelectable = props.isRowSelectable;
   var prefixCls = "".concat(PREFIX_CLS, "-select-view");
 
   var _useState = useState(value || emptyValue),
@@ -216,6 +220,10 @@ export default function SelectView(props) {
           handleChangeData([node.id], [node.data], true);
         }
       },
+      rowHeight: rowHeight,
+      defaultColDef: defaultColDef,
+      cellDisplayFlex: cellDisplayFlex,
+      isRowSelectable: isRowSelectable,
       dataSource: rows,
       columns: columns,
       loading: loading,
@@ -233,6 +241,9 @@ export default function SelectView(props) {
       className: "".concat(prefixCls, "-body")
     }, /*#__PURE__*/React.createElement(DataGrid, {
       dataSource: data,
+      defaultColDef: defaultColDef,
+      rowHeight: rowHeight,
+      cellDisplayFlex: cellDisplayFlex,
       onDataSourceChange: setData,
       columns: mSelectedCols,
       rowKey: rowKey,
@@ -262,8 +273,7 @@ export default function SelectView(props) {
       tabBarGutter: 20,
       onChange: setTabFlag,
       tabBarExtraContent: {
-        right: tabFlag === 'selected' && !readOnly ? /*#__PURE__*/React.createElement(Button, {
-          type: "link",
+        right: tabFlag === 'selected' && !readOnly ? /*#__PURE__*/React.createElement("a", {
           onClick: handleClear
         }, "\u6E05\u7A7A") : null
       }

package/es/components/SelectView/index.less

@@ -15,7 +15,7 @@
   }
 
   &-sider {
-    width: 228px;
+    width: 200px;
     padding: @padding-md @padding-md @padding-md 0;
     overflow: auto;
     border-right: 1px solid @border-color-split;

package/es/styles/overrides.less

@@ -168,7 +168,7 @@ a[title='站长统计'] {
 @input-padding-vertical-base: (
     round(((@input-height-base - @font-size-base * @line-height-base) / 2) * 10) / 10
   ) - @border-width-base;
-@input-disabled-color: fade(#333, 70);
+@input-disabled-color: fade(#333, 50);
 @input-disabled-bg: #fff;
 
 .@{ant-prefix}-input-prefix,
@@ -189,7 +189,7 @@ a[title='站长统计'] {
   }
 
   &&-disabled &-suffix {
-    color: fade(#333, 49);
+    color: fade(#333, 40);
   }
 }
 

package/package.json

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