@zat-design/sisyphus-react 3.5.0-beta.7 → 3.5.1

package/dist/index.esm.css

@@ -2937,7 +2937,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .ant-form-item-label > label {
   white-space: pre-wrap;
-  word-break: keep-all;
+  word-break: break-all;
 }
 .pro-form .suffix-value {
   margin-left: calc(var(--zaui-space-size-sm, 8px) * var(--zaui-size, 1));
@@ -5313,7 +5313,7 @@ input[type='button'] {
 .ant-form .ant-form-item .ant-form-item-label > label,
 .ant-drawer .ant-form-item .ant-form-item-label > label,
 .ant-modal .ant-form-item .ant-form-item-label > label {
-  word-break: keep-all;
+  word-break: break-all;
 }
 .ant-form .ant-form-item .ant-form-item-label > label::after,
 .ant-drawer .ant-form-item .ant-form-item-label > label::after,

package/dist/less.esm.css

@@ -2937,7 +2937,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .ant-form-item-label > label {
   white-space: pre-wrap;
-  word-break: keep-all;
+  word-break: break-all;
 }
 .pro-form .suffix-value {
   margin-left: calc(var(--zaui-space-size-sm, 8px) * var(--zaui-size, 1));

package/es/ProForm/components/combination/Group/utils.js

@@ -263,6 +263,7 @@ export var useTransformColumns = function useTransformColumns(params) {
       name: columnName
     }, reactiveProps), {}, {
       disabled: reactiveProps.disabled || groupProps.disabled,
+      getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
       fieldProps: _objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
         onChange: handleChange,
         value: value === null || value === void 0 ? void 0 : value[index]

package/es/ProForm/style/index.less

@@ -215,7 +215,7 @@
   .@{ant-prefix}-form-item-label {
     > label {
       white-space: pre-wrap;
-      word-break: keep-all;
+      word-break: break-all;
     }
   }
 

package/es/ProForm/utils/useForm.js

@@ -1,4 +1,5 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
@@ -11,7 +12,6 @@ export var useForm = function useForm(originForm) {
     form = _Form$useForm2[0];
   var getFieldsValue = form.getFieldsValue,
     validateFields = form.validateFields,
-    setFieldsValue = form.setFieldsValue,
     isModified = form.isModified;
   if (isModified) return [form];
   // @ts-ignore
@@ -23,13 +23,6 @@ export var useForm = function useForm(originForm) {
     }
     return getFieldsValue(nameList, filterFunc);
   };
-  // const _setFieldsValue: FormInstance<T>['setFieldsValue'] = (data) => {
-  //   // 解决names通过set设置无法触发rc-field-form中onStoreChange的问题
-  //   setTimeout(() => {
-  //     const baseData = getFieldsValue(true);
-  //     setFieldsValue({ ...baseData, ...data });
-  //   }, 0);
-  // };
   var _validateFields = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
       var _rest$,
@@ -66,8 +59,11 @@ export var useForm = function useForm(originForm) {
                 validateNames.push(item.name);
               }
             });
+            if (Array.isArray(nameList) && nameList.length && !validateNames.length) {
+              validateNames = _toConsumableArray(nameList);
+            }
             // @ts-ignore
-            delete rest[0].recursive;
+            // delete rest[0].recursive;
             _context.next = 11;
             return validateFields.apply(void 0, [validateNames].concat(rest)).then(function (values) {
               return filterInternalFields(values);
@@ -105,6 +101,5 @@ export var useForm = function useForm(originForm) {
   form.getFieldsValue = _getFieldsValue;
   form.validateFields = _validateFields;
   form.isModified = true;
-  // form.setFieldsValue = _setFieldsValue;
   return [form];
 };

package/es/ProSelect/propsType.d.ts

@@ -4,7 +4,7 @@ import { Service, Options, Result } from 'ahooks/lib/useRequest/src/types';
 import { ProFormOtherProps } from '../ProForm/propsType';
 export interface DataOption {
     label?: string;
-    value?: string;
+    value?: string | number;
     [key: string]: any;
 }
 export interface PropSelectProps extends Omit<SelectProps, 'onSearch'> {

package/es/ProStep/components/Listener/index.d.ts

@@ -1,5 +1,3 @@
 import React from 'react';
-declare const _default: ({ children, delayTime, }: any) => React.DetailedReactHTMLElement<{
-    onClick: import("lodash").DebouncedFunc<() => Promise<void>>;
-}, HTMLElement>;
+declare const _default: ({ children, delayTime, ...props }: any) => React.DetailedReactHTMLElement<any, HTMLElement>;
 export default _default;

package/es/ProStep/components/Listener/index.js

@@ -1,14 +1,18 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["children", "delayTime"];
 import { throttle } from 'lodash';
 import React from 'react';
 import { useStep } from '../../index';
 export default (function (_ref) {
   var children = _ref.children,
-    delayTime = _ref.delayTime;
+    delayTime = _ref.delayTime,
+    props = _objectWithoutProperties(_ref, _excluded);
   var _useStep = useStep(),
     notify = _useStep.notify;
-  return /*#__PURE__*/React.cloneElement(children, {
+  return /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, props), {}, {
     onClick: throttle( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var values;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -32,5 +36,5 @@ export default (function (_ref) {
         }
       }, _callee);
     })), 3000)
-  });
+  }));
 });

