@zat-design/sisyphus-react 3.13.14-deta.2 → 4.0.0-beta.3

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

@@ -16,11 +16,10 @@ import type { Props as SwitchProps } from '../base/Switch';
 import type { Props as SwitchCheckboxProps } from '../base/SwitchCheckbox';
 import type { Props as TextAreaProps } from '../base/TextArea';
 import type { ProCascaderType } from '../combination/ProCascader/propsType';
-import type { ProCombinationType } from '../combination/ProCombination/propsType';
 import type { ProModalSelectType } from '../combination/ProModalSelect/propsType';
 import type { ProNumberRangeType } from '../combination/ProNumberRange/propsType';
 import type { ProLimitProps } from '../combination/ProTimeLimit';
-import type { Props as ProRangeLimitProps } from '../combination/ProRangeLimit';
+import type { ProRangeLimitType } from '../combination/ProRangeLimit/propsType';
 import type { CheckboxPropsMap, ProEnum, PropProSelectsMap, PropRadioPropsMap } from '../../../ProEnum/propsType';
 import type { PropSelectProps as ProSelectProps } from '../../../ProSelect/propsType';
 import type { ProEditTableType } from '../../../ProEditTable/propsType';
@@ -123,9 +122,6 @@ export type ColumnTypeMap<Values = any, T = 'ProForm'> = {
 } | {
     type?: 'ProCascader';
     fieldProps?: FieldType<ProCascaderType, Values, T>;
-} | {
-    type?: 'ProCombination';
-    fieldProps?: FieldType<ProCombinationType, Values, T>;
 } | {
     type?: 'ProModalSelect';
     fieldProps?: FieldType<ProModalSelectType, Values, T>;
@@ -134,7 +130,7 @@ export type ColumnTypeMap<Values = any, T = 'ProForm'> = {
     fieldProps?: FieldType<ProNumberRangeType, Values, T>;
 } | {
     type?: 'ProRangeLimit';
-    fieldProps?: FieldType<ProRangeLimitProps, Values, T>;
+    fieldProps?: FieldType<ProRangeLimitType, Values, T>;
 } | {
     type?: 'ProTimeLimit';
     fieldProps?: FieldType<ProLimitProps, Values, T>;

package/es/ProForm/components/render/propsType.js

@@ -1,2 +1,27 @@
+/**
+ * percent 百分比 permillage 千分比 amount 金额
+ */
+
+/**
+ * 扩展函数的参数
+ */
+
+// ProForm场景 转换value为可选, onChange参数修改
+
 var a = {};
+
+/**
+ * 值转换
+ */
+
+// 扩展依赖类型的ProFormColumn接口
+
+/**
+ * 表单渲染类型
+ */
+
+/**
+ * 兼容旧命名导出
+ */
+// 类型别名
 export {};

package/es/ProForm/index.js

@@ -1,35 +1,27 @@
-import "antd/es/row/style";
-import _Row from "antd/es/row";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/col/style";
-import _Col from "antd/es/col";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _omit from "lodash/omit";
-import _merge from "lodash/merge";
-import _isObject from "lodash/isObject";
 var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize", "desensitizationKey", "stopOnFirstError"];
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DoubleLeftOutlined } from '@ant-design/icons';
+import { Col, Form, Row, Space } from 'antd';
 import classnames from 'classnames';
 import React, { forwardRef, useImperativeHandle, useMemo, useEffect } from 'react';
-import { FormFooter, InputRange, ProAddress, ProCascader, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeModal, ProTree, EnumSelect } from './components';
-import RenderFields from './components/render/RenderFields';
-import { useProConfig } from '../ProConfigProvider';
-import { useProDrawerFormContext } from '../ProDrawerForm';
-import { getLayout, splitNameStr, useControlled, initialValuesToNames, filterInternalFields, getFormFieldPaths } from './utils/index';
-import { useForm } from './utils/useForm';
-import { useFieldProps } from './utils/useFieldProps';
-import locale from '../locale';
-import useWatch from './utils/useWatch';
-import FormsProvider, { useContextForms, useForms } from '../FormsProvider';
-import { useStep } from '../ProStep';
+import { isObject, merge, omit } from 'lodash';
+import { FormFooter } from "./components";
+import RenderFields from "./components/render/RenderFields";
+import { useProConfig } from "../ProConfigProvider";
+import { useProDrawerFormContext } from "../ProDrawerForm";
+import { getLayout, splitNameStr, useControlled, initialValuesToNames, filterInternalFields, getFormFieldPaths } from "./utils/index";
+import { useForm } from "./utils/useForm";
+import { useFieldProps } from "./utils/useFieldProps";
+import locale from "../locale";
+import useWatch from "./utils/useWatch";
+import FormsProvider, { useContextForms, useForms } from "../FormsProvider";
+import { useStep } from "../ProStep";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var ProForm = function ProForm(props, ref) {
   var _localStorage, _ref3;
   var _props$mode = props.mode,
@@ -95,6 +87,7 @@ var ProForm = function ProForm(props, ref) {
     }),
     _useForm2 = _slicedToArray(_useForm, 1),
     form = _useForm2[0];
+
   // 保存内部配置
   useEffect(function () {
     if (!form.__INTERNAL_CONFIG__) {
@@ -118,36 +111,38 @@ var ProForm = function ProForm(props, ref) {
     colProps = _getLayout.colProps,
     _onOk = _getLayout.onOk,
     _onCancel = _getLayout.onCancel;
+
   // 初始值names转换
   var _initialValues = useMemo(function () {
     var values = initialValuesToNames(initialValues, columns);
     return values;
   }, []);
+
   /**
    * 展开&收起函数
    */
   var expandHandle = function expandHandle() {
-    setOpenState === null || setOpenState === void 0 ? void 0 : setOpenState(!openState);
+    setOpenState === null || setOpenState === void 0 || setOpenState(!openState);
   };
   var expandRender = function expandRender() {
-    return !!expand && columns.length > Number(expand) && _jsx("div", {
+    return !!expand && columns.length > Number(expand) && /*#__PURE__*/_jsx("div", {
       className: "expand-button",
       onClick: expandHandle,
-      children: !openState ? _jsxs(_Space, {
+      children: !openState ? /*#__PURE__*/_jsxs(Space, {
         align: "center",
-        children: [locale.ProForm.unfold, _jsx(DoubleLeftOutlined, {
+        children: [locale.ProForm.unfold, /*#__PURE__*/_jsx(DoubleLeftOutlined, {
           className: "rotate-to-bottom"
         })]
-      }) : _jsxs(_Space, {
+      }) : /*#__PURE__*/_jsxs(Space, {
         align: "center",
-        children: [locale.ProForm.packUp, _jsx(DoubleLeftOutlined, {
+        children: [locale.ProForm.packUp, /*#__PURE__*/_jsx(DoubleLeftOutlined, {
           className: "rotate-to-top"
         })]
       })
     });
   };
   var defaultFooter = function defaultFooter(footerConfig) {
-    return _jsx(FormFooter, {
+    return /*#__PURE__*/_jsx(FormFooter, {
       formId: formId,
       onOk: onOk || _onOk,
       okText: okText,
@@ -158,13 +153,16 @@ var ProForm = function ProForm(props, ref) {
       form: form
     });
   };
+
   // 暴露form出去给类组件使用
   useImperativeHandle(ref, function () {
     return form;
   });
+
   // 解决平铺后的值拿不到的问题
   var handleValuesChange = function handleValuesChange(changedValue) {
     if (!onValuesChange) return;
+
     // 暂时通过'-'区分组合组件字段和普通字段
     var keys = Object.keys(changedValue);
     if (!keys.length) {
@@ -180,12 +178,13 @@ var ProForm = function ProForm(props, ref) {
         }
         return {};
       });
-      onValuesChange(filterInternalFields(_merge.apply(void 0, [changedValue].concat(_toConsumableArray(values))), optimize), form.getFieldsValue());
+      onValuesChange(filterInternalFields(merge.apply(void 0, [changedValue].concat(_toConsumableArray(values))), optimize), form.getFieldsValue());
     }
   };
+
   // 包装一层兼容 names 改变
   var handleFinish = function handleFinish() {
-    onFinish === null || onFinish === void 0 ? void 0 : onFinish(form.getFieldsValue());
+    onFinish === null || onFinish === void 0 || onFinish(form.getFieldsValue());
   };
   var cls = classnames(_defineProperty({
     'pro-form': true,
@@ -199,26 +198,28 @@ var ProForm = function ProForm(props, ref) {
     if (isView || disabled) {
       // 查看或禁用模式
       footerEle = null;
-    } else if (/*#__PURE__*/React.isValidElement(footer)) {
+    } else if ( /*#__PURE__*/React.isValidElement(footer)) {
       // 传入组件渲染组件
       footerEle = footer;
-    } else if (footer === undefined || footer || _isObject(footer)) {
+    } else if (footer === undefined || footer || isObject(footer)) {
       // 不传或者传入对象 渲染默认
       footerEle = defaultFooter(footer);
     }
+
     // 展开折叠按钮
     var expandEle = expandRender();
     var hasElement = footerEle || expandEle;
-    return hasElement ? _jsx(_Col, _objectSpread(_objectSpread({}, colProps), {}, {
+    return hasElement ? /*#__PURE__*/_jsx(Col, _objectSpread(_objectSpread({}, colProps), {}, {
       className: footerCls,
-      children: _jsxs(_Space, {
+      children: /*#__PURE__*/_jsxs(Space, {
         align: "center",
         children: [footerEle, expandEle]
       })
     })) : null;
   };
+
   // 国际化，非中文时默认上下布局
-  if (((_localStorage = localStorage) === null || _localStorage === void 0 ? void 0 : _localStorage.locale) && localStorage.locale !== 'zh-CN') {
+  if ((_localStorage = localStorage) !== null && _localStorage !== void 0 && _localStorage.locale && localStorage.locale !== 'zh-CN') {
     // 一行布局时，左右布局
     if (span === 24) {
       otherProps.layout = otherProps.layout || 'horizontal';
@@ -227,7 +228,7 @@ var ProForm = function ProForm(props, ref) {
       otherProps.layout = otherProps.layout || 'vertical';
     }
   }
-  return _jsxs(_Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsxs(Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     onKeyPress: function onKeyPress(event) {
       if (!submitOnEnter) return;
       if (event.key === 'Enter') {
@@ -236,25 +237,23 @@ var ProForm = function ProForm(props, ref) {
     },
     className: cls,
     form: form
-  }, formProps), _omit(config, ['isDiffAll'])), otherProps), {}, {
+  }, formProps), omit(config, ['isDiffAll'])), otherProps), {}, {
     labelAlign: (_ref3 = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref3 !== void 0 ? _ref3 : 'left',
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,
     initialValues: _initialValues,
-    scrollToFirstError: {
-      block: 'center',
-      behavior: 'smooth'
-    },
-    children: [_jsxs(_Row, _objectSpread(_objectSpread({
+    children: [/*#__PURE__*/_jsxs(Row, _objectSpread(_objectSpread({
       gutter: 24
     }, rowProps), {}, {
-      children: [_jsx(RenderFields, {
+      children: [/*#__PURE__*/_jsx(RenderFields, {
         form: form,
         isView: isView,
         columns: columns,
         disabled: disabled,
-        expand: expand,
-        openState: openState,
+        expand: expand // 展示条数
+        ,
+        openState: openState // 展开折叠状态
+        ,
         colProps: colProps,
         viewEmpty: viewEmpty,
         labelWidth: labelWidth,
@@ -268,6 +267,7 @@ var ProForm = function ProForm(props, ref) {
     })), children]
   }));
 };
+
 // @ts-ignore
 var ProFormForward = /*#__PURE__*/forwardRef(ProForm);
 ProFormForward.useForm = useForm;
@@ -283,23 +283,28 @@ export var ProFormProvider = function ProFormProvider(props) {
         value = _item$value === void 0 ? [] : _item$value;
       var name = item.name;
       var namesStr = name[name.length - 1];
+
       // name中的最后一位如果包含 '-' 则是names组件
       var isNames = String(namesStr).includes('-');
       if (!isNames) return item; // 不是names组件直接返回
+
       var namesList = splitNameStr(String(namesStr)); // 拆解出name列表
+
       var prefix = name.slice(0, name.length - 1);
       return namesList.map(function (nameItem, index) {
         return _objectSpread(_objectSpread({}, item), {}, {
           name: [].concat(_toConsumableArray(prefix), _toConsumableArray(nameItem)),
+          // 拼接前缀 组成完整name
           value: value[index]
         });
       });
     });
     info.changedFields = _changedFields;
+
     // @ts-ignore
     onFormChange(formName, info);
   };
-  return _jsx(_Form.Provider, {
+  return /*#__PURE__*/_jsx(Form.Provider, {
     onFormChange: onFormChange ? handleFormChange : undefined,
     onFormFinish: onFormFinish,
     children: children
@@ -310,24 +315,6 @@ ProFormForward.useFieldProps = useFieldProps; // 获取每个字段的其他参
 // 表单实例共享
 ProFormForward.FormsProvider = FormsProvider; // 表单实例共享Provider
 ProFormForward.useForms = useForms; // 获取上下文中的共享的表单实例map
-ProFormForward.useFormInstances = useForms; // 获取上下文中的共享的表单实例map
 ProFormForward.useContextForms = useContextForms; // 获取上下文中的共享的表单实例map
-// 内置组合
-ProFormForward.ProCascader = ProCascader;
-ProFormForward.ProCombination = ProCombination;
-ProFormForward.ProNumberRange = ProNumberRange;
-ProFormForward.ProModalSelect = ProModalSelect;
-ProFormForward.ProTimeLimit = ProTimeLimit;
-ProFormForward.ProUpload = ProUpload;
-// ProFormForward.ProTreeSelect = ProTreeSelect;
-ProFormForward.ProTreeModal = ProTreeModal;
-ProFormForward.ProTree = ProTree;
-// 待废弃
-ProFormForward.EnumSelect = EnumSelect;
-ProFormForward.ProAddress = ProAddress;
-ProFormForward.InputRange = InputRange;
-ProFormForward.ProRangeBox = ProRangeBox;
-ProFormForward.ProCertValidity = ProCertValidity;
-ProFormForward.ProCertNo = ProCertNo;
-ProFormForward.transferAddressInfoToRegion = transferAddressInfoToRegion;
+
 export default ProFormForward;

package/es/ProForm/propsType.d.ts

@@ -5,7 +5,7 @@ import { StoreValue, Store } from 'rc-field-form/es/interface.d';
 import { ShouldUpdate } from 'rc-field-form/es/Field.d';
 import React, { ReactNode } from 'react';
 import type { ProFormColumnType, ViewType } from './components/render/propsType';
-import type { ProFormComponentType } from './components/index.d';
+import type { ProFormComponentType } from './components/index';
 export interface ButtonType extends ButtonProps {
     children?: any;
 }

package/es/ProForm/propsType.js

@@ -1 +1,5 @@
-export var otherKeys = ['isView', 'viewEmpty', 'label', 'valueType', 'viewType', 'name', 'names', 'form', 'type', 'hiddenNames'];
+export var otherKeys = ['isView', 'viewEmpty', 'label', 'valueType', 'viewType', 'name', 'names', 'form', 'type', 'hiddenNames'];
+
+/**
+ * 兼容旧命名导出
+ */

package/es/ProForm/style/index.less

@@ -1,6 +1,7 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 @import '../components/base/SwitchCheckbox/style/index.less';
+@import '../components/base/TimePicker/style/index.less';
 @import '../components/base/TextArea/index.less';
 @import '../components/combination/FormList/style/index.less';
 @import '../components/combination/ProTimeLimit/style/index.less';
@@ -9,8 +10,6 @@
 @import '../components/combination/ProModalSelect/style/index.less';
 @import '../components/combination/Group/style/index.less';
 @import '../components/combination/Container/style/index.less';
-@import '../components/old/EnumSelect/style/index.less';
-@import '../components/old/EnumSelect/style/index.less';
 
 .pro-form {
   &.@{ant-prefix}-form-vertical {
@@ -106,7 +105,6 @@
   }
 
   .@{ant-prefix}-form-item {
-    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1)) !important;
 
     &.pro-form-item-width-auto {
       .@{ant-prefix}-form-item-control-input {
@@ -137,13 +135,6 @@
       display: none;
     }
 
-    .@{ant-prefix}-form-item-explain {
-      height: auto;
-
-      .@{ant-prefix}-form-item-explain-error {
-        font-size: var(--zaui-font-size, 14px);
-      }
-    }
 
     .@{ant-prefix}-input-number {
       width: 100%;
@@ -186,8 +177,8 @@
 
   .@{ant-prefix}-form-item-has-error {
     .group-separator {
-      color: var(--ant-error-color);
-      border-color: var(--ant-error-color);
+      color: #ff4d4f;
+      border-color: #ff4d4f;
     }
 
     .site-input-split {
@@ -318,8 +309,7 @@
     width: 18px;
   }
   .pro-form-list-tool-btn {
-    margin-left: 8px;
-    padding: 0;
+    padding: 0 4px;
     cursor: pointer;
     .anticon {
       color: var(--zaui-text-weak, #a0a0a0);

package/es/ProForm/utils/diffOriginal.js

@@ -1,11 +1,10 @@
-import _isObject from "lodash/isObject";
-import _isFunction from "lodash/isFunction";
-import _isEqual from "lodash/isEqual";
-import { isEmpty } from '../../utils';
+import { isEqual, isFunction, isObject } from 'lodash';
+import { isEmpty } from "../../utils";
 // 过滤对象中undefined字段
 // 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
 var filterObject = function filterObject(data) {
-  if (!_isObject(data) || data === null) return data;
+  if (!isObject(data) || data === null) return data;
+
   // ['1', undefined] ['1', ''] 视为相等
   if (Array.isArray(data)) {
     // 数组中全是empty值的话 视为null
@@ -25,6 +24,7 @@ var filterObject = function filterObject(data) {
       resData[key] = data[key];
     }
   });
+
   // 空对象视为null 比较时 null undefined {} [] '' 视为相等
   if (!Object.keys(resData).length) return null;
   return resData;
@@ -34,7 +34,7 @@ export var diffOriginal = function diffOriginal(params) {
     value = params.value,
     onDiff = params.onDiff;
   // 支持传入自定义比较事件
-  if (_isFunction(onDiff)) {
+  if (isFunction(onDiff)) {
     var diffRes = onDiff(originalValue, value);
     // 如果返回undefined走内置比较逻辑
     if (diffRes !== undefined) {
@@ -48,9 +48,11 @@ export var diffOriginal = function diffOriginal(params) {
   var _originalValue = filterObject(originalValue);
   var isEmptyVal = isEmpty(_value);
   var isEmptyOrg = isEmpty(_originalValue);
+
   // 都为空视为相等
   if (isEmptyOrg && isEmptyVal) return 'same';
+
   // 如果原始值为空 且当前有值的话 视为新增
   if (isEmptyOrg && !isEmptyVal) return 'add';
-  return _isEqual(_value, _originalValue) ? 'same' : 'changed';
+  return isEqual(_value, _originalValue) ? 'same' : 'changed';
 };

package/es/ProForm/utils/getDefaultProps.js

@@ -1,5 +1,4 @@
-import _isEqual from "lodash/isEqual";
-import _get from "lodash/get";
+import { get, isEqual } from 'lodash';
 var defaultPropsMap = {
   ProSelect: function ProSelect(props) {
     var fieldProps = props.fieldProps,
@@ -8,18 +7,19 @@ var defaultPropsMap = {
     var _ref = fieldProps || {},
       filterInList = _ref.filterInList;
     var defaultProps = {};
+
     // formList场景传入列表过滤时
     if (filterInList && namePath && name) {
       var _listName = namePath.slice(0, -1);
       var _namePath = name.slice(1);
       defaultProps.shouldUpdate = function (preValues, curValues) {
-        var preListValue = _get(preValues, _listName).map(function (item) {
-          return _get(item, _namePath);
+        var preListValue = get(preValues, _listName).map(function (item) {
+          return get(item, _namePath);
         });
-        var curListValue = _get(curValues, _listName).map(function (item) {
-          return _get(item, _namePath);
+        var curListValue = get(curValues, _listName).map(function (item) {
+          return get(item, _namePath);
         });
-        return !_isEqual(preListValue, curListValue);
+        return !isEqual(preListValue, curListValue);
       };
     }
     return defaultProps;

package/es/ProForm/utils/index.d.ts

@@ -61,7 +61,6 @@ export declare function initialValuesToNames(values: AnyObject, columns: AnyObje
  * @returns ['group-7x19no', 0, 'abc'] =>['group-7x19no', 0]
  */
 export declare function getArrayBeforeNumber(arr: (string | number)[]): (string | number)[];
-export declare const customEqualForFun: (value: any, other: any) => boolean;
 /**
  * 查询数据中是否包含rowKey
  */
@@ -102,4 +101,19 @@ export declare const parseNamePath: (input: string) => any;
  */
 export declare const getFormFieldPaths: (form: FormInstance) => any[];
 export declare function findNamesKeyInArray(arr: string[], key: string): string | null;
+type DataItem = (string | number)[];
+/**
+ * 根据特定规则合并两个数据源 (TypeScript 版本)
+ * @param data1 第一个数据源
+ * @param data2 第二个数据源
+ * @returns 合并后的结果数组
+ */
+export declare const mergeNames: (data1: DataItem[], data2: DataItem[]) => DataItem[];
+/**
+ * 是否 formlist或者pro-edit-table 场景
+ * 使用正则表达式判断一个由逗号分隔的字符串中，是否包含一个纯数字的片段。
+ * @param {string} str - 输入的字符串。
+ * @returns {boolean} - 如果匹配成功，返回 true；否则返回 false。
+ */
+export declare const isListForm: (str: string) => boolean;
 export {};