@zat-design/sisyphus-react 3.4.1-beta.6 → 3.4.1-beta.7

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

@@ -1,7 +1,6 @@
 import React from 'react';
 import { RowProps, SpaceProps } from 'antd';
-import { FormInstance } from 'antd/es/form';
-import { NamePath } from 'antd/lib/form/interface';
+import { FormInstance } from 'antd/es/form/Form';
 import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
 export interface SpaceType extends SpaceProps {
     /**
@@ -15,15 +14,6 @@ export interface SpaceType extends SpaceProps {
     /** 间隔距离 */
     size?: number;
 }
-/**
- * 扩展函数的参数
- */
-type FunctionArgs<Values> = (value: any, record: any, { form, index, namePath, option, selectedOptions, dateString, }: {
-    form: FormInstance<Values>;
-    index?: number;
-    namePath?: NamePath;
-    [key: string]: any;
-}) => any;
 export interface GroupProps {
     children?: ProColumnProps[];
     space?: SpaceType;
@@ -33,6 +23,7 @@ export interface GroupProps {
     value?: any;
     id?: string;
     disabled?: boolean | (() => void);
-    onFieldChange?: FunctionArgs<any>;
+    onFieldChange?: (value: any[] | null, record: any, { form, }: {
+        form: FormInstance;
+    }) => any;
 }
-export {};

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

@@ -167,7 +167,7 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
     fieldProps?: FieldProps<ProTreeProps, Values, T>;
 } | {
     type?: 'Group';
-    fieldProps?: FieldProps<GroupProps, Values, T>;
+    fieldProps?: GroupProps | ReactiveFunction<Values, GroupProps>;
 } | {
     type?: 'ProCollapse';
     fieldProps?: ProCollapseProps | ReactiveFunction<Values, ProCollapseProps>;

package/es/ProIcon/index.js

@@ -103,11 +103,12 @@ var ProIcon = function ProIcon(props) {
       }
     }
   }
-  var RenderIcon = _jsx("span", {
+  var RenderIcon = _jsx("span", _objectSpread(_objectSpread({
     className: "anticon",
     style: {
       color: color
-    },
+    }
+  }, reset), {}, {
     children: _jsx("svg", {
       className: proIconClassNames,
       "aria-hidden": "true",
@@ -121,7 +122,7 @@ var ProIcon = function ProIcon(props) {
         xlinkHref: "#icon-".concat(_type)
       })
     })
-  });
+  }));
   return !isExtendButtonMode ? RenderIcon : _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({
     type: isIconMode ? 'text' : (buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.type) || 'link',
     className: proIconClassNames,

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

@@ -1,7 +1,6 @@
 import React from 'react';
 import { RowProps, SpaceProps } from 'antd';
-import { FormInstance } from 'antd/es/form';
-import { NamePath } from 'antd/lib/form/interface';
+import { FormInstance } from 'antd/es/form/Form';
 import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
 export interface SpaceType extends SpaceProps {
     /**
@@ -15,15 +14,6 @@ export interface SpaceType extends SpaceProps {
     /** 间隔距离 */
     size?: number;
 }
-/**
- * 扩展函数的参数
- */
-type FunctionArgs<Values> = (value: any, record: any, { form, index, namePath, option, selectedOptions, dateString, }: {
-    form: FormInstance<Values>;
-    index?: number;
-    namePath?: NamePath;
-    [key: string]: any;
-}) => any;
 export interface GroupProps {
     children?: ProColumnProps[];
     space?: SpaceType;
@@ -33,6 +23,7 @@ export interface GroupProps {
     value?: any;
     id?: string;
     disabled?: boolean | (() => void);
-    onFieldChange?: FunctionArgs<any>;
+    onFieldChange?: (value: any[] | null, record: any, { form, }: {
+        form: FormInstance;
+    }) => any;
 }
-export {};

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

@@ -167,7 +167,7 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
     fieldProps?: FieldProps<ProTreeProps, Values, T>;
 } | {
     type?: 'Group';
-    fieldProps?: FieldProps<GroupProps, Values, T>;
+    fieldProps?: GroupProps | ReactiveFunction<Values, GroupProps>;
 } | {
     type?: 'ProCollapse';
     fieldProps?: ProCollapseProps | ReactiveFunction<Values, ProCollapseProps>;

package/lib/ProIcon/index.js

@@ -110,11 +110,12 @@ var ProIcon = function ProIcon(props) {
       }
     }
   }
-  var RenderIcon = (0, _jsxRuntime.jsx)("span", {
+  var RenderIcon = (0, _jsxRuntime.jsx)("span", (0, _objectSpread2.default)((0, _objectSpread2.default)({
     className: "anticon",
     style: {
       color: color
-    },
+    }
+  }, reset), {}, {
     children: (0, _jsxRuntime.jsx)("svg", {
       className: proIconClassNames,
       "aria-hidden": "true",
@@ -128,7 +129,7 @@ var ProIcon = function ProIcon(props) {
         xlinkHref: "#icon-".concat(_type)
       })
     })
-  });
+  }));
   return !isExtendButtonMode ? RenderIcon : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     type: isIconMode ? 'text' : (buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.type) || 'link',
     className: proIconClassNames,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.1-beta.6",
+  "version": "3.4.1-beta.7",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",