@zat-design/sisyphus-react 3.4.3-beta.13 → 3.4.3-beta.15

package/es/ProForm/components/combination/FormList/components/ActionButton.d.ts

@@ -17,6 +17,7 @@ export interface Props {
     fields: FormListFieldData[];
     mode: FormListMode;
     disabled?: boolean;
+    isView?: boolean;
 }
 declare const ActionButton: React.FC<Props>;
 export default ActionButton;

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

@@ -116,7 +116,8 @@ var ActionButton = function ActionButton(props) {
     fields = props.fields,
     min = props.min,
     max = props.max,
-    mode = props.mode;
+    mode = props.mode,
+    isView = props.isView;
   // 默认显示一个delete
   var actionProps = useMemo(function () {
     var _props$actionProps;
@@ -167,7 +168,7 @@ var ActionButton = function ActionButton(props) {
       var _onClick = onClick || onHandle;
       if (['add', 'delete', 'copy', 'moveUp', 'moveDown'].includes(actionType)) {
         // 禁用状态默认隐藏内置操作按钮
-        if (disabled) return _jsx(_Fragment, {});
+        if (disabled || isView) return _jsx(_Fragment, {});
         var _defaultActions$actio = defaultActions[actionType],
           internalOnClick = _defaultActions$actio.onClick,
           defaultLabel = _defaultActions$actio.label,

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

@@ -59,7 +59,8 @@ var BlockFields = function BlockFields(props) {
         fields: fields,
         actionProps: actionProps,
         mode: mode,
-        disabled: disabled
+        disabled: disabled,
+        isView: isView
       }),
       children: _jsx(_Row, {
         gutter: 24,

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

@@ -59,9 +59,6 @@ var ToolbarButton = function ToolbarButton(props) {
       operation.add(data);
     }
   };
-  if (disabled || isView) {
-    return null;
-  }
   return _jsx(_Space, {
     align: "start",
     className: "pro-form-list-toolbar",
@@ -80,7 +77,7 @@ var ToolbarButton = function ToolbarButton(props) {
         rest = _objectWithoutProperties(item, _excluded);
       var _onClick = _onClick2 || onHandle;
       if (['add'].includes(actionType)) {
-        if (disabled) return _jsx(_Fragment, {});
+        if (disabled || isView) return _jsx(_Fragment, {});
         var _actions$actionType = actions[actionType],
           internalOnClick = _actions$actionType.onClick,
           defaultLabel = _actions$actionType.label,

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

@@ -227,15 +227,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var handleSelectValue = function handleSelectValue(val, option) {
     onChange(val, option);
   };
-  // 清空表单项
-  var handleClearValue = function handleClearValue() {
-    onChange(undefined, {});
-    setState({
-      _value: undefined,
-      selectedRowKeys: [],
-      selectedRows: []
-    });
-  };
   var handleClick = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _yield$beforeOpen, res;
@@ -625,7 +616,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           setState({
             isInit: false
           });
-        }, 0);
+        }, 300);
       } else {
         getInitValues();
       }
@@ -674,9 +665,10 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       showCodeName: showCodeName,
       labelInValue: labelInValue,
       dataSource: options,
+      scrollFollowParent: false,
       onClick: function onClick() {
         // 没有值的时候，初始化点击默认查询前五十条
-        if (!value && isInit) {
+        if (!value && isInit || !(options === null || options === void 0 ? void 0 : options.length)) {
           var _useRequest$options9;
           var queryBean = useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams;
           var params = withPagination ? {

package/es/ProForm/components/old/ProAddress/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ProAddressPropsType } from './propsTypes';
 export declare const transferAddressInfoToRegion: () => {
     normalize: (value: any) => {

package/es/ProForm/components/old/ProRangeBox/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 import { ProRangeBoxPropsType } from './propsType';
 export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): JSX.Element;

package/es/ProForm/components/render/ConfirmWrapper.js

@@ -2,7 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/modal/style";
 import _Modal from "antd/es/modal";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["onChange", "children", "confirm"];
+var _excluded = ["onChange", "children", "confirm", "otherProps"];
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { isFunction, isObject } from 'lodash';
 import React from 'react';
@@ -15,6 +15,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
   var onChange = props.onChange,
     children = props.children,
     confirm = props.confirm,
+    otherProps = props.otherProps,
     rest = _objectWithoutProperties(props, _excluded);
   var _ProForm$useFieldProp = ProForm.useFieldProps(),
     form = _ProForm$useFieldProp.form;
@@ -23,7 +24,12 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
       other[_key - 1] = arguments[_key];
     }
     var _value = (value === null || value === void 0 ? void 0 : value.target) ? value.target.value : value;
-    var confirmProps = isFunction(confirm) ? confirm(form.getFieldsValue()) : confirm;
+    var confirmProps = isFunction(confirm) ? confirm(value, form.getFieldsValue(), {
+      option: other[0],
+      form: form,
+      namePath: otherProps.namePath,
+      index: otherProps.index
+    }) : confirm;
     if (confirmProps === true) {
       _Modal.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
         onOk: function onOk() {

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, }: {
+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;
@@ -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/utils/index.js

@@ -135,7 +135,7 @@ export var filterInternalFields = function filterInternalFields(values) {
   if (isObject(nextValues)) {
     var result = {};
     Object.keys(nextValues).forEach(function (key) {
-      // if (key.includes('-')) return;
+      if (key.includes('-')) return;
       result[key] = filterInternalFields(nextValues[key]);
     });
     return result;

package/es/ProTree/components/CloseIcon.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare function CloseIcon(props: any): JSX.Element;
 export default CloseIcon;

package/es/ProTreeModal/components/CloseIcon.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare function CloseIcon(props: any): JSX.Element;
 export default CloseIcon;

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

@@ -17,6 +17,7 @@ export interface Props {
     fields: FormListFieldData[];
     mode: FormListMode;
     disabled?: boolean;
+    isView?: boolean;
 }
 declare const ActionButton: React.FC<Props>;
 export default ActionButton;

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

@@ -117,7 +117,8 @@ var ActionButton = function ActionButton(props) {
     fields = props.fields,
     min = props.min,
     max = props.max,
-    mode = props.mode;
+    mode = props.mode,
+    isView = props.isView;
   // 默认显示一个delete
   var actionProps = (0, _react.useMemo)(function () {
     var _props$actionProps;
@@ -168,7 +169,7 @@ var ActionButton = function ActionButton(props) {
       var _onClick = onClick || onHandle;
       if (['add', 'delete', 'copy', 'moveUp', 'moveDown'].includes(actionType)) {
         // 禁用状态默认隐藏内置操作按钮
-        if (disabled) return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+        if (disabled || isView) return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
         var _defaultActions$actio = defaultActions[actionType],
           internalOnClick = _defaultActions$actio.onClick,
           defaultLabel = _defaultActions$actio.label,

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

@@ -63,7 +63,8 @@ var BlockFields = function BlockFields(props) {
         fields: fields,
         actionProps: actionProps,
         mode: mode,
-        disabled: disabled
+        disabled: disabled,
+        isView: isView
       }),
       children: (0, _jsxRuntime.jsx)(_antd.Row, {
         gutter: 24,

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

@@ -63,9 +63,6 @@ var ToolbarButton = function ToolbarButton(props) {
       operation.add(data);
     }
   };
-  if (disabled || isView) {
-    return null;
-  }
   return (0, _jsxRuntime.jsx)(_antd.Space, {
     align: "start",
     className: "pro-form-list-toolbar",
@@ -84,7 +81,7 @@ var ToolbarButton = function ToolbarButton(props) {
         rest = (0, _objectWithoutProperties2.default)(item, _excluded);
       var _onClick = _onClick2 || onHandle;
       if (['add'].includes(actionType)) {
-        if (disabled) return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+        if (disabled || isView) return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
         var _actions$actionType = actions[actionType],
           internalOnClick = _actions$actionType.onClick,
           defaultLabel = _actions$actionType.label,

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

@@ -224,15 +224,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var handleSelectValue = function handleSelectValue(val, option) {
     onChange(val, option);
   };
-  // 清空表单项
-  var handleClearValue = function handleClearValue() {
-    onChange(undefined, {});
-    setState({
-      _value: undefined,
-      selectedRowKeys: [],
-      selectedRows: []
-    });
-  };
   var handleClick = /*#__PURE__*/function () {
     var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _yield$beforeOpen, res;
@@ -622,7 +613,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           setState({
             isInit: false
           });
-        }, 0);
+        }, 300);
       } else {
         getInitValues();
       }
@@ -671,9 +662,10 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       showCodeName: showCodeName,
       labelInValue: labelInValue,
       dataSource: options,
+      scrollFollowParent: false,
       onClick: function onClick() {
         // 没有值的时候，初始化点击默认查询前五十条
-        if (!value && isInit) {
+        if (!value && isInit || !(options === null || options === void 0 ? void 0 : options.length)) {
           var _useRequest$options9;
           var queryBean = useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams;
           var params = withPagination ? {

package/lib/ProForm/components/old/ProAddress/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ProAddressPropsType } from './propsTypes';
 export declare const transferAddressInfoToRegion: () => {
     normalize: (value: any) => {

package/lib/ProForm/components/old/ProRangeBox/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 import { ProRangeBoxPropsType } from './propsType';
 export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): JSX.Element;

package/lib/ProForm/components/render/ConfirmWrapper.js

@@ -12,7 +12,7 @@ var _lodash = require("lodash");
 var _react = _interopRequireDefault(require("react"));
 var _antd = require("antd");
 var _index = _interopRequireDefault(require("../../index"));
-var _excluded = ["onChange", "children", "confirm"];
+var _excluded = ["onChange", "children", "confirm", "otherProps"];
 var defaultConfirmProps = {
   title: '操作提示',
   content: '确定要修改该字段吗？'
@@ -21,6 +21,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
   var onChange = props.onChange,
     children = props.children,
     confirm = props.confirm,
+    otherProps = props.otherProps,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ProForm$useFieldProp = _index.default.useFieldProps(),
     form = _ProForm$useFieldProp.form;
@@ -29,7 +30,12 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
       other[_key - 1] = arguments[_key];
     }
     var _value = (value === null || value === void 0 ? void 0 : value.target) ? value.target.value : value;
-    var confirmProps = (0, _lodash.isFunction)(confirm) ? confirm(form.getFieldsValue()) : confirm;
+    var confirmProps = (0, _lodash.isFunction)(confirm) ? confirm(value, form.getFieldsValue(), {
+      option: other[0],
+      form: form,
+      namePath: otherProps.namePath,
+      index: otherProps.index
+    }) : confirm;
     if (confirmProps === true) {
       _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultConfirmProps), {}, {
         onOk: function onOk() {

package/lib/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, }: {
+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;
@@ -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/lib/ProForm/utils/index.js

@@ -151,7 +151,7 @@ var filterInternalFields = exports.filterInternalFields = function filterInterna
   if ((0, _lodash.isObject)(nextValues)) {
     var result = {};
     Object.keys(nextValues).forEach(function (key) {
-      // if (key.includes('-')) return;
+      if (key.includes('-')) return;
       result[key] = filterInternalFields(nextValues[key]);
     });
     return result;

package/lib/ProTree/components/CloseIcon.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare function CloseIcon(props: any): JSX.Element;
 export default CloseIcon;

package/lib/ProTreeModal/components/CloseIcon.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare function CloseIcon(props: any): JSX.Element;
 export default CloseIcon;

package/package.json

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