@lemon-fe/kits 1.0.6 → 1.0.8

package/es/components/DataGrid/index.js

@@ -1232,7 +1232,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
             })));
             code = mCode;
           } catch (err) {
-            console.log('pre check mathmatic expression failed');
+            console.log('pre check mathmatic expression failed:', err.message);
           }
 
           fieldCol.valueGetter = function (params) {
@@ -1273,10 +1273,12 @@ var DataGrid = /*#__PURE__*/function (_Component) {
               if (code) {
                 try {
                   var scope = Object.fromEntries(Object.entries(scopeMap).map(function (_ref5) {
+                    var _getValue;
+
                     var _ref6 = _slicedToArray(_ref5, 1),
                         k = _ref6[0];
 
-                    return [k, getValue(scopeMap[k]) || ''];
+                    return [k, (_getValue = getValue(scopeMap[k])) !== null && _getValue !== void 0 ? _getValue : ''];
                   }));
                   return code.evaluate(scope);
                 } catch (err) {
@@ -1298,7 +1300,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           };
 
           fieldCol.valueFormatter = function (params) {
-            if (Number.isNaN(params.value) || BigNumber.isBigNumber(params.value) && params.value.isNaN()) {
+            if (Number.isNaN(params.value) || !Number.isFinite(params.value) || BigNumber.isBigNumber(params.value) && (params.value.isNaN() || !params.value.isFinite())) {
               return '-';
             }
 
@@ -1629,8 +1631,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         _this9.store.setState({
           errors: errors
         });
-      }).catch(function (_ref7) {
-        var fields = _ref7.fields;
+      }).catch(function (res) {
+        var fields = res.fields;
         var errors = new Map(_this9.store.getState().errors);
         var error = new Map();
         Object.entries(fields).forEach(function (item) {
@@ -1657,7 +1659,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
             switch (_context4.prev = _context4.next) {
               case 0:
                 promises = [];
-                this.api.forEachNode(function (rowNode) {
+                this.api.forEachNode(function (rowNode, idx) {
                   var record = rowNode.data;
 
                   if (record === undefined) {
@@ -1671,11 +1673,14 @@ var DataGrid = /*#__PURE__*/function (_Component) {
                   if (_this10.validator === null) {
                     promises.push(Promise.resolve(true));
                   } else {
-                    promises.push(_this10.validator.validate(record).catch(function (_ref8) {
-                      var fields = _ref8.fields;
+                    promises.push(_this10.validator.validate(record).catch(function (_ref7) {
+                      var fields = _ref7.fields;
                       return Promise.reject({
                         id: rowId,
-                        fields: fields
+                        data: record,
+                        fields: fields,
+                        node: rowNode,
+                        index: idx
                       });
                     }));
                   }
@@ -1690,14 +1695,14 @@ var DataGrid = /*#__PURE__*/function (_Component) {
                 failed = [];
                 result.forEach(function (item) {
                   if (item.status === 'rejected') {
-                    var _ref9 = item.reason,
-                        id = _ref9.id,
-                        fields = _ref9.fields;
+                    var _ref8 = item.reason,
+                        id = _ref8.id,
+                        fields = _ref8.fields;
                     var error = new Map();
-                    Object.entries(fields).forEach(function (_ref10) {
-                      var _ref11 = _slicedToArray(_ref10, 2),
-                          field = _ref11[0],
-                          errs = _ref11[1];
+                    Object.entries(fields).forEach(function (_ref9) {
+                      var _ref10 = _slicedToArray(_ref9, 2),
+                          field = _ref10[0],
+                          errs = _ref10[1];
 
                       error.set(field, errs.map(function (err) {
                         return err.message || "".concat(field, "\u8F93\u5165\u9519\u8BEF");
@@ -1937,8 +1942,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     }
   }], [{
     key: "isSummaryRow",
-    value: function isSummaryRow(_ref12) {
-      var node = _ref12.node;
+    value: function isSummaryRow(_ref11) {
+      var node = _ref11.node;
 
       if (node && node.data && node.data[DataGrid.SummaryFlag]) {
         return true;

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

@@ -1,6 +1,6 @@
-import type { ColDef, ColGroupDef, EditableCallbackParams, ICellEditorParams, ICellRendererParams, IHeaderParams, AgGridEvent, CheckboxSelectionCallback, ColumnState } from '@ag-grid-community/core';
+import type { ColDef, ColGroupDef, EditableCallbackParams, ICellEditorParams, ICellRendererParams, IHeaderParams, AgGridEvent, CheckboxSelectionCallback, ColumnState, IRowNode } from '@ag-grid-community/core';
 import type { AgGridReactProps } from '@ag-grid-community/react';
-import type { RuleItem } from 'async-validator/dist-types/interface';
+import type { RuleItem, ValidateFieldsError } from 'async-validator/dist-types/interface';
 import type { ReactElement, ReactNode } from 'react';
 import type { DateEditorParams } from './cell-editors/Date';
 import type { NumberEditorParams } from './cell-editors/Number';
@@ -20,6 +20,13 @@ export declare type PathType = string;
 export declare type ValidateRule<T> = Pick<RuleItem, 'required' | 'message' | 'pattern' | 'min' | 'max' | 'len' | 'type'> & {
     validator?: (rule: any, val: any, record: T) => void | Promise<void>;
 };
+export declare type ValidateResult<TData> = {
+    id: string;
+    node: IRowNode<TData>;
+    data: TData;
+    index: number;
+    fields: ValidateFieldsError;
+}[];
 interface EditorParamsType<T extends string, K extends Record<string, any>> {
     type: T;
     params?: K;

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

@@ -1,5 +1,6 @@
-import React from 'react';
+import React, { type CSSProperties } from 'react';
 declare const PageLoading: React.FC<{
     tip?: string;
+    style?: CSSProperties;
 }>;
 export default PageLoading;

package/es/components/PageLoading/index.js

@@ -1,11 +1,13 @@
-import React from 'react';
 import { Spin } from 'antd';
+import React from 'react';
 import { PREFIX_CLS } from "../../constants";
 
 var PageLoading = function PageLoading(_ref) {
-  var tip = _ref.tip;
+  var tip = _ref.tip,
+      style = _ref.style;
   return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(PREFIX_CLS, "-page-loading")
+    className: "".concat(PREFIX_CLS, "-page-loading"),
+    style: style
   }, /*#__PURE__*/React.createElement(Spin, {
     size: "large",
     tip: tip

package/es/layouts/MicroLayout/index.js

@@ -36,7 +36,8 @@ function MicroLayout(props) {
       routes = _props$routes === void 0 ? [] : _props$routes,
       authorities = props.authorities,
       tabs = props.tabs,
-      active = props.active;
+      active = props.active,
+      basenameProp = props.basename;
   var history = useHistory();
   var auth = useMemo(function () {
     if (authorities === undefined || authorities === null) {
@@ -46,7 +47,7 @@ function MicroLayout(props) {
     return new Set(authorities);
   }, [authorities]);
   var basename = useMemo(function () {
-    return window.routerBase;
+    return basenameProp || window.routerBase;
   }, []);
   var key = (_tabs$active = tabs[active]) === null || _tabs$active === void 0 ? void 0 : _tabs$active.rootPath;
   var routeTabs = useMemo(function () {

package/es/layouts/MicroLayout/typings.d.ts

@@ -25,4 +25,8 @@ export interface MicroLayoutProps {
    * @description 当前active tab
    */
   active: number;
+  /**
+   * @description 路由的basename
+   */
+  basename?: string;
 }

package/package.json

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