@zat-design/sisyphus-react 3.4.6-beta.11 → 3.4.6-beta.13

package/dist/index.esm.css

@@ -4146,9 +4146,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   -webkit-box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
           box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
 }
-.pro-edit-table td[rowspan] {
-  vertical-align: middle !important;
-}
 .pro-edit-table .pro-edit-table-tooltip {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
@@ -4215,7 +4212,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   display: -ms-flexbox;
   display: flex;
 }
-.pro-edit-table .drag-wrapper .anticon {
+.pro-edit-table .drag-wrapper .drag-icon {
   margin-right: var(--zaui-space-size-md, 16px);
   margin-left: var(--zaui-space-size-xs, 4px);
   cursor: pointer;

package/dist/less.esm.css

@@ -4146,9 +4146,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   -webkit-box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
           box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
 }
-.pro-edit-table td[rowspan] {
-  vertical-align: middle !important;
-}
 .pro-edit-table .pro-edit-table-tooltip {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
@@ -4215,7 +4212,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   display: -ms-flexbox;
   display: flex;
 }
-.pro-edit-table .drag-wrapper .anticon {
+.pro-edit-table .drag-wrapper .drag-icon {
   margin-right: var(--zaui-space-size-md, 16px);
   margin-left: var(--zaui-space-size-xs, 4px);
   cursor: pointer;

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

@@ -315,7 +315,7 @@ var RenderField = function RenderField(_ref) {
           }
           _args = [].concat(args);
           rowPath = [].concat(_toConsumableArray(namePath), [index]);
-          row = type === 'Group' ? _args[1] : form.getFieldValue(rowPath, true);
+          row = form.getFieldValue(rowPath, true);
           orgRow = cloneDeep(row);
           if (!onFieldChange) {
             _context.next = 18;
@@ -360,7 +360,7 @@ var RenderField = function RenderField(_ref) {
           return onChange.apply(void 0, _toConsumableArray(_args));
         case 27:
           // 判断属性是否变动
-          type !== 'Group' && form.setFieldValue(rowPath, row);
+          form.setFieldValue(rowPath, row);
           if (!isEqual(orgRow, row)) {
             diff = 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) {
@@ -406,7 +406,7 @@ var RenderField = function RenderField(_ref) {
             }
             _args = formatArgs([].concat(args));
             rowPath = [].concat(_toConsumableArray(namePath), [index]);
-            row = type === 'Group' ? _args[1] : form.getFieldValue(rowPath, true);
+            row = type === form.getFieldValue(rowPath, true);
             orgRow = 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;
@@ -497,11 +497,7 @@ var RenderField = function RenderField(_ref) {
       isView: isView
     }
   });
-  if (type === 'Group') {
-    componentProps.onFieldChange = _onchange;
-  } else {
-    componentProps = omit(componentProps, ['onFieldChange', 'namePath', 'index']);
-  }
+  componentProps = omit(componentProps, ['onFieldChange', 'namePath', 'index']);
   // 单元格编辑时，设置各个单元格disabled属性
   if (isCell) {
     record["".concat(dataIndex, "-Disabled")] = _disabled;

package/es/ProEditTable/style/index.less

@@ -2,9 +2,6 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-edit-table {
-  td[rowspan]{
-    vertical-align: middle !important;
-  }
   .pro-edit-table-tooltip {
     display    : inline-flex;
     align-items: center;
@@ -65,7 +62,7 @@
 
   .drag-wrapper {
     display: flex;
-    .anticon {
+    .drag-icon {
       margin-right: var(--zaui-space-size-md, 16px);
       margin-left: var(--zaui-space-size-xs, 4px);
       cursor: pointer;

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

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

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

@@ -3,7 +3,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
-var _excluded = ["placeholder", "otherProps", "className", "tooltip"];
+var _excluded = ["placeholder", "otherProps", "className"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { omit } from 'lodash';
 import classnames from 'classnames';
@@ -17,8 +17,6 @@ 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 = _objectWithoutProperties(props, _excluded);
   var _ref = ProForm.useFieldProps() || {},
     label = _ref.label,
@@ -29,7 +27,7 @@ var TextAreaDef = function TextAreaDef(props) {
   if (isView) {
     return _jsx(Container, {
       nowrap: false,
-      tooltip: tooltip,
+      tooltip: true,
       viewEmpty: viewEmpty,
       children: rest.value
     });

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

@@ -48,7 +48,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(_toConsumableArray(toArray(nameItem))) : [].concat(_toConsumableArray(namePath), _toConsumableArray(toArray(nameItem)));
+          return [].concat(_toConsumableArray(namePath), _toConsumableArray(toArray(nameItem)));
         }) : item.names,
         index: fieldName,
         namePath: namePath,

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

@@ -8,12 +8,11 @@ export var namesPathTransform = function namesPathTransform(_ref) {
   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/es/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;

package/es/ProForm/components/combination/Group/index.js

@@ -1,61 +1,61 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useMemo } from 'react';
-import { omit, isFunction, union, isNumber } from 'lodash';
-import { useDeepCompareEffect } from 'ahooks';
+import React, { useMemo } from 'react';
+import { omit } from 'lodash';
 import classnames from 'classnames';
-import RenderFields from '../../render/RenderFields';
-import { insertSeparator, transformNamesString } from './utils';
+import { insertSeparator, transformColumns } from './utils';
 import ProForm from '../../../../ProForm';
-var Group = function Group(props) {
-  var columns = props.children,
-    otherProps = props.otherProps,
+import ComRender from './component/ComRender';
+/**
+ * 1. 外层过滤FormItem相关属性, 但是子元素上的 required [disabled] [show] rules [fieldProps] [component] 需要取到并
+ * 2.
+ *
+ * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
+ */
+var GroupCopy = function GroupCopy(props) {
+  console.log('🚀 ~~> props:', props);
+  var children = props.children,
     className = props.className,
     _props$space = props.space,
     space = _props$space === void 0 ? {
       size: 12
     } : _props$space,
-    id = props.id,
     value = props.value,
-    isView = props.isView,
-    index = props.index,
-    onFieldChange = props.onFieldChange,
-    namePath = props.namePath;
-  var _ref = ProForm.useFieldProps() || {},
-    names = _ref.names,
-    name = _ref.name,
-    form = _ref.form,
-    _namePath = _ref.namePath;
-  var newNamePath = namePath || _namePath || [];
-  if (!Array.isArray(names)) {
-    console.error('Warning: Composite form components whose type is Group must be configured with names');
-  }
-  var data = useMemo(function () {
-    var fieldList = [];
-    var result = columns.map(function (item) {
-      return _objectSpread(_objectSpread({
-        disabled: Boolean(props === null || props === void 0 ? void 0 : props.disabled)
-      }, item), {}, {
-        isView: isView !== null && isView !== void 0 ? isView : item.isView,
-        noStyle: (space === null || space === void 0 ? void 0 : space.compact) || (space === null || space === void 0 ? void 0 : space.separator),
-        parentNames: id,
-        namePath: newNamePath
-      });
-    });
-    var node = _jsx(_Button, {
-      className: "group-separator",
-      children: space.separator
+    onChange = props.onChange,
+    otherProps = props.otherProps,
+    disabled = props.disabled;
+  var contextProps = ProForm.useFieldProps() || {};
+  var names = contextProps.names,
+    name = contextProps.name,
+    form = contextProps.form,
+    namePath = contextProps.namePath,
+    index = contextProps.index;
+  var _option = React.useRef([]);
+  // 组合onChange
+  var handleChange = function handleChange(value, option, index) {
+    var _value = props.value ? _toConsumableArray(props.value) : [];
+    _value[index] = value;
+    _option.current[index] = option;
+    onChange(_value, _option.current);
+  };
+  var columns = useMemo(function () {
+    var columnsProps = transformColumns({
+      columns: children,
+      name: name,
+      names: names,
+      onChange: handleChange,
+      namePath: namePath,
+      form: form,
+      index: index,
+      value: value,
+      groupProps: props
     });
-    return {
-      columns: insertSeparator(result, space, node, otherProps),
-      fieldList: fieldList
-    };
-  }, [name, columns, space, props, names]);
+    return insertSeparator(columnsProps, space);
+  }, [name, value, children, space, names, namePath, index]);
   var _className = classnames(_defineProperty({
     'pro-group': true,
     'pro-group-diy-width': columns.some(function (item) {
@@ -66,44 +66,27 @@ var Group = function Group(props) {
       return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
     })
   }, "".concat(className), className));
-  // 用于formList场景下names移除掉了前缀，需要再次合并回来
-  var _names = names.map(function (item) {
-    if (isNumber(item === null || item === void 0 ? void 0 : item[0])) {
-      return union(newNamePath, item);
-    }
-    return item;
-  });
-  useDeepCompareEffect(function () {
-    var _document, _document$activeEleme;
-    // 焦点激活的表单
-    var touchName = ((_document = document) === null || _document === void 0 ? void 0 : (_document$activeEleme = _document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.id) || '';
-    // 模拟change,初始化不执行onFieldChange
-    if (isFunction(onFieldChange) && form.isFieldsTouched(_names) && transformNamesString(_names).includes(touchName)) {
-      onFieldChange(value, (newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.length) ? form.getFieldValue(newNamePath, true) : form.getFieldsValue(), {
-        form: form,
-        namePath: newNamePath,
-        index: index
-      });
-    }
-  }, [value]);
-  var _otherProps = omit(otherProps, ['colProps', 'required']);
   return _jsx("div", {
     className: _className,
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
-      children: _jsx(RenderFields, _objectSpread({
-        columns: data.columns,
-        form: form
-      }, _otherProps))
+      children: columns.map(function (column) {
+        return _jsx(ComRender, _objectSpread(_objectSpread({
+          contextProps: contextProps
+        }, column), {}, {
+          otherProps: otherProps
+        }));
+      })
     }) : _jsx(_Space, _objectSpread(_objectSpread({
       align: "start"
     }, omit(space, ['separator', 'compact'])), {}, {
-      children: data.columns.map(function (column, index) {
-        return _jsx(RenderFields, _objectSpread({
-          columns: [column],
-          form: form
-        }, _otherProps), (column === null || column === void 0 ? void 0 : column.name) || index);
+      children: columns.map(function (column, index) {
+        return _jsx(ComRender, _objectSpread(_objectSpread({
+          contextProps: contextProps
+        }, column), {}, {
+          otherProps: otherProps
+        }));
       })
     }))
   });
 };
-export default Group;
+export default GroupCopy;

package/es/ProForm/components/combination/Group/propsType.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
-import { RowProps, SpaceProps } from 'antd';
+import { FormItemProps, ModalFuncProps, SpaceProps } from 'antd';
 import { FormInstance } from 'antd/es/form/Form';
 import { NamePath } from 'antd/lib/form/interface';
-import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
+import { ColumnPropsMap, FunctionArgs, ProFormValueType, ReactiveFunction, ViewType } from '../../../propsType';
 export interface SpaceType extends SpaceProps {
     /**
      * 是否紧凑合并
@@ -16,20 +16,33 @@ export interface SpaceType extends SpaceProps {
     size?: number;
 }
 export interface GroupProps {
-    children?: ProColumnProps[];
+    children?: GroupColumnProps[];
     space?: SpaceType;
-    otherProps?: ProFormOtherProps;
-    rowProps?: RowProps;
     className?: string;
-    value?: any;
     id?: string;
-    disabled?: boolean | (() => void);
+    disabled?: boolean;
     isView?: boolean;
-    namePath?: NamePath;
-    index?: number;
-    onFieldChange?: (value: any[] | null, record: any, { form, }: {
-        form: FormInstance;
-        namePath?: NamePath;
-        index?: number;
-    }) => any;
+    value?: any[];
+    onChange?: (value: any[] | null, options?: any[]) => void;
+    otherProps?: any;
 }
+export type GroupColumnProps<Values = any> = {
+    component?: React.ReactNode | ReactiveFunction<Values, React.ReactNode>;
+    names?: NamePath[];
+    show?: boolean | ReactiveFunction<Values, boolean>;
+    valueType?: ProFormValueType;
+    switchValue?: [any, any];
+    isView?: boolean;
+    viewRender?: (value: any, record: Values, { form, index, namePath, }: {
+        form: FormInstance<Values>;
+        index?: number | undefined;
+        [key: string]: any;
+    }) => React.ReactElement<any, any> | string | undefined | null;
+    viewType?: ViewType;
+    disabled?: boolean | ReactiveFunction<Values, boolean>;
+    trim?: boolean;
+    upperCase?: boolean;
+    toISOString?: boolean;
+    clearNotShow?: boolean;
+    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
+} & ColumnPropsMap & FormItemProps;

package/es/ProForm/components/combination/Group/utils.d.ts

@@ -1,10 +1,63 @@
-import { ReactNode } from 'react';
-import { SpaceType } from './propsType';
+/// <reference types="react" />
+import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
+import { FormInstance } from 'antd';
+import { GroupColumnProps, GroupProps, SpaceType } from './propsType';
+import { ProFormColumnProps, ReactiveFunction } from '../../render/propsType';
+export type EventArgs = any[];
 /**
-* 插入间隔符
-* @param columns 表单配置数组
-* @returns
-*/
-export declare const insertSeparator: (columns: any, space?: SpaceType, separatorNode?: ReactNode, otherProps?: any) => any;
+ * 插入间隔符
+ * @param columns 表单配置数组
+ * @returns
+ */
+export declare const insertSeparator: (columns: GroupColumnProps[], space?: SpaceType) => any[];
+/** 带出event的组件默认取值方法 */
+export declare function defaultGetValueFromEvent(valuePropName: string, ...args: EventArgs): any;
 /** 转换names */
 export declare const transformNamesString: (arr: (string | string[])[]) => (string | string[])[];
+/**
+ * Input TextArea 小写自动转大写
+ * @param type 组件类型
+ * @param upperCase 是否小写转大写
+ * @returns {}
+ */
+export declare const isUpperCase: (type: string, upperCase: boolean) => any;
+interface Params {
+    form?: FormInstance;
+    index?: number;
+    type?: string;
+    namePath?: InternalNamePath;
+    disabled?: boolean | ReactiveFunction<any, boolean>;
+    show?: boolean | ReactiveFunction<any, boolean>;
+    component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
+    fieldProps?: boolean | ReactiveFunction<any, boolean>;
+    name?: NamePath;
+}
+/** 计算响应式参数的值 */
+export declare const getReactiveProps: (params: Params) => {
+    disabled: boolean;
+    show: boolean;
+    component: any;
+    fieldProps: boolean;
+};
+type ValueTypeGetterParams = Pick<ProFormColumnProps, 'valueType' | 'switchValue' | 'toISOString'> & {
+    type?: any;
+    mode?: string;
+};
+/** 获取当前字段的转换函数 */
+export declare const getValueTypeTrans: (params: ValueTypeGetterParams) => any;
+/** 执行所有中间件 返回处理后的值 */
+export declare const getValueMiddleware: (value: any, callbacks?: any[]) => any;
+interface ColumnsTransformerParams {
+    columns: GroupColumnProps[];
+    name?: NamePath;
+    names?: NamePath[];
+    value?: any[];
+    onChange: any;
+    namePath?: InternalNamePath;
+    form: FormInstance;
+    index?: number;
+    groupProps: GroupProps;
+}
+/** 转换columns */
+export declare const transformColumns: (params: ColumnsTransformerParams) => any[];
+export {};