@zat-design/sisyphus-react 3.4.7 → 3.4.8-beta.2

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

@@ -28,7 +28,7 @@ import { ProEditTableProps } from '../../../ProEditTable/propsType';
 import { ProTreeModalProps } from '../../../ProTreeModal/propsType';
 import { ProUploadProps } from '../../../ProUpload/propsType';
 import { ProTreeProps } from '../../../ProTree/propsType';
-import { GroupProps } from '../combination/Group/propsType';
+import { GroupProps as GroupCopyProps } from '../combination/Group/propsType';
 import { ProCollapseProps } from '../../../ProLayout/components/ProCollapse/PropTypes';
 import { DistributiveOmit } from '../../propsType';
 export type ComponentMap = keyof typeof componentMap;
@@ -159,7 +159,7 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
     fieldProps?: FieldProps<ProTreeProps, Values, T>;
 } | {
     type?: 'Group';
-    fieldProps?: GroupProps | ReactiveFunction<Values, GroupProps>;
+    fieldProps?: GroupCopyProps | ReactiveFunction<Values, GroupCopyProps>;
 } | {
     type?: 'ProCollapse';
     fieldProps?: ProCollapseProps | ReactiveFunction<Values, ProCollapseProps>;

package/es/ProForm/style/index.less

@@ -140,6 +140,13 @@
 
       // 地址组件
       .@{ant-prefix}-form-item-control-input-content {
+        // 查看模式
+        & > span {
+          border-radius: 4px;
+          padding: 5px 8px;
+          background: @zaui-contract-bg;
+        }
+
         & > .pro-address {
           .@{ant-prefix}-select-selector,
           .@{ant-prefix}-input-affix-wrapper,

package/es/ProForm/utils/diffOriginal.js

@@ -40,7 +40,8 @@ export var diffOriginal = function diffOriginal(params) {
     });
   }
   if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return !isEqual(value, originalValue);
+    var res = !isEqual(value, originalValue);
+    return res;
   }
   return false;
 };

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

@@ -95,4 +95,6 @@ export declare const findOptionByValue: (treeData: any[], value: string | number
 export declare const equalDependencies: (dependencies: any, prevValues: any, currentValues: any) => any;
 /** 解析namePath */
 export declare const parseNamePath: (input: string) => any;
+/** 解析namePath */
+export declare function findNamesKeyInArray(arr: string[], key: string): string | null;
 export {};

package/es/ProForm/utils/index.js

@@ -434,4 +434,25 @@ export var parseNamePath = function parseNamePath(input) {
     return isNaN(Number(item)) ? item : Number(item);
   });
   return [result];
-};
+};
+/** 解析namePath */
+export function findNamesKeyInArray(arr, key) {
+  var _iterator2 = _createForOfIteratorHelper(arr),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var item = _step2.value;
+      if (!item.includes('_')) {
+        return null;
+      }
+      if (item.split('_')[0].includes(key)) {
+        return item;
+      }
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  return null;
+}

package/es/ProForm/utils/transformNames.js

@@ -1,23 +1,16 @@
-import { union, isNumber } from 'lodash';
+import { union } from 'lodash';
 import { transformValue } from './transformValue';
 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;
