@zat-design/sisyphus-react 3.4.11-beta.3 → 3.4.11-beta.5

package/es/ProEditTable/components/RenderField/index.js

@@ -286,6 +286,12 @@ var RenderField = function RenderField(_ref) {
     }
     return nextArgs;
   };
+  var debounceValidate = function debounceValidate() {
+    var validateFieldKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    setTimeout(function () {
+      form.validateFields([name].concat(_toConsumableArray(validateFieldKeys)));
+    }, 100);
+  };
   // 单元格更新数据时，加个防抖，防止更新频率过快，卡顿
   var _onChange = debounce( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _len2,
@@ -366,10 +372,10 @@ var RenderField = function RenderField(_ref) {
               return [].concat(_toConsumableArray(rowPath), [key]);
             });
             if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-              setTimeout(function () {
-                form.validateFields([name].concat(_toConsumableArray(validateFieldKeys)));
-              }, 100);
+              debounceValidate(validateFieldKeys);
             }
+          } else {
+            debounceValidate();
           }
           setState({
             forceUpdate: {
@@ -432,8 +438,10 @@ var RenderField = function RenderField(_ref) {
                 return [].concat(_toConsumableArray(rowPath), [key]);
               });
               if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-                form.validateFields(validateFieldKeys);
+                debounceValidate(validateFieldKeys);
               }
+            } else {
+              debounceValidate();
             }
             if (!isCell) {
               _context2.next = 20;

package/es/ProForm/components/combination/ProCascader/index.js

@@ -9,6 +9,7 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/typography/style";
 import _Typography from "antd/es/typography";
@@ -22,11 +23,14 @@ import useEnum from '../../../../ProEnum/hooks/useEnum';
 import locale from '../../../../locale';
 import ProForm from '../../..';
 var Text = _Typography.Text;
-var filterDataSource = function filterDataSource(dataSource, level) {
+var defaultFieldNames = {
+  label: 'name',
+  value: 'code',
+  children: 'children'
+};
+var filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
   return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
-    return _objectSpread(_objectSpread({}, item), {}, {
-      children: level === 1 ? [] : filterDataSource(item === null || item === void 0 ? void 0 : item.children, level - 1)
-    });
+    return _objectSpread(_objectSpread({}, item), {}, _defineProperty({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
   });
 };
 var getViewLabel = function getViewLabel(_ref) {
@@ -44,11 +48,6 @@ var getViewLabel = function getViewLabel(_ref) {
   });
   return viewLabel;
 };
-var defaultFieldNames = {
-  label: 'name',
-  value: 'code',
-  children: 'children'
-};
 var ProCascader = function ProCascader(props) {
   var _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
   var _ref2 = useProConfig('ProAddressBar') || {},
@@ -94,7 +93,7 @@ var ProCascader = function ProCascader(props) {
     enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
   var realDataSource = useMemo(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    var result = isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level) : innerDataSource;
+    var result = isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource;
     return transformDataName(result, fieldNames);
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _useRequest = _objectSpread({}, useRequest),
@@ -129,7 +128,7 @@ var ProCascader = function ProCascader(props) {
               value: fieldNames.value,
               children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
             });
-            serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level) : transFormData;
+            serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
             setServiceData(serviceData);
           case 9:
           case "end":

package/es/ProForm/components/render/propsType.d.ts

@@ -2,7 +2,7 @@ import { ColProps, FormInstance, FormItemProps, ModalFuncProps } from 'antd';
 import { NamePath } from 'antd/es/form/interface';
 import React from 'react';
 import { validate, regExp } from '@zat-design/utils';
-import { Rule } from 'antd/es/form';
+import { RuleObject } from 'antd/es/form';
 import * as componentMap from '../index';
 import { IProps as InputProps } from '../base/Input/propsType';
 import { Props as InputNumberProps } from '../base/InputNumber';
@@ -38,7 +38,7 @@ interface ExtendType {
     type?: ValidateKey | RegExpKey;
     message?: string;
 }
-export type ProRule = Rule | ExtendType;
+export type ProRule = RuleObject | ExtendType;
 /**
  * percent 百分比 permillage 千分比 amount 金额
  */

package/es/ProForm/utils/useRules.js

@@ -42,6 +42,14 @@ var useRules = function useRules(props) {
         }
         result.rules = Array.isArray(rules) ? [].concat(_toConsumableArray(rules), [rule]) : [rule];
       }
