@zat-design/sisyphus-react 4.0.0-beta.2 → 4.0.0-beta.4

package/es/ProEnum/index.js

@@ -3,29 +3,25 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _isNumber from "lodash/isNumber";
-import _omit from "lodash/omit";
-import _isArray from "lodash/isArray";
-import _isString from "lodash/isString";
-import _isFunction from "lodash/isFunction";
-import _cloneDeep from "lodash/cloneDeep";
 var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component", "onChange", "transformResponse", "otherProps", "isView"],
   _excluded2 = ["fieldNames", "clear", "cacheKey", "showCodeName"];
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import { message, Radio, Checkbox, Space } from 'antd';
 import React, { useState, useEffect, useMemo } from 'react';
-import ProSelect from '../ProSelect';
-import { useProConfig } from '../ProConfigProvider';
-import ProEnumTag from './components/Tag';
-import ProEnumGroup from './components/Group';
-import Container from '../ProForm/components/Container';
-import { isObject } from './utils';
-import getEnumLabel from './utils/getEnumLabel';
-import useEnum from './hooks/useEnum';
-import locale from '../locale';
-import './style/index.less';
-import { useFieldProps } from '../ProForm/utils/useFieldProps';
+import { cloneDeep, isFunction, isString, isArray, omit, isNumber } from 'lodash';
+import ProSelect from "../ProSelect";
+import { useProConfig } from "../ProConfigProvider";
+import ProEnumTag from "./components/Tag";
+import ProEnumGroup from "./components/Group";
+import Container from "../ProForm/components/Container";
+import { isObject } from "./utils";
+import getEnumLabel from "./utils/getEnumLabel";
+import useEnum from "./hooks/useEnum";
+import locale from "../locale";
+import "./style/index.less";
+import { useFieldProps } from "../ProForm/utils/useFieldProps";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 var ProEnum = function ProEnum(props) {
   var _otherProps$isView, _enumProps$showCodeNa;
   var code = props.code,
@@ -65,23 +61,24 @@ var ProEnum = function ProEnum(props) {
     (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) && setData(_toConsumableArray(dataSource));
   }, [dataSource]);
   if (fieldNames && Object.keys(fieldNames).length) {
-    if (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) label = fieldNames.label;
-    if (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) fieldValue = fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value;
+    if (fieldNames !== null && fieldNames !== void 0 && fieldNames.label) label = fieldNames.label;
+    if (fieldNames !== null && fieldNames !== void 0 && fieldNames.value) fieldValue = fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value;
   }
   if (props.fieldNames && Object.keys(props.fieldNames).length) {
     var _props$fieldNames, _props$fieldNames2, _props$fieldNames3, _props$fieldNames4;
-    if (props === null || props === void 0 ? void 0 : (_props$fieldNames = props.fieldNames) === null || _props$fieldNames === void 0 ? void 0 : _props$fieldNames.label) label = (_props$fieldNames2 = props.fieldNames) === null || _props$fieldNames2 === void 0 ? void 0 : _props$fieldNames2.label;
-    if (props === null || props === void 0 ? void 0 : (_props$fieldNames3 = props.fieldNames) === null || _props$fieldNames3 === void 0 ? void 0 : _props$fieldNames3.value) fieldValue = (_props$fieldNames4 = props.fieldNames) === null || _props$fieldNames4 === void 0 ? void 0 : _props$fieldNames4.value;
+    if (props !== null && props !== void 0 && (_props$fieldNames = props.fieldNames) !== null && _props$fieldNames !== void 0 && _props$fieldNames.label) label = (_props$fieldNames2 = props.fieldNames) === null || _props$fieldNames2 === void 0 ? void 0 : _props$fieldNames2.label;
+    if (props !== null && props !== void 0 && (_props$fieldNames3 = props.fieldNames) !== null && _props$fieldNames3 !== void 0 && _props$fieldNames3.value) fieldValue = (_props$fieldNames4 = props.fieldNames) === null || _props$fieldNames4 === void 0 ? void 0 : _props$fieldNames4.value;
   }
   if (clear) {
     label = 'label';
     fieldValue = 'value';
   }
+
   // 这种时候优先级最高、完全走自定义