package/es/ProStep/index.d.ts

@@ -7,8 +7,6 @@ declare const ProStep: {
     ({ children, ...resetProps }: ProStepPropsType): JSX.Element;
     useStep: () => any;
     Item: ({ id, title, collapse: collapseItem, children, ...restProps }: import("./propsType").ProStepItem) => JSX.Element;
-    Listener: ({ children, delayTime, }: any) => import("react").DetailedReactHTMLElement<{
-        onClick: import("lodash").DebouncedFunc<() => Promise<void>>;
-    }, HTMLElement>;
+    Listener: ({ children, delayTime, ...props }: any) => import("react").DetailedReactHTMLElement<any, HTMLElement>;
 };
 export default ProStep;

package/es/style/theme/antd.less

@@ -55,7 +55,7 @@
       }
 
       & > label {
-        word-break: keep-all;
+        word-break: break-all;
 
         // 隐藏冒号
         &::after {

package/lib/ProForm/components/combination/Group/utils.js

@@ -270,6 +270,7 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
       name: columnName
     }, reactiveProps), {}, {
       disabled: reactiveProps.disabled || groupProps.disabled,
+      getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
       fieldProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
         onChange: handleChange,
         value: value === null || value === void 0 ? void 0 : value[index]

package/lib/ProForm/style/index.less

@@ -215,7 +215,7 @@
   .@{ant-prefix}-form-item-label {
     > label {
       white-space: pre-wrap;
-      word-break: keep-all;
+      word-break: break-all;
     }
   }
 

package/lib/ProForm/utils/useForm.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useForm = void 0;
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _antd = require("antd");
@@ -17,7 +18,6 @@ var useForm = exports.useForm = function useForm(originForm) {
     form = _Form$useForm2[0];
   var getFieldsValue = form.getFieldsValue,
     validateFields = form.validateFields,
-    setFieldsValue = form.setFieldsValue,
     isModified = form.isModified;
   if (isModified) return [form];
   // @ts-ignore
@@ -29,13 +29,6 @@ var useForm = exports.useForm = function useForm(originForm) {
     }
     return getFieldsValue(nameList, filterFunc);
   };
-  // const _setFieldsValue: FormInstance<T>['setFieldsValue'] = (data) => {
-  //   // 解决names通过set设置无法触发rc-field-form中onStoreChange的问题
-  //   setTimeout(() => {
-  //     const baseData = getFieldsValue(true);
-  //     setFieldsValue({ ...baseData, ...data });
-  //   }, 0);
-  // };
   var _validateFields = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
       var _rest$,
@@ -72,8 +65,11 @@ var useForm = exports.useForm = function useForm(originForm) {
                 validateNames.push(item.name);
               }
             });
