@zat-design/sisyphus-react 3.4.3 → 3.4.4-beta.2

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

@@ -52,12 +52,12 @@ interface ControlProps {
 /**
  * 扩展函数的参数
  */
-type FunctionArgs<Values> = (value: any, record: any, { form, index, namePath, option, selectedOptions, dateString, }: {
+export type FunctionArgs<Values, R = any> = (value: any, record: any, { form, index, namePath, option, selectedOptions, dateString, }: {
     form: FormInstance<Values>;
     index?: number;
     namePath?: NamePath;
     [key: string]: any;
-}) => any;
+}) => R;
 type TransformToFormField<T extends ControlProps, Values> = DistributiveOmit<T, 'onChange' | 'value'> & {
     value?: T['value'];
     onChange?: (value: Parameters<T['onChange']>[0], options: Parameters<T['onChange']>[1], form: FormInstance<Values>) => void;
@@ -206,7 +206,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     hiddenNames?: string[] | any[];
     rules?: ProRule[] | ReactiveFunction<Values, ProRule[]>;
     equalWith?: (originValue: any, currentValue: any) => boolean;
-    required?: boolean | ReactiveFunction<Values, boolean>;
+    required?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     labelRequired?: boolean;
     toISOString?: boolean;
     clearNotShow?: boolean;
@@ -220,7 +220,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     extra?: string | React.ReactNode;
     /** 是否固定字段, 不隐藏 */
     fixed?: boolean;
-    confirm?: boolean | ModalFuncProps | ((values: Values) => boolean | ModalFuncProps);
+    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
 }
 export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T, 'ProForm'>;
 /**

package/es/ProForm/index.js

@@ -26,7 +26,7 @@ import { useForm } from './utils/useForm';
 import { useFieldProps } from './utils/useFieldProps';
 import locale from '../locale';
 var ProForm = function ProForm(props, ref) {
-  var _forms$formKey, _localStorage;
+  var _forms$formKey, _localStorage, _ref;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -49,8 +49,7 @@ var ProForm = function ProForm(props, ref) {
     expandOpenChange = props.expandOpenChange,
     _props$viewEmpty = props.viewEmpty,
     viewEmpty = _props$viewEmpty === void 0 ? '-' : _props$viewEmpty,
-    _props$labelAlign = props.labelAlign,
-    labelAlign = _props$labelAlign === void 0 ? 'left' : _props$labelAlign,
+    labelAlign = props.labelAlign,
     labelWidth = props.labelWidth,
     onValuesChange = props.onValuesChange,
     onFinish = props.onFinish,
@@ -231,9 +230,9 @@ var ProForm = function ProForm(props, ref) {
       }
     },
     className: cls,
-    form: form,
-    labelAlign: labelAlign
+    form: form
   }, formProps), config), otherProps), {}, {
+    labelAlign: (_ref = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref !== void 0 ? _ref : 'left',
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,
     initialValues: _initialValues,

package/es/ProForm/propsType.d.ts

@@ -38,7 +38,7 @@ export interface ProFormOtherProps {
     colProps: ColProps;
     disabled: boolean;
     show?: boolean | (() => boolean);
-    required?: boolean | (() => boolean);
+    required?: boolean | boolean[] | (() => boolean | boolean[]);
     mode?: string;
     namePath?: any[] | string | number;
 }
@@ -70,7 +70,7 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     formId?: string;
-    required?: boolean;
+    required?: boolean | boolean[];
     originalDiffTip?: boolean;
 }
 export interface Transform<T = any> {

package/es/ProForm/style/index.less

@@ -132,7 +132,8 @@
         }
       }
 
-      .ant-form-item-control:has(.ant-switch-handle, .ant-checkbox-wrapper-in-form-item) {
+      .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
+      .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
         background: @zaui-contract-bg;
         border-radius: 4px;
       }
@@ -140,13 +141,13 @@
       // 地址组件
       .@{ant-prefix}-form-item-control-input-content {
         & > .pro-address {
-          .ant-select-selector,
-          .ant-input-affix-wrapper,
-          .ant-input-disabled {
+          .@{ant-prefix}-select-selector,
+          .@{ant-prefix}-input-affix-wrapper,
+          .@{ant-prefix}-input-disabled {
             background: @zaui-contract-bg;
           }
         }
-        & > .ant-input-group {
+        & > .@{ant-prefix}-input-group {
           .forever-checkbox {
             background: @zaui-contract-bg;
           }
@@ -346,4 +347,21 @@
   .delete-icon {
     width: 18px;
   }
+  .pro-form-list-tool-btn {
+    margin-left: 8px;
+    padding: 0;
+    cursor: pointer;
+    .anticon {
+      color: var(--zaui-text-weak, #a0a0a0);
+      font-size: 16px;
+      vertical-align: middle;
+    }
+  }
+  .pro-form-list-mode-block{
+    .pro-collapse-content{
+      .@{ant-prefix}-row{
+        width: auto;
+      }
+    }
+  }
 }

package/es/ProForm/utils/diffOriginal.js

@@ -1,46 +1,31 @@
-import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
-import { isEqual, isFunction } from 'lodash';
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import { isEqual, isFunction, isString } from 'lodash';
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
-var extractValue = function extractValue(obj, path) {
-  var value = obj || {};
-  if (!Object.keys(obj)) {
-    return [];
-  }
-  var _iterator = _createForOfIteratorHelper(path),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var key = _step.value;
-      if (value && value.hasOwnProperty(key)) {
-        value = value[key];
-      } else {
-        return undefined;
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  return Object.values(value);
-};
 /** 将解构后的name值，反向转回names,例如 formData {a:1, b:2} names ['a', 'b'] 返回 [1,2] */
-var extractValues = function extractValues(data, pathString) {
-  if (pathString.includes('_')) {
-    var namePrefixes = pathString.split('-')[0].split('_').slice(0, -1);
-    return extractValue(data, namePrefixes);
+var extractValues = function extractValues(form, pathString) {
+  var _pathString;
+  var result = [];
+  var PrefixesName = isString(pathString) ? [] : pathString.slice(0, -1);
+  if (isString(pathString)) {
+    pathString.split('-').forEach(function (item) {
+      result.push(form.getFieldValue([].concat(_toConsumableArray(PrefixesName), [item])));
+    });
+    return result;
   }
-  return pathString.split('-').map(function (item) {
-    return data[item];
+  (_pathString = pathString[pathString.length - 1]) === null || _pathString === void 0 ? void 0 : _pathString.split('-').forEach(function (item) {
+    result.push(form.getFieldValue([].concat(_toConsumableArray(PrefixesName), [item])));
   });
+  return result;
 };
 export var diffOriginal = function diffOriginal(params) {
+  var _name$join;
   var originalValue = params.originalValue,
     _value = params.value,
     equalWith = params.equalWith,
     form = params.form,
     name = params.name;
-  var value = !(name === null || name === void 0 ? void 0 : name.includes('-')) ? _value : extractValues(form.getFieldsValue(), name);
+  var isNames = Array.isArray(name) && ((_name$join = name.join(',')) === null || _name$join === void 0 ? void 0 : _name$join.includes('-')) || (name === null || name === void 0 ? void 0 : name.includes('-'));
+  var value = !isNames ? _value : extractValues(form, name);
   // 支持传入自定义比较事件
   if (isFunction(equalWith)) {
     return !equalWith(originalValue, value);

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

@@ -36,7 +36,7 @@ export declare const isNullValue: (value: any) => boolean;
  * @param arr 值
  * @returns boole
  */
-export declare const isNotFullArray: (arr: any, length: any) => boolean;
+export declare const isNotFullArray: (arr: any, length: any, required: any) => boolean;
 /**
  * 判断数组中值是否都为空 全部为空则为true
  * @param arr 值

package/es/ProForm/utils/index.js

@@ -5,6 +5,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useState } from 'react';
 import _, { isObject, isFunction, cloneDeep, get, set, omit, isNaN } from 'lodash';
+import moment from 'moment';
 export var getLayout = function getLayout(params) {
   var _params$span = params.span,
     span = _params$span === void 0 ? 8 : _params$span,
@@ -42,7 +43,7 @@ export var useControlled = function useControlled(props) {
 export var isSelect = function isSelect(props) {
   var dataSource = props.dataSource,
     type = props.type;
-  return (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || ['Select', 'ProSelect', 'ProEnum', 'DatePicker', 'RangePicker', 'ProAddressBar', 'ProTimeLimit', 'ProModalSelect', 'ProTreeModal', 'ProUpload'].includes(type);
+  return (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || ['Select', 'ProSelect', 'ProEnum', 'DatePicker', 'RangePicker', 'ProAddressBar', 'ProTimeLimit', 'ProModalSelect', 'ProTreeModal', 'ProUpload', 'TimePicker'].includes(type);
 };
 /**
  * Input TextArea 移除前后空格
@@ -122,8 +123,8 @@ export var splitNameStr = function splitNameStr(name) {
 // 过滤掉字段名中包含 '-' 的字段
 export var filterInternalFields = function filterInternalFields(values) {
   var nextValues = values;
-  // fix: braft-editor对象不可遍历
-  if (values === null || values === void 0 ? void 0 : values._immutable) {
+  // fix: braft-editor对象不可遍历 Moment不过滤
+  if ((values === null || values === void 0 ? void 0 : values._immutable) || moment.isMoment(values)) {
     return nextValues;
   }
   if (Array.isArray(nextValues)) {
@@ -171,10 +172,15 @@ export var isNullValue = function isNullValue(value) {
  * @param arr 值
  * @returns boole
  */
-export var isNotFullArray = function isNotFullArray(arr, length) {
+export var isNotFullArray = function isNotFullArray(arr, length, required) {
   if (!Array.isArray(arr)) {
     return false;
   }
+  if (Array.isArray(required) && required.some(function (item) {
+    return item === false;
+  })) {
+    return false;
+  }
   if (arr.length < length) return true;
   return arr.some(function (item) {
     if (item === undefined || item === null) {
@@ -295,6 +301,10 @@ export function initialValuesToNames() {
         values[key] = formInitialValue;
       }
     }
+    // 给FormList默认增加一行
+    if (item.type === 'FormList' && !item.initialValue && !get(values, item.name)) {
+      item.initialValue = [{}];
+    }
   });
   return values;
 }

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

@@ -1 +1,7 @@
-export declare const rulesCreator: (rules: any, label: any, isSelect: any) => any[];
+export declare const rulesCreator: ({ rules, label, isSelect, names, required }: {
+    rules: any;
+    label: any;
+    isSelect: any;
+    names: any;
+    required: any;
+}) => any[];

package/es/ProForm/utils/rulesCreator.js

@@ -1,10 +1,24 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { validate, regExp } from '@zat-design/utils';
-import { isString } from 'lodash';
+import { isString, isNumber } from 'lodash';
 import { isNullValue } from './index';
-import locale from '../../locale';
-export var rulesCreator = function rulesCreator(rules, label, isSelect) {
+import locale, { formatMessage } from '../../locale';
+var getNonEmptyValuesByIndex = function getNonEmptyValuesByIndex(required, valueArray) {
+  var result = [];
+  required.forEach(function (item, index) {
+    if (item && !valueArray[index] && !isNumber(valueArray[index])) {
+      result.push(index + 1);
+    }
+  });
+  return result;
+};
+export var rulesCreator = function rulesCreator(_ref) {
   var _result;
+  var rules = _ref.rules,
+    label = _ref.label,
+    isSelect = _ref.isSelect,
+    names = _ref.names,
+    required = _ref.required;
   var message = "".concat(isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(locale.ProForm.ruleText).concat(isString(label) ? label : '');
   var result = [];
   result = rules.map(function (ruleItem) {
@@ -29,6 +43,34 @@ export var rulesCreator = function rulesCreator(rules, label, isSelect) {
     }
     return rule;
   });
+  if ((names === null || names === void 0 ? void 0 : names.length) && (required === null || required === void 0 ? void 0 : required.length)) {
+    var customRequired = {
+      validator: function validator(rules, value) {
+        var _errorValues3;
+        var errorValues = getNonEmptyValuesByIndex(required, value);
+        if ((value === null || value === void 0 ? void 0 : value.length) === 2) {
+          var _errorValues;
+          errorValues = errorValues.map(function (item) {
+            var _locale$ProForm;
+            return locale === null || locale === void 0 ? void 0 : (_locale$ProForm = locale.ProForm) === null || _locale$ProForm === void 0 ? void 0 : _locale$ProForm.ruleStartEndText[item - 1];
+          });
+          if ((_errorValues = errorValues) === null || _errorValues === void 0 ? void 0 : _errorValues.length) {
+            var _locale$ProForm2, _errorValues2;
+            return Promise.reject(new Error("".concat(locale === null || locale === void 0 ? void 0 : (_locale$ProForm2 = locale.ProForm) === null || _locale$ProForm2 === void 0 ? void 0 : _locale$ProForm2.inputPlaceholder).concat((_errorValues2 = errorValues) === null || _errorValues2 === void 0 ? void 0 : _errorValues2.join(','))));
+          }
+        }
+        // 校验为true的值是否存在
+        if (Array.isArray(value) && ((_errorValues3 = errorValues) === null || _errorValues3 === void 0 ? void 0 : _errorValues3.length)) {
+          var _locale$ProForm3, _errorValues4;
+          return Promise.reject(new Error("".concat(formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProForm3 = locale.ProForm) === null || _locale$ProForm3 === void 0 ? void 0 : _locale$ProForm3.halfRuleText, {
+            total: (_errorValues4 = errorValues) === null || _errorValues4 === void 0 ? void 0 : _errorValues4.join(',')
+          }))));
+        }
+        return Promise.resolve();
+      }
+    };
+    result.push(customRequired);
+  }
   if (!((_result = result) === null || _result === void 0 ? void 0 : _result.length)) {
     result = [{
       required: false

package/es/ProForm/utils/useRules.js

@@ -13,19 +13,26 @@ var useRules = function useRules(props) {
     labelRequired = props.labelRequired,
     type = props.type;
   var _label = isString(label) ? label : '';
+  var requiredRule = Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.find(function (rule) {
+    return 'required' in rule;
+  }));
+  var allRequired = required === true || Array.isArray(required) && required.every(function (item) {
+    return item === true;
+  });
   // 根据 required 添加 rules, names 字段会添加数组的必填校验
   var internalRule = useMemo(function () {
     var result = {
       rules: rules || []
     };
-    if (required === true) {
-      var requiredRule = Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.find(function (rule) {
-        return 'required' in rule;
-      }));
+    // Group required: true时，直接走完整校验
+    if (allRequired && type === 'Group') {
+      return result;
+    }
+    if (allRequired) {
       if (!requiredRule) {
         var message = isSelect ? "".concat(locale.ProForm.selectPlaceHolder).concat(_label) : "".concat(locale.ProForm.inputPlaceholder).concat(_label);
         var rule = {
-          required: required,
+          required: allRequired,
           message: message
         };
         // names字段的必填校验
@@ -43,22 +50,40 @@ var useRules = function useRules(props) {
     return result;
   }, [rules, required]);
   // type转换为内置rules
-  internalRule.rules = internalRule.rules && rulesCreator(internalRule.rules, _label, isSelect);
+  internalRule.rules = internalRule.rules && rulesCreator({
+    rules: internalRule.rules,
+    label: _label,
+    isSelect: isSelect,
+    names: names,
+    required: required
+  });
   useEffect(function () {
+    if (type === 'Group' && (allRequired || requiredRule)) {
+      var customRequired = {
+        validator: function validator(rules, value) {
+          // 完整性校验, 数组有值且值不完整则校验不通过
+          if (Array.isArray(value) && isNotFullArray(value, names.length, required)) {
+            return Promise.reject(new Error("".concat(locale.ProForm.completeText).concat(_label)));
+          }
+          return Promise.resolve();
+        }
+      };
+      // 插入rules第一条，完整性校验大于自定义
+      internalRule.rules.unshift(customRequired);
+      return;
+    }
     // 添加完整性校验
     if (names && !isBoolean(labelRequired)) {
-      var customRequired = {
+      var _customRequired = {
         validator: function validator(rules, value) {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
-          if (Array.isArray(value) && !isNullArray(value) && isNotFullArray(value, names.length)) {
+          if (Array.isArray(value) && !isNullArray(value) && isNotFullArray(value, names.length, required)) {
             return Promise.reject(new Error("".concat(locale.ProForm.completeText).concat(_label)));
           }
           return Promise.resolve();
         }
       };
-      if (!(type === 'Group' && Array.isArray(names) && !required)) {
-        internalRule.rules.push(customRequired);
-      }
+      internalRule.rules.unshift(_customRequired);
     }
   }, [internalRule]);
   return internalRule;

package/es/ProForm/utils/useShouldUpdate.js

@@ -84,11 +84,11 @@ var useShouldUpdate = function useShouldUpdate(props) {
     disabledRef.current = disabled;
   }
   if (isFunction(required)) {
-    requiredRef.current = Boolean(required(values, {
+    requiredRef.current = required(values, {
       form: form,
       index: index,
       namePath: namePath
-    }));
+    });
   } else {
     requiredRef.current = required;
   }
@@ -133,11 +133,11 @@ var useShouldUpdate = function useShouldUpdate(props) {
         index: index,
         namePath: namePath
       })) : disabled;
-      var _required = isFunction(required) ? Boolean(required(_currentValues, {
+      var _required = isFunction(required) ? required(_currentValues, {
         form: form,
         index: index,
         namePath: namePath
-      })) : required;
+      }) : required;
       var _rules = isFunction(rules) ? rules(_currentValues, {
         form: form,
         index: index,

package/es/ProIcon/index.js

@@ -40,9 +40,6 @@ var ProIcon = function ProIcon(props) {
   var language = locale.ProIcon.language;
   // 加载内部icon
   var status = useExternal('https://at.alicdn.com/t/c/font_4063056_jmnz9g5uycp.js');
-  if (status !== 'ready') {
-    return null;
-  }
   var rotateStyle = rotate ? {
     msTransform: "rotate(".concat(rotate, "deg)"),
     transform: "rotate(".concat(rotate, "deg)")

package/es/ProLayout/components/ProCollapse/index.js

@@ -7,6 +7,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import "antd/es/collapse/style";
 import _Collapse from "antd/es/collapse";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useLayoutEffect } from 'react';
 import { CaretRightOutlined } from '@ant-design/icons';
 import classNames from 'classnames';
 import { ReactSVG } from 'react-svg';
@@ -38,7 +39,8 @@ var ProCollapse = function ProCollapse(props) {
     'pro-collapse': true,
     'pro-collapse-level2': level === '2',
     'pro-collapse-list': titleList === null || titleList === void 0 ? void 0 : titleList.length,
-    'pro-collapse-no-title': !title
+    'pro-collapse-no-title': !title,
+    'pro-collapse-no-level1-title': !title && level !== '2'
   }, "".concat(className), className));
   var content = _jsx("div", {
     className: "pro-collapse-content",
@@ -107,6 +109,26 @@ var ProCollapse = function ProCollapse(props) {
       }), content]
     });
   };
+  // 当pro-layout-content只存在一个card时，高度动态计算
+  useLayoutEffect(function () {
+    var proCollapseContent = document.querySelector('.pro-layout-content');
+    if (!proCollapseContent) {
+      return;
+    }
+    var proCollapseNoTitles = proCollapseContent.querySelectorAll('.pro-collapse-no-level1-title');
+    var proCollapses = proCollapseContent.querySelectorAll('.pro-collapse');
+    if (proCollapseNoTitles.length === 1 && proCollapses.length === 1) {
+      var rect = proCollapseNoTitles[0].getBoundingClientRect();
+      if ((rect === null || rect === void 0 ? void 0 : rect.height) < window.innerHeight - rect.top) {
+        proCollapseNoTitles[0].style.minHeight = "calc(100vh - ".concat(rect.top + 16, "px)");
+      }
+    }
+    return function () {
+      if (proCollapseNoTitles.length === 1 && proCollapses.length === 1) {
+        proCollapseNoTitles[0].style.minHeight = 'auto'; // 移除 minHeight 的设置
+      }
+    };
+  });
   return _jsx("div", {
     id: id,
     style: style,

package/es/ProLayout/components/ProCollapse/style/index.less

@@ -23,7 +23,7 @@
 
   &.@{ant-prefix}-collapse {
     .pro-collapse-panel {
-      margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
+      margin-bottom: 16px;
     }
   }
 

package/es/ProThemeTools/component/PrdTools/index.js

@@ -12,6 +12,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { CheckOutlined, CloseOutlined } from '@ant-design/icons';
 import { useState, useEffect } from 'react';
 import { setThemes } from '../../utils/index';
+import { useProConfig } from '../../../ProConfigProvider';
 import locale from '../../../locale';
 var connect = function connect(Component) {
   var ComponentWrapper = function ComponentWrapper(props) {
@@ -29,6 +30,10 @@ var PrdTools = function PrdTools(_ref) {
     tableBorder = _ref.tableBorder,
     tableStripe = _ref.tableStripe,
     prefixCls = _ref.prefixCls;
+  var _useProConfig = useProConfig(),
+    config = _useProConfig.state,
+    dispatch = _useProConfig.dispatch;
+  var ProForm = config.ProForm;
   var _useState = useState([{
       color: '#006AFF',
       active: true
@@ -146,35 +151,16 @@ var PrdTools = function PrdTools(_ref) {
       }), _jsx("div", {
         className: "pro-theme-tools-item",
         children: _jsxs(_Radio.Group, {
-          value: state.zauiFormAlign,
+          value: ProForm === null || ProForm === void 0 ? void 0 : ProForm.labelAlign,
           onChange: function onChange(e) {
-            var after = e.target.value === 'left' ? 'inline' : 'none';
-            var before = e.target.value === 'right' ? 'inline' : 'none';
-            // 遍历添加className
-            var formItemLabels = document.querySelectorAll(".".concat(prefixCls, "-form-item-label"));
-            // 遍历元素列表，为每个元素添加新的 class
-            formItemLabels.forEach(function (label) {
-              var _label$classList, _label$classList$valu, _label$classList2, _label$classList2$val;
-              if (!label) {
-                return false;
-              }
-              if (e.target.value === 'left' && !((_label$classList = label.classList) === null || _label$classList === void 0 ? void 0 : (_label$classList$valu = _label$classList.value) === null || _label$classList$valu === void 0 ? void 0 : _label$classList$valu.includes("".concat(prefixCls, "-form-item-label-left")))) {
-                label.classList.add("".concat(prefixCls, "-form-item-label-left"));
-              }
-              if (e.target.value === 'right' && ((_label$classList2 = label.classList) === null || _label$classList2 === void 0 ? void 0 : (_label$classList2$val = _label$classList2.value) === null || _label$classList2$val === void 0 ? void 0 : _label$classList2$val.includes("".concat(prefixCls, "-form-item-label-left")))) {
-                label.classList.remove("".concat(prefixCls, "-form-item-label-left"));
+            dispatch({
+              type: 'setWithLocal',
+              payload: {
+                ProForm: {
+                  labelAlign: e.target.value
+                }
               }
             });
-            setState(_objectSpread(_objectSpread({}, state), {}, {
-              zauiFormAlign: e.target.value,
-              zauiFormRequiredAfter: after,
-              zauiFormRequiredBefore: before
-            }));
-            setThemes({
-              'zaui-form-align': e.target.value,
-              'zaui-form-required-after': after,
-              'zaui-form-required-before': before
-            });
           },
           children: [_jsx(_Radio.Button, {
             value: "left",
@@ -185,30 +171,6 @@ var PrdTools = function PrdTools(_ref) {
           })]
         })
       })]
-    }), _jsxs("div", {
-      className: "pro-theme-tools-box pro-theme-tools-space pro-theme-tools-small-space",
-      children: [_jsx("div", {
-        className: "pro-theme-tools-item",
-        children: _jsx("p", {
-          children: "".concat(locale.ProThemeTools.bigText)
-        })
-      }), _jsx("div", {
-        className: "pro-theme-tools-item",
-        children: _jsx(_Switch, {
-          checkedChildren: "".concat(locale.ProThemeTools.switchText[0]),
-          unCheckedChildren: "".concat(locale.ProThemeTools.switchText[1]),
-          checked: state.zauiBigText,
-          onClick: function onClick(value) {
-            setState(_objectSpread(_objectSpread({}, state), {}, {
-              zauiBaseFontSize: value ? 2 : 0,
-              zauiBigText: value
-            }));
-            setThemes({
-              'zaui-base-font-size': value ? '2px' : '0px'
-            });
-          }
-        })
-      })]
     }), tableBorder && _jsxs("div", {
       className: "pro-theme-tools-box pro-theme-tools-space pro-theme-tools-small-space",
       children: [_jsx("div", {

package/es/ProThemeTools/index.js

@@ -70,7 +70,6 @@ var ProThemeTools = function ProThemeTools(_ref) {
     setThemes({
       'zaui-brand': '#006AFF',
       'zaui-text': '#343434',
-      'zaui-form-align': 'left',
       'zaui-form-required-after': 'inline',
       'zaui-form-required-before': 'none',
       'zaui-size': 1,

package/es/ProTree/components/ProTreeSelect/style/index.less

@@ -113,4 +113,4 @@
             }
         }
     }
-}
+}

package/es/ProTree/style/index.less

@@ -336,3 +336,8 @@
 .pro-form.pro-form-view .@{ant-prefix}-form-item .pro-tree .@{ant-prefix}-tree-checkbox * {
   height: 16px !important;
 }
+
+// 解决双滚动条
+.@{ant-prefix}-select-dropdown.pro-tree-select-drop-down-container.checkable-tree{
+  overflow: hidden!important;
+}

package/es/ProUpload/style/index.less

@@ -324,7 +324,7 @@
 }
 
 .proupload-modal-preview {
-  .ant-modal {
+  .@{ant-prefix}-modal {
     width: 600px;
   }
 }

package/es/ProWaterMark/__snapshots__/index.test.tsx.snap

@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`render ProWaterMark with dumi 1`] = `
+<span>
+  123
+</span>
+`;