+    } else if (requiredRule && (names === null || names === void 0 ? void 0 : names.length)) {
+      // names字段 修改必填规则校验
+      requiredRule.validator = function (_, value) {
+        if (!value || isNullArray(value)) {
+          return Promise.reject(new Error("".concat(locale.ProForm.inputPlaceholder).concat(_label)));
+        }
+        return Promise.resolve();
+      };
     }
     return result;
   }, [rules, required]);

package/es/ProLayout/components/ProCollapse/PropTypes.d.ts

@@ -20,6 +20,11 @@ export interface ProCollapseProps {
     */
     title?: string | React.ReactNode;
     /**
+   * @description       展开收起状态
+   * @default           false
+   */
+    collapsed?: boolean;
+    /**
     * @description     自动适应窗口大小
     * @default           -
     */

package/es/ProTreeModal/index.js

@@ -224,9 +224,13 @@ var ProTreeModal = function ProTreeModal(props) {
     // 全选的时候返回 allValue 标记即可
     // 3.3.2 版本全选的时候返回所有值的合集 list
     if (allValue !== undefined && state.checkAll && !draggable) {
-      onChange === null || onChange === void 0 ? void 0 : onChange(state.flatTreeData.map(function (item) {
-        return item[fieldNameValue];
-      }));
+      if (labelInValue) {
+        onChange === null || onChange === void 0 ? void 0 : onChange(state.flatTreeData);
+      } else {
+        onChange === null || onChange === void 0 ? void 0 : onChange(state.flatTreeData.map(function (item) {
+          return item[fieldNameValue];
+        }));
+      }
     } else if (draggable && span) {
       var _listRef$current;
       // 开启 draggable 使用拖拽后的顺序

package/lib/ProEditTable/components/RenderField/index.js

@@ -289,6 +289,12 @@ var RenderField = function RenderField(_ref) {
     }
     return nextArgs;
   };
+  var debounceValidate = function debounceValidate() {
+    var validateFieldKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    setTimeout(function () {
+      form.validateFields([name].concat((0, _toConsumableArray2.default)(validateFieldKeys)));
+    }, 100);
+  };
   // 单元格更新数据时，加个防抖，防止更新频率过快，卡顿
   var _onChange = (0, _lodash.debounce)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
     var _len2,
@@ -369,10 +375,10 @@ var RenderField = function RenderField(_ref) {
               return [].concat((0, _toConsumableArray2.default)(rowPath), [key]);
             });
             if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-              setTimeout(function () {
-                form.validateFields([name].concat((0, _toConsumableArray2.default)(validateFieldKeys)));
-              }, 100);
+              debounceValidate(validateFieldKeys);
             }
+          } else {
+            debounceValidate();
           }
           setState({
             forceUpdate: {
@@ -435,8 +441,10 @@ var RenderField = function RenderField(_ref) {
                 return [].concat((0, _toConsumableArray2.default)(rowPath), [key]);
               });
               if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-                form.validateFields(validateFieldKeys);
+                debounceValidate(validateFieldKeys);
               }
+            } else {
+              debounceValidate();
             }
             if (!isCell) {
               _context2.next = 20;

package/lib/ProForm/components/combination/ProCascader/index.js

@@ -10,7 +10,8 @@ var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helper
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _antd = require("antd");
@@ -22,11 +23,14 @@ var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ = _interopRequireDefault(require("../../.."));
 var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
 var Text = _antd.Typography.Text;
-var filterDataSource = function filterDataSource(dataSource, level) {
+var defaultFieldNames = {
+  label: 'name',
+  value: 'code',
+  children: 'children'
+};
+var filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
   return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
-      children: level === 1 ? [] : filterDataSource(item === null || item === void 0 ? void 0 : item.children, level - 1)
-    });
+    return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, (0, _defineProperty2.default)({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
   });
 };
 var getViewLabel = function getViewLabel(_ref) {
@@ -44,11 +48,6 @@ var getViewLabel = function getViewLabel(_ref) {
   });
   return viewLabel;
 };