-  var _names = names;
-  if (!((_names2 = _names) === null || _names2 === void 0 ? void 0 : _names2.length)) {
+  if (!(names === null || names === void 0 ? void 0 : names.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;
-  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),
+  var _transformValue = transformValue(names, form, _fieldName, normalize, getValueProps),
     _normalize = _transformValue.normalize,
     _getValueProps = _transformValue.getValueProps,
     _shouldUpdate = _transformValue.shouldUpdate;

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

@@ -0,0 +1,2 @@
+/** 深度比较依赖变化memo */
+export declare const useDeepCompareMemo: (fun: () => any, depList: any[]) => any;

package/es/ProForm/utils/useDeepCompareMemo.js

@@ -0,0 +1,14 @@
+import { useRef } from 'react';
+import { isEqualWith } from 'lodash';
+import { customEqualForFun } from '.';
+/** 深度比较依赖变化memo */
+export var useDeepCompareMemo = function useDeepCompareMemo(fun, depList) {
+  var lastDependency = useRef(); // 上一次的依赖
+  var lastRes = useRef(); // 上一次的结果
+  if (!isEqualWith(depList, lastDependency.current, customEqualForFun)) {
+    var res = fun();
+    lastRes.current = res;
+  }
+  lastDependency.current = depList;
+  return lastRes.current;
+};

package/es/ProForm/utils/useForm.js

@@ -3,7 +3,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { filterInternalFields } from './index';
+import { filterInternalFields, findNamesKeyInArray } from './index';
 export var useForm = function useForm(originForm) {
   var _Form$useForm = _Form.useForm(originForm),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -24,6 +24,8 @@ export var useForm = function useForm(originForm) {
       var _len,
         rest,
         _key,
+        _form$getFieldsError,
+        hasNames,
         values,
         _values,
         _error$errorFields,
@@ -32,25 +34,33 @@ export var useForm = function useForm(originForm) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.prev = 0;
             for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
               rest[_key - 1] = _args[_key];
             }
-            _context.next = 4;
-            return validateFields.apply(void 0, [nameList].concat(rest));
-          case 4:
-            values = _context.sent;
+            // 区域性校验，且配置了nameList和names时
+            if (Array.isArray(nameList)) {
+              hasNames = (_form$getFieldsError = form.getFieldsError()) === null || _form$getFieldsError === void 0 ? void 0 : _form$getFieldsError.filter(function (item) {
+                return findNamesKeyInArray(item.name, nameList[0]) !== null;
+              });
+              if (hasNames.length) {
+                hasNames.forEach(function (item) {
+                  validateFields.apply(void 0, [item.name].concat(rest));
+                });
+              }
+            }
+            _context.prev = 2;
+            values = validateFields.apply(void 0, [nameList].concat(rest));
             if (!nameList) {
-              _context.next = 7;
+              _context.next = 6;
               break;
             }
             return _context.abrupt("return", values);
-          case 7:
+          case 6:
             _values = _getFieldsValue();
             return _context.abrupt("return", _values);
-          case 11:
-            _context.prev = 11;
-            _context.t0 = _context["catch"](0);
+          case 10:
+            _context.prev = 10;
+            _context.t0 = _context["catch"](2);
             if (_context.t0 && (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.errorFields)) {
               form === null || form === void 0 ? void 0 : form.scrollToField(_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$errorFields = _context.t0.errorFields) === null || _error$errorFields === void 0 ? void 0 : (_error$errorFields$ = _error$errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
                 block: 'center',
@@ -58,11 +68,11 @@ export var useForm = function useForm(originForm) {
               });
             }
             throw _context.t0;
-          case 15:
+          case 14:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 11]]);
+      }, _callee, null, [[2, 10]]);
     }));
     return function _validateFields(_x) {
       return _ref.apply(this, arguments);

package/es/ProForm/utils/useListChanged.js

@@ -1,6 +1,6 @@
 import "antd/es/form/style";
 import _Form from "antd/es/form";
-import { get } from 'lodash';
+import { get, isString } from 'lodash';
 import { diffOriginal } from './diffOriginal';
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
@@ -87,7 +87,7 @@ export var useListChanged = function useListChanged(params) {
     originalValue: originalValue,
     form: form,
     equalWith: equalWith,
-    name: namesStr || name
+    name: isString(namesStr) ? namesStr : originalName || name
   });
   return [changed, originalValue];
 };

package/es/ProForm/utils/useRules.js

@@ -24,10 +24,6 @@ var useRules = function useRules(props) {
     var result = {
       rules: rules || []
     };
-    // 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);
@@ -58,23 +54,9 @@ var useRules = function useRules(props) {
     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, required)) {
@@ -83,7 +65,7 @@ var useRules = function useRules(props) {
           return Promise.resolve();
         }
       };
-      internalRule.rules.unshift(_customRequired);
+      internalRule.rules.unshift(customRequired);
     }
   }, [internalRule]);
   return internalRule;

package/es/global.less

