@pisell/pisellos 0.0.52 → 0.0.54

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { CartItem, CartModuleAPI, IAddItemParams, IUpdateItemParams } from './types';
+import { CartItem, CartModuleAPI, ECartItemInfoType, IAddItemParams, IUpdateItemParams } from './types';
 export * from './types';
 /**
  * 购物车模块实现
@@ -57,8 +57,10 @@ export declare class CartModule extends BaseModule implements Module, CartModule
     clearCartByAccount(account_id: string): void;
     /**
      * 清除购物车商品中的信息
+     * @param type 清除购物车商品中的信息类型
+     * @param _id 购物车商品ID
      */
-    deleteCartItemInfo(types: 'resource' | 'time' | 'relationForms'): void;
+    deleteCartItemInfo(type: ECartItemInfoType, _id?: string): void;
     /**
      * 清除购物车
      */

package/dist/modules/Cart/index.js

@@ -22,7 +22,8 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
-import { createCartItemOrigin, deleteRelationFormsFromCartItem, deleteResourceFromCartItem, deleteTimeFromCartItem, formatAccountToCartItem, formatDateToCartItem, formatDiscountToCartItem, formatNoteToCartItem, formatProductToCartItem, formatRelationFormsToCartItem, formatResourceToCartItem, getUniqueId } from "./utils";
+import { ECartItemInfoType } from "./types";
+import { createCartItemOrigin, deleteHolderFromCartItem, deleteRelationFormsFromCartItem, deleteResourceFromCartItem, deleteTimeFromCartItem, formatAccountToCartItem, formatDateToCartItem, formatDiscountToCartItem, formatNoteToCartItem, formatProductToCartItem, formatRelationFormsToCartItem, formatResourceToCartItem, getUniqueId } from "./utils";
 import { cloneDeep } from 'lodash-es';
 export * from "./types";
 
