@pisell/pisellos 0.0.52 → 0.0.53

package/dist/modules/Cart/types.d.ts

@@ -173,7 +173,7 @@ export interface IUpdateItemParams {
     /** 关联表单 */
     relationForms?: {
         /** 关联表单ID */
-        form_id: number[];
+        form_id: number;
         /** 关联表单记录ID */
         form_record_ids: number[];
     }[];

package/dist/modules/Cart/utils.d.ts

@@ -98,14 +98,14 @@ export declare const formatResourceToCartItemOrigin: (params: {
 export declare const formatRelationFormsToCartItem: (params: {
     cartItem: CartItem;
     relationForms: {
-        form_id: number[];
+        form_id: number;
         form_record_ids: number[];
     }[];
 }) => CartItem;
 export declare const formatRelationFormsToCartItemOrigin: (params: {
     cartItem: CartItem;
     relationForms: {
-        form_id: number[];
+        form_id: number;
         form_record_ids: number[];
     }[];
 }) => any;

package/dist/modules/Cart/utils.js

@@ -632,21 +632,12 @@ export var deleteResourceFromCartItem = function deleteResourceFromCartItem(cart
   // 删除UI层的数据
   cartItem.resource_id = undefined;
   cartItem.relation_form_name = undefined;
-  cartItem.start_date = undefined;
-  cartItem.start_time = undefined;
-  cartItem.end_date = undefined;
-  cartItem.end_time = undefined;
 
   // 删除资源原始数据
   delete cartItem._resourceOrigin;
 
   // 删除原始数据
   cartItem._origin.resources = null;
-  cartItem._origin.select_date = null;
-  cartItem._origin.start_date = null;
-  cartItem._origin.start_time = null;
-  cartItem._origin.end_date = null;
-  cartItem._origin.end_time = null;
   return cartItem;
 };
 

package/dist/solution/BookingByStep/index.js

@@ -1401,12 +1401,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "autoSelectAllProductResources",
     value: function autoSelectAllProductResources(resources_code, timeSlots) {
-      var _this7 = this;
+      var _dateRange$,
+        _this7 = this;
       var dateRange = this.store.date.getDateRange();
       var resources = [];
-      dateRange.forEach(function (n) {
-        if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
-      });
+      if (dateRange !== null && dateRange !== void 0 && (_dateRange$ = dateRange[0]) !== null && _dateRange$ !== void 0 && _dateRange$.date) {
+        dateRange.forEach(function (n) {
+          if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
+        });
+      }
       var resourcesMap = getResourcesMap(cloneDeep(resources));
       // 一个账号一个账号处理
       var errorList = [];
@@ -1544,6 +1547,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // 取出购物车中所有一已选择的第一步资源
       var resources = [];
       var cartItems = this.store.cart.getItems();
+      if (cartItems !== null && cartItems !== void 0 && cartItems[0].start_date) return [];
       var resourceIds = [];
       cartItems.forEach(function (item) {
         var _item$_productOrigin8;

package/lib/modules/Cart/types.d.ts

@@ -173,7 +173,7 @@ export interface IUpdateItemParams {
     /** 关联表单 */
     relationForms?: {
         /** 关联表单ID */
-        form_id: number[];
+        form_id: number;
         /** 关联表单记录ID */
         form_record_ids: number[];
     }[];

package/lib/modules/Cart/utils.d.ts

@@ -98,14 +98,14 @@ export declare const formatResourceToCartItemOrigin: (params: {
 export declare const formatRelationFormsToCartItem: (params: {
     cartItem: CartItem;
     relationForms: {
-        form_id: number[];
+        form_id: number;
         form_record_ids: number[];
     }[];
 }) => CartItem;
 export declare const formatRelationFormsToCartItemOrigin: (params: {
     cartItem: CartItem;
     relationForms: {
-        form_id: number[];
+        form_id: number;
         form_record_ids: number[];
     }[];
 }) => any;

package/lib/modules/Cart/utils.js

@@ -491,17 +491,8 @@ var handleProductDeposit = (params) => {
 var deleteResourceFromCartItem = (cartItem) => {
   cartItem.resource_id = void 0;
   cartItem.relation_form_name = void 0;
-  cartItem.start_date = void 0;
-  cartItem.start_time = void 0;
-  cartItem.end_date = void 0;
-  cartItem.end_time = void 0;
   delete cartItem._resourceOrigin;
   cartItem._origin.resources = null;
-  cartItem._origin.select_date = null;
-  cartItem._origin.start_date = null;
-  cartItem._origin.start_time = null;
-  cartItem._origin.end_date = null;
-  cartItem._origin.end_time = null;
   return cartItem;
 };
 var deleteTimeFromCartItem = (cartItem) => {

package/lib/solution/BookingByStep/index.js

@@ -804,12 +804,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 给所有购物车里的商品先分配一个资源
   autoSelectAllProductResources(resources_code, timeSlots) {
+    var _a;
     const dateRange = this.store.date.getDateRange();
     const resources = [];
-    dateRange.forEach((n) => {
-      if (n.resource)
-        resources.push(...n.resource);
-    });
+    if ((_a = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _a.date) {
+      dateRange.forEach((n) => {
+        if (n.resource)
+          resources.push(...n.resource);
+      });
+    }
     const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
     const errorList = [];
     const selectResourcesMap = {};
@@ -817,9 +820,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const selectForCartResources = (cartItems2) => {
       let recordTimeSlots = (0, import_lodash_es.cloneDeep)(timeSlots);
       cartItems2.forEach((item, index) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
         const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
-          capacity: (_a = item._productOrigin) == null ? void 0 : _a.capacity,
+          capacity: (_a2 = item._productOrigin) == null ? void 0 : _a2.capacity,
           product_bundle: item._origin.product.product_bundle
         });
         const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
@@ -941,6 +944,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const dateRange = this.store.date.getDateRange();
     const resources = [];
     const cartItems = this.store.cart.getItems();
+    if (cartItems == null ? void 0 : cartItems[0].start_date)
+      return [];
     const resourceIds = [];
     cartItems.forEach((item) => {
       var _a, _b, _c;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.52",
+  "version": "0.0.53",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",