@zat-design/sisyphus-react 3.4.9-beta.16 → 3.4.9-beta.17

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

@@ -6,6 +6,8 @@ import _Popconfirm from "antd/es/popconfirm";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 var _excluded = ["label", "onClick", "onHandle", "actionType", "needConfirm", "confirmProps", "title"],
   _excluded2 = ["onClick", "label"];
@@ -128,17 +130,55 @@ var ActionButton = function ActionButton(props) {
     }
     return props.actionProps;
   }, [props.actionProps]);
-  var handleClick = function handleClick(callback, index, item) {
+  var handleClick = /*#__PURE__*/function () {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, index, item) {
+      var value, data;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            value = form.getFieldValue(namePath);
+            _context.next = 3;
+            return callback === null || callback === void 0 ? void 0 : callback(value, {
+              namePath: namePath,
+              index: index,
+              operation: operation,
+              form: form
+            });
+          case 3:
+            data = _context.sent;
+            if (!(data === true)) {
+              _context.next = 7;
+              break;
+            }
+            defaultCallback === null || defaultCallback === void 0 ? void 0 : defaultCallback(value, {
+              namePath: namePath,
+              index: index,
+              operation: operation,
+              form: form
+            });
+            return _context.abrupt("return");
+          case 7:
+            if ((item === null || item === void 0 ? void 0 : item.actionType) === 'add') {
+              operation.add(data, index !== undefined ? index + 1 : undefined);
+            }
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleClick(_x, _x2, _x3, _x4) {
+      return _ref6.apply(this, arguments);
+    };
+  }();
+  var customClick = function customClick(callback, index) {
     var value = form.getFieldValue(namePath);
-    var data = callback === null || callback === void 0 ? void 0 : callback(value, {
+    callback === null || callback === void 0 ? void 0 : callback(value, {
       namePath: namePath,
       index: index,
       operation: operation,
       form: form
     });
-    if ((item === null || item === void 0 ? void 0 : item.actionType) === 'add') {
-      operation.add(data, index !== undefined ? index + 1 : undefined);
-    }
   };
   var defaultActions = useMemo(function () {
     return getDefaultActions(mode);
@@ -195,7 +235,7 @@ var ActionButton = function ActionButton(props) {
             return e.stopPropagation();
           },
           onConfirm: function onConfirm(e) {
-            handleClick(_onClick || internalOnClick, index, item);
+            handleClick(internalOnClick, _onClick, index, item);
           }
         }, _confirmProps), {}, {
           children: _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), rest), {}, {
@@ -207,7 +247,7 @@ var ActionButton = function ActionButton(props) {
         }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index)) : _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), rest), {}, {
           onClick: function onClick(e) {
             e.stopPropagation();
-            handleClick(_onClick || internalOnClick, index, item);
+            handleClick(internalOnClick, _onClick, index, item);
           },
           children: label || defaultLabel
         }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
@@ -218,7 +258,7 @@ var ActionButton = function ActionButton(props) {
           return e.stopPropagation();
         },
         onConfirm: function onConfirm() {
-          return handleClick(_onClick, index);
+          return customClick(_onClick, index);
         }
       }, _confirmProps), {}, {
         children: _jsx(_Button, _objectSpread(_objectSpread({}, rest), {}, {
@@ -231,7 +271,7 @@ var ActionButton = function ActionButton(props) {
         key: "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index),
         onClick: function onClick(e) {
           e.stopPropagation();
-          handleClick(_onClick, index);
+          customClick(_onClick, index);
         }
       }), label));
     })

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

@@ -4,6 +4,8 @@ import _Button from "antd/es/button";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 var _excluded = ["label", "onClick", "onHandle", "actionType"],
   _excluded2 = ["onClick", "label"];
@@ -48,16 +50,52 @@ var ToolbarButton = function ToolbarButton(props) {
     }
     return props.toolbarProps;
   }, [props.toolbarProps]);
