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

package/es/ProForm/style/index.less

@@ -31,16 +31,6 @@
     }
   }
 
-  &.@{ant-prefix}-form {
-    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
-  }
-
-  .pro-collapse-level2 {
-    .@{ant-prefix}-collapse-item {
-      margin-bottom: 0 !important;
-    }
-  }
-
   .@{ant-prefix}-form-item-control-input {
     flex-grow: 1;
     max-width: 100%;
@@ -135,7 +125,7 @@
         background: @zaui-contract-bg !important;
 
         input {
-          background: @zaui-contract-bg;
+          background: transparent;
         }
         .@{ant-prefix}-select-selection-placeholder {
           z-index: 9;
@@ -147,8 +137,22 @@
         border-radius: 4px;
       }
 
-      // 查看模式 修改容器样式
-      .@{ant-prefix}-form-item-control-input-content > span, // 地址组件
+      // 地址组件
+      .@{ant-prefix}-form-item-control-input-content {
+        & > .pro-address {
+          .ant-select-selector,
+          .ant-input-affix-wrapper,
+          .ant-input-disabled {
+            background: @zaui-contract-bg;
+          }
+        }
+        & > .ant-input-group {
+          .forever-checkbox {
+            background: @zaui-contract-bg;
+          }
+        }
+      }
+
       .pro-form-view-container {
         padding: 4px 8px;
         background: @zaui-contract-bg;

package/es/ProForm/utils/{contrastOriginal.d.ts → diffOriginal.d.ts}

@@ -3,7 +3,8 @@ interface Params {
     originalValue: any;
     value: any;
     form: FormInstance;
+    name?: string | any[];
     equalWith?: (originalValue: any, currentValue: any) => boolean;
 }
-export declare const contrastOriginal: (params: Params) => boolean;
+export declare const diffOriginal: (params: Params) => boolean;
 export {};

package/es/ProForm/utils/diffOriginal.js

@@ -0,0 +1,61 @@
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
+import { isEqual, isFunction } 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);
+  }
+  return pathString.split('-').map(function (item) {
+    return data[item];
+  });
+};
+export var diffOriginal = function diffOriginal(params) {
+  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);
+  // 支持传入自定义比较事件
+  if (isFunction(equalWith)) {
+    return !equalWith(originalValue, value);
+  }
+  if (Array.isArray(originalValue)) {
+    return originalValue.some(function (valueItem, index) {
+      // 如果两个值有一个不是空值, 则进行深比较
+      if (!nullValue.includes(value === null || value === void 0 ? void 0 : value[index]) || !nullValue.includes(valueItem)) {
+        return !isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
+      }
+      return false;
+    });
+  }
+  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
+    return !isEqual(value, originalValue);
+  }
+  return false;
+};

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

@@ -26,7 +26,7 @@ export declare const isTrim: (type: string, trim: boolean, configData: any) => a
  */
 export declare const isUpperCase: (type: string, upperCase: boolean) => any;
 export declare const weedOutProps: (data: Record<string, any>, keys: string[]) => {}[];
-export declare const contrast: (prevValues: any, curValues: any, names: NamePath[]) => boolean;
+export declare const diffField: (prevValues: any, curValues: any, names: NamePath[]) => boolean;
 export declare const splitNameStr: (name: string) => NamePath[];
 export declare const filterInternalFields: (values: any) => any;
 export declare const getAllNamePath: (object: Record<string, any>, currentPath?: InternalNamePath) => InternalNamePath[];
@@ -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

@@ -108,7 +108,7 @@ export var weedOutProps = function weedOutProps(data, keys) {
   return [obj, weedOut];
 };
 // 对比字段变化