-  if ((useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) && props.fieldNames) {
+  if (useRequest !== null && useRequest !== void 0 && useRequest.service && props.fieldNames) {
     var _props$fieldNames5, _props$fieldNames6;
-    if ((_props$fieldNames5 = props.fieldNames) === null || _props$fieldNames5 === void 0 ? void 0 : _props$fieldNames5.label) label = props.fieldNames.label;
-    if ((_props$fieldNames6 = props.fieldNames) === null || _props$fieldNames6 === void 0 ? void 0 : _props$fieldNames6.value) fieldValue = props.fieldNames.value;
+    if ((_props$fieldNames5 = props.fieldNames) !== null && _props$fieldNames5 !== void 0 && _props$fieldNames5.label) label = props.fieldNames.label;
+    if ((_props$fieldNames6 = props.fieldNames) !== null && _props$fieldNames6 !== void 0 && _props$fieldNames6.value) fieldValue = props.fieldNames.value;
   }
   var _useProConfig = useProConfig('ProEnum'),
     _useProConfig$dics = _useProConfig.dics,
@@ -111,7 +108,7 @@ var ProEnum = function ProEnum(props) {
             if (Array.isArray(data)) {
               setData(_toConsumableArray(data));
             }
-            if (isObject(data) && _isString(code)) {
+            if (isObject(data) && isString(code)) {
               setData(data[code]);
             }
           } else {
@@ -121,34 +118,36 @@ var ProEnum = function ProEnum(props) {
       }
     })),
     run = _useRequestFunc.run;