+            if (Array.isArray(nameList) && nameList.length && !validateNames.length) {
+              validateNames = (0, _toConsumableArray2.default)(nameList);
+            }
             // @ts-ignore
-            delete rest[0].recursive;
+            // delete rest[0].recursive;
             _context.next = 11;
             return validateFields.apply(void 0, [validateNames].concat(rest)).then(function (values) {
               return (0, _index.filterInternalFields)(values);
@@ -111,6 +107,5 @@ var useForm = exports.useForm = function useForm(originForm) {
   form.getFieldsValue = _getFieldsValue;
   form.validateFields = _validateFields;
   form.isModified = true;
-  // form.setFieldsValue = _setFieldsValue;
   return [form];
 };

package/lib/ProSelect/propsType.d.ts

@@ -4,7 +4,7 @@ import { Service, Options, Result } from 'ahooks/lib/useRequest/src/types';
 import { ProFormOtherProps } from '../ProForm/propsType';
 export interface DataOption {
     label?: string;
-    value?: string;
+    value?: string | number;
     [key: string]: any;
 }
 export interface PropSelectProps extends Omit<SelectProps, 'onSearch'> {

package/lib/ProStep/components/Listener/index.d.ts

@@ -1,5 +1,3 @@
 import React from 'react';
-declare const _default: ({ children, delayTime, }: any) => React.DetailedReactHTMLElement<{
-    onClick: import("lodash").DebouncedFunc<() => Promise<void>>;
-}, HTMLElement>;
+declare const _default: ({ children, delayTime, ...props }: any) => React.DetailedReactHTMLElement<any, HTMLElement>;
 export default _default;

package/lib/ProStep/components/Listener/index.js

@@ -7,15 +7,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _lodash = require("lodash");
 var _react = _interopRequireDefault(require("react"));
 var _index = require("../../index");
+var _excluded = ["children", "delayTime"];
 var _default = exports.default = function _default(_ref) {
   var children = _ref.children,
-    delayTime = _ref.delayTime;
+    delayTime = _ref.delayTime,
+    props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _useStep = (0, _index.useStep)(),
     notify = _useStep.notify;
-  return /*#__PURE__*/_react.default.cloneElement(children, {
+  return /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
     onClick: (0, _lodash.throttle)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var values;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
@@ -39,5 +43,5 @@ var _default = exports.default = function _default(_ref) {
         }
       }, _callee);
     })), 3000)
-  });
+  }));
 };

package/lib/ProStep/index.d.ts

@@ -7,8 +7,6 @@ declare const ProStep: {
     ({ children, ...resetProps }: ProStepPropsType): JSX.Element;
     useStep: () => any;
     Item: ({ id, title, collapse: collapseItem, children, ...restProps }: import("./propsType").ProStepItem) => JSX.Element;
-    Listener: ({ children, delayTime, }: any) => import("react").DetailedReactHTMLElement<{
-        onClick: import("lodash").DebouncedFunc<() => Promise<void>>;
-    }, HTMLElement>;
+    Listener: ({ children, delayTime, ...props }: any) => import("react").DetailedReactHTMLElement<any, HTMLElement>;
 };
 export default ProStep;

package/lib/style/theme/antd.less

@@ -55,7 +55,7 @@
       }
 
       & > label {
-        word-break: keep-all;
+        word-break: break-all;
 
         // 隐藏冒号
         &::after {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.5.0-beta.7",
+  "version": "3.5.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -58,7 +58,7 @@
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
     "@pansy/react-watermark": "^3.1.13",
-    "@zat-design/utils": "^1.1.23",
+    "@zat-design/utils": "^1.1.25",
     "ahooks": "3.7.4",
     "antd": "4.24.8",
     "big.js": "^6.2.1",