@lemon-fe/kits 1.0.0-125 → 1.0.0-127

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

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import type { ComponentOption, FilterProps } from './typings';
 declare function Filter<T extends Record<string, any> = Record<string, any>>(props: FilterProps<T>): JSX.Element;
 declare namespace Filter {
@@ -7,9 +7,10 @@ declare namespace Filter {
         title: string;
         value: Record<string | number, any>;
     }>(getData: (storageKey: string) => T[] | Promise<T[]>, setData: (storageKey: string, data: T[], action: {
-        type: "delete" | "set";
+        type: "set" | "delete";
         target: T;
     }) => void | Promise<void>) => void;
     var defaultProps: Partial<FilterProps<Record<string, any>>>;
 }
-export default Filter;
+declare const _default: React.MemoExoticComponent<typeof Filter>;
+export default _default;

package/es/components/Filter/index.js

@@ -38,7 +38,7 @@ import { useDebounce, useRequest } from '@lemon-fe/hooks';
 import { Button, Checkbox, Form, Input, Popover, Space, Modal, message, Select, Empty, InputNumber } from 'antd';
 import classNames from 'classnames';
 import ResizeObserver from 'rc-resize-observer';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { memo, useEffect, useMemo, useState } from 'react';
 import Dropdown from "../Dropdown";
 import DurationPicker from "../DurationPicker";
 import FormLayout from "../FormLayout";
