@lemon-fe/kits 1.0.0-182 → 1.0.0-184

package/es/components/DurationPicker/index.js

@@ -167,9 +167,10 @@ function DurationPicker(props) {
   var handleChangeDates = function handleChangeDates(dates) {
     var newDurationPickerValue = _objectSpread({}, value);
 
+    newDurationPickerValue.option = defaultOptions[0].label;
+
     if (dates === null) {
       newDurationPickerValue.dates = emptyValue;
-      newDurationPickerValue.option = defaultOptions[0].label;
     } else {
       if (restProps.showTime) {
         newDurationPickerValue.dates = [moment(dates[0]).format(dateFormat), moment(dates[1]).format(dateFormat)];

package/es/hooks/useBatchOperator/index.d.ts

@@ -10,6 +10,8 @@ declare type ProcessStepParams<T> = {
     payload?: any;
 };
 declare type ProcessStep<T, R> = {
+    /** 在不传入render warning会自动进行二次确认  */
+    mode?: 'warning';
     handler: (params: ProcessStepParams<T>) => Promise<any> | any;
     /**
      * 出现错误或者最后一步的 渲染函数
@@ -66,6 +68,11 @@ interface Props<RecordType extends Record<string, any> = Record<string, any>, Re
          */
         reload: (params?: any) => any;
     }) => ReactElement | string | number | null;
+    /**
+     * isError 应该与自定义渲染有关
+     * @param result
+     * @returns
+     */
     isError?: (result: ResultType) => boolean;
     params?: ParamsType;
     /**

package/es/hooks/useBatchOperator/index.js

@@ -234,7 +234,7 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
       var _processNode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(id, stepIdx, payload, next) {
         var _this2 = this;
 
-        var process, grid, node, data, _process$stepIdx, handler, renderResult, isFinal, done, _result;
+        var process, grid, node, data, _process$stepIdx, handler, renderResult, mode, isFinal, done, _result;
 
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) {
@@ -281,7 +281,7 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
                 return _context2.abrupt("return");
 
               case 13:
-                _process$stepIdx = process[stepIdx], handler = _process$stepIdx.handler, renderResult = _process$stepIdx.render;
+                _process$stepIdx = process[stepIdx], handler = _process$stepIdx.handler, renderResult = _process$stepIdx.render, mode = _process$stepIdx.mode;
                 isFinal = stepIdx === process.length - 1;
 
                 done = function done(result, error) {
@@ -295,12 +295,22 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
                         payload: payload,
                         render: function render() {
                           if (error) {
+                            if (mode === 'warning') {
+                              return /*#__PURE__*/React.createElement(Row, {
+                                justify: 'space-between'
+                              }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Icons.Tip, {
+                                type: "warning"
+                              }), /*#__PURE__*/React.createElement("span", null, " ", error.message, " ")), /*#__PURE__*/React.createElement("a", {
+                                onClick: function onClick() {
+                                  _this2.processNode(id, stepIdx + 1);
+                                }
+                              }, "\u7EE7\u7EED"));
+                            }
+
                             return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Icons.Tip, {
                               type: "error"
                             }), /*#__PURE__*/React.createElement("span", null, " ", error.message, " "), /*#__PURE__*/React.createElement(ReloadOutlined, {
                               onClick: function onClick() {
-                                debugger;
-
                                 _this2.processNode(id, 0, _this2.props.params);
                               }
                             }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.0-182",
+  "version": "1.0.0-184",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",