@pisell/private-materials 6.8.12 → 6.8.13

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -36,6 +36,7 @@ import { createCacheItem, genValues, isBundle, isOption, setHandleSetService } f
 import { useToast } from '@pisell/materials';
 import { useIsActive } from "../../context/IsActiveContext";
 import { SelectHolderModal } from "../../../booking/utils/selectHolderModal";
+import { getOpenNormalServiceHandler } from "../../../booking/info2/service/openNormalService";
 var productListLayout = {
   grid: true,
   config: '12:12'
@@ -624,29 +625,45 @@ var AddSerivce = function AddSerivce(props) {
     var isSession = isSessionProduct(item);
     var isOnlySession = getIsOnlySession(item);
     var isEject = getIsEject(item, type);
-    state.action({
-      type: 'pisell1.handleOpenProductModal',
-      data: {
-        id: item.id,
-        date: state.date.value.format('YYYY-MM-DD'),
-        productDetail: item,
-        showConfig: {
-          option: true,
-          session: isSession,
-          variant: true,
-          package: true,
-          number: getIsShowNumber(item, state)
+    if (isNormalProductByDurationSchedule(item) || !isSession && isEject) {
+      var openNormalService = getOpenNormalServiceHandler();
+      if (openNormalService) {
+        openNormalService({
+          mode: 'create',
+          productId: item.id,
+          date: state.date.value.format('YYYY-MM-DD'),
+          isEject: isEject ? 1 : 0,
+          onClose: function onClose() {
+            setCurrentProduct(null);
+          },
+          callback: createProductModalCallback(item)
+        });
+      }
+    } else {
+      state.action({
+        type: 'pisell1.handleOpenProductModal',
+        data: {
+          id: item.id,
+          date: state.date.value.format('YYYY-MM-DD'),
+          productDetail: item,
+          showConfig: {
+            option: true,
+            session: isSession,
+            variant: true,
+            package: true,
+            number: getIsShowNumber(item, state)
+          },
+          isOnlySession: isOnlySession,
+          is_eject: isEject ? 1 : 0,
+          customer_id: customerId,
+          isOS: isSession
         },
-        isOnlySession: isOnlySession,
-        is_eject: isEject ? 1 : 0,
-        customer_id: customerId,
-        isOS: isSession
-      },
-      onCancel: function onCancel() {
-        setCurrentProduct(null);
-      },
-      callback: createProductModalCallback(item)
-    });
+        onCancel: function onCancel() {
+          setCurrentProduct(null);
+        },
+        callback: createProductModalCallback(item)
+      });
+    }
   });
 
   // 处理产品选择

package/lib/components/ticketBooking/components/addServiceVariant/addService.js

@@ -51,6 +51,7 @@ var import_utils7 = require("./utils");
 var import_materials = require("@pisell/materials");
 var import_IsActiveContext = require("../../context/IsActiveContext");
 var import_selectHolderModal = require("../../../booking/utils/selectHolderModal");
+var import_openNormalService = require("../../../booking/info2/service/openNormalService");
 var productListLayout = {
   grid: true,
   config: "12:12"
@@ -488,29 +489,45 @@ var AddSerivce = (props) => {
     const isSession = (0, import_utils2.isSessionProduct)(item);
     const isOnlySession = (0, import_utils2.getIsOnlySession)(item);
     const isEject = (0, import_utils2.getIsEject)(item, type);
-    state.action({
-      type: "pisell1.handleOpenProductModal",
-      data: {
-        id: item.id,
-        date: state.date.value.format("YYYY-MM-DD"),
-        productDetail: item,
-        showConfig: {
-          option: true,
-          session: isSession,
-          variant: true,
-          package: true,
-          number: (0, import_utils6.getIsShowNumber)(item, state)
+    if ((0, import_utils4.isNormalProductByDurationSchedule)(item) || !isSession && isEject) {
+      const openNormalService = (0, import_openNormalService.getOpenNormalServiceHandler)();
+      if (openNormalService) {
+        openNormalService({
+          mode: "create",
+          productId: item.id,
+          date: state.date.value.format("YYYY-MM-DD"),
+          isEject: isEject ? 1 : 0,
+          onClose: () => {
+            setCurrentProduct(null);
+          },
+          callback: createProductModalCallback(item)
+        });
+      }
+    } else {
+      state.action({
+        type: "pisell1.handleOpenProductModal",
+        data: {
+          id: item.id,
+          date: state.date.value.format("YYYY-MM-DD"),
+          productDetail: item,
+          showConfig: {
+            option: true,
+            session: isSession,
+            variant: true,
+            package: true,
+            number: (0, import_utils6.getIsShowNumber)(item, state)
+          },
+          isOnlySession,
+          is_eject: isEject ? 1 : 0,
+          customer_id: customerId,
+          isOS: isSession
         },
-        isOnlySession,
-        is_eject: isEject ? 1 : 0,
-        customer_id: customerId,
-        isOS: isSession
-      },
-      onCancel: () => {
-        setCurrentProduct(null);
-      },
-      callback: createProductModalCallback(item)
-    });
+        onCancel: () => {
+          setCurrentProduct(null);
+        },
+        callback: createProductModalCallback(item)
+      });
+    }
   });
   const handleSelectProduct = (0, import_ahooks.useMemoizedFn)(
     async (item, type = "select") => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.8.12",
+  "version": "6.8.13",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -76,8 +76,8 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
-    "@pisell/icon": "0.0.11",
     "@pisell/materials": "6.8.4",
+    "@pisell/icon": "0.0.11",
     "@pisell/utils": "3.0.2",
     "@pisell/date-picker": "3.0.7"
   },