@pisell/private-materials 3.0.200 → 3.0.201

package/es/components/booking/addons/model.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/es/components/booking/info/service/editService/index.js

@@ -640,12 +640,24 @@ var Info = function Info(_, ref) {
    * @Date: 2024-08-28 17:08
    */
   var handleEdit = useMemoizedFn(function (e) {
-    var _item$_extend, _item$_extend$other, _item$_extend2, _item$_extend2$other;
+    var _item$_extend3;
     // 当前商品
     var item = state.service.cacheItem;
 
     // 表单数据
     var values = form.getFieldsValue();
+    var dayValue = {};
+    if (isDay) {
+      var _item$_extend, _item$_extend$other, _item$_extend$other$o, _item$_extend2, _item$_extend2$other;
+      // 格式化单规格
+      var option = (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : (_item$_extend$other = _item$_extend.other) === null || _item$_extend$other === void 0 ? void 0 : (_item$_extend$other$o = _item$_extend$other.option) === null || _item$_extend$other$o === void 0 ? void 0 : _item$_extend$other$o.map(function (o) {
+        return _objectSpread(_objectSpread({}, o), {}, {
+          option_group_item_id: o.product_option_item_id
+        });
+      });
+      dayValue.product_variant = ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : (_item$_extend2$other = _item$_extend2.other) === null || _item$_extend2$other === void 0 ? void 0 : _item$_extend2$other.product_variant_id) || 0;
+      dayValue.product_option = option || [];
+    }
 
     // 打开商品详情弹窗
     state.action({
@@ -659,10 +671,7 @@ var Info = function Info(_, ref) {
           variant: isDay ? true : false,
           package: true
         },
-        value: _objectSpread(_objectSpread({}, item._extend.other), {}, {
-          product_variant: ((_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : (_item$_extend$other = _item$_extend.other) === null || _item$_extend$other === void 0 ? void 0 : _item$_extend$other.product_variant_id) || 0,
-          product_option: ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : (_item$_extend2$other = _item$_extend2.other) === null || _item$_extend2$other === void 0 ? void 0 : _item$_extend2$other.option) || []
-        })
+        value: _objectSpread(_objectSpread({}, ((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.other) || {}), dayValue)
       },
       callback: function callback(e) {
         var _cacheItem$_extend, _cacheItem$_extend$ot;

package/es/components/booking/payments/index.d.ts

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Payments: any;
+declare const Payments: (props: any) => any;
 export default Payments;

package/lib/components/booking/addons/model.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/booking/info/service/editService/index.js

@@ -399,9 +399,20 @@ var Info = (_, ref) => {
     useEndDate
   ]);
   const handleEdit = (0, import_ahooks.useMemoizedFn)((e) => {
-    var _a2, _b2, _c2, _d2;
+    var _a2, _b2, _c2, _d2, _e2, _f2;
     const item = state.service.cacheItem;
     let values = form.getFieldsValue();
+    let dayValue = {};
+    if (isDay) {
+      const option = (_c2 = (_b2 = (_a2 = item._extend) == null ? void 0 : _a2.other) == null ? void 0 : _b2.option) == null ? void 0 : _c2.map((o) => {
+        return {
+          ...o,
+          option_group_item_id: o.product_option_item_id
+        };
+      });
+      dayValue.product_variant = ((_e2 = (_d2 = item._extend) == null ? void 0 : _d2.other) == null ? void 0 : _e2.product_variant_id) || 0;
+      dayValue.product_option = option || [];
+    }
     state.action({
       type: "pisell1.handleOpenProductModal",
       data: {
@@ -414,9 +425,8 @@ var Info = (_, ref) => {
           package: true
         },
         value: {
-          ...item._extend.other,
-          product_variant: ((_b2 = (_a2 = item._extend) == null ? void 0 : _a2.other) == null ? void 0 : _b2.product_variant_id) || 0,
-          product_option: ((_d2 = (_c2 = item._extend) == null ? void 0 : _c2.other) == null ? void 0 : _d2.option) || []
+          ...((_f2 = item._extend) == null ? void 0 : _f2.other) || {},
+          ...dayValue
         }
       },
       callback: (e2) => {

package/lib/components/booking/payments/index.d.ts

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Payments: any;
+declare const Payments: (props: any) => any;
 export default Payments;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.200",
+  "version": "3.0.201",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -62,7 +62,7 @@
     "@pisell/utils": "1.0.42",
     "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.1",
-    "@pisell/materials": "3.0.60"
+    "@pisell/materials": "3.0.61"
   },
   "peerDependencies": {
     "react": "^18.0.0",