@@ -190,14 +190,14 @@ function Filter(props) {
       collapsed = _useState14[0],
       setCollapsed = _useState14[1];
 
-  var _useRequest = useRequest(function () {
+  useRequest(function () {
     if (!storageKey) {
       return null;
     }
 
     return getStorageData(storageKey);
   }, {
-    loadingState: false,
+    manual: false,
     onSuccess: function onSuccess(res) {
       if (res !== null) {
         setTabs(function (prev) {
@@ -205,12 +205,7 @@ function Filter(props) {
         });
       }
     }
-  }),
-      init = _useRequest.run;
-
-  useEffect(function () {
-    init();
-  }, []);
+  });
   useEffect(function () {
     if (value) {
       form.setFieldsValue(value);
@@ -357,7 +352,7 @@ function Filter(props) {
       var result = _objectSpread(_objectSpread({}, emptyValue), tabs[index].value);
 
       form.setFieldsValue(result);
-      handleFinish(result, 'reset');
+      handleFinish(form.getFieldsValue(), 'reset');
     }
   };
 
@@ -680,4 +675,4 @@ function Filter(props) {
 Filter.setComponents = setComponents;
 Filter.setStorage = setStorage;
 Filter.defaultProps = {};
-export default Filter;
+export default /*#__PURE__*/memo(Filter);

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

@@ -26,6 +26,9 @@ declare namespace FormLayout {
         children?: React.ReactNode;
     }>;
     var Col: React.FC<{
+        /**
+         * @description 最大24，设计上6为一列
+         */
         span?: number | undefined;
         children?: React.ReactNode;
         className?: string | undefined;

package/es/components/FormLayout/index.js

@@ -4,8 +4,8 @@ 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; }
 
-import React from 'react';
 import classNames from 'classnames';
+import React from 'react';
 import { prefixClassName } from "../utils";
 var prefix = prefixClassName('form');
 

package/es/components/FormLayout/index.less

@@ -58,6 +58,7 @@
 
       &-control {
         flex: 1 1 0;
+        min-width: 0;
       }
     }
 

package/es/components/Icons/Tip.d.ts

@@ -1,5 +1,5 @@
-import type { ComponentProps } from 'react';
 import Icon from '@ant-design/icons';
+import type { ComponentProps } from 'react';
 export default function Tip(props: {
     type?: 'success' | 'error' | 'warning' | 'info';
 } & ComponentProps<typeof Icon>): JSX.Element;

package/es/components/Icons/Tip.js

@@ -6,131 +6,121 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 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); }
 
-import React from 'react';
 import Icon from '@ant-design/icons';
+import React from 'react';
 
 var ErrorSvg = function ErrorSvg(props) {
   return /*#__PURE__*/React.createElement("svg", _extends({
-    width: "1em",
-    height: "1em",
     xmlns: "http://www.w3.org/2000/svg",
     viewBox: "0 0 20 20"
   }, props), /*#__PURE__*/React.createElement("g", {
     fill: "none",
     fillRule: "evenodd"
   }, /*#__PURE__*/React.createElement("circle", {
-    fill: "#EC4510",
     cx: "10",
     cy: "10",
-    r: "10"
-  }), /*#__PURE__*/React.createElement("g", {
-    transform: "rotate(45 3.172 12.828)",
-    fill: "#FFF"
-  }, /*#__PURE__*/React.createElement("rect", {
-    x: "4",
-    width: "4",
-    height: "12",
-    rx: "1"
+    r: "10",
+    fill: "#FF4128"
+  }), /*#__PURE__*/React.createElement("rect", {
+    width: "2",
+    height: "10",
+    x: "9",
+    y: "5",
+    fill: "#FFF",
+    rx: "1",
+    transform: "rotate(45 10 10)"
   }), /*#__PURE__*/React.createElement("rect", {
-    transform: "rotate(90 6 6)",
-    x: "4",
-    width: "4",
-    height: "12",
-    rx: "1"
-  }))));
+    width: "2",
+    height: "10",
+    x: "9",
+    y: "5",
+    fill: "#FFF",
+    rx: "1",
+    transform: "scale(-1 1) rotate(45 0 -14.142)"
+  })));
 };
 
 var SuccessSvg = function SuccessSvg(props) {
   return /*#__PURE__*/React.createElement("svg", _extends({
-    width: "1em",
-    height: "1em",
     xmlns: "http://www.w3.org/2000/svg",
     viewBox: "0 0 20 20"
   }, props), /*#__PURE__*/React.createElement("g", {
     fill: "none",
     fillRule: "evenodd"
   }, /*#__PURE__*/React.createElement("circle", {
-    fill: "#1ED07C",
     cx: "10",
     cy: "10",
-    r: "10"
-  }), /*#__PURE__*/React.createElement("g", {
-    transform: "rotate(45 3.379 14.743)",
-    fill: "#FFF"
-  }, /*#__PURE__*/React.createElement("rect", {
-    x: "4",
-    width: "4",
-    height: "12",
-    rx: "1"
-  }), /*#__PURE__*/React.createElement("rect", {
-    transform: "rotate(90 4 10)",
-    x: "2",
-    y: "6",
-    width: "4",
-    height: "8",
-    rx: "1"
-  }))));
+    r: "10",
+    fill: "#22C07D"
+  }), /*#__PURE__*/React.createElement("path", {
+    stroke: "#FFF",
+    strokeLinecap: "round",
+    strokeLinejoin: "round",
+    strokeWidth: "2",
+    d: "m14.243 7.586-5.657 5.657-2.829-2.829"
+  })));
 };
 
 var WarningSvg = function WarningSvg(props) {
   return /*#__PURE__*/React.createElement("svg", _extends({
-    width: "1em",
-    height: "1em",
     xmlns: "http://www.w3.org/2000/svg",
     viewBox: "0 0 20 20"
   }, props), /*#__PURE__*/React.createElement("g", {
     fill: "none",
     fillRule: "evenodd"
   }, /*#__PURE__*/React.createElement("circle", {
-    fill: "#FAAD14",
     cx: "10",
     cy: "10",
-    r: "10"
+    r: "10",
+    fill: "#FF7F18"
   }), /*#__PURE__*/React.createElement("rect", {
+    width: "2",
+    height: "8",
+    x: "9",
+    y: "4",
     fill: "#FFF",
-    x: "8",
-    y: "13",
-    width: "4",
-    height: "4",
-    rx: "1"
+    rx: "1",
+    transform: "matrix(-1 0 0 1 20 0)"
   }), /*#__PURE__*/React.createElement("rect", {
+    width: "2",
+    height: "2",
+    x: "9",
+    y: "13",
     fill: "#FFF",
-    x: "8",
-    y: "4",
-    width: "4",
-    height: "8",
-    rx: "1"
+    rx: "1",
+    transform: "matrix(-1 0 0 1 20 0)"
   })));
 };
 
 var InfoSvg = function InfoSvg(props) {
   return /*#__PURE__*/React.createElement("svg", _extends({
-    width: "1em",
-    height: "1em",
     xmlns: "http://www.w3.org/2000/svg",
     viewBox: "0 0 20 20"
   }, props), /*#__PURE__*/React.createElement("g", {
     fill: "none",
-    fillRule: "evenodd"
+    fillRule: "evenodd",
+    transform: "rotate(-180 10 10)"
   }, /*#__PURE__*/React.createElement("circle", {
-    fill: "#2357DF",
     cx: "10",
     cy: "10",
-    r: "10"
+    r: "10",
+    fill: "#226BF3"
   }), /*#__PURE__*/React.createElement("rect", {
-    fill: "#FFF",
-    x: "8",
+    width: "2",
+    height: "8",
+    x: "9",
     y: "4",
-    width: "4",
-    height: "4",
-    rx: "1"
+    fill: "#FFF",
+    rx: "1",
+    transform: "matrix(-1 0 0 1 20 0)"
   }), /*#__PURE__*/React.createElement("rect", {
+    width: "2",
+    height: "2",
+    x: "9",
+    y: "13",
     fill: "#FFF",
-    x: "8",
-    y: "9",
-    width: "4",
-    height: "8",
-    rx: "1"
+    rx: "1",
+    transform: "matrix(-1 0 0 1 20 0)"
   })));
 };
 

