@pisell/private-materials 3.4.70 → 3.4.71

package/es/plus/orderList/components/BatchActionBar.js

@@ -16,7 +16,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useCallback, useMemo } from 'react';
 import { Checkbox, Button } from 'antd';
 import { PisellBatchActionBar, PisellQuickFilter, PisellDataSourceContainer, PisellModal } from '@pisell/materials';
-import { editordership, postSendInvoice, printPack, printPicking, batchAddOrderTags, batchDeleteOrderTags, batchPutOrderStatus, batchVoidedOrder } from "../serve";
+import { editordership, postSendInvoice, printPack, printPicking, batchAddOrderTags, batchDeleteOrderTags, batchPutOrderStatus } from "../serve";
 import useEngineContext from "../../../hooks/useEngineContext";
 import { getTagSelectOptions } from "../serve";
 var useContainerContext = PisellDataSourceContainer.useContainerContext;
@@ -715,69 +715,39 @@ var OrderBatchActionBar = function OrderBatchActionBar(props) {
   /**
    * 作废订单（voided）
    */
-  var handleMarkAsVoid = useCallback( /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(keys, rows) {
-      return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-        while (1) switch (_context16.prev = _context16.next) {
-          case 0:
-            PisellModal.confirm({
-              title: locales.getText('pisell2.orderList.batchAction.void.title'),
-              cancelText: locales.getText('pisell2.orderList.batchAction.button.cancel'),
-              okText: locales.getText('pisell2.orderList.batchAction.button.ok'),
-              content: locales.getText('page.order.lists.cancel.content')(0, 0, 0, '', false, 'void'),
-              onOk: function () {
-                var _onOk7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
-                  return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-                    while (1) switch (_context15.prev = _context15.next) {
-                      case 0:
-                        _context15.prev = 0;
-                        setLoadingStates(function (prev) {
-                          return _objectSpread(_objectSpread({}, prev), {}, {
-                            markAsVoid: true
-                          });
-                        });
-                        _context15.next = 4;
-                        return batchVoidedOrder({
-                          order_ids: keys
-                        });
-                      case 4:
-                        handleSuccess();
-                        _context15.next = 10;
-                        break;
-                      case 7:
-                        _context15.prev = 7;
-                        _context15.t0 = _context15["catch"](0);
-                        handleError();
-                      case 10:
-                        _context15.prev = 10;
-                        setLoadingStates(function (prev) {
-                          return _objectSpread(_objectSpread({}, prev), {}, {
-                            markAsVoid: false
-                          });
-                        });
-                        return _context15.finish(10);
-                      case 13:
-                      case "end":
-                        return _context15.stop();
-                    }
-                  }, _callee15, null, [[0, 7, 10, 13]]);
-                }));
-                function onOk() {
-                  return _onOk7.apply(this, arguments);
-                }
-                return onOk;
-              }()
-            });
-          case 1:
-          case "end":
-            return _context16.stop();
-        }
-      }, _callee16);
-    }));
-    return function (_x16, _x17) {
-      return _ref9.apply(this, arguments);
-    };
-  }(), [handleSuccess, handleError, locales]);
+  // const handleMarkAsVoid = useCallback(
+  //   async (keys: React.Key[], rows?: any[]) => {
+  //     PisellModal.confirm({
+  //       title: locales.getText('pisell2.orderList.batchAction.void.title'),
+  //       cancelText: locales.getText(
+  //         'pisell2.orderList.batchAction.button.cancel'
+  //       ),
+  //       okText: locales.getText('pisell2.orderList.batchAction.button.ok'),
+  //       content: locales.getText('page.order.lists.cancel.content')(
+  //         0,
+  //         0,
+  //         0,
+  //         '',
+  //         false,
+  //         'void'
+  //       ),
+  //       onOk: async () => {
+  //         try {
+  //           setLoadingStates((prev) => ({ ...prev, markAsVoid: true }));
+  //           await batchVoidedOrder({
+  //             order_ids: keys as number[],
+  //           });
+  //           handleSuccess();
+  //         } catch (error: any) {
+  //           handleError();
+  //         } finally {
+  //           setLoadingStates((prev) => ({ ...prev, markAsVoid: false }));
+  //         }
+  //       },
+  //     });
+  //   },
+  //   [handleSuccess, handleError, locales]
+  // );
 
   /**
    * 批量操作按钮配置
@@ -835,14 +805,18 @@ var OrderBatchActionBar = function OrderBatchActionBar(props) {
       icon: 'pisell2-slash-circle-01',
       loading: loadingStates.markAsCancelled,
       onClick: handleMarkAsCancelled
-    }, {
-      key: 'mark-as-void',
-      label: locales.getText('page.order.void'),
-      icon: 'pisell2-alert-circle',
-      loading: loadingStates.markAsVoid,
-      onClick: handleMarkAsVoid
-    }];
-  }, [loadingStates.ship, loadingStates.invoice, loadingStates.addTags, loadingStates.removeTags, loadingStates.markAsOpen, loadingStates.markAsCompleted, loadingStates.markAsCancelled, loadingStates.markAsVoid, handleShip, handleInvoice, handlePrintPack, handlePrintPicking, handleAddTags, handleRemoveTags, handleMarkAsOpen, handleMarkAsCompleted, handleMarkAsCancelled, handleMarkAsVoid, locales]);
+    }
+    // {
+    //   key: 'mark-as-void',
+    //   label: locales.getText('page.order.void'),
+    //   icon: 'pisell2-alert-circle',
+    //   loading: loadingStates.markAsVoid,
+    //   onClick: handleMarkAsVoid,
+    // },
+    ];
+  }, [loadingStates.ship, loadingStates.invoice, loadingStates.addTags, loadingStates.removeTags, loadingStates.markAsOpen, loadingStates.markAsCompleted, loadingStates.markAsCancelled, loadingStates.markAsVoid, handleShip, handleInvoice, handlePrintPack, handlePrintPicking, handleAddTags, handleRemoveTags, handleMarkAsOpen, handleMarkAsCompleted, handleMarkAsCancelled,
+  // handleMarkAsVoid,
+  locales]);
   if (selectedKeys.length === 0) {
     return null;
   }

package/lib/plus/orderList/components/BatchActionBar.js

@@ -55,8 +55,11 @@ var OrderBatchActionBar = (props) => {
     },
     [onClearSelection]
   );
-  const handleError = (0, import_react.useCallback)((error, defaultMessage) => {
-  }, []);
+  const handleError = (0, import_react.useCallback)(
+    (error, defaultMessage) => {
+    },
+    []
+  );
   const handleShip = (0, import_react.useCallback)(
     async (keys, rows) => {
       let checked = true;
@@ -409,65 +412,45 @@ var OrderBatchActionBar = (props) => {
         cancelText: locales.getText(
           "pisell2.orderList.batchAction.button.cancel"
         ),
-        footer: () => /* @__PURE__ */ import_react.default.createElement("div", { style: { display: "flex", gap: 10, justifyContent: "flex-end", width: "100%" } }, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { key: "cancel", onClick: () => modalInstance.destroy() }, locales.getText("pisell2.orderList.batchAction.button.cancel")), /* @__PURE__ */ import_react.default.createElement(
-          import_antd.Button,
-          {
-            key: "only-cancel",
-            onClick: () => executeCancelOrder(0),
-            loading: loadingStates.markAsCancelled
-          },
-          locales.getText(
-            "pisell2.orderList.batchAction.button.onlyCancel"
-          )
-        ), /* @__PURE__ */ import_react.default.createElement(
-          import_antd.Button,
+        footer: () => /* @__PURE__ */ import_react.default.createElement(
+          "div",
           {
-            key: "cancel-void",
-            type: "primary",
-            onClick: () => executeCancelOrder(1),
-            loading: loadingStates.markAsCancelled
+            style: {
+              display: "flex",
+              gap: 10,
+              justifyContent: "flex-end",
+              width: "100%"
+            }
           },
-          locales.getText(
-            "pisell2.orderList.batchAction.button.cancelAndVoid"
+          /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { key: "cancel", onClick: () => modalInstance.destroy() }, locales.getText("pisell2.orderList.batchAction.button.cancel")),
+          /* @__PURE__ */ import_react.default.createElement(
+            import_antd.Button,
+            {
+              key: "only-cancel",
+              onClick: () => executeCancelOrder(0),
+              loading: loadingStates.markAsCancelled
+            },
+            locales.getText(
+              "pisell2.orderList.batchAction.button.onlyCancel"
+            )
+          ),
+          /* @__PURE__ */ import_react.default.createElement(
+            import_antd.Button,
+            {
+              key: "cancel-void",
+              type: "primary",
+              onClick: () => executeCancelOrder(1),
+              loading: loadingStates.markAsCancelled
+            },
+            locales.getText(
+              "pisell2.orderList.batchAction.button.cancelAndVoid"
+            )
           )
-        ))
+        )
       });
     },
     [handleSuccess, handleError, loadingStates.markAsCancelled]
   );