-export var contrast = function contrast(prevValues, curValues, names) {
+export var diffField = function diffField(prevValues, curValues, names) {
   return names.some(function (name) {
     return _.get(prevValues, name) !== _.get(curValues, name);
   });
@@ -171,10 +171,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) {

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,22 @@ 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 errorIndexes = getNonEmptyValuesByIndex(required, value);
+        // 校验为true的值是否存在
+        if (Array.isArray(value) && (errorIndexes === null || errorIndexes === void 0 ? void 0 : errorIndexes.length)) {
+          var _locale$ProForm;
+          return Promise.reject(new Error("".concat(formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProForm = locale.ProForm) === null || _locale$ProForm === void 0 ? void 0 : _locale$ProForm.halfRuleText, {
+            total: errorIndexes === null || errorIndexes === void 0 ? void 0 : errorIndexes.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/transformNames.d.ts

@@ -6,5 +6,5 @@ interface TransformProps extends FormItemProps {
     namePath: any[];
 }
 type TransformFun = 'normalize' | 'getValueProps' | 'shouldUpdate' | 'name';
-declare const transformNames: (formItem: TransformProps, form: FormInstance, names: NamePath[], fieldName: string) => Pick<TransformProps, TransformFun>;
+declare const transformNames: (formItem: TransformProps, form: FormInstance, names: NamePath[], fieldName: string, type?: string) => Pick<TransformProps, TransformFun>;
 export default transformNames;

package/es/ProForm/utils/transformNames.js

@@ -1,16 +1,23 @@
-import { union } from 'lodash';
+import { union, isNumber } from 'lodash';
 import { transformValue } from './transformValue';
-var transformNames = function transformNames(formItem, form, names, fieldName) {
+var transformNames = function transformNames(formItem, form, names, fieldName, type) {
+  var _names2, _names3, _names3$;
   var _ref = formItem || {},
     normalize = _ref.normalize,
     getValueProps = _ref.getValueProps,
     _shouldUpdate2 = _ref.shouldUpdate;
-  if (!(names === null || names === void 0 ? void 0 : names.length)) {
+  var _names = names;
+  if (!((_names2 = _names) === null || _names2 === void 0 ? void 0 : _names2.length)) {
     return {};
   }
   // 当在formList场景下，给transformValue函数的setFiledProps的name, 需要全namePath
   var _fieldName = Array.isArray(formItem === null || formItem === void 0 ? void 0 : formItem.name) ? union(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, formItem === null || formItem === void 0 ? void 0 : formItem.name) : fieldName;
-  var _transformValue = transformValue(names, form, _fieldName, normalize, getValueProps),
+  if (type === 'Group' && isNumber((_names3 = _names) === null || _names3 === void 0 ? void 0 : (_names3$ = _names3[0]) === null || _names3$ === void 0 ? void 0 : _names3$[0])) {
+    _names = _names.map(function (item) {
+      return union(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, item);
+    });
+  }
+  var _transformValue = transformValue(_names, form, _fieldName, normalize, getValueProps),
     _normalize = _transformValue.normalize,
     _getValueProps = _transformValue.getValueProps,
     _shouldUpdate = _transformValue.shouldUpdate;

package/es/ProForm/utils/transformValue.js

@@ -2,7 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["value"];
 import { set } from 'lodash';
-import { contrast } from '../utils';
+import { diffField } from '../utils';
 export var transformValue = function transformValue(names, form, fieldName, _normalize, _getValueProps) {
   return {
     normalize: function normalize(value) {
@@ -41,7 +41,7 @@ export var transformValue = function transformValue(names, form, fieldName, _nor
       }, cusRest);
     },
     shouldUpdate: function shouldUpdate(prevValues, curValues) {
-      return contrast(prevValues, curValues, names);
+      return diffField(prevValues, curValues, names);
     }
   };
 };

package/es/ProForm/utils/useChanged.js

@@ -1,7 +1,7 @@
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import { get } from 'lodash';
-import { contrastOriginal } from './contrastOriginal';
+import { diffOriginal } from './diffOriginal';
 export var useChanged = function useChanged(_ref) {
   var name = _ref.name,
     names = _ref.names,
@@ -16,11 +16,12 @@ export var useChanged = function useChanged(_ref) {
   if (notWatch) form = [];
   var value = _Form.useWatch(namesStr || name, form);
   if (notWatch) return [false];
-  var changed = contrastOriginal({
+  var changed = diffOriginal({
     originalValue: originalValue,
     value: value,
     form: form,
-    equalWith: equalWith
+    equalWith: equalWith,
+    name: namesStr || name
   });
   return [changed, originalValue];
 };

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

@@ -1,7 +1,7 @@
 import { FormInstance } from 'antd';
 import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
 interface Params {
-    name?: NamePath;
+    name?: any;
     names?: NamePath[];
     namesStr?: NamePath;
     originalName?: NamePath;

package/es/ProForm/utils/useListChanged.js

@@ -1,7 +1,7 @@
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import { get } from 'lodash';
-import { contrastOriginal } from './contrastOriginal';
+import { diffOriginal } from './diffOriginal';
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -27,6 +27,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
     var rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
     var rowValue = form.getFieldValue(rowValueNamePath);
+    if (!rowValue) return undefined;
     var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
     if (!keyValue) return undefined;
     var originalValueList = get(originalValues, originalName.slice(0, rowKeyPath.length - 2));
@@ -83,11 +84,12 @@ export var useListChanged = function useListChanged(params) {
   if (notWatch) _form = [];
   var value = _Form.useWatch(namePath, _form);
   if (notWatch || noChange) return [false];
-  var changed = contrastOriginal({
+  var changed = diffOriginal({
     value: value,
     originalValue: originalValue,
     form: form,
-    equalWith: equalWith
+    equalWith: equalWith,
+    name: namesStr || name
   });
   return [changed, originalValue];
 };

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/ProForm/utils/valueType.d.ts

@@ -1,28 +1,33 @@
 declare const _default: {
     /** 年月日 */
-    date: ({ type, toISOString }: {
+    date: ({ type, toISOString, mode }: {
         type: any;
         toISOString: any;
+        mode: any;
     }) => {};
     /** 年月日 时分秒 */
-    dateTime: ({ type, toISOString }: {
+    dateTime: ({ type, toISOString, mode }: {
         type: any;
         toISOString: any;
+        mode: any;
     }) => {};
     /** 年月日 00:00:00 */
-    dateStartTime: ({ type, toISOString }: {
+    dateStartTime: ({ type, toISOString, mode }: {
         type: any;
         toISOString: any;
+        mode: any;
     }) => {};
     /** 年月日 23:59:59 */
-    dateEndTime: ({ type, toISOString }: {
+    dateEndTime: ({ type, toISOString, mode }: {
         type: any;
         toISOString: any;
+        mode: any;
     }) => {};
     /** 年月日 00:00:00 ~ 年月日 23:59:59 */
-    dateStartEndTime: ({ type, toISOString }: {
+    dateStartEndTime: ({ type, toISOString, mode }: {
         type: any;
         toISOString: any;
+        mode: any;
     }) => {};
     /** 百分比 */
     percentage: ({ type, valueType }: {

package/es/ProForm/utils/valueType.js

@@ -153,51 +153,61 @@ export default {
   /** 年月日 */
   date: function date(_ref3) {
     var type = _ref3.type,
-      toISOString = _ref3.toISOString;
+      toISOString = _ref3.toISOString,
+      mode = _ref3.mode;
     return dateTransform({
       type: type,
       _valueType: 'date',
-      toISOString: toISOString
+      toISOString: toISOString,
+      mode: mode
     });
   },
   /** 年月日 时分秒 */
   dateTime: function dateTime(_ref4) {
     var type = _ref4.type,
-      toISOString = _ref4.toISOString;
+      toISOString = _ref4.toISOString,
+      mode = _ref4.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateTime',
-      toISOString: toISOString
+      toISOString: toISOString,
+      mode: mode
     });
   },
   /** 年月日 00:00:00 */
   dateStartTime: function dateStartTime(_ref5) {
     var type = _ref5.type,
-      toISOString = _ref5.toISOString;
+      toISOString = _ref5.toISOString,
+      mode = _ref5.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateStartTime',
-      toISOString: toISOString
+      toISOString: toISOString,
+      mode: mode
     });
   },
   /** 年月日 23:59:59 */
   dateEndTime: function dateEndTime(_ref6) {
     var type = _ref6.type,
-      toISOString = _ref6.toISOString;
+      toISOString = _ref6.toISOString,
+      mode = _ref6.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateEndTime',
-      toISOString: toISOString
+      toISOString: toISOString,
+      mode: mode
     });
   },
   /** 年月日 00:00:00 ~ 年月日 23:59:59 */
   dateStartEndTime: function dateStartEndTime(_ref7) {
     var type = _ref7.type,
-      toISOString = _ref7.toISOString;
+      toISOString = _ref7.toISOString,
+      mode = _ref7.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateStartEndTime',
-      toISOString: toISOString
+      toISOString: toISOString,
+      mode: mode
     });
   },
   /** 百分比 */

package/es/ProIcon/config/index.d.ts

@@ -1,4 +1,5 @@
 export declare const iconMap: {
     type: string;
-    text: string;
+    'text-cn': string;
+    'text-en': string;
 }[];