@pisell/pisellos 1.0.41 → 1.0.43

package/dist/effects/index.d.ts

@@ -1,4 +1,4 @@
-type EffectCallback = (payload: any) => void | Promise<void | {
+declare type EffectCallback = (payload: any) => void | Promise<void | {
     status: boolean;
     message?: string;
 }>;

package/dist/modules/Order/index.js

@@ -22,7 +22,7 @@ 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 { generateDuration } from "./utils";
+import { generateDuration, mergeRelationForms } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(OrderModule, _BaseModule);
@@ -92,6 +92,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             (_order$relation_forms = order.relation_forms).push.apply(_order$relation_forms, _toConsumableArray(relationForms));
             delete item._origin.relation_forms;
           } else {
+            // 合并关联表单
+            var _relationForms = mergeRelationForms(item._origin.relation_forms || []);
+            item._origin.relation_forms = _relationForms;
             order.bookings.push(item._origin);
           }
           if (item !== null && item !== void 0 && item.deposit) {

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

@@ -8,3 +8,15 @@ export declare const generateDuration: (cartItem: CartItem) => {
     duration: number;
     durationType: string;
 };
+/**
+ * 合并关联表单
+ * @param relationForms 关联表单
+ * @returns 合并后的关联表单
+ */
+export declare const mergeRelationForms: (relationForms: {
+    form_id: number;
+    form_record_ids: number[];
+}[]) => {
+    form_id: number;
+    form_record_ids: number[];
+}[];

package/dist/modules/Order/utils.js

@@ -1,3 +1,9 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import dayjs from "dayjs";
 /**
  * 通过 session 类商品的开始时间结束时间生成商品的时长
@@ -12,4 +18,37 @@ export var generateDuration = function generateDuration(cartItem) {
     duration: duration,
     durationType: 'minutes'
   };
+};
+
+/**
+ * 合并关联表单
+ * @param relationForms 关联表单
+ * @returns 合并后的关联表单
+ */
+export var mergeRelationForms = function mergeRelationForms(relationForms) {
+  return Object.values(relationForms.reduce(function (acc, cur) {
+    var _acc$form_id$form_rec;
+    var form_id = cur.form_id,
+      form_record_ids = cur.form_record_ids;
+    // 如果 acc 中没有 form_id，则初始化一个空数组
+    if (!acc[form_id]) {
+      acc[form_id] = {
+        form_id: form_id,
+        form_record_ids: []
+      };
+    }
+
+    // 兼容 form_record_id 可能是数组或单个数字
+    var ids = Array.isArray(form_record_ids) ? form_record_ids : [form_record_ids];
+    // 过滤掉空值（null、undefined等）
+    var validIds = ids.filter(function (id) {
+      return id != null;
+    });
+    (_acc$form_id$form_rec = acc[form_id].form_record_ids).push.apply(_acc$form_id$form_rec, _toConsumableArray(validIds));
+    // 去重
+    acc[form_id].form_record_ids = _toConsumableArray(new Set(acc[form_id].form_record_ids));
+    return acc;
+  }, {})).filter(function (item) {
+    return item.form_record_ids.length > 0;
+  }); // 过滤掉没有有效记录的表单
 };

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

@@ -7,11 +7,11 @@ export declare enum PaymentHooks {
 /**
  * 支付方式
  */
-export type PaymentMethod = 'credit_card' | 'debit_card' | 'paypal' | 'alipay' | 'wechat_pay' | 'bank_transfer';
+export declare type PaymentMethod = 'credit_card' | 'debit_card' | 'paypal' | 'alipay' | 'wechat_pay' | 'bank_transfer';
 /**
  * 支付状态
  */
-export type PaymentStatus = 'pending' | 'processing' | 'completed' | 'failed' | 'refunded';
+export declare type PaymentStatus = 'pending' | 'processing' | 'completed' | 'failed' | 'refunded';
 /**
  * 支付信息
  */

package/dist/modules/Rules/index.js

@@ -429,7 +429,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }));
         }
         for (var _i = 0; _i < splitCount; _i++) {
-          var _originProduct$_produ, _product$discount_lis11;
+          var _product$discount_lis11, _originProduct$_produ;
           // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
           var _selectedDiscount = selectedDiscountCard || applicableDiscounts[_i];
           // 标记优惠券为已使用
@@ -440,14 +440,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 优先从 origin_total拿，可能会拿不到（比如用户端预约在没有配置 original_price 的情况下）
           var productOriginTotal = product.origin_total || product.total || 0;
+          // 如果当前 product 有 discount_list，则先从 origin_total 拿
+          if ((_product$discount_lis11 = product.discount_list) !== null && _product$discount_lis11 !== void 0 && _product$discount_lis11.length && product.origin_total) {
+            productOriginTotal = product.origin_total;
+          }
           // 如果originProduct?._productInit?.original_price为 0，product.origin_total可能为空，此时取 product.total
           if (Number((originProduct === null || originProduct === void 0 || (_originProduct$_produ = originProduct._productInit) === null || _originProduct$_produ === void 0 ? void 0 : _originProduct$_produ.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
             productOriginTotal = product.total;
           }
-          // 如果当前 product 有 discount_list，则必须从 origin_total 拿
-          if ((_product$discount_lis11 = product.discount_list) !== null && _product$discount_lis11 !== void 0 && _product$discount_lis11.length && product.origin_total) {
-            productOriginTotal = product.origin_total;
-          }
 
           // 计算使用折扣卡/商品券以后，单个商品的总 total
           var targetProductTotal = _selectedDiscount.tag === 'good_pass' ? new Decimal(productOriginTotal).minus(new Decimal(product.price || 0)).toNumber() : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(productOriginTotal)).toNumber();

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

@@ -24,7 +24,7 @@ export interface RulesModuleAPI {
         productList: any[];
     }) => DiscountResult;
 }