@@ -379,20 +380,36 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
 
     /**
      * 清除购物车商品中的信息
+     * @param type 清除购物车商品中的信息类型
+     * @param _id 购物车商品ID
      */
   }, {
     key: "deleteCartItemInfo",
-    value: function deleteCartItemInfo(types) {
+    value: function deleteCartItemInfo(type, _id) {
       var list = this.store.list.map(function (item) {
-        // 清除购物车商品中的资源信息
-        if (types === 'resource') {
-          item = deleteResourceFromCartItem(item);
-        } else if (types === 'time') {
-          // 清除购物车商品中的时间信息
-          item = deleteTimeFromCartItem(item);
-        } else if (types === 'relationForms') {
-          // 清除购物车商品中的关联表单信息
-          item = deleteRelationFormsFromCartItem(item);
+        var needDelete = _id ? item._id === _id : true;
+
+        // 如果存在_id，则只需要操作对应的购物车数据，否则操作所有
+        if (!needDelete) {
+          return item;
+        }
+        switch (type) {
+          case ECartItemInfoType.Resource:
+            // 清除购物车商品中的资源信息
+            item = deleteResourceFromCartItem(item);
+            break;
+          case ECartItemInfoType.Time:
+            // 清除购物车商品中的时间信息
+            item = deleteTimeFromCartItem(item);
+            break;
+          case ECartItemInfoType.RelationForms:
+            // 清除购物车商品中的关联表单信息
+            item = deleteRelationFormsFromCartItem(item);
+            break;
+          case ECartItemInfoType.Holder:
+            // 清除购物车商品中的账户信息
+            item = deleteHolderFromCartItem(item);
+            break;
         }
         return item;
       });

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

@@ -7,6 +7,19 @@ export declare enum CartHooks {
     OnCartUpdateItem = "card:onCartUpdateItem",
     OnCartRemove = "card:onCartRemove"
 }
+/**
+ * 购物车商品信息类型
+ */
+export declare enum ECartItemInfoType {
+    /** 资源信息 */
+    Resource = "resource",
+    /** 时间信息 */
+    Time = "time",
+    /** 关联表单信息 */
+    RelationForms = "relationForms",
+    /** 账户信息 */
+    Holder = "holder"
+}
 export interface CartModuleAPI {
     /** 添加商品到购物车 */
     addItem: (item: IAddItemParams) => Promise<void>;
@@ -26,6 +39,8 @@ export interface CartModuleAPI {
     getCartByAccount: (account_id: string) => CartItem[];
     /** 清除购物车 */
     clear: () => void;
+    /** 清除购物车商品中的信息 */
+    deleteCartItemInfo: (type: ECartItemInfoType, _id?: string) => void;
 }
 /**
  * 购物车商品接口
@@ -173,7 +188,7 @@ export interface IUpdateItemParams {
     /** 关联表单 */
     relationForms?: {
         /** 关联表单ID */
-        form_id: number[];
+        form_id: number;
         /** 关联表单记录ID */
         form_record_ids: number[];
     }[];

package/dist/modules/Cart/types.js

@@ -6,6 +6,17 @@ export var CartHooks = /*#__PURE__*/function (CartHooks) {
   return CartHooks;
 }({});
 
+/**
+ * 购物车商品信息类型
+ */
+export var ECartItemInfoType = /*#__PURE__*/function (ECartItemInfoType) {
+  ECartItemInfoType["Resource"] = "resource";
+  ECartItemInfoType["Time"] = "time";
+  ECartItemInfoType["RelationForms"] = "relationForms";
+  ECartItemInfoType["Holder"] = "holder";
+  return ECartItemInfoType;
+}({});
+
 /**
  * 购物车商品接口
  */

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;
@@ -251,3 +251,4 @@ export declare const deleteTimeFromCartItem: (cartItem: CartItem) => CartItem;
  * @returns 删除后的购物车
  */
 export declare const deleteRelationFormsFromCartItem: (cartItem: CartItem) => CartItem;
+export declare const deleteHolderFromCartItem: (cartItem: CartItem) => CartItem;

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;
 };
 
@@ -680,4 +671,13 @@ export var deleteRelationFormsFromCartItem = function deleteRelationFormsFromCar
   // 删除原始数据
   cartItem._origin.relation_forms = null;
   return cartItem;
+};
+export var deleteHolderFromCartItem = function deleteHolderFromCartItem(cartItem) {
+  // 删除UI层的数据
+  cartItem.holder_id = undefined;
+  cartItem.holder_title = undefined;
+
+  // 删除原始数据
+  cartItem._origin.holder = null;
+  return cartItem;
 };

package/dist/solution/BookingByStep/index.d.ts

@@ -2,7 +2,7 @@ import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { Response } from '../../plugins';
 import { BookingByStepState } from './types';
-import { CartItem, IUpdateItemParams, ProductData, ProductResourceItem } from '../../modules';
+import { CartItem, IUpdateItemParams, ProductData, ProductResourceItem, ECartItemInfoType } from '../../modules';
 import { Account } from '../../modules/Account/types';
 import { IStep } from '../../modules/Step/tyeps';
 import { TimeSliceItem } from './utils/resources';
@@ -130,7 +130,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     /**
      * 从购物车中按类别删除信息
      */
-    deleteCartItemInfo(types: 'resource' | 'time' | 'relationForms'): void;
+    deleteCartItemInfo(type: ECartItemInfoType, _id?: string): void;
     destroy(): void;
     getResourcesList(): any[];
     getResourcesListByCartItem(id: string | number): {

package/dist/solution/BookingByStep/index.js

@@ -1063,8 +1063,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
      */
   }, {
     key: "deleteCartItemInfo",
-    value: function deleteCartItemInfo(types) {
-      this.store.cart.deleteCartItemInfo(types);
+    value: function deleteCartItemInfo(type, _id) {
+      this.store.cart.deleteCartItemInfo(type, _id);
     }
   }, {
     key: "destroy",
@@ -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/index.d.ts

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { CartItem, CartModuleAPI, IAddItemParams, IUpdateItemParams } from './types';
+import { CartItem, CartModuleAPI, ECartItemInfoType, IAddItemParams, IUpdateItemParams } from './types';
 export * from './types';
 /**
  * 购物车模块实现
@@ -57,8 +57,10 @@ export declare class CartModule extends BaseModule implements Module, CartModule
     clearCartByAccount(account_id: string): void;
     /**
      * 清除购物车商品中的信息
+     * @param type 清除购物车商品中的信息类型
+     * @param _id 购物车商品ID
      */
-    deleteCartItemInfo(types: 'resource' | 'time' | 'relationForms'): void;
+    deleteCartItemInfo(type: ECartItemInfoType, _id?: string): void;
     /**
      * 清除购物车
      */

package/lib/modules/Cart/index.js

@@ -24,6 +24,7 @@ __export(Cart_exports, {
 });
 module.exports = __toCommonJS(Cart_exports);
 var import_BaseModule = require("../BaseModule");
+var import_types = require("./types");
 var import_utils = require("./utils");
 var import_lodash_es = require("lodash-es");
 __reExport(Cart_exports, require("./types"), module.exports);
@@ -226,15 +227,28 @@ var CartModule = class extends import_BaseModule.BaseModule {
   }
   /**
    * 清除购物车商品中的信息
+   * @param type 清除购物车商品中的信息类型
+   * @param _id 购物车商品ID
    */
-  deleteCartItemInfo(types) {
+  deleteCartItemInfo(type, _id) {
     const list = this.store.list.map((item) => {
-      if (types === "resource") {
-        item = (0, import_utils.deleteResourceFromCartItem)(item);
-      } else if (types === "time") {
-        item = (0, import_utils.deleteTimeFromCartItem)(item);
-      } else if (types === "relationForms") {
-        item = (0, import_utils.deleteRelationFormsFromCartItem)(item);
+      const needDelete = _id ? item._id === _id : true;
+      if (!needDelete) {
+        return item;
+      }
+      switch (type) {
+        case import_types.ECartItemInfoType.Resource:
+          item = (0, import_utils.deleteResourceFromCartItem)(item);
+          break;
+        case import_types.ECartItemInfoType.Time:
+          item = (0, import_utils.deleteTimeFromCartItem)(item);
+          break;
+        case import_types.ECartItemInfoType.RelationForms:
+          item = (0, import_utils.deleteRelationFormsFromCartItem)(item);
+          break;
+        case import_types.ECartItemInfoType.Holder:
+          item = (0, import_utils.deleteHolderFromCartItem)(item);
+          break;
       }
       return item;
     });

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

@@ -7,6 +7,19 @@ export declare enum CartHooks {
     OnCartUpdateItem = "card:onCartUpdateItem",
     OnCartRemove = "card:onCartRemove"
 }
+/**
+ * 购物车商品信息类型
+ */
+export declare enum ECartItemInfoType {
+    /** 资源信息 */
+    Resource = "resource",
+    /** 时间信息 */
+    Time = "time",
+    /** 关联表单信息 */
+    RelationForms = "relationForms",
+    /** 账户信息 */
+    Holder = "holder"
+}
 export interface CartModuleAPI {
     /** 添加商品到购物车 */
     addItem: (item: IAddItemParams) => Promise<void>;
@@ -26,6 +39,8 @@ export interface CartModuleAPI {
     getCartByAccount: (account_id: string) => CartItem[];
     /** 清除购物车 */
     clear: () => void;
+    /** 清除购物车商品中的信息 */
+    deleteCartItemInfo: (type: ECartItemInfoType, _id?: string) => void;
 }
 /**
  * 购物车商品接口
@@ -173,7 +188,7 @@ export interface IUpdateItemParams {
     /** 关联表单 */
     relationForms?: {
         /** 关联表单ID */
-        form_id: number[];
+        form_id: number;
         /** 关联表单记录ID */
         form_record_ids: number[];
     }[];

package/lib/modules/Cart/types.js

@@ -19,7 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/modules/Cart/types.ts
 var types_exports = {};
 __export(types_exports, {
-  CartHooks: () => CartHooks
+  CartHooks: () => CartHooks,
+  ECartItemInfoType: () => ECartItemInfoType
 });
 module.exports = __toCommonJS(types_exports);
 var CartHooks = /* @__PURE__ */ ((CartHooks2) => {
@@ -29,7 +30,15 @@ var CartHooks = /* @__PURE__ */ ((CartHooks2) => {
   CartHooks2["OnCartRemove"] = "card:onCartRemove";
   return CartHooks2;
 })(CartHooks || {});
+var ECartItemInfoType = /* @__PURE__ */ ((ECartItemInfoType2) => {
+  ECartItemInfoType2["Resource"] = "resource";
+  ECartItemInfoType2["Time"] = "time";
+  ECartItemInfoType2["RelationForms"] = "relationForms";
+  ECartItemInfoType2["Holder"] = "holder";
+  return ECartItemInfoType2;
+})(ECartItemInfoType || {});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  CartHooks
+  CartHooks,
+  ECartItemInfoType
 });

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;
@@ -251,3 +251,4 @@ export declare const deleteTimeFromCartItem: (cartItem: CartItem) => CartItem;
  * @returns 删除后的购物车
  */
 export declare const deleteRelationFormsFromCartItem: (cartItem: CartItem) => CartItem;
+export declare const deleteHolderFromCartItem: (cartItem: CartItem) => CartItem;

package/lib/modules/Cart/utils.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   createCartItemOrigin: () => createCartItemOrigin,
+  deleteHolderFromCartItem: () => deleteHolderFromCartItem,
   deleteRelationFormsFromCartItem: () => deleteRelationFormsFromCartItem,
   deleteResourceFromCartItem: () => deleteResourceFromCartItem,
   deleteTimeFromCartItem: () => deleteTimeFromCartItem,
@@ -491,17 +492,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) => {
@@ -520,9 +512,16 @@ var deleteRelationFormsFromCartItem = (cartItem) => {
   cartItem._origin.relation_forms = null;
   return cartItem;
 };
+var deleteHolderFromCartItem = (cartItem) => {
+  cartItem.holder_id = void 0;
+  cartItem.holder_title = void 0;
+  cartItem._origin.holder = null;
+  return cartItem;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createCartItemOrigin,
+  deleteHolderFromCartItem,
   deleteRelationFormsFromCartItem,
   deleteResourceFromCartItem,
   deleteTimeFromCartItem,

package/lib/solution/BookingByStep/index.d.ts

@@ -2,7 +2,7 @@ import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { Response } from '../../plugins';
 import { BookingByStepState } from './types';
-import { CartItem, IUpdateItemParams, ProductData, ProductResourceItem } from '../../modules';
+import { CartItem, IUpdateItemParams, ProductData, ProductResourceItem, ECartItemInfoType } from '../../modules';
 import { Account } from '../../modules/Account/types';
 import { IStep } from '../../modules/Step/tyeps';
 import { TimeSliceItem } from './utils/resources';
@@ -130,7 +130,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     /**
      * 从购物车中按类别删除信息
      */
-    deleteCartItemInfo(types: 'resource' | 'time' | 'relationForms'): void;
+    deleteCartItemInfo(type: ECartItemInfoType, _id?: string): void;
     destroy(): void;
     getResourcesList(): any[];
     getResourcesListByCartItem(id: string | number): {

package/lib/solution/BookingByStep/index.js

@@ -516,8 +516,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   /**
    * 从购物车中按类别删除信息
    */
-  deleteCartItemInfo(types) {
-    this.store.cart.deleteCartItemInfo(types);
+  deleteCartItemInfo(type, _id) {
+    this.store.cart.deleteCartItemInfo(type, _id);
   }
   destroy() {
     var _a, _b, _c, _d, _e, _f;
@@ -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;
@@ -978,17 +983,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 提交时间切片，绑定到对应购物车的商品上，更新购物车
   submitTimeSlot(timeSlots) {
     const cartItems = this.store.cart.getItems();
-    const itemsByAccount = cartItems.reduce(
-      (acc, item) => {
-        const holderId = item.holder_id;
-        if (!acc[holderId]) {
-          acc[holderId] = [];
-        }
-        acc[holderId].push(item);
-        return acc;
-      },
-      {}
-    );
+    const itemsByAccount = cartItems.reduce((acc, item) => {
+      const holderId = item.holder_id;
+      if (!acc[holderId]) {
+        acc[holderId] = [];
+      }
+      acc[holderId].push(item);
+      return acc;
+    }, {});
     Object.values(itemsByAccount).forEach((accountItems) => {
       let currentStartTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
       accountItems.forEach((item, index) => {

package/package.json

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