@lemon-fe/kits 1.0.0-190 → 1.0.0-192

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

@@ -52,7 +52,7 @@ export default class DataGrid<TData extends Record<string, any>> extends Compone
         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<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"> & {
+        Select: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "mode" | "virtual" | "allowClear" | "options" | "showSearch" | "listHeight"> & {
             fieldNames?: {
                 label: string;
                 value: string;

package/es/components/FormLayout/index.less

@@ -60,6 +60,10 @@
         flex: 1 1 0;
         min-width: 0;
       }
+
+      &-explain-error {
+        margin-top: 2px;
+      }
     }
 
     &-row {

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

@@ -52,6 +52,10 @@ interface Props<RecordType, ParamsType extends Record<string, any>> extends Pick
             style?: CSSProperties;
         }) => ReactElement;
     } & FilterProps<ParamsType>;
+    /**
+     * 筛选参数校验，如日期范围，true: 校验通过
+     */
+    checkSearchParams?: (params: ParamsType) => boolean;
     loading?: boolean;
     readOnly?: boolean;
 }

package/es/components/SelectView/index.js

@@ -55,7 +55,8 @@ export default function SelectView(props) {
       defaultColDef = props.defaultColDef,
       rowHeight = props.rowHeight,
       cellDisplayFlex = props.cellDisplayFlex,
-      isRowSelectable = props.isRowSelectable;
+      isRowSelectable = props.isRowSelectable,
+      checkSearchParams = props.checkSearchParams;
   var prefix = prefixClassName("select-view");
 
   var _useState = useState(value || emptyValue),
@@ -158,6 +159,10 @@ export default function SelectView(props) {
       filter.onChange(mParams, 'submit');
     }
 
+    if (checkSearchParams && !checkSearchParams(mParams)) {
+      return;
+    }
+
     setParams(mParams);
   };
 

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/layouts/MicroLayout/index.js

@@ -5,8 +5,10 @@ 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 { useLastestRef } from '@lemon-fe/hooks';
+import { Button, Result } from 'antd';
 import React, { memo, useEffect } from 'react';
 import { useMemo } from 'react';
+import { ErrorBoundary } from 'react-error-boundary';
 import { matchPath, useHistory } from 'react-router-dom';
 import RouteTab from "../components/RouteTab";
 
@@ -134,6 +136,22 @@ function MicroLayout(props) {
         width: '100%',
         height: '100%'
       }
+    }, /*#__PURE__*/React.createElement(ErrorBoundary, {
+      fallbackRender: function fallbackRender(_ref) {
+        var error = _ref.error,
+            resetErrorBoundary = _ref.resetErrorBoundary;
+        return /*#__PURE__*/React.createElement(Result, {
+          status: "500",
+          title: "\u9875\u9762\u5F02\u5E38",
+          subTitle: error.message,
+          extra: /*#__PURE__*/React.createElement(Button, {
+            type: "primary",
+            onClick: function onClick() {
+              resetErrorBoundary();
+            }
+          }, "\u91CD\u65B0\u52A0\u8F7D")
+        });
+      }
     }, route !== null && tab.match !== null && /*#__PURE__*/React.createElement(RouteTab, {
       routerBase: basename,
       authorities: auth,
@@ -144,7 +162,7 @@ function MicroLayout(props) {
       location: tab.location,
       match: tab.match,
       instance: tab.instance
-    }));
+    })));
   }));
 }
 

package/es/styles/overrides.less

@@ -306,16 +306,11 @@ span.@{ant-prefix}-radio + * {
 
 /** form **/
 .@{ant-prefix}-form-item {
-  &-has-error{
-    & + *{
-      margin-top: 16px;
-    }
-  }
-  &-explain-error{
-    font-size: 12px;
+  &-explain-error {
+    margin-top: 4px;
+    color: #ff4128;
     font-weight: 400;
-    color: #FF4128;
+    font-size: 12px;
     line-height: 20px;
-    margin-top: 4px;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.0-190",
+  "version": "1.0.0-192",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -56,6 +56,7 @@
     "moment": "^2.29.4",
     "rc-resize-observer": "^1.0.0",
     "react-color": "^2.19.3",
+    "react-error-boundary": "^4.0.11",
     "react-gcolor-picker": "^1.2.4",
     "react-resizable": "^3.0.4",
     "react-router": "^5.0.0",