package/es/components/Layout/index.less

@@ -5,6 +5,10 @@
   height: 100%;
   background: #fff;
 
+  .@{ant-prefix}-modal-body & {
+    background: transparent;
+  }
+
   &-header {
     min-height: (46px - @space-v);
     padding: @space-v @space-h 0;

package/es/hooks/useBatchOperator/index.d.ts

@@ -1,15 +1,22 @@
 import { type ReactElement } from 'react';
 import type { Key } from 'react';
 import type { ColType, DataGridProps } from "../../components/DataGrid/typings";
-declare type Result<ResultType = unknown> = void | string | Error | symbol | ResultType;
-export default function useBatchOperate<RecordType extends Record<string, any> = Record<string, any>, ResultType = unknown>(options: {
+declare type Result<ResultType> = Error | symbol | ResultType;
+export default function useBatchOperate<RecordType extends Record<string, any> = Record<string, any>, ResultType = any>(options: {
     modalTitle: string;
-    handler: (record: RecordType) => Promise<string | void | ResultType>;
+    handler: (record: RecordType) => Promise<ResultType>;
     columns?: ColType<RecordType>[];
     rowKey: DataGridProps<RecordType>['rowKey'];
-    onClose?: (results: Map<Key, Result<ResultType>>) => void;
+    /**
+     * 关闭时触发
+     * @param success 成功的结果
+     * @returns
+     */
+    onClose?: (success: Map<Key, ResultType>, others: {
+        results: Map<Key, Result<ResultType>>;
+    }) => void;
     /** 弹窗关闭前的检验，返回true校验通过关闭弹窗，false校验不通过 */
-    onBeforeClose?: (results: Map<Key, Result>) => Promise<boolean>;
+    onBeforeClose?: (results: Map<Key, Result<ResultType>>) => Promise<boolean>;
     /**
      * 自定义渲染结果，不要依赖上下文
      * @param params
@@ -28,7 +35,7 @@ export default function useBatchOperate<RecordType extends Record<string, any> =
         };
         reload: () => any;
     }) => ReactElement | string | number | null;
-    isError?: () => boolean;
+    isError?: (result: ResultType) => boolean;
 }): {
     node: JSX.Element;
     run: (rows: RecordType[]) => void;

package/es/hooks/useBatchOperator/index.js

@@ -45,7 +45,8 @@ export default function useBatchOperate(options) {
       onClose = options.onClose,
       onBeforeClose = options.onBeforeClose,
       rowKey = options.rowKey,
-      renderResult = options.renderResult;
+      renderResult = options.renderResult,
+      isError = options.isError;
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -215,37 +216,56 @@ export default function useBatchOperate(options) {
 
   var handleClose = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      var beforeCloseResult;
+      var value;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              if (!onBeforeClose) {
-                _context3.next = 6;
+              _context3.t0 = onBeforeClose;
+
+              if (!_context3.t0) {
+                _context3.next = 5;
                 break;
               }
 
-              _context3.next = 3;
+              _context3.next = 4;
               return onBeforeClose(results);
 
-            case 3:
-              beforeCloseResult = _context3.sent;
+            case 4:
+              _context3.t0 = !_context3.sent;
 
-              if (beforeCloseResult) {
-                _context3.next = 6;
+            case 5:
+              if (!_context3.t0) {
+                _context3.next = 7;
                 break;
               }
 
               return _context3.abrupt("return");
 
-            case 6:
+            case 7:
               setVisible(false);
 
               if (onClose) {
-                onClose(results);
+                value = _toConsumableArray(results).filter(function (_ref4) {
+                  var _ref5 = _slicedToArray(_ref4, 2),
+                      val = _ref5[1];
+
+                  if (val instanceof Error || val === loading) {
+                    return false;
+                  }
+
+                  if (isError !== undefined) {
+                    return !isError(val);
+                  }
+
+                  return true;
+                });
+                onClose(new Map(value), {
+                  results: results
+                });
               }
 
-            case 8:
+            case 9:
             case "end":
               return _context3.stop();
           }
@@ -263,8 +283,8 @@ export default function useBatchOperate(options) {
       title: '编号',
       colId: 'id',
       dataIndex: typeof rowKey === 'string' ? rowKey : undefined,
-      render: function render(_1, _2, _3, _ref4) {
-        var node = _ref4.node;
+      render: function render(_1, _2, _3, _ref6) {
+        var node = _ref6.node;
         return node.id || '';
       }
     }];
@@ -272,9 +292,9 @@ export default function useBatchOperate(options) {
       title: '',
       colId: '__delete__',
       width: 32,
-      render: function render(_1, _2, index, _ref5) {
-        var context = _ref5.context,
-            node = _ref5.node;
+      render: function render(_1, _2, index, _ref7) {
+        var context = _ref7.context,
+            node = _ref7.node;
         var key = node.id;
         return /*#__PURE__*/React.createElement(Icons.Delete, {
           onClick: function onClick() {
@@ -313,9 +333,9 @@ export default function useBatchOperate(options) {
       dataIndex: 'status',
       flex: 1,
       resizable: false,
-      render: function render(_, record, index, _ref6) {
-        var context = _ref6.context,
-            node = _ref6.node;
+      render: function render(_, record, index, _ref8) {
+        var context = _ref8.context,
+            node = _ref8.node;
         var key = node.id;
         var result = context.results.get(key);
 
@@ -377,7 +397,7 @@ export default function useBatchOperate(options) {
   var node = /*#__PURE__*/React.createElement(Modal, {
     title: modalTitle,
     open: visible,
-    width: 896,
+    width: 1000,
     centered: true,
     onCancel: handleClose,
     footer: null,

package/es/init.js

@@ -6,15 +6,14 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 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); }
 
-import React from 'react';
-import { message, Modal, Select, ConfigProvider, Result, Button, DatePicker, Cascader, TreeSelect, Empty, Menu } from 'antd';
 import { config } from '@lemon-fe/hooks';
-import PageLoading from "./components/PageLoading";
+import { message, Modal, Select, ConfigProvider, Result, Button, DatePicker, Cascader, TreeSelect, Empty, Menu } from 'antd';
+import React from 'react';
 import Icons from "./components/Icons";
+import PageLoading from "./components/PageLoading";
 import empty from "./styles/empty.png";
 var Tip = Icons.Tip,
     Down = Icons.Down,
-    BigTip = Icons.BigTip,
     Close = Icons.Close,
     Clear = Icons.Clear;
 export default function init() {
@@ -71,10 +70,11 @@ export default function init() {
 
     Modal[item] = function () {
       return modalAPI(_objectSpread({
-        icon: /*#__PURE__*/React.createElement(BigTip, {
+        title: '提示',
+        width: 400,
+        icon: /*#__PURE__*/React.createElement(Tip, {
           type: item
-        }),
-        title: '提示'
+        })
       }, arguments.length <= 0 ? undefined : arguments[0]));
     };
   });
@@ -82,9 +82,10 @@ export default function init() {
 
   Modal.confirm = function () {
     return modalConfirm(_objectSpread({
-      icon: /*#__PURE__*/React.createElement(BigTip, {
+      icon: /*#__PURE__*/React.createElement(Tip, {
         type: "info"
       }),
+      width: 400,
       title: '提示'
     }, arguments.length <= 0 ? undefined : arguments[0]));
   };

package/es/styles/overrides.less

@@ -66,57 +66,25 @@ a[title='站长统计'] {
 
 /** modal */
 
-.@{ant-prefix}-modal-content {
-  border-radius: 8px;
-}
+@modal-header-padding-horizontal: @padding-md;
+@modal-body-padding: @padding-md;
+@modal-footer-padding-horizontal: @padding-md;
+@modal-confirm-body-padding: 20px;
+@modal-border-radius: 8px;
 
-.@{ant-prefix}-modal-header {
-  border-radius: 8px 8px 0 0;
+.@{ant-prefix}-modal-confirm-body > .anticon {
+  margin-right: 8px;
 }
 
-.@{ant-prefix}-modal-confirm {
-  .@{ant-prefix}-modal-body {
-    padding: 0;
-  }
-
-  .@{ant-prefix}-modal-confirm-body {
-    padding: 40px 48px;
-    overflow: hidden;
-
-    & > img:first-child {
-      position: absolute;
-      top: 40px;
-      left: 48px;
-    }
-  }
-
-  .@{ant-prefix}-modal-confirm-btns {
-    float: none;
-    margin-top: 0;
-    padding: 10px 16px;
-    text-align: right;
-    background: transparent;
-    border-top: 1px solid rgba(0, 0, 0, 0.06);
-    border-radius: 0 0 2px 2px;
-
-    & > .@{ant-prefix}-btn {
-      min-width: 72px;
-    }
-  }
-
-  .@{ant-prefix}-modal-confirm-title {
-    float: none;
-    margin-left: 56px;
-    font-weight: 600;
-    line-height: 24px;
-  }
+.@{ant-prefix}-modal-confirm-body
+  > .anticon
+  + .@{ant-prefix}-modal-confirm-title
+  + .@{ant-prefix}-modal-confirm-content {
+  margin-left: 30px;
+}
 
-  .@{ant-prefix}-modal-confirm-content {
-    float: none;
-    margin: 2px 0 0 56px;
-    color: rgba(51, 51, 51, 0.5);
-    line-height: 22px;
-  }
+.@{ant-prefix}-modal-confirm-body .@{ant-prefix}-modal-confirm-content {
+  color: fade(#333, 70);
 }
 
 /** pagination */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.0-125",
+  "version": "1.0.0-127",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -19,6 +19,7 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
+  "sideEffects": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "main": "es/index.js",