@@ -9,13 +9,21 @@ pre {
   scrollbar-face-color: #d2d3d7;
   scrollbar-highlight-color: #979797;
   scrollbar-3dlight-color: #979797;
+
   ::-webkit-scrollbar  {
     width: 16px;
+    background: transparent;
   }
 
-  // // 滑块
-  ::-webkit-scrollbar-thumb {
-    background-color: #d2d3d7;
+  // 轨道
+  ::-webkit-scrollbar-track {
+    background-color: #fff;
+    border-radius: 10px;
+  }
+
+  // 悬浮轨道
+  ::-webkit-scrollbar-thumb:hover {
+    background-color: #979797;
     background-clip: padding-box;
     border-color: transparent;
     border-style: dashed;
@@ -24,14 +32,25 @@ pre {
     -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
   }
 
-  // 轨道
-  ::-webkit-scrollbar-track {
-    background-color: transparent;
+  :hover::-webkit-scrollbar-track {
+    background: transparent;
+  }
+
+  :hover::-webkit-scrollbar-thumb {
+    background-color: #d2d3d7;
+    background-clip: padding-box;
+    border-color: transparent;
+    border-style: dashed;
+    border-width: 4px;
     border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
   }
 
-  // 悬浮轨道
-  ::-webkit-scrollbar-thumb:hover {
+  :hover::-webkit-scrollbar-thumb:hover {
     background-color: #979797;
   }
+
+  :hover::-webkit-scrollbar-track {
+    background-color: #fff;
+  }
 }

package/es/locale/zh_CN.js

@@ -89,7 +89,7 @@ export default {
     edit: '编辑',
     copy: '复制',
     delete: '删除',
-    mulDelete: '删除',
+    mulDelete: '批量删除',
     save: '保存',
     custom: '自定义',
     operation: '操作',

package/lib/ProEditTable/components/RenderField/index.js

@@ -318,7 +318,7 @@ var RenderField = function RenderField(_ref) {
           }
           _args = [].concat(args);
           rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
-          row = type === 'Group' ? _args[1] : form.getFieldValue(rowPath, true);
+          row = form.getFieldValue(rowPath, true);
           orgRow = (0, _lodash.cloneDeep)(row);
           if (!onFieldChange) {
             _context.next = 18;
@@ -363,7 +363,7 @@ var RenderField = function RenderField(_ref) {
           return onChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
         case 27:
           // 判断属性是否变动
-          type !== 'Group' && form.setFieldValue(rowPath, row);
+          form.setFieldValue(rowPath, row);
           if (!(0, _lodash.isEqual)(orgRow, row)) {
             diff = (0, _tools.difference)(row, orgRow) || {};
             validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
@@ -409,7 +409,7 @@ var RenderField = function RenderField(_ref) {
             }
             _args = formatArgs([].concat(args));
             rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
-            row = type === 'Group' ? _args[1] : form.getFieldValue(rowPath, true);
+            row = form.getFieldValue(rowPath, true);
             orgRow = (0, _lodash.cloneDeep)(row);
             _args[1] = row;
             _context2.t0 = (_TargetComponent3 = TargetComponent) === null || _TargetComponent3 === void 0 ? void 0 : (_TargetComponent3$pro = _TargetComponent3.props) === null || _TargetComponent3$pro === void 0 ? void 0 : _TargetComponent3$pro.onBlur;
@@ -500,11 +500,7 @@ var RenderField = function RenderField(_ref) {
       isView: isView
     }
   });
-  if (type === 'Group') {
-    componentProps.onFieldChange = _onchange;
-  } else {
-    componentProps = (0, _lodash.omit)(componentProps, ['onFieldChange', 'namePath', 'index']);
-  }
+  componentProps = (0, _lodash.omit)(componentProps, ['onFieldChange', 'namePath', 'index']);
   // 单元格编辑时，设置各个单元格disabled属性
   if (isCell) {
     record["".concat(dataIndex, "-Disabled")] = _disabled;

package/lib/ProEditTable/style/index.less

@@ -65,7 +65,7 @@
 
   .drag-wrapper {
     display: flex;
-    .drag-icon {
+    .anticon {
       margin-right: var(--zaui-space-size-md, 16px);
       margin-left: var(--zaui-space-size-xs, 4px);
       cursor: pointer;

package/lib/ProForm/components/base/TextArea/index.d.ts

@@ -5,6 +5,7 @@ import './index.less';
 export interface Props extends TextAreaProps {
     otherProps?: ProFormOtherProps;
     isView?: boolean;
+    tooltip?: boolean;
 }
 declare const TextAreaDef: React.FC<Props>;
 export default TextAreaDef;

package/lib/ProForm/components/base/TextArea/index.js

@@ -17,12 +17,14 @@ var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
 require("./index.less");
-var _excluded = ["placeholder", "otherProps", "className"];
+var _excluded = ["placeholder", "otherProps", "className", "tooltip"];
 var TextArea = _antd.Input.TextArea;
 var TextAreaDef = function TextAreaDef(props) {
   var placeholder = props.placeholder,
     otherProps = props.otherProps,
     className = props.className,
+    _props$tooltip = props.tooltip,
+    tooltip = _props$tooltip === void 0 ? true : _props$tooltip,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = _ProForm.default.useFieldProps() || {},
     label = _ref.label,
@@ -33,7 +35,7 @@ var TextAreaDef = function TextAreaDef(props) {
   if (isView) {
     return (0, _jsxRuntime.jsx)(_Container.default, {
       nowrap: false,
-      tooltip: true,
+      tooltip: tooltip,
       viewEmpty: viewEmpty,
       children: rest.value
     });

package/lib/ProForm/components/combination/FormList/components/BlockFields.d.ts

@@ -1,7 +1,7 @@
 import { ColProps, FormListFieldData } from 'antd';
 import React from 'react';
 import { InternalNamePath } from 'antd/es/form/interface';
-import type { levelType } from '@/ProLayout/components/ProCollapse/PropTypes';
+import type { levelType } from '../../../../../ProLayout/components/ProCollapse/PropTypes';
 import type { FormListProps } from '../propsType';
 interface Props extends Omit<FormListProps, 'toolbarProps'> {
     index: number;

package/lib/ProForm/components/combination/FormList/index.js

@@ -54,7 +54,7 @@ var FormList = function FormList(props, ref) {
         name: _name,
         names: (item === null || item === void 0 ? void 0 : item.names) ? item.names.map(function (nameItem) {
           // 传给Group的names会被渲染成真实FormItem 不能传完整name
-          return item.type === 'Group' ? [fieldName].concat((0, _toConsumableArray2.default)((0, _utils.toArray)(nameItem))) : [].concat((0, _toConsumableArray2.default)(namePath), (0, _toConsumableArray2.default)((0, _utils.toArray)(nameItem)));
+          return [].concat((0, _toConsumableArray2.default)(namePath), (0, _toConsumableArray2.default)((0, _utils.toArray)(nameItem)));
         }) : item.names,
         index: fieldName,
         namePath: namePath,

package/lib/ProForm/components/combination/FormList/propsType.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import type { FormInstance } from 'antd/es/form/Form';
 import type { ButtonProps, FormListFieldData, FormListOperation, PopconfirmProps } from 'antd';
 import type { InternalNamePath } from 'antd/es/form/interface';
-import type { levelType } from '@/ProLayout/components/ProCollapse/PropTypes';
+import type { levelType } from '../../../../ProLayout/components/ProCollapse/PropTypes';
 import type { ProColumnProps, ProFormOtherProps } from '../../../propsType';
 export type TitleRender = (record: Record<string, any>, index: number, form: FormInstance) => any;
 export type TitleType = string | React.ReactNode | TitleRender;

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

@@ -14,12 +14,11 @@ var namesPathTransform = exports.namesPathTransform = function namesPathTransfor
   var names = _ref.names,
     prefixNamePath = _ref.prefixNamePath,
     type = _ref.type;
-  if (!Array.isArray(names) || type !== 'Group' && !Array.isArray(prefixNamePath)) {
+  if (!Array.isArray(names) || !Array.isArray(prefixNamePath)) {
     return '';
   }
-  var _prefixNamePath = type === 'Group' ? '' : prefixNamePath;
   var newNamePath = names.map(function (val) {
-    return _prefixNamePath.concat(val);
+    return prefixNamePath.concat(val);
   });
   return newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.map(function (name) {
     return Array.isArray(name) ? name.join('_') : name;

package/lib/ProForm/components/combination/{GroupCopy → Group}/component/ComRender.js

@@ -10,8 +10,8 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireDefault(require("react"));
-var _ConfirmWrapper = _interopRequireDefault(require("@/ProForm/components/render/ConfirmWrapper"));
-var _useFieldProps = require("@/ProForm/utils/useFieldProps");
+var _ConfirmWrapper = _interopRequireDefault(require("../../../../components/render/ConfirmWrapper"));
+var _useFieldProps = require("../../../../utils/useFieldProps");
 var componentMap = _interopRequireWildcard(require("../../../../../index"));
 var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps"];
 /** 渲染组件 */

package/lib/ProForm/components/combination/Group/index.d.ts

@@ -1,4 +1,10 @@
 import React from 'react';
 import { GroupProps } from './propsType';
-declare const Group: React.FC<GroupProps>;
-export default Group;
+/**
+ * 1. 外层过滤FormItem相关属性, 但是子元素上的 required [disabled] [show] rules [fieldProps] [component] 需要取到并
+ * 2.
+ *
+ * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
+ */
+declare const GroupCopy: React.FC<GroupProps>;
+export default GroupCopy;