-  const handleMarkAsVoid = (0, import_react.useCallback)(
-    async (keys, rows) => {
-      import_materials.PisellModal.confirm({
-        title: locales.getText("pisell2.orderList.batchAction.void.title"),
-        cancelText: locales.getText(
-          "pisell2.orderList.batchAction.button.cancel"
-        ),
-        okText: locales.getText("pisell2.orderList.batchAction.button.ok"),
-        content: locales.getText("page.order.lists.cancel.content")(
-          0,
-          0,
-          0,
-          "",
-          false,
-          "void"
-        ),
-        onOk: async () => {
-          try {
-            setLoadingStates((prev) => ({ ...prev, markAsVoid: true }));
-            await (0, import_serve.batchVoidedOrder)({
-              order_ids: keys
-            });
-            handleSuccess();
-          } catch (error) {
-            handleError();
-          } finally {
-            setLoadingStates((prev) => ({ ...prev, markAsVoid: false }));
-          }
-        }
-      });
-    },
-    [handleSuccess, handleError, locales]
-  );
   const actions = (0, import_react.useMemo)(
     () => [
       {
@@ -532,14 +515,14 @@ var OrderBatchActionBar = (props) => {
         icon: "pisell2-slash-circle-01",
         loading: loadingStates.markAsCancelled,
         onClick: handleMarkAsCancelled
-      },
-      {
-        key: "mark-as-void",
-        label: locales.getText("page.order.void"),
-        icon: "pisell2-alert-circle",
-        loading: loadingStates.markAsVoid,
-        onClick: handleMarkAsVoid
       }
+      // {
+      //   key: 'mark-as-void',
+      //   label: locales.getText('page.order.void'),
+      //   icon: 'pisell2-alert-circle',
+      //   loading: loadingStates.markAsVoid,
+      //   onClick: handleMarkAsVoid,
+      // },
     ],
     [
       loadingStates.ship,
@@ -559,7 +542,7 @@ var OrderBatchActionBar = (props) => {
       handleMarkAsOpen,
       handleMarkAsCompleted,
       handleMarkAsCancelled,
-      handleMarkAsVoid,
+      // handleMarkAsVoid,
       locales
     ]
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.4.70",
+  "version": "3.4.71",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -78,8 +78,8 @@
     "styled-components": "^6.0.0-rc.3",
     "@pisell/utils": "3.0.2",
     "@pisell/materials": "3.3.79",
-    "@pisell/date-picker": "3.0.4",
-    "@pisell/icon": "0.0.11"
+    "@pisell/icon": "0.0.11",
+    "@pisell/date-picker": "3.0.4"
   },
   "peerDependencies": {
     "react": "^18.0.0",