-type ProductDetail = {
+declare type ProductDetail = {
     isClient?: boolean;
     isManualDiscount?: boolean;
     booking_id: any;

package/dist/modules/Schedule/type.d.ts

@@ -1,4 +1,4 @@
-export type ScheduleItem = {
+export declare type ScheduleItem = {
     /** 颜色 */
     color: string;
     /** 创建时间 */
@@ -65,7 +65,7 @@ export type ScheduleItem = {
         schedule_id: number;
     }[];
 };
-export type ScheduleFormOtherValue = {
+export declare type ScheduleFormOtherValue = {
     /** 截止模式
      * 1: 永不截止
      * 2: 按日期截止
@@ -79,11 +79,11 @@ export type ScheduleFormOtherValue = {
     includeStatus: boolean;
     type: 'standard' | 'time-slots' | 'designation';
 };
-export type ExcIncDate = {
+export declare type ExcIncDate = {
     start: string;
     end: string;
 };
-export type ScheduleFormData = {
+export declare type ScheduleFormData = {
     /** 颜色 */
     color: string;
     /** 日程名称 */
@@ -131,20 +131,20 @@ export type ScheduleFormData = {
     start_time: any;
     end_time: any;
 };
-export type CalendarDataItem = {
+export declare type CalendarDataItem = {
     date: string;
     color: string[];
     isExcluded: boolean;
     schedule_ids?: number[];
     [key: string]: any;
 };
-export type RequestData<Data> = {
+export declare type RequestData<Data> = {
     data: Data;
     status: boolean;
     message: string;
     code: number;
 };
-export type ResponseListData<Data> = {
+export declare type ResponseListData<Data> = {
     status: boolean;
     message: string;
     code: number;

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

@@ -4,7 +4,7 @@ export interface ScheduleState {
     availabilityDateList: ScheduleAvailabilityDateItem[];
     otherProductsIds: number[];
 }
-export type ScheduleAvailabilityDateItem = {
+export declare type ScheduleAvailabilityDateItem = {
     date: string;
     schedule_id: number[];
     product_ids: number[];
@@ -24,7 +24,7 @@ export interface LoadScheduleAvailableDateParams {
 }
 export interface ScheduleModuleAPI {
 }
-export type ScheduleItem = {
+export declare type ScheduleItem = {
     /** 颜色 */
     color: string;
     /** 创建时间 */
@@ -91,7 +91,7 @@ export type ScheduleItem = {
         schedule_id: number;
     }[];
 };
-export type ScheduleFormOtherValue = {
+export declare type ScheduleFormOtherValue = {
     /** 截止模式
      * 1: 永不截止
      * 2: 按日期截止
@@ -105,11 +105,11 @@ export type ScheduleFormOtherValue = {
     includeStatus: boolean;
     type: 'standard' | 'time-slots' | 'designation';
 };
-export type ExcIncDate = {
+export declare type ExcIncDate = {
     start: string;
     end: string;
 };
-export type ScheduleFormData = {
+export declare type ScheduleFormData = {
     /** 颜色 */
     color: string;
     /** 日程名称 */
@@ -157,20 +157,20 @@ export type ScheduleFormData = {
     start_time: any;
     end_time: any;
 };
-export type CalendarDataItem = {
+export declare type CalendarDataItem = {
     date: string;
     color: string[];
     isExcluded: boolean;
     schedule_ids?: number[];
     [key: string]: any;
 };
-export type RequestData<Data> = {
+export declare type RequestData<Data> = {
     data: Data;
     status: boolean;
     message: string;
     code: number;
 };
-export type ResponseListData<Data> = {
+export declare type ResponseListData<Data> = {
     status: boolean;
     message: string;
     code: number;
@@ -181,7 +181,7 @@ export type ResponseListData<Data> = {
         skip: number;
     };
 };
-export type ScheduleAllMap = Record<string, {
+export declare type ScheduleAllMap = Record<string, {
     minTime: dayjs.Dayjs | null;
     maxTime: dayjs.Dayjs | null;
     minTimeStr: string | null;

package/dist/solution/BookingByStep/utils/resources.d.ts

@@ -6,7 +6,7 @@ import { CartItem, ProductData } from '../../../modules';
  * 3. 格式化资源相关 格式化资源列表 --> 格式化资源 --> 获取时间切片列表 --> 判断单个时间切片是否可用 formatResources
  *
  */
-type DateType = Dayjs;
+declare type DateType = Dayjs;
 export interface TimeSliceItem {
     start_time: string;
     end_time: string;

package/dist/solution/ShopDiscount/types.d.ts

@@ -10,7 +10,7 @@ export declare enum ShopDiscountHooks {
     onRulesListChange = "shopDiscount:onRulesListChange",
     onLoadPrepareCalcResult = "shopDiscount:onLoadPrepareCalcResult"
 }
-export type Customer = {
+export declare type Customer = {
     id: string | number;
     name: string;
     email: string;

package/dist/types/index.d.ts

@@ -27,7 +27,7 @@ export interface ModuleOptions {
     initialState?: Record<string, any>;
     otherParams?: Record<string, any>;
 }
-export type EventHandler = (data?: any) => void;
+export declare type EventHandler = (data?: any) => void;
 export interface PisellCore {
     registerPlugin: (plugin: Plugin, options?: PluginOptions) => void;
     getPlugin: <T extends Plugin>(name: string) => T | null;

package/lib/core/index.js

@@ -26,13 +26,13 @@ module.exports = __toCommonJS(core_exports);
 var import_createStore = require("../store/createStore");
 var import_effects = require("../effects");
 var PisellOSCore = class {
+  plugins = /* @__PURE__ */ new Map();
+  modules = /* @__PURE__ */ new Map();
+  stores = /* @__PURE__ */ new Map();
+  effects = new import_effects.EffectsManager();
+  debug = false;
+  context = {};
   constructor(options) {
-    this.plugins = /* @__PURE__ */ new Map();
-    this.modules = /* @__PURE__ */ new Map();
-    this.stores = /* @__PURE__ */ new Map();
-    this.effects = new import_effects.EffectsManager();
-    this.debug = false;
-    this.context = {};
     this.debug = (options == null ? void 0 : options.debug) || false;
     this.context = (options == null ? void 0 : options.context) || {};
     this.initialize(options);
@@ -48,7 +48,7 @@ var PisellOSCore = class {
         this.registerModule(item.module, item.options);
       });
     }
-    this.log("PisellOS 核心初始化完成");
+    this.log("PisellOS \u6838\u5FC3\u521D\u59CB\u5316\u5B8C\u6210");
   }
   // 日志方法
   log(message, level = "info") {
@@ -71,12 +71,12 @@ var PisellOSCore = class {
   // 插件相关方法
   registerPlugin(plugin, options) {
     if (this.plugins.has(plugin.name)) {
-      this.log(`插件 ${plugin.name} 已经注册过，将被覆盖`, "warn");
+      this.log(`\u63D2\u4EF6 ${plugin.name} \u5DF2\u7ECF\u6CE8\u518C\u8FC7\uFF0C\u5C06\u88AB\u8986\u76D6`, "warn");
     }
     if (options == null ? void 0 : options.dependencies) {
       for (const dep of options.dependencies) {
         if (!this.plugins.has(dep)) {
-          throw new Error(`注册插件 ${plugin.name} 失败：缺少依赖插件 ${dep}`);
+          throw new Error(`\u6CE8\u518C\u63D2\u4EF6 ${plugin.name} \u5931\u8D25\uFF1A\u7F3A\u5C11\u4F9D\u8D56\u63D2\u4EF6 ${dep}`);
         }
       }
     }
@@ -84,14 +84,14 @@ var PisellOSCore = class {
       const result = plugin.initialize();
       if (result instanceof Promise) {
         result.catch((err) => {
-          this.log(`插件 ${plugin.name} 初始化失败: ${err.message}`, "error");
+          this.log(`\u63D2\u4EF6 ${plugin.name} \u521D\u59CB\u5316\u5931\u8D25: ${err.message}`, "error");
           throw err;
         });
       }
       this.plugins.set(plugin.name, plugin);
-      this.log(`插件 ${plugin.name} v${plugin.version} 注册成功`);
+      this.log(`\u63D2\u4EF6 ${plugin.name} v${plugin.version} \u6CE8\u518C\u6210\u529F`);
     } catch (error) {
-      this.log(`插件 ${plugin.name} 初始化过程中出错: ${error}`, "error");
+      this.log(`\u63D2\u4EF6 ${plugin.name} \u521D\u59CB\u5316\u8FC7\u7A0B\u4E2D\u51FA\u9519: ${error}`, "error");
       throw error;
     }
   }
@@ -104,12 +104,12 @@ var PisellOSCore = class {
   // 模块相关方法
   registerModule(module2, options) {
     if (this.modules.has(module2.name)) {
-      this.log(`模块 ${module2.name} 已经注册过，将被覆盖`, "warn");
+      this.log(`\u6A21\u5757 ${module2.name} \u5DF2\u7ECF\u6CE8\u518C\u8FC7\uFF0C\u5C06\u88AB\u8986\u76D6`, "warn");
     }
     if (options == null ? void 0 : options.dependencies) {
       for (const dep of options.dependencies) {
         if (!this.modules.has(dep)) {
-          throw new Error(`注册模块 ${module2.name} 失败：缺少依赖模块 ${dep}`);
+          throw new Error(`\u6CE8\u518C\u6A21\u5757 ${module2.name} \u5931\u8D25\uFF1A\u7F3A\u5C11\u4F9D\u8D56\u6A21\u5757 ${dep}`);
         }
       }
     }
@@ -117,7 +117,7 @@ var PisellOSCore = class {
       for (const plugin of options.plugins) {
         if (!this.plugins.has(plugin)) {
           throw new Error(
-            `注册模块 ${module2.name} 失败：缺少依赖插件 ${plugin}`
+            `\u6CE8\u518C\u6A21\u5757 ${module2.name} \u5931\u8D25\uFF1A\u7F3A\u5C11\u4F9D\u8D56\u63D2\u4EF6 ${plugin}`
           );
         }
       }
@@ -126,10 +126,9 @@ var PisellOSCore = class {
       (options == null ? void 0 : options.initialState) || {},
       module2.name,
       (path, value) => {
-        console.log("core 检测到模块值更新", module2.name, path, value);
+        console.log("core \u68C0\u6D4B\u5230\u6A21\u5757\u503C\u66F4\u65B0", module2.name, path, value);
         this.effects.emit(`${module2.name}:changed`, { path, value });
-        if (module2.storeChange)
-          module2.storeChange(path, value);
+        if (module2.storeChange) module2.storeChange(path, value);
       }
     );
     this.stores.set(module2.name, proxy);
@@ -137,14 +136,14 @@ var PisellOSCore = class {
       const result = module2.initialize(this, { store: proxy, ...options });
       if (result instanceof Promise) {
         result.catch((err) => {
-          this.log(`模块 ${module2.name} 初始化失败: ${err.message}`, "error");
+          this.log(`\u6A21\u5757 ${module2.name} \u521D\u59CB\u5316\u5931\u8D25: ${err.message}`, "error");
           throw err;
         });
       }
       this.modules.set(module2.name, module2);
-      this.log(`模块 ${module2.name} v${module2.version} 注册成功`);
+      this.log(`\u6A21\u5757 ${module2.name} v${module2.version} \u6CE8\u518C\u6210\u529F`);
     } catch (error) {
-      this.log(`模块 ${module2.name} 初始化过程中出错: ${error}`, "error");
+      this.log(`\u6A21\u5757 ${module2.name} \u521D\u59CB\u5316\u8FC7\u7A0B\u4E2D\u51FA\u9519: ${error}`, "error");
       throw error;
     }
   }
@@ -168,9 +167,9 @@ var PisellOSCore = class {
       if (module2.destroy) {
         try {
           await Promise.resolve(module2.destroy());
-          this.log(`模块 ${name} 已销毁`);
+          this.log(`\u6A21\u5757 ${name} \u5DF2\u9500\u6BC1`);
         } catch (error) {
-          this.log(`销毁模块 ${name} 时出错: ${error}`, "error");
+          this.log(`\u9500\u6BC1\u6A21\u5757 ${name} \u65F6\u51FA\u9519: ${error}`, "error");
         }
       }
     }
@@ -179,14 +178,14 @@ var PisellOSCore = class {
       if (plugin.destroy) {
         try {
           await Promise.resolve(plugin.destroy());
-          this.log(`插件 ${name} 已销毁`);
+          this.log(`\u63D2\u4EF6 ${name} \u5DF2\u9500\u6BC1`);
         } catch (error) {
-          this.log(`销毁插件 ${name} 时出错: ${error}`, "error");
+          this.log(`\u9500\u6BC1\u63D2\u4EF6 ${name} \u65F6\u51FA\u9519: ${error}`, "error");
         }
       }
     }
     this.plugins.clear();
-    this.log("PisellOS 核心已销毁");
+    this.log("PisellOS \u6838\u5FC3\u5DF2\u9500\u6BC1");
   }
   /**
    * 验证上下文参数
@@ -196,7 +195,7 @@ var PisellOSCore = class {
       const value = this.context[rule.name];
       if (rule.required && (value === void 0 || value === null)) {
         this.log(
-          `模块 ${config.name} 缺少必需的上下文参数: ${rule.name}`,
+          `\u6A21\u5757 ${config.name} \u7F3A\u5C11\u5FC5\u9700\u7684\u4E0A\u4E0B\u6587\u53C2\u6570: ${rule.name}`,
           "error"
         );
         return false;
@@ -204,7 +203,7 @@ var PisellOSCore = class {
       if (rule.validate && value !== void 0 && value !== null) {
         if (!rule.validate(value)) {
           this.log(
-            `模块 ${config.name} 上下文参数验证失败: ${rule.name} - ${rule.message || "验证失败"}`,
+            `\u6A21\u5757 ${config.name} \u4E0A\u4E0B\u6587\u53C2\u6570\u9A8C\u8BC1\u5931\u8D25: ${rule.name} - ${rule.message || "\u9A8C\u8BC1\u5931\u8D25"}`,
             "error"
           );
           return false;

package/lib/effects/index.d.ts

@@ -1,4 +1,4 @@
-type EffectCallback = (payload: any) => void | Promise<void | {
+declare type EffectCallback = (payload: any) => void | Promise<void | {
     status: boolean;
     message?: string;
 }>;

package/lib/effects/index.js

@@ -23,13 +23,10 @@ __export(effects_exports, {
 });
 module.exports = __toCommonJS(effects_exports);
 var EffectsManager = class {
-  constructor() {
-    this.listeners = /* @__PURE__ */ new Map();
-  }
+  listeners = /* @__PURE__ */ new Map();
   on(event, callback) {
     var _a;
-    if (!this.listeners.has(event))
-      this.listeners.set(event, /* @__PURE__ */ new Set());
+    if (!this.listeners.has(event)) this.listeners.set(event, /* @__PURE__ */ new Set());
     (_a = this.listeners.get(event)) == null ? void 0 : _a.add(callback);
   }
   off(event, callback) {
@@ -53,8 +50,7 @@ var EffectsManager = class {
   }
   async emit(event, payload) {
     const callbacks = this.listeners.get(event);
-    if (!callbacks)
-      return { status: true, data: [] };
+    if (!callbacks) return { status: true, data: [] };
     return new Promise(async (resolve) => {
       const res = [];
       for (const cb of callbacks) {

package/lib/modules/Account/index.js

@@ -27,16 +27,16 @@ var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
 __reExport(Account_exports, require("./types"), module.exports);
 var AccountModule = class extends import_BaseModule.BaseModule {
+  defaultName = "account";
+  defaultVersion = "1.0.0";
+  isGuest = false;
+  store = {
+    accountInfo: null,
+    isLoggedIn: false,
+    active: false
+  };
   constructor(name, version) {
     super(name, version);
-    this.defaultName = "account";
-    this.defaultVersion = "1.0.0";
-    this.isGuest = false;
-    this.store = {
-      accountInfo: null,
-      isLoggedIn: false,
-      active: false
-    };
   }
   async initialize(core, options) {
     this.core = core;
@@ -65,8 +65,7 @@ var AccountModule = class extends import_BaseModule.BaseModule {
     return this.store.accountInfo;
   }
   async updateProfile(updates) {
-    if (!this.store.accountInfo)
-      return;
+    if (!this.store.accountInfo) return;
     this.store.accountInfo = {
       ...this.store.accountInfo,
       ...updates

package/lib/modules/AccountList/index.js

@@ -28,19 +28,22 @@ var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
 var import_utils = require("./utils");
 var AccountListModule = class extends import_BaseModule.BaseModule {
+  defaultName = "accountList";
+  defaultVersion = "1.0.0";
+  store = {
+    accountList: [],
+    // 账号的纯数据列表
+    accounts: [],
+    // 账号的 module 列表
+    isLoading: false,
+    error: null
+  };
+  request;
+  cacheId;
+  openCache = false;
+  fatherModule;
   constructor(name, version) {
     super(name, version);
-    this.defaultName = "accountList";
-    this.defaultVersion = "1.0.0";
-    this.store = {
-      accountList: [],
-      // 账号的纯数据列表
-      accounts: [],
-      // 账号的 module 列表
-      isLoading: false,
-      error: null
-    };
-    this.openCache = false;
   }
   async initialize(core, options) {
     var _a, _b, _c;

package/lib/modules/BaseModule.js

@@ -23,10 +23,13 @@ __export(BaseModule_exports, {
 });
 module.exports = __toCommonJS(BaseModule_exports);
 var BaseModule = class {
+  defaultName = "baseModule";
+  defaultVersion = "1.0.0";
+  name;
+  version;
+  isSolution = false;
+  core;
   constructor(name, version) {
-    this.defaultName = "baseModule";
-    this.defaultVersion = "1.0.0";
-    this.isSolution = false;
     this.name = name || this.defaultName;
     this.version = version || this.defaultVersion;
   }

package/lib/modules/Cart/index.js

@@ -30,12 +30,17 @@ var import_lodash_es = require("lodash-es");
 var import_utils2 = require("../Product/utils");
 __reExport(Cart_exports, require("./types"), module.exports);
 var CartModule = class extends import_BaseModule.BaseModule {
+  // 提供给 baseModule 用的默认名称 和 默认版本
+  defaultName = "cart";
+  defaultVersion = "1.0.0";
+  request;
+  window;
+  store;
+  cacheId;
+  openCache = false;
+  fatherModule;
   constructor(name, version) {
     super(name, version);
-    // 提供给 baseModule 用的默认名称 和 默认版本
-    this.defaultName = "cart";
-    this.defaultVersion = "1.0.0";
-    this.openCache = false;
   }
   /**
    * 初始化购物车模块
@@ -60,12 +65,12 @@ var CartModule = class extends import_BaseModule.BaseModule {
     this.request = core.getPlugin("request");
     this.window = core.getPlugin("window");
     if (!this.request) {
-      throw new Error("购物车模块需要 request 插件支持");
+      throw new Error("\u8D2D\u7269\u8F66\u6A21\u5757\u9700\u8981 request \u63D2\u4EF6\u652F\u6301");
     }
     if (!this.window) {
-      throw new Error("购物车模块需要 window 插件支持");
+      throw new Error("\u8D2D\u7269\u8F66\u6A21\u5757\u9700\u8981 window \u63D2\u4EF6\u652F\u6301");
     }
-    console.log("[CartModule] 初始化完成");
+    console.log("[CartModule] \u521D\u59CB\u5316\u5B8C\u6210");
   }
   /**
    * 添加商品到购物车
@@ -116,7 +121,7 @@ var CartModule = class extends import_BaseModule.BaseModule {
       this.store.list = [...items];
       await this.core.effects.emit(`${this.name}:onUpdateItem`, tempCartItem);
     } catch (error) {
-      console.error("[CartModule] 更新购物车商品失败", error);
+      console.error("[CartModule] \u66F4\u65B0\u8D2D\u7269\u8F66\u5546\u54C1\u5931\u8D25", error);
     }
   }
   /**
@@ -142,7 +147,7 @@ var CartModule = class extends import_BaseModule.BaseModule {
       quantity = (tempCartItem == null ? void 0 : tempCartItem.num) || 1;
     }
     if (!tempCartItem) {
-      throw new Error("[CartModule] 格式化数据到购物车失败，商品不存在");
+      throw new Error("[CartModule] \u683C\u5F0F\u5316\u6570\u636E\u5230\u8D2D\u7269\u8F66\u5931\u8D25\uFF0C\u5546\u54C1\u4E0D\u5B58\u5728");
     }
     if (cartItem) {
       tempCartItem = cartItem;