+
   // 自定义请求
   useDeepCompareEffect(function () {
     var _ref3 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
       defaultParams = _ref3.defaultParams;
     var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
-    if (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) {
+    if (useRequest !== null && useRequest !== void 0 && useRequest.service) {
       run(params);
     }
   }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
   var enumLists = useMemo(function () {
     var lists = [];
-    if (_isString(code)) {
+    if (isString(code)) {
       lists = (dics === null || dics === void 0 ? void 0 : dics[code]) || [];
     }
-    if (_isArray(code)) {
+    if (isArray(code)) {
       code.forEach(function (enumCode) {
         var _lists;
-        _isArray(dics === null || dics === void 0 ? void 0 : dics[enumCode]) && (_lists = lists).push.apply(_lists, _toConsumableArray(dics === null || dics === void 0 ? void 0 : dics[enumCode]));
+        isArray(dics === null || dics === void 0 ? void 0 : dics[enumCode]) && (_lists = lists).push.apply(_lists, _toConsumableArray(dics === null || dics === void 0 ? void 0 : dics[enumCode]));
       });
     }
     return lists;
   }, [dics, code]);
   var renderComponent = function renderComponent() {
     var list = [];
+
     // 优先使用组件内部自己传入的数据源或者请求得到的数据
-    list = _cloneDeep(dataList && dataList.length ? dataList : enumLists);
+    list = cloneDeep(dataList && dataList.length ? dataList : enumLists);
     // 对数据进行一系列的过滤等操作
-    if (!(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) && transformResponse) {
+    if (!(useRequest !== null && useRequest !== void 0 && useRequest.service) && transformResponse) {
       list = transformResponse(list);
       if (!Array.isArray(list)) {
         var _locale$ProEnum3;
@@ -156,9 +155,9 @@ var ProEnum = function ProEnum(props) {
         list = [];
       }
     }
-    if (/*#__PURE__*/React.isValidElement(component)) {
+    if ( /*#__PURE__*/React.isValidElement(component)) {
       var Component = component;
-      return _jsx(Component, _objectSpread(_objectSpread({}, enumProps), {}, {
+      return /*#__PURE__*/_jsx(Component, _objectSpread(_objectSpread({}, enumProps), {}, {
         dataSource: list,
         fieldNames: {
           label: label,
@@ -170,7 +169,7 @@ var ProEnum = function ProEnum(props) {
     }
     switch (type) {
       case 'ProSelect':
-        return _jsx(ProSelect, _objectSpread(_objectSpread({}, enumProps), {}, {
+        return /*#__PURE__*/_jsx(ProSelect, _objectSpread(_objectSpread({}, enumProps), {}, {
           otherProps: otherProps,
           dataSource: list,
           fieldNames: {
@@ -181,12 +180,12 @@ var ProEnum = function ProEnum(props) {
           onChange: onChange
         }));
       case 'Radio':
-        return _jsx(Radio.Group, _objectSpread(_objectSpread({}, _omit(enumProps, ['fieldNames', 'showCodeName'])), {}, {
+        return /*#__PURE__*/_jsx(Radio.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
           children: list.map(function (item) {
-            return _jsx(Radio, {
+            return /*#__PURE__*/_jsx(Radio, {
               value: item[fieldValue],
               disabled: !!item.disabled,
               children: item[label]
@@ -194,12 +193,12 @@ var ProEnum = function ProEnum(props) {
           })
         }));
       case 'Checkbox':
-        return _jsx(Checkbox.Group, _objectSpread(_objectSpread({}, _omit(enumProps, ['fieldNames', 'showCodeName'])), {}, {
+        return /*#__PURE__*/_jsx(Checkbox.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
           children: list.map(function (item) {
-            return _jsx(Checkbox, {
+            return /*#__PURE__*/_jsx(Checkbox, {
               value: item[fieldValue],
               disabled: !!item.disabled,
               children: item[label]
@@ -207,7 +206,7 @@ var ProEnum = function ProEnum(props) {
           })
         }));
       case 'Tag':
-        return _jsx(ProEnumTag, {
+        return /*#__PURE__*/_jsx(ProEnumTag, {
           id: enumProps.id,
           value: value,
           onChange: onChange,
@@ -216,7 +215,7 @@ var ProEnum = function ProEnum(props) {
           dataSource: list
         });
       case 'Group':
-        return _jsx(ProEnumGroup, _objectSpread(_objectSpread({}, _omit(enumProps, ['showCodeName'])), {}, {
+        return /*#__PURE__*/_jsx(ProEnumGroup, _objectSpread(_objectSpread({}, omit(enumProps, ['showCodeName'])), {}, {
           value: value,
           onChange: onChange,
           fieldLabel: label,
@@ -229,7 +228,7 @@ var ProEnum = function ProEnum(props) {
   };
   if (!code && !dataSource && !useRequest) {
     var _locale$ProEnum4;
-    message.error("".concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.label, "-").concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.name, "-").concat(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType));
+    message.error("".concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.label, "-").concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.name, "-").concat(locale === null || locale === void 0 || (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType));
   }
   var transToLabel = function transToLabel(value) {
     var list = dataList && dataList.length ? dataList : enumLists;
@@ -262,33 +261,33 @@ var ProEnum = function ProEnum(props) {
       record.forEach(function (item) {
         arr.push(props.optionRender(item));
       });
-      return _jsx(Space, {
+      return /*#__PURE__*/_jsx(Space, {
         direction: "vertical",
         size: 4,
         children: arr.map(function (item) {
-          return _jsx(React.Fragment, {
+          return /*#__PURE__*/_jsx(React.Fragment, {
             children: item
           }, item);
         })
       });
     };
-    return _isFunction(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join('，');
+    return isFunction(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join('，');
   };
   if (_isView) {
     var __value = value || _defalutValue;
     if (Array.isArray(__value)) {
-      return _jsx(Container, {
+      return /*#__PURE__*/_jsx(Container, {
         tooltip: true,
         viewEmpty: viewEmpty,
         children: transToLabel(__value)
       });
     }
-    return _jsx(Container, {
+    return /*#__PURE__*/_jsx(Container, {
       viewEmpty: viewEmpty,
-      children: __value || _isNumber(__value) ? transToLabel([__value]) : null
+      children: __value || isNumber(__value) ? transToLabel([__value]) : null
     });
   }
-  return _jsx(_Fragment, {
+  return /*#__PURE__*/_jsx(_Fragment, {
     children: renderComponent()
   });
 };

package/es/ProEnum/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 @zaui-disabled-bg: var(--zaui-disabled-bg);
 

package/es/ProEnum/utils/eventCenter.js

@@ -1,13 +1,14 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _isFunction from "lodash/isFunction";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import { isFunction } from 'lodash';
 var SimpleEventCenter = /*#__PURE__*/function () {
   function SimpleEventCenter() {
     _classCallCheck(this, SimpleEventCenter);
-    this.events = void 0;
+    _defineProperty(this, "events", void 0);
     this.events = new Map();
   }
-  return _createClass(SimpleEventCenter, [{
+  _createClass(SimpleEventCenter, [{
     key: "subscribe",
     value: function subscribe(eventName, callback) {
       if (!this.events.has(eventName)) {
@@ -20,7 +21,7 @@ var SimpleEventCenter = /*#__PURE__*/function () {
     value: function publish(eventName, data) {
       if (this.events.has(eventName)) {
         this.events.get(eventName).forEach(function (callback) {
-          _isFunction(callback) && (callback === null || callback === void 0 ? void 0 : callback(data));
+          isFunction(callback) && (callback === null || callback === void 0 ? void 0 : callback(data));
         });
       }
     }
@@ -34,5 +35,6 @@ var SimpleEventCenter = /*#__PURE__*/function () {
       }
     }
   }]);
+  return SimpleEventCenter;
 }(); // 将 eventCenter 实例添加到 window 对象上
 window.eventCenter = new SimpleEventCenter();

package/es/ProEnum/utils/getEnumLabel.js

@@ -1,9 +1,8 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _isString from "lodash/isString";
-import _isArray from "lodash/isArray";
-import { jsx as _jsx } from "react/jsx-runtime";
 import { useMemo } from 'react';
-import { useProConfig } from '../../ProConfigProvider';
+import { isArray, isString } from 'lodash';
+import { useProConfig } from "../../ProConfigProvider";
+import { jsx as _jsx } from "react/jsx-runtime";
 var EnumLabel = function EnumLabel(props) {
   var fieldNameLabel = '';
   var fieldNameValue = '';
@@ -29,13 +28,13 @@ var EnumLabel = function EnumLabel(props) {
     dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
   var enumLists = useMemo(function () {
     var lists = [];
-    if (_isString(code)) {
+    if (isString(code)) {
       lists = (dics === null || dics === void 0 ? void 0 : dics[code]) || [];
     }
-    if (_isArray(code)) {
+    if (isArray(code)) {
       code.forEach(function (enumCode) {
         var _lists;
-        _isArray(dics === null || dics === void 0 ? void 0 : dics[enumCode]) && (_lists = lists).push.apply(_lists, _toConsumableArray(dics === null || dics === void 0 ? void 0 : dics[enumCode]));
+        isArray(dics === null || dics === void 0 ? void 0 : dics[enumCode]) && (_lists = lists).push.apply(_lists, _toConsumableArray(dics === null || dics === void 0 ? void 0 : dics[enumCode]));
       });
     }
     return lists;
@@ -50,7 +49,7 @@ var EnumLabel = function EnumLabel(props) {
       }
       return '';
     });
-    return _jsx("span", {
+    return /*#__PURE__*/_jsx("span", {
       children: labelList.join('，') || '-'
     });
   };
@@ -60,7 +59,7 @@ var EnumLabel = function EnumLabel(props) {
     }
     return transToLabel([value]);
   }
-  return _jsx("span", {
+  return /*#__PURE__*/_jsx("span", {
     children: "-"
   });
 };
@@ -71,7 +70,7 @@ var getEnumLabel = function getEnumLabel(code, value) {
   if (!code) {
     return null;
   }
-  return _jsx(EnumLabel, {
+  return /*#__PURE__*/_jsx(EnumLabel, {
     code: code,
     value: value,
     compose: compose,

package/es/ProEnum/utils/index.js

@@ -1,7 +1,6 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _isUndefined from "lodash/isUndefined";
-import _isNull from "lodash/isNull";
 var _excluded = ["children"];
+import { isNull, isUndefined } from 'lodash';
 export var baseCacheKey = 'zat-design-pro-component-cacheKey';
 /**
  * 获取枚举数据
@@ -21,6 +20,7 @@ export function getEnumData(storage, cacheKey, baseEnumStorage) {
     return JSON.parse(window.sessionStorage.getItem(cacheKey) || '{}');
   }
 }
+
 /**
  * 设置枚举数据
  * @param storage
@@ -29,7 +29,7 @@ export function getEnumData(storage, cacheKey, baseEnumStorage) {
  */
 export function setEnumData(storage, cacheKey, data) {
   var _Object$keys;
-  if (!((_Object$keys = Object.keys(data === null || data === void 0 ? void 0 : data.data)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length)) {
+  if (!((_Object$keys = Object.keys(data === null || data === void 0 ? void 0 : data.data)) !== null && _Object$keys !== void 0 && _Object$keys.length)) {
     return false;
   }
   if (storage === 'localStorage') {
@@ -38,6 +38,7 @@ export function setEnumData(storage, cacheKey, data) {
     window.sessionStorage.setItem(cacheKey, JSON.stringify(data));
   }
 }
+
 /**
  * 判断枚举列表是否存在
  * @param storage
@@ -50,6 +51,7 @@ export function hasEnumList(storage, cacheKey, code) {
   var enumList = (res === null || res === void 0 ? void 0 : res.data) || {};
   return enumList === null || enumList === void 0 ? void 0 : enumList[code];
 }
+
 /**
  * 判断是否是对象
  * @param obj
@@ -58,6 +60,7 @@ export function hasEnumList(storage, cacheKey, code) {
 export function isObject(obj) {
   return Object.prototype.toString.call(obj) === '[object Object]';
 }
+
 /**
  * 合并枚举数据
  * @param storage
@@ -73,8 +76,9 @@ export function mergeCacheData(storage, code, cacheKey, responseData) {
   if (cacheData && cacheData.data) {
     cacheData.data[code] = responseData;
   }
-  (_window2 = window) === null || _window2 === void 0 ? void 0 : _window2[cacheStorage].setItem(cacheKey, JSON.stringify(cacheData));
+  (_window2 = window) === null || _window2 === void 0 || _window2[cacheStorage].setItem(cacheKey, JSON.stringify(cacheData));
 }
+
 /**
  * diff code 差异
  * @param cacheCodes
@@ -94,6 +98,7 @@ export function diffCode(cacheCodes, codes) {
   }
   return diff;
 }
+
 /**
  * 缓存fieldNames制定的值
  * @param fieldNames 保留映射值
@@ -106,7 +111,7 @@ export function cacheFieldNames(fieldNames, dataSource) {
   var result = {};
   Object.keys(restFieldNames).forEach(function (key) {
     var value = dataSource[restFieldNames[key]] ? dataSource[restFieldNames[key]] : dataSource[key];
-    if (!(_isUndefined(value) || _isNull(value))) {
+    if (!(isUndefined(value) || isNull(value))) {
       result[key] = dataSource[restFieldNames[key]] ? dataSource[restFieldNames[key]] : dataSource[key];
     }
   });

package/es/ProForm/components/Container.js

@@ -1,12 +1,14 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import React from 'react';
 import { Tooltip } from 'antd';
 import classNames from 'classnames';
-import { isEmptyArray } from '../utils';
+import { isEmptyArray } from "../utils";
+import { jsx as _jsx } from "react/jsx-runtime";
 var Container = function Container(props) {
   var children = props.children,
     tooltip = props.tooltip,
     nowrap = props.nowrap,
     viewEmpty = props.viewEmpty;
+
   // 值为false但不为0, 或者值为空数组
   var nullValue = children !== 0 && !children || isEmptyArray(children);
   var _className = classNames({
@@ -14,16 +16,16 @@ var Container = function Container(props) {
     'pro-form-view-container_nowrap': nowrap !== null && nowrap !== void 0 ? nowrap : tooltip
   });
   if (tooltip && !nullValue) {
-    return _jsx(Tooltip, {
+    return /*#__PURE__*/_jsx(Tooltip, {
       placement: "topLeft",
       title: children,
-      children: _jsx("div", {
+      children: /*#__PURE__*/_jsx("div", {
         className: _className,
         children: children
       })
     });
   }
-  return _jsx("div", {
+  return /*#__PURE__*/_jsx("div", {
     className: _className,
     children: nullValue ? viewEmpty : children
   });

package/es/ProForm/components/FormFooter/index.js

@@ -1,9 +1,10 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Space, Button } from 'antd';
-import { useEffect, useMemo } from 'react';
-import { useProConfig } from '../../../ProConfigProvider';
-import locale from '../../../locale';
+import React, { useEffect, useMemo } from 'react';
+import { useProConfig } from "../../../ProConfigProvider";
+import locale from "../../../locale";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 export var PRO_FORM_CACHE = 'PRO_FORM_CACHE';
 var FormFooter = function FormFooter(props) {
   var initialConfig = useProConfig('FormFooter');
@@ -37,45 +38,46 @@ var FormFooter = function FormFooter(props) {
       form.setFieldsValue(searchCache[formId]);
     }
   }, [formId]);
-  var _onOk = function _onOk() {
+  var nextOnOk = function nextOnOk() {
     var _modifiedForm$__INTER;
     if (formId) {
       var values = form.getFieldsValue();
       searchCache[formId] = values;
       window.sessionStorage.setItem(PRO_FORM_CACHE, JSON.stringify(searchCache));
     }
+
     // 支持 stopOnFirstError
     // @ts-ignore 使用类型断言处理自定义属性
     var modifiedForm = form;
-    if ((_modifiedForm$__INTER = modifiedForm.__INTERNAL_CONFIG__) === null || _modifiedForm$__INTER === void 0 ? void 0 : _modifiedForm$__INTER.stopOnFirstError) {
+    if ((_modifiedForm$__INTER = modifiedForm.__INTERNAL_CONFIG__) !== null && _modifiedForm$__INTER !== void 0 && _modifiedForm$__INTER.stopOnFirstError) {
       // 使用自定义验证逻辑
       form.validateFields().then(function () {
         onOk();
-      }).catch(function () {
-        // 验证失败，不执行 onOk
+      }).catch(function (error) {
+        console.warn('ProForm validateFields error', error);
       });
     } else {
       onOk();
     }
   };
-  var _onCancel = function _onCancel() {
+  var nextOnCancel = function nextOnCancel() {
     if (formId && searchCache[formId]) {
       delete searchCache[formId];
       window.sessionStorage.setItem(PRO_FORM_CACHE, JSON.stringify(searchCache));
     }
     onCancel();
   };
-  return _jsxs(Space, {
-    children: [_jsx(Button, _objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsxs(Space, {
+    children: [/*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
       type: "primary",
       htmlType: onOk ? 'button' : 'submit',
-      onClick: _onOk,
+      onClick: nextOnOk,
       disabled: confirmLoading,
       loading: confirmLoading
     }, okButtonProps), {}, {
       children: okChildren || okText || "".concat(locale.ProForm.search)
-    })), _jsx(Button, _objectSpread(_objectSpread({
-      onClick: _onCancel
+    })), /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
+      onClick: nextOnCancel
     }, cancelButtonProps), {}, {
       children: cancelChildren || cancelText || "".concat(locale.ProForm.reset)
     })), children]

package/es/ProForm/components/base/Checkbox/index.js

@@ -1,12 +1,13 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["dataSource", "otherProps", "fieldNames"];
-import { createElement as _createElement } from "react";
-import { jsx as _jsx } from "react/jsx-runtime";
+import React from 'react';
 import { Checkbox as AntCheckbox } from 'antd';
-import Container from '../../Container';
-import { useProConfig } from '../../../../ProConfigProvider';
-import ProForm from '../../../index';
+import Container from "../../Container";
+import { useProConfig } from "../../../../ProConfigProvider";
+import ProForm from "../../../index";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { createElement as _createElement } from "react";
 var Checkbox = function Checkbox(props) {
   var dataSource = props.dataSource,
     otherProps = props.otherProps,
@@ -17,6 +18,7 @@ var Checkbox = function Checkbox(props) {
     isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
+
   var _fieldNames = fieldNames || initialConfig.fieldNames || {
     label: 'label',
     value: 'value'
@@ -33,17 +35,18 @@ var Checkbox = function Checkbox(props) {
       return labelList.join('，');
     };
     if (Array.isArray(value)) {
-      return _jsx(Container, {
+      return /*#__PURE__*/_jsx(Container, {
         tooltip: true,
         viewEmpty: viewEmpty,
         children: transToLabel(value)
       });
     }
-    return _jsx(Container, {
+    return /*#__PURE__*/_jsx(Container, {
       viewEmpty: viewEmpty,
       children: value ? transToLabel([value]) : null
     });
   }
+
   // 假如dataSource包含code,name, fieldNames没有配置，_fieldNames默认为code, name
   if (Array.isArray(dataSource) && !fieldNames) {
     var _dataSource$filter;
@@ -57,7 +60,7 @@ var Checkbox = function Checkbox(props) {
       };
     }
   }
-  return _jsx(AntCheckbox.Group, _objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsx(AntCheckbox.Group, _objectSpread(_objectSpread({
     style: {
       width: '100%'
     }