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

package/es/ProForm/index.js

@@ -1,11 +1,16 @@
+import "antd/es/form/style";
+import _Form from "antd/es/form";
+import "antd/es/row/style";
+import _Row from "antd/es/row";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import "antd/es/col/style";
+import _Col from "antd/es/col";
+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";
-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", "shouldUpdateDebounce"];
+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", "stopOnFirstError", "shouldUpdateDebounce"];
 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 { isObject, merge, omit } from 'lodash';
@@ -22,7 +27,7 @@ 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 ProForm = (props, ref) => {
   var _localStorage, _ref3;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
@@ -65,8 +70,6 @@ var ProForm = function ProForm(props, ref) {
     scrollToError = _props$scrollToError === void 0 ? true : _props$scrollToError,
     _props$optimize = props.optimize,
     optimize = _props$optimize === void 0 ? false : _props$optimize,
-    _props$desensitizatio = props.desensitizationKey,
-    desensitizationKey = _props$desensitizatio === void 0 ? 'zat-design-pro-component-desensitization' : _props$desensitizatio,
     _props$stopOnFirstErr = props.stopOnFirstError,
     stopOnFirstError = _props$stopOnFirstErr === void 0 ? false : _props$stopOnFirstErr,
     _props$shouldUpdateDe = props.shouldUpdateDebounce,
@@ -82,16 +85,16 @@ var ProForm = function ProForm(props, ref) {
     _ref2$source = _ref2.source,
     stepSource = _ref2$source === void 0 ? '' : _ref2$source;
   var _useForm = useForm(originForm, {
-      scrollToError: scrollToError,
-      optimize: optimize,
-      formKey: formKey,
+      scrollToError,
+      optimize,
+      formKey,
       source: source || stepSource || 'ProForm'
     }),
     _useForm2 = _slicedToArray(_useForm, 1),
     form = _useForm2[0];
 
   // 保存内部配置
-  useEffect(function () {
+  useEffect(() => {
     if (!form.__INTERNAL_CONFIG__) {
       form.__INTERNAL_CONFIG__ = {};
     }
@@ -106,8 +109,8 @@ var ProForm = function ProForm(props, ref) {
     openState = _useControlled2[0],
     setOpenState = _useControlled2[1];
   var _getLayout = getLayout({
-      span: span,
-      form: form
+      span,
+      form
     }),
     formProps = _getLayout.formProps,
     colProps = _getLayout.colProps,
@@ -115,7 +118,7 @@ var ProForm = function ProForm(props, ref) {
     _onCancel = _getLayout.onCancel;
 
   // 初始值names转换
-  var _initialValues = useMemo(function () {
+  var _initialValues = useMemo(() => {
     var values = initialValuesToNames(initialValues, columns);
     return values;
   }, []);
@@ -123,19 +126,19 @@ var ProForm = function ProForm(props, ref) {
   /**
    * 展开&收起函数
    */
-  var expandHandle = function expandHandle() {
+  var expandHandle = () => {
     setOpenState === null || setOpenState === void 0 || setOpenState(!openState);
   };
-  var expandRender = function expandRender() {
+  var expandRender = () => {
     return !!expand && columns.length > Number(expand) && /*#__PURE__*/_jsx("div", {
       className: "expand-button",
       onClick: expandHandle,
-      children: !openState ? /*#__PURE__*/_jsxs(Space, {
+      children: !openState ? /*#__PURE__*/_jsxs(_Space, {
         align: "center",
         children: [locale.ProForm.unfold, /*#__PURE__*/_jsx(DoubleLeftOutlined, {
           className: "rotate-to-bottom"
         })]
-      }) : /*#__PURE__*/_jsxs(Space, {
+      }) : /*#__PURE__*/_jsxs(_Space, {
         align: "center",
         children: [locale.ProForm.packUp, /*#__PURE__*/_jsx(DoubleLeftOutlined, {
           className: "rotate-to-top"
@@ -143,7 +146,7 @@ var ProForm = function ProForm(props, ref) {
       })
     });
   };
-  var defaultFooter = function defaultFooter(footerConfig) {
+  var defaultFooter = footerConfig => {
     return /*#__PURE__*/_jsx(FormFooter, {
       formId: formId,
       onOk: onOk || _onOk,
@@ -157,12 +160,10 @@ var ProForm = function ProForm(props, ref) {
   };
 
   // 暴露form出去给类组件使用
-  useImperativeHandle(ref, function () {
-    return form;
-  });
+  useImperativeHandle(ref, () => form);
 
   // 解决平铺后的值拿不到的问题
-  var handleValuesChange = function handleValuesChange(changedValue) {
+  var handleValuesChange = changedValue => {
     if (!onValuesChange) return;
 
     // 暂时通过'-'区分组合组件字段和普通字段
@@ -170,32 +171,31 @@ var ProForm = function ProForm(props, ref) {
     if (!keys.length) {
       onValuesChange(filterInternalFields(changedValue, optimize), form.getFieldsValue());
     } else {
-      var values = keys.map(function (key) {
+      var values = keys.map(key => {
         if (key.includes('-')) {
           var comKeys = [];
-          comKeys = key.split('-').map(function (keyStr) {
-            return keyStr.split('_');
-          });
+          comKeys = key.split('-').map(keyStr => keyStr.split('_'));
           return form.getFieldsValue(comKeys);
         }
         return {};
       });
-      onValuesChange(filterInternalFields(merge.apply(void 0, [changedValue].concat(_toConsumableArray(values))), optimize), form.getFieldsValue());
+      onValuesChange(filterInternalFields(merge(changedValue, ...values), optimize), form.getFieldsValue());
     }
   };
 
   // 包装一层兼容 names 改变
-  var handleFinish = function handleFinish() {
+  var handleFinish = () => {
     onFinish === null || onFinish === void 0 || onFinish(form.getFieldsValue());
   };
-  var cls = classnames(_defineProperty({
+  var cls = classnames({
     'pro-form': true,
-    'pro-form-view': isView
-  }, className, className));
+    'pro-form-view': isView,
+    [className]: className
+  });
   var footerCls = classnames({
     'pro-form-custom-footer': true
   });
-  var footerRender = function footerRender() {
+  var footerRender = () => {
     var footerEle = null;
     if (isView || disabled) {
       // 查看或禁用模式
@@ -211,9 +211,9 @@ var ProForm = function ProForm(props, ref) {
     // 展开折叠按钮
     var expandEle = expandRender();
     var hasElement = footerEle || expandEle;
-    return hasElement ? /*#__PURE__*/_jsx(Col, _objectSpread(_objectSpread({}, colProps), {}, {
+    return hasElement ? /*#__PURE__*/_jsx(_Col, _objectSpread(_objectSpread({}, colProps), {}, {
       className: footerCls,
-      children: /*#__PURE__*/_jsxs(Space, {
+      children: /*#__PURE__*/_jsxs(_Space, {
         align: "center",
         children: [footerEle, expandEle]
       })
@@ -230,8 +230,8 @@ var ProForm = function ProForm(props, ref) {
       otherProps.layout = otherProps.layout || 'vertical';
     }
   }
-  return /*#__PURE__*/_jsxs(Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
-    onKeyPress: function onKeyPress(event) {
+  return /*#__PURE__*/_jsxs(_Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+    onKeyPress: event => {
       if (!submitOnEnter) return;
       if (event.key === 'Enter') {
         form.submit();
@@ -244,7 +244,7 @@ var ProForm = function ProForm(props, ref) {
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,
     initialValues: _initialValues,
-    children: [/*#__PURE__*/_jsxs(Row, _objectSpread(_objectSpread({
+    children: [/*#__PURE__*/_jsxs(_Row, _objectSpread(_objectSpread({
       gutter: 24
     }, rowProps), {}, {
       children: [/*#__PURE__*/_jsx(RenderFields, {
@@ -264,7 +264,6 @@ var ProForm = function ProForm(props, ref) {
         requiredOnView: requiredOnView,
         required: required,
         globalControl: globalControl,
-        desensitizationKey: desensitizationKey,
         shouldUpdateDebounce: shouldUpdateDebounce
       }), footerRender()]
     })), children]
@@ -275,13 +274,13 @@ var ProForm = function ProForm(props, ref) {
 var ProFormForward = /*#__PURE__*/forwardRef(ProForm);
 ProFormForward.useForm = useForm;
 ProFormForward.useWatch = useWatch;
-export var ProFormProvider = function ProFormProvider(props) {
+export var ProFormProvider = props => {
   var onFormChange = props.onFormChange,
     onFormFinish = props.onFormFinish,
     children = props.children;
-  var handleFormChange = function handleFormChange(formName, info) {
+  var handleFormChange = (formName, info) => {
     var changedFields = info.changedFields;
-    var _changedFields = changedFields.flatMap(function (item) {
+    var _changedFields = changedFields.flatMap(item => {
       var _item$value = item.value,
         value = _item$value === void 0 ? [] : _item$value;
       var name = item.name;
@@ -294,9 +293,9 @@ export var ProFormProvider = function ProFormProvider(props) {
       var namesList = splitNameStr(String(namesStr)); // 拆解出name列表
 
       var prefix = name.slice(0, name.length - 1);
-      return namesList.map(function (nameItem, index) {
+      return namesList.map((nameItem, index) => {
         return _objectSpread(_objectSpread({}, item), {}, {
-          name: [].concat(_toConsumableArray(prefix), _toConsumableArray(nameItem)),
+          name: [...prefix, ...nameItem],
           // 拼接前缀 组成完整name
           value: value[index]
         });
@@ -307,7 +306,7 @@ export var ProFormProvider = function ProFormProvider(props) {
     // @ts-ignore
     onFormChange(formName, info);
   };
-  return /*#__PURE__*/_jsx(Form.Provider, {
+  return /*#__PURE__*/_jsx(_Form.Provider, {
     onFormChange: onFormChange ? handleFormChange : undefined,
     onFormFinish: onFormFinish,
     children: children

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';
+import type { ProFormComponentType } from './components';
 export interface ButtonType extends ButtonProps {
     children?: any;
 }
@@ -46,7 +46,6 @@ export interface ProFormOtherType {
     formDisabled?: boolean;
     isDiffChange?: boolean;
     diffConfig?: DiffConfigType;
-    desensitizationKey?: string;
 }
 export interface DiffConfigType<Values = any> {
     /** 比对原始数据源 */
@@ -99,8 +98,6 @@ export interface ProFormType<Values = any> extends FormProps<Values> {
      * 1. 开启不过滤names的中间态值
      */
     optimize?: boolean;
-    /** 全局脱敏开关的key、默认 zat-design-pro-component-desensitization */
-    desensitizationKey?: string;
     /** 是否在遇到第一个错误时停止验证 */
     stopOnFirstError?: boolean;
     /** shouldUpdate防抖延迟时间，默认500ms，设置为0则不防抖 */

package/es/ProForm/utils/diffOriginal.js

@@ -4,7 +4,7 @@ import { isEmpty } from "../../utils";
 // 比较策略接口
 
 // 数字类型标准化函数
-var normalizeNumberValue = function normalizeNumberValue(value) {
+var normalizeNumberValue = value => {
   if (value === null || value === undefined || value === '') return null;
   var num = Number(value);
   return Number.isNaN(num) ? null : num;
@@ -12,7 +12,7 @@ var normalizeNumberValue = function normalizeNumberValue(value) {
 
 // InputNumber 比较策略
 var inputNumberStrategy = {
-  compare: function compare(val1, val2) {
+  compare: (val1, val2) => {
     var num1 = normalizeNumberValue(val1);
     var num2 = normalizeNumberValue(val2);
     return num1 === num2;
@@ -21,10 +21,10 @@ var inputNumberStrategy = {
 
 // ProNumberRange 比较策略
 var proNumberRangeStrategy = {
-  compare: function compare(val1, val2) {
+  compare: (val1, val2) => {
     if (!Array.isArray(val1) || !Array.isArray(val2)) return false;
     if (val1.length !== val2.length) return false;
-    return val1.every(function (item, index) {
+    return val1.every((item, index) => {
       var num1 = normalizeNumberValue(item);
       var num2 = normalizeNumberValue(val2[index]);
       return num1 === num2;
@@ -33,7 +33,7 @@ var proNumberRangeStrategy = {
 };
 
 // 数字类型处理函数
-var handleNumberTypeDiff = function handleNumberTypeDiff(params) {
+var handleNumberTypeDiff = params => {
   var originalValue = params.originalValue,
     value = params.value,
     type = params.type;
@@ -60,14 +60,14 @@ var handleNumberTypeDiff = function handleNumberTypeDiff(params) {
 
 // 过滤对象中undefined字段
 // 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
-var filterObject = function filterObject(data) {
+var filterObject = data => {
   if (!isObject(data) || data === null) return data;
 
   // ['1', undefined] ['1', ''] 视为相等
   if (Array.isArray(data)) {
     // 数组中全是empty值的话 视为null
     var isFillNull = true;
-    var arr = data.map(function (item) {
+    var arr = data.map(item => {
       if (isEmpty(item)) {
         return null;
       }
@@ -77,7 +77,7 @@ var filterObject = function filterObject(data) {
     return isFillNull ? null : arr;
   }
   var resData = {};
-  Object.keys(data).forEach(function (key) {
+  Object.keys(data).forEach(key => {
     if (!isEmpty(data[key])) {
       resData[key] = data[key];
     }
@@ -87,7 +87,7 @@ var filterObject = function filterObject(data) {
   if (!Object.keys(resData).length) return null;
   return resData;
 };
-export var diffOriginal = function diffOriginal(params) {
+export var diffOriginal = params => {
   var originalValue = params.originalValue,
     value = params.value,
     onDiff = params.onDiff,

package/es/ProForm/utils/getDefaultProps.js

@@ -1,6 +1,6 @@
 import { get, isEqual } from 'lodash';
 var defaultPropsMap = {
-  ProSelect: function ProSelect(props) {
+  ProSelect: props => {
     var fieldProps = props.fieldProps,
       name = props.name,
       namePath = props.namePath;
@@ -12,11 +12,11 @@ var defaultPropsMap = {
     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) {
+      defaultProps.shouldUpdate = (preValues, curValues) => {
+        var preListValue = get(preValues, _listName).map(item => {
           return get(item, _namePath);
         });
-        var curListValue = get(curValues, _listName).map(function (item) {
+        var curListValue = get(curValues, _listName).map(item => {
           return get(item, _namePath);
         });
         return !isEqual(preListValue, curListValue);
@@ -25,7 +25,7 @@ var defaultPropsMap = {
     return defaultProps;
   }
 };
-export var getDefaultProps = function getDefaultProps(props) {
+export var getDefaultProps = props => {
   var _defaultPropsMap$type;
   var type = props.type;
   return (_defaultPropsMap$type = defaultPropsMap[type]) === null || _defaultPropsMap$type === void 0 ? void 0 : _defaultPropsMap$type.call(defaultPropsMap, props);