@lemon-fe/kits 1.0.2-0 → 1.0.2

package/es/components/SelectView/index.js

@@ -26,12 +26,12 @@ 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 { Spin, Tabs } from 'antd';
 import { get } from 'lodash';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import DataGrid from "../DataGrid";
 import Filter from "../Filter";
-import { PREFIX_CLS } from "../../constants";
+import { prefixClassName } from "../utils";
 export default function SelectView(props) {
   var emptyValue = useMemo(function () {
     return [];
@@ -50,9 +50,14 @@ export default function SelectView(props) {
       filter = props.filter,
       dataSource = props.dataSource,
       rowFilter = props.rowFilter,
-      loading = props.loading,
-      readOnly = props.readOnly;
-  var prefixCls = "".concat(PREFIX_CLS, "-select-view");
+      loadingProp = props.loading,
+      readOnly = props.readOnly,
+      defaultColDef = props.defaultColDef,
+      rowHeight = props.rowHeight,
+      cellDisplayFlex = props.cellDisplayFlex,
+      isRowSelectable = props.isRowSelectable,
+      checkSearchParams = props.checkSearchParams;
+  var prefix = prefixClassName("select-view");
 
   var _useState = useState(value || emptyValue),
       _useState2 = _slicedToArray(_useState, 2),
@@ -76,6 +81,13 @@ export default function SelectView(props) {
       rows = _useState8[0],
       setRows = _useState8[1];
 
+  var _useState9 = useState(false),
+      _useState10 = _slicedToArray(_useState9, 2),
+      loading = _useState10[0],
+      setLoading = _useState10[1];
+
+  var cParams = (filter === null || filter === void 0 ? void 0 : filter.value) || params;
+
   var getRowKey = function getRowKey(item) {
     var _get;
 
@@ -93,28 +105,32 @@ export default function SelectView(props) {
     return fetch({
       current: current,
       pageSize: pageSize,
-      params: params,
+      params: cParams,
       sort: sort
     });
   } : undefined;
   useEffect(function () {
-    setRows(dataSource);
-  }, [dataSource]);
-  useEffect(function () {
-    if (list.current !== null) {
-      if (dataSource !== undefined && rowFilter !== undefined) {
-        setRows(dataSource.filter(function (row) {
-          return rowFilter(row, params);
-        }));
+    var mDataSource = dataSource;
 
-        if (list.current.ready()) {
-          list.current.api.paginationGoToFirstPage();
-        }
-      } else if (request !== undefined) {
+    if (rowFilter !== undefined && dataSource !== undefined) {
+      mDataSource = dataSource.filter(function (row) {
+        return rowFilter(row, cParams);
+      });
+    }
+
+    setRows(mDataSource);
+
+    if (list.current !== null) {
+      if (mDataSource !== undefined) {
+        var grid = list.current;
+        grid.afterReady(function () {
+          grid.api.paginationGoToFirstPage();
+        });
+      } else {
         list.current.fetch();
       }
     }
-  }, [params, dataSource]);
+  }, [cParams, dataSource]);
   useEffect(function () {
     setData(value || emptyValue);
   }, [value]);
@@ -147,6 +163,10 @@ export default function SelectView(props) {
       filter.onChange(mParams, 'submit');
     }
 
+    if (checkSearchParams && !checkSearchParams(mParams)) {
+      return;
+    }
+
     setParams(mParams);
   };
 
@@ -156,20 +176,21 @@ export default function SelectView(props) {
   if (filter) {
     if (filter.data) {
       headerNode = /*#__PURE__*/React.createElement(Filter, _extends({
-        simple: true
+        simple: true,
+        autoPlaceholder: true
       }, filter, {
-        value: params,
+        value: cParams,
         onChange: function onChange(val) {
-          return handleChangeParams(_objectSpread(_objectSpread({}, params), val));
+          return handleChangeParams(_objectSpread(_objectSpread({}, cParams), val));
         }
       }));
     }
 
     if (filter.sider) {
       siderNode = filter.sider({
-        value: params,
+        value: cParams,
         onChange: function onChange(val) {
-          return handleChangeParams(_objectSpread(_objectSpread({}, params), val));
+          return handleChangeParams(_objectSpread(_objectSpread({}, cParams), val));
         }
       });
     }
@@ -184,7 +205,8 @@ export default function SelectView(props) {
     }
 
     var result = [{
-      type: 'delete'
+      type: 'delete',
+      sortable: false
     }].concat(_toConsumableArray(selectedColumns));
     return result;
   }, [selectedColumns, readOnly]);
@@ -192,22 +214,23 @@ export default function SelectView(props) {
 
   var renderList = function renderList() {
     return /*#__PURE__*/React.createElement("div", {
-      className: "".concat(prefixCls, "-layout")
+      className: prefix('layout')
     }, siderNode !== null && /*#__PURE__*/React.createElement("div", {
-      className: "".concat(prefixCls, "-sider")
+      className: prefix('sider')
     }, siderNode), /*#__PURE__*/React.createElement("div", {
-      className: "".concat(prefixCls, "-main")
+      className: prefix('main')
     }, headerNode !== null && /*#__PURE__*/React.createElement("div", {
-      className: "".concat(prefixCls, "-head")
+      className: prefix('head')
     }, headerNode), /*#__PURE__*/React.createElement("div", {
-      className: "".concat(prefixCls, "-body")
+      className: prefix('body')
     }, /*#__PURE__*/React.createElement(DataGrid, {
       ref: list,
       rowKey: rowKey,
       rowSelection: {
         type: multiple ? 'checkbox' : 'radio',
         selectedRowKeys: dataKeys,
-        onChange: handleChangeData
+        onChange: handleChangeData,
+        preserveSelectedRowKeys: true
       },
       onRowDoubleClicked: function onRowDoubleClicked(_ref2) {
         var node = _ref2.node;
@@ -216,9 +239,13 @@ 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,
+      onLoading: setLoading,
       fetch: request,
       pagination: pagination
     }))));
@@ -226,14 +253,20 @@ export default function SelectView(props) {
 
   var renderSelected = function renderSelected() {
     return /*#__PURE__*/React.createElement("div", {
-      className: "".concat(prefixCls, "-layout")
+      className: prefix('layout')
     }, /*#__PURE__*/React.createElement("div", {
-      className: "".concat(prefixCls, "-main")
+      className: prefix('main')
     }, /*#__PURE__*/React.createElement("div", {
-      className: "".concat(prefixCls, "-body")
+      className: prefix('body')
     }, /*#__PURE__*/React.createElement(DataGrid, {
       dataSource: data,
-      onDataSourceChange: setData,
+      defaultColDef: defaultColDef,
+      rowHeight: rowHeight,
+      cellDisplayFlex: cellDisplayFlex,
+      onDataSourceChange: function onDataSourceChange(v) {
+        onChange === null || onChange === void 0 ? void 0 : onChange(v);
+        setData(v);
+      },
       columns: mSelectedCols,
       rowKey: rowKey,
       pagination: pagination,
@@ -262,8 +295,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
       }
@@ -271,6 +303,9 @@ export default function SelectView(props) {
   }
 
   return /*#__PURE__*/React.createElement("div", {
-    className: prefixCls
-  }, content);
+    className: prefix()
+  }, content, loadingProp || loading ? /*#__PURE__*/React.createElement(Spin, {
+    spinning: true,
+    className: prefix('spin')
+  }) : null);
 }

package/es/components/SelectView/index.less

@@ -1,15 +1,24 @@
 .@{prefixCls}-select-view {
+  position: relative;
   height: 100%;
 
-  .@{ant-prefix}-modal-body > & {
-    margin: -@padding-md;
+  &-spin {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: rgba(255, 255, 255, 0.6);
   }
 
   & > .@{ant-prefix}-tabs {
     .fullTabs();
 
     & > .@{ant-prefix}-tabs-nav {
-      margin: @padding-md @padding-md 0;
+      margin-bottom: 0;
     }
   }
 
@@ -19,8 +28,8 @@
   }
 
   &-sider {
-    width: 228px;
-    padding: @padding-md;
+    width: 200px;
+    padding: @padding-md @padding-md @padding-md 0;
     overflow: auto;
     border-right: 1px solid @border-color-split;
   }
@@ -30,7 +39,11 @@
     flex: 1;
     flex-direction: column;
     min-width: 0;
-    padding: @padding-md;
+    padding: @padding-md 0;
+  }
+
+  &-sider + &-main {
+    padding-left: @padding-md;
   }
 
   &-head + &-body {

package/es/components/SiderTree/index.js

@@ -90,7 +90,7 @@ export default function SiderTree(props) {
         if (filterNode) {
           return filterNode(keywords, item);
         } else {
-          return new RegExp(keywords, 'i').test(item.title.toString());
+          return item.title.toString().toLowerCase().includes(keywords.toLowerCase());
         }
       });
     }
@@ -162,14 +162,7 @@ export default function SiderTree(props) {
       }
     },
     blockNode: true,
-    switcherIcon: function switcherIcon(_ref) {
-      var expanded = _ref.expanded,
-          isLeaf = _ref.isLeaf;
-
-      if (isLeaf) {
-        return null;
-      }
-
+    switcherIcon: function switcherIcon() {
       return /*#__PURE__*/React.createElement(Icons.Down, {
         style: {
           fontSize: 14,

package/es/components/SiderTree/index.less

@@ -7,15 +7,6 @@
     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 {
@@ -58,20 +49,11 @@
   &-body {
     min-height: 0;
     overflow: auto;
-    .scrollBar(8px);
+    .scrollBar();
 
     .@{ant-prefix}-tree {
-      &-list-holder-inner {
-        align-items: stretch;
-      }
-
-      &-list-scrollbar-thumb {
-        background: #ddd !important;
-      }
-
       &-node-content-wrapper {
         min-width: 0;
-        overflow-x: hidden;
       }
 
       &-title {
@@ -79,7 +61,6 @@
         flex: 1;
         align-items: center;
         justify-content: space-between;
-        min-width: 56px;
         border-radius: 4px;
         cursor: pointer;
         transition: background-color 0.2s;
@@ -151,21 +132,20 @@
   .@{prefixCls}-tree-wrapper {
     padding: @padding-md;
 
-    &:first-child .@{prefixCls}-tree-header {
+    .@{prefixCls}-tree-header {
       margin-right: @padding-md;
     }
   }
 
   .@{prefixCls}-tree-tabs {
     padding: @padding-md;
+
+    .@{prefixCls}-tree-wrapper .@{prefixCls}-tree-header {
+      margin-right: 0;
+    }
   }
 
   .@{ant-prefix}-tabs-tabpane > .@{prefixCls}-tree-wrapper {
     padding: 0;
   }
-
-  .@{prefixCls}-tree-body {
-    margin-right: -@padding-md;
-    padding-right: @padding-md;
-  }
 }

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

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 interface Props {
     shape?: 'default' | 'order' | 'text';
-    type?: 'default' | 'success' | 'warning' | 'error' | 'disabled';
+    type?: 'default' | 'success' | 'warning' | 'error' | 'disabled' | 'processing';
     children?: string;
 }
 export default function State(props: Props): JSX.Element;

package/es/components/State/index.js

@@ -1,3 +1,11 @@
+var _excluded = ["shape", "type", "children"];
+
+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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+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 classNames from 'classnames';
 import React from 'react';
 import { prefixClassName } from "../utils";
@@ -8,8 +16,10 @@ export default function State(props) {
       _props$type = props.type,
       type = _props$type === void 0 ? 'default' : _props$type,
       _props$children = props.children,
-      children = _props$children === void 0 ? '' : _props$children;
-  return /*#__PURE__*/React.createElement("div", {
+      children = _props$children === void 0 ? '' : _props$children,
+      restProps = _objectWithoutProperties(props, _excluded);
+
+  return /*#__PURE__*/React.createElement("div", _extends({
     className: classNames(prefix(), prefix("shape-".concat(shape)), prefix("type-".concat(type)))
-  }, /*#__PURE__*/React.createElement("span", null, children));
+  }, restProps), /*#__PURE__*/React.createElement("span", null, children));
 }

package/es/components/State/index.less

@@ -1,6 +1,7 @@
 @color-success: #2ca471;
 @color-warning: #e37319;
 @color-error: #d54a42;
+@color-processing: #16c0ff;
 @color-disabled: rgba(51, 51, 51, 0.5);
 
 .@{prefixCls}-state {
@@ -66,7 +67,7 @@
 
   &-type-default&-shape-default {
     &::before {
-      background-color: @color-disabled;
+      background-color: #c0c0c0;
     }
   }
 
@@ -74,6 +75,10 @@
     .defaultShapeColor(@color-success);
   }
 
+  &-type-processing&-shape-default {
+    .defaultShapeColor(@color-processing);
+  }
+
   &-type-warning&-shape-default {
     .defaultShapeColor(@color-warning);
   }

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

@@ -1,10 +1,37 @@
 import { type ReactElement } from 'react';
-import type { Key } from 'react';
+import type { Key, ReactNode } from 'react';
 import type { ColType, DataGridProps } from "../../components/DataGrid/typings";
-declare type Result<ResultType> = Error | symbol | ResultType;
+declare type Result<ResultType> = Error | ResultType;
+declare type ProcessStepParams<T> = {
+    data: T;
+    /**
+     * 上一步的额外信息，如果上一步执行成功，则没有该数据
+     */
+    payload?: any;
+};
+declare type ProcessStep<T, R> = {
+    /** 在不传入render warning会自动进行二次确认  */
+    mode?: 'warning';
+    handler: (params: ProcessStepParams<T>) => Promise<any> | any;
+    /**
+     * 出现错误或者最后一步的 渲染函数
+     * @param params
+     * @returns
+     */
+    render?: (params: {
+        data: T;
+        error?: Error;
+        result?: R;
+        next: (params: {
+            type: 'goOn' | 'stop' | 'restart';
+            payload?: any;
+        }) => void;
+    }) => ReactNode;
+};
 interface Props<RecordType extends Record<string, any> = Record<string, any>, ResultType = any, ParamsType = any> {
     modalTitle: string;
-    handler: (record: RecordType, params?: ParamsType) => Promise<ResultType>;
+    handler?: (record: RecordType, params?: ParamsType, reloadParams?: any) => Promise<ResultType>;
+    process?: ProcessStep<RecordType, any>[] | ((parmas?: ParamsType) => ProcessStep<RecordType, any>[]);
     columns?: ColType<RecordType>[];
     rowKey: DataGridProps<RecordType>['rowKey'];
     /**
@@ -35,8 +62,17 @@ interface Props<RecordType extends Record<string, any> = Record<string, any>, Re
             failIcon: ReactElement;
             successIcon: ReactElement;
         };
-        reload: () => any;
+        /**
+         * @description 重新执行handler的方法
+         * @param params handler的第三个参数可获取到这里传入的params
+         */
+        reload: (params?: any) => any;
     }) => ReactElement | string | number | null;
+    /**
+     * isError 应该与自定义渲染有关
+     * @param result
+     * @returns
+     */
     isError?: (result: ResultType) => boolean;
     params?: ParamsType;
     /**