-var defaultFieldNames = {
-  label: 'name',
-  value: 'code',
-  children: 'children'
-};
 var ProCascader = function ProCascader(props) {
   var _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProAddressBar') || {},
@@ -94,10 +93,10 @@ var ProCascader = function ProCascader(props) {
     enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
   var realDataSource = (0, _react.useMemo)(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    var result = isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level) : innerDataSource;
+    var result = isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource;
     return (0, _index.transformDataName)(result, fieldNames);
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
-  var _useRequest = (0, _objectSpread2.default)({}, useRequest),
+  var _useRequest = (0, _objectSpread3.default)({}, useRequest),
     service = _useRequest.service,
     _useRequest$defaultPa = _useRequest.defaultParams,
     defaultParams = _useRequest$defaultPa === void 0 ? {} : _useRequest$defaultPa;
@@ -129,7 +128,7 @@ var ProCascader = function ProCascader(props) {
               value: fieldNames.value,
               children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
             });
-            serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level) : transFormData;
+            serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
             setServiceData(serviceData);
           case 9:
           case "end":
@@ -222,7 +221,7 @@ var ProCascader = function ProCascader(props) {
     children: viewValue
   }) : (0, _jsxRuntime.jsxs)("div", {
     className: "pro-address ".concat(className),
-    children: [(0, _jsxRuntime.jsx)(_antd.Cascader, (0, _objectSpread2.default)({
+    children: [(0, _jsxRuntime.jsx)(_antd.Cascader, (0, _objectSpread3.default)({
       className: hasDetail ? '' : 'no-detail',
       placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAddressBar = _locale.default.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
       value: addressValue,

package/lib/ProForm/components/render/propsType.d.ts

@@ -2,7 +2,7 @@ import { ColProps, FormInstance, FormItemProps, ModalFuncProps } from 'antd';
 import { NamePath } from 'antd/es/form/interface';
 import React from 'react';
 import { validate, regExp } from '@zat-design/utils';
-import { Rule } from 'antd/es/form';
+import { RuleObject } from 'antd/es/form';
 import * as componentMap from '../index';
 import { IProps as InputProps } from '../base/Input/propsType';
 import { Props as InputNumberProps } from '../base/InputNumber';
@@ -38,7 +38,7 @@ interface ExtendType {
     type?: ValidateKey | RegExpKey;
     message?: string;
 }
-export type ProRule = Rule | ExtendType;
+export type ProRule = RuleObject | ExtendType;
 /**
  * percent 百分比 permillage 千分比 amount 金额
  */

package/lib/ProForm/utils/useRules.js

@@ -49,6 +49,14 @@ var useRules = function useRules(props) {
         }
         result.rules = Array.isArray(rules) ? [].concat((0, _toConsumableArray2.default)(rules), [rule]) : [rule];
       }
+    } else if (requiredRule && (names === null || names === void 0 ? void 0 : names.length)) {
+      // names字段 修改必填规则校验
+      requiredRule.validator = function (_, value) {
+        if (!value || (0, _index.isNullArray)(value)) {
+          return Promise.reject(new Error("".concat(_locale.default.ProForm.inputPlaceholder).concat(_label)));
+        }
+        return Promise.resolve();
+      };
     }
     return result;
   }, [rules, required]);

package/lib/ProLayout/components/ProCollapse/PropTypes.d.ts

@@ -20,6 +20,11 @@ export interface ProCollapseProps {
     */
     title?: string | React.ReactNode;
     /**
+   * @description       展开收起状态
+   * @default           false
+   */
+    collapsed?: boolean;
+    /**
     * @description     自动适应窗口大小
     * @default           -
     */

package/lib/ProTreeModal/index.js

@@ -225,9 +225,13 @@ var ProTreeModal = function ProTreeModal(props) {
     // 全选的时候返回 allValue 标记即可
     // 3.3.2 版本全选的时候返回所有值的合集 list
     if (allValue !== undefined && state.checkAll && !draggable) {
-      onChange === null || onChange === void 0 ? void 0 : onChange(state.flatTreeData.map(function (item) {
-        return item[fieldNameValue];
-      }));
+      if (labelInValue) {
+        onChange === null || onChange === void 0 ? void 0 : onChange(state.flatTreeData);
+      } else {
+        onChange === null || onChange === void 0 ? void 0 : onChange(state.flatTreeData.map(function (item) {
+          return item[fieldNameValue];
+        }));
+      }
     } else if (draggable && span) {
       var _listRef$current;
       // 开启 draggable 使用拖拽后的顺序

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.11-beta.3",
+  "version": "3.4.11-beta.5",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",