-  var handleClick = function handleClick(callback, item) {
+  var handleClick = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
+      var value, data;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            value = form.getFieldValue(namePath);
+            _context.next = 3;
+            return callback === null || callback === void 0 ? void 0 : callback(value, {
+              operation: operation,
+              form: form,
+              namePath: namePath
+            });
+          case 3:
+            data = _context.sent;
+            if (!(data === true)) {
+              _context.next = 7;
+              break;
+            }
+            defaultCallback === null || defaultCallback === void 0 ? void 0 : defaultCallback(value, {
+              operation: operation,
+              form: form,
+              namePath: namePath
+            });
+            return _context.abrupt("return");
+          case 7:
+            if ((item === null || item === void 0 ? void 0 : item.actionType) === 'add' && data) {
+              operation.add(data);
+            }
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleClick(_x, _x2, _x3) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var customClick = function customClick(callback, item) {
     var value = form.getFieldValue(namePath);
-    var data = callback === null || callback === void 0 ? void 0 : callback(value, {
+    callback === null || callback === void 0 ? void 0 : callback(value, {
       operation: operation,
       form: form,
       namePath: namePath
     });
-    if ((item === null || item === void 0 ? void 0 : item.actionType) === 'add' && data) {
-      operation.add(data);
-    }
   };
   return _jsx(_Space, {
     align: "start",
@@ -88,14 +126,14 @@ var ToolbarButton = function ToolbarButton(props) {
         }
         return _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, actions[actionType]), rest), {}, {
           onClick: function onClick() {
-            return handleClick(_onClick || internalOnClick, item);
+            return handleClick(internalOnClick, _onClick, item);
           },
           children: label || defaultLabel
         }), actionType);
       }
       return _jsx(_Button, _objectSpread(_objectSpread({}, rest), {}, {
         onClick: function onClick() {
-          return handleClick(_onClick2, item);
+          return customClick(_onClick2, item);
         },
         children: label
       }), actionType);

package/es/ProTree/propsType.d.ts

@@ -65,6 +65,11 @@ export interface ProTreeProps extends PropTreeSelectProps {
     onSelect?: (values: string[] | AllValueType, info?: any) => any;
     /** 复选情况下点击checkbox触发,参照antd */
     onCheck?: (values: string[] | AllValueType, info?: any) => any;
+    onExpand?: (newExpandedKeys: React.Key[], nextPara: {
+        expanded: boolean;
+        node: DataOption;
+        nativeEvent: PointerEvent;
+    }) => void;
     /** 自定义展示 */
     optionRender?: (item: any, searchStr: string) => string | ReactNode;
     /** 对后台返回数据进行格式化 */

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

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = require("react");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -129,17 +131,55 @@ var ActionButton = function ActionButton(props) {
     }
     return props.actionProps;
   }, [props.actionProps]);
-  var handleClick = function handleClick(callback, index, item) {
+  var handleClick = /*#__PURE__*/function () {
+    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(defaultCallback, callback, index, item) {
+      var value, data;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            value = form.getFieldValue(namePath);
+            _context.next = 3;
+            return callback === null || callback === void 0 ? void 0 : callback(value, {
+              namePath: namePath,
+              index: index,
+              operation: operation,
+              form: form
+            });
+          case 3:
+            data = _context.sent;
+            if (!(data === true)) {
+              _context.next = 7;
+              break;
+            }
+            defaultCallback === null || defaultCallback === void 0 ? void 0 : defaultCallback(value, {
+              namePath: namePath,
+              index: index,
+              operation: operation,
+              form: form
+            });
+            return _context.abrupt("return");
+          case 7:
+            if ((item === null || item === void 0 ? void 0 : item.actionType) === 'add') {
+              operation.add(data, index !== undefined ? index + 1 : undefined);
+            }
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleClick(_x, _x2, _x3, _x4) {
+      return _ref6.apply(this, arguments);
+    };
+  }();
+  var customClick = function customClick(callback, index) {
     var value = form.getFieldValue(namePath);
-    var data = callback === null || callback === void 0 ? void 0 : callback(value, {
+    callback === null || callback === void 0 ? void 0 : callback(value, {
       namePath: namePath,
       index: index,
       operation: operation,
       form: form
     });
-    if ((item === null || item === void 0 ? void 0 : item.actionType) === 'add') {
-      operation.add(data, index !== undefined ? index + 1 : undefined);
-    }
   };
   var defaultActions = (0, _react.useMemo)(function () {
     return getDefaultActions(mode);
@@ -196,7 +236,7 @@ var ActionButton = function ActionButton(props) {
             return e.stopPropagation();
           },
           onConfirm: function onConfirm(e) {
-            handleClick(_onClick || internalOnClick, index, item);
+            handleClick(internalOnClick, _onClick, index, item);
           }
         }, _confirmProps), {}, {
           children: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), rest), {}, {
@@ -208,7 +248,7 @@ var ActionButton = function ActionButton(props) {
         }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index)) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), rest), {}, {
           onClick: function onClick(e) {
             e.stopPropagation();
-            handleClick(_onClick || internalOnClick, index, item);
+            handleClick(internalOnClick, _onClick, index, item);
           },
           children: label || defaultLabel
         }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
@@ -219,7 +259,7 @@ var ActionButton = function ActionButton(props) {
           return e.stopPropagation();
         },
         onConfirm: function onConfirm() {
-          return handleClick(_onClick, index);
+          return customClick(_onClick, index);
         }
       }, _confirmProps), {}, {
         children: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
@@ -232,7 +272,7 @@ var ActionButton = function ActionButton(props) {
         key: "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index),
         onClick: function onClick(e) {
           e.stopPropagation();
-          handleClick(_onClick, index);
+          customClick(_onClick, index);
         }
       }), label));
     })

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

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
@@ -52,16 +54,52 @@ var ToolbarButton = function ToolbarButton(props) {
     }
     return props.toolbarProps;
   }, [props.toolbarProps]);
-  var handleClick = function handleClick(callback, item) {
+  var handleClick = /*#__PURE__*/function () {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(defaultCallback, callback, item) {
+      var value, data;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            value = form.getFieldValue(namePath);
+            _context.next = 3;
+            return callback === null || callback === void 0 ? void 0 : callback(value, {
+              operation: operation,
+              form: form,
+              namePath: namePath
+            });
+          case 3:
+            data = _context.sent;
+            if (!(data === true)) {
+              _context.next = 7;
+              break;
+            }
+            defaultCallback === null || defaultCallback === void 0 ? void 0 : defaultCallback(value, {
+              operation: operation,
+              form: form,
+              namePath: namePath
+            });
+            return _context.abrupt("return");
+          case 7:
+            if ((item === null || item === void 0 ? void 0 : item.actionType) === 'add' && data) {
+              operation.add(data);
+            }
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleClick(_x, _x2, _x3) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var customClick = function customClick(callback, item) {
     var value = form.getFieldValue(namePath);
-    var data = callback === null || callback === void 0 ? void 0 : callback(value, {
+    callback === null || callback === void 0 ? void 0 : callback(value, {
       operation: operation,
       form: form,
       namePath: namePath
     });
-    if ((item === null || item === void 0 ? void 0 : item.actionType) === 'add' && data) {
-      operation.add(data);
-    }
   };
   return (0, _jsxRuntime.jsx)(_antd.Space, {
     align: "start",
@@ -92,14 +130,14 @@ var ToolbarButton = function ToolbarButton(props) {
         }
         return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, actions[actionType]), rest), {}, {
           onClick: function onClick() {
-            return handleClick(_onClick || internalOnClick, item);
+            return handleClick(internalOnClick, _onClick, item);
           },
           children: label || defaultLabel
         }), actionType);
       }
       return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
         onClick: function onClick() {
-          return handleClick(_onClick2, item);
+          return customClick(_onClick2, item);
         },
         children: label
       }), actionType);

package/lib/ProTree/propsType.d.ts

@@ -65,6 +65,11 @@ export interface ProTreeProps extends PropTreeSelectProps {
     onSelect?: (values: string[] | AllValueType, info?: any) => any;
     /** 复选情况下点击checkbox触发,参照antd */
     onCheck?: (values: string[] | AllValueType, info?: any) => any;
+    onExpand?: (newExpandedKeys: React.Key[], nextPara: {
+        expanded: boolean;
+        node: DataOption;
+        nativeEvent: PointerEvent;
+    }) => void;
     /** 自定义展示 */
     optionRender?: (item: any, searchStr: string) => string | ReactNode;
     /** 对后台返回数据进行格式化 */

package/package.json

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