@pisell/pisellos 0.0.44 → 0.0.46

package/lib/modules/Schedule/index.d.ts

@@ -5,9 +5,14 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
+    private cacheId;
+    private openCache;
+    private fatherModule;
     constructor(name?: string, version?: string);
-    initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     setScheduleList(list: ScheduleItem[]): void;
-    setAvailabilityDateList(list: ScheduleAvailabilityDateItem[]): void;
-    getAvailabilityDateList(): ScheduleAvailabilityDateItem[];
+    getScheduleListByIds(ids: number[]): ScheduleItem[];
+    setAvailabilityScheduleDateList(list: ScheduleAvailabilityDateItem[]): void;
+    getAvailabilityScheduleDateList(): ScheduleAvailabilityDateItem[];
+    storeChange(): void;
 }

package/lib/modules/Schedule/index.js

@@ -22,6 +22,7 @@ __export(Schedule_exports, {
   ScheduleModule: () => ScheduleModule
 });
 module.exports = __toCommonJS(Schedule_exports);
+var import_lodash_es = require("lodash-es");
 var import_BaseModule = require("../BaseModule");
 var ScheduleModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -29,20 +30,50 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     this.defaultName = "schedule";
     this.defaultVersion = "1.0.0";
     this.store = {};
+    this.openCache = false;
   }
   async initialize(core, options) {
+    var _a, _b;
     this.core = core;
     this.store = options == null ? void 0 : options.store;
+    if (options.initialState) {
+      this.store.scheduleList = options.initialState.scheduleList;
+      this.store.availabilityDateList = options.initialState.availabilityDateList;
+    } else {
+      this.store.scheduleList = [];
+      this.store.availabilityDateList = [];
+    }
+    if ((_a = options.otherParams) == null ? void 0 : _a.cacheId) {
+      this.openCache = options.otherParams.openCache;
+      this.cacheId = options.otherParams.cacheId;
+    }
+    if ((_b = options.otherParams) == null ? void 0 : _b.fatherModule) {
+      this.fatherModule = options.otherParams.fatherModule;
+    }
   }
   setScheduleList(list) {
     this.store.scheduleList = list;
   }
-  setAvailabilityDateList(list) {
+  getScheduleListByIds(ids) {
+    return this.store.scheduleList.filter((n) => ids.includes(n.id));
+  }
+  setAvailabilityScheduleDateList(list) {
     this.store.availabilityDateList = list;
   }
-  getAvailabilityDateList() {
+  getAvailabilityScheduleDateList() {
     return this.store.availabilityDateList;
   }
+  storeChange() {
+    if (this.openCache) {
+      const store = (0, import_lodash_es.cloneDeep)(this.store);
+      this.checkSaveCache({
+        cacheId: this.cacheId,
+        fatherModule: this.fatherModule,
+        store,
+        cacheKey: ["scheduleList", "availabilityDateList"]
+      });
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -18,7 +18,7 @@ export type ScheduleItem = {
     repeat_rule: {
         end: {
             /** 截止类型 */
-            type: "date" | "never";
+            type: 'date' | 'never';
             /** 结束时间 */
             end_date: string | null;
             occurrence: any | null;
@@ -28,13 +28,13 @@ export type ScheduleItem = {
         included_date: ExcIncDate[];
         frequency_date: number[];
     };
-    repeat_type: "daily" | "none" | "weekly";
+    repeat_type: 'daily' | 'none' | 'weekly';
     /** 日程类型
      * standard: 标准日程
      * time-slots: 时间段日程
      * designation: 指定日期日程
      * */
-    type: "standard" | "time-slots" | "designation";
+    type: 'standard' | 'time-slots' | 'designation';
     conflict?: boolean;
     time_slot: {
         start_time: string;
@@ -77,7 +77,7 @@ export type ScheduleFormOtherValue = {
     excludedStatus: boolean;
     /** 是否包含排除日期 */
     includeStatus: boolean;
-    type: "standard" | "time-slots" | "designation";
+    type: 'standard' | 'time-slots' | 'designation';
 };
 export type ExcIncDate = {
     start: string;
@@ -89,15 +89,15 @@ export type ScheduleFormData = {
     /** 日程名称 */
     name: {
         en: string;
-        "zh-CN": string;
-        "zh-HK": string;
+        'zh-CN': string;
+        'zh-HK': string;
         original: string;
     } | string;
     /** 重复模式
      * 0:不重复
      * 1:按天重复
      * 2:按周重复 */
-    repeat_type: "0" | "1" | "2";
+    repeat_type: '0' | '1' | '2';
     /** 备注 */
     note: string;
     /** 指定的开始时间结束时间 */

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

@@ -1,4 +1,4 @@
-import dayjs from "dayjs";
+import dayjs from 'dayjs';
 export interface ScheduleState {
     scheduleList: ScheduleItem[];
     availabilityDateList: ScheduleAvailabilityDateItem[];
@@ -29,7 +29,7 @@ export type ScheduleItem = {
     repeat_rule: {
         end: {
             /** 截止类型 */
-            type: "date" | "never";
+            type: 'date' | 'never';
             /** 结束时间 */
             end_date: string | null;
             occurrence: any | null;
@@ -39,13 +39,13 @@ export type ScheduleItem = {
         included_date: ExcIncDate[];
         frequency_date: number[];
     };
-    repeat_type: "daily" | "none" | "weekly";
+    repeat_type: 'daily' | 'none' | 'weekly';
     /** 日程类型
      * standard: 标准日程
      * time-slots: 时间段日程
      * designation: 指定日期日程
      * */
-    type: "standard" | "time-slots" | "designation";
+    type: 'standard' | 'time-slots' | 'designation';
     conflict?: boolean;
     time_slot: {
         start_time: string;
@@ -88,7 +88,7 @@ export type ScheduleFormOtherValue = {
     excludedStatus: boolean;
     /** 是否包含排除日期 */
     includeStatus: boolean;
-    type: "standard" | "time-slots" | "designation";
+    type: 'standard' | 'time-slots' | 'designation';
 };
 export type ExcIncDate = {
     start: string;
@@ -100,15 +100,15 @@ export type ScheduleFormData = {
     /** 日程名称 */
     name: {
         en: string;
-        "zh-CN": string;
-        "zh-HK": string;
+        'zh-CN': string;
+        'zh-HK': string;
         original: string;
     } | string;
     /** 重复模式
      * 0:不重复
      * 1:按天重复
      * 2:按周重复 */
-    repeat_type: "0" | "1" | "2";
+    repeat_type: '0' | '1' | '2';
     /** 备注 */
     note: string;
     /** 指定的开始时间结束时间 */

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

@@ -1,11 +1,11 @@
-import { ScheduleFormData, ScheduleFormOtherValue, ScheduleItem, ScheduleAllMap } from "./types";
+import { ScheduleFormData, ScheduleFormOtherValue, ScheduleItem, ScheduleAllMap } from './types';
 /**
  * 根据日程配置生成日历数据
  * @param values
  * @param others
  * @param type
  */
-export declare const calcCalendarDataBySchedule: (values: ScheduleFormData, others: ScheduleFormOtherValue, type?: "standard" | "time-slots" | "designation") => any[];
+export declare const calcCalendarDataBySchedule: (values: ScheduleFormData, others: ScheduleFormOtherValue, type?: 'standard' | 'time-slots' | 'designation') => any[];
 /**
  * 获取开始时间和结束时间之间的所有日期
  * @param startDate
@@ -46,7 +46,7 @@ export declare const formatScheduleResult: (schedule: ScheduleItem) => {
 };
 export declare const calcScheduleDateRange: (schedule: ScheduleItem) => any[];
 export declare const calcCalendarDataBySchedules: (schedules: ScheduleItem[]) => unknown[];
-export declare const calcMinTimeMaxTimeBySchedules: (schedules: ScheduleItem[], scheduleAllMap: ScheduleAllMap, selectDate?: string) => {};
+export declare const calcMinTimeMaxTimeBySchedules: (schedules: ScheduleItem[], scheduleAllMap?: ScheduleAllMap, selectDate?: string) => {};
 /**
  * @title: 格式化日程数据
  * @description:
@@ -59,3 +59,9 @@ export declare const calcMinTimeMaxTimeBySchedules: (schedules: ScheduleItem[],
  * @Date: 2024-09-04 11:54
  */
 export declare const formatScheduleData: (relation: Array<any>, table_type?: string, item_type?: string, isExcluded?: boolean) => any;
+export interface TimeRange {
+    start: string;
+    end: string;
+    count?: number;
+}
+export declare function getAllSortedDateRanges(schedules: Record<string, any>): TimeRange[];

package/lib/modules/Schedule/utils.js

@@ -39,6 +39,7 @@ __export(utils_exports, {
   calcScheduleDateRange: () => calcScheduleDateRange,
   formatScheduleData: () => formatScheduleData,
   formatScheduleResult: () => formatScheduleResult,
+  getAllSortedDateRanges: () => getAllSortedDateRanges,
   getDaysByStartEnd: () => getDaysByStartEnd,
   isAllDay: () => isAllDay
 });
@@ -490,7 +491,7 @@ var calcCalendarDataBySchedules = (schedules) => {
 var calcMinTimeMaxTimeBySchedules = (schedules, scheduleAllMap, selectDate) => {
   return schedules.reduce((pre, cur) => {
     var _a;
-    let dateRange = ((_a = scheduleAllMap[cur.id]) == null ? void 0 : _a.dateRange) || calcScheduleDateRange(cur);
+    let dateRange = ((_a = scheduleAllMap == null ? void 0 : scheduleAllMap[cur.id]) == null ? void 0 : _a.dateRange) || calcScheduleDateRange(cur);
     let dateRangeFormat = [];
     if (selectDate) {
       const dateRangeTmp = [];
@@ -543,18 +544,44 @@ var calcMinTimeMaxTimeBySchedules = (schedules, scheduleAllMap, selectDate) => {
 var formatScheduleData = (relation, table_type, item_type, isExcluded) => {
   const _relation = relation || [];
   if (table_type && item_type && isExcluded) {
-    return _relation.find((item) => (item == null ? void 0 : item.relation_table_type) === table_type && (item == null ? void 0 : item.item_type) !== item_type);
+    return _relation.find(
+      (item) => (item == null ? void 0 : item.relation_table_type) === table_type && (item == null ? void 0 : item.item_type) !== item_type
+    );
   }
   if (table_type && item_type) {
-    return _relation.find((item) => (item == null ? void 0 : item.relation_table_type) === table_type && (item == null ? void 0 : item.item_type) === item_type);
+    return _relation.find(
+      (item) => (item == null ? void 0 : item.relation_table_type) === table_type && (item == null ? void 0 : item.item_type) === item_type
+    );
   }
   if (table_type) {
-    return _relation.some((item) => (item == null ? void 0 : item.relation_table_type) === table_type);
+    return _relation.some(
+      (item) => (item == null ? void 0 : item.relation_table_type) === table_type
+    );
   }
   if (item_type) {
     return _relation.find((item) => (item == null ? void 0 : item.item_type) === item_type);
   }
 };
+function getAllSortedDateRanges(schedules) {
+  const allDateRanges = [];
+  Object.values(schedules).forEach((schedule) => {
+    if (schedule.dateRange && Array.isArray(schedule.dateRange)) {
+      allDateRanges.push(...schedule.dateRange);
+    }
+  });
+  if (allDateRanges.length === 0) {
+    console.log("No dateRanges found in schedules:", schedules);
+    return [];
+  }
+  return allDateRanges.sort((a, b) => {
+    const startTimeCompare = (0, import_dayjs.default)(a.start).valueOf() - (0, import_dayjs.default)(b.start).valueOf();
+    if (startTimeCompare !== 0)
+      return startTimeCompare;
+    const durationA = (0, import_dayjs.default)(a.end).valueOf() - (0, import_dayjs.default)(a.start).valueOf();
+    const durationB = (0, import_dayjs.default)(b.end).valueOf() - (0, import_dayjs.default)(b.start).valueOf();
+    return durationA - durationB;
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   calcCalendarDataByDesignation,
@@ -567,6 +594,7 @@ var formatScheduleData = (relation, table_type, item_type, isExcluded) => {
   calcScheduleDateRange,
   formatScheduleData,
   formatScheduleResult,
+  getAllSortedDateRanges,
   getDaysByStartEnd,
   isAllDay
 });

package/lib/modules/Step/index.d.ts

@@ -1,6 +1,6 @@
-import { Module, PisellCore, ModuleOptions } from "../../types";
-import { BaseModule } from "../BaseModule";
-import { IStep, IStepModuleAPI } from "./tyeps";
+import { Module, PisellCore, ModuleOptions } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { IStep, IStepModuleAPI } from './tyeps';
 export declare class StepModule extends BaseModule implements Module, IStepModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -19,5 +19,16 @@ export declare class StepModule extends BaseModule implements Module, IStepModul
     prevStep(): void;
     nextStep(): void;
     gotoStep(stepIndex: number): void;
+    /**
+     * 添加步骤
+     * @param step 步骤
+     * @param key 步骤的 key，如果存在则插入到该步骤之后，否则插入到当前步骤之后
+     */
+    addStep(step: IStep, key?: string): void;
+    /**
+     * 删除步骤
+     * @param key 步骤的 key
+     */
+    removeStep(key: string): void;
     storeChange(): void;
 }

package/lib/modules/Step/index.js

@@ -83,9 +83,46 @@ var StepModule = class extends import_BaseModule.BaseModule {
   gotoStep(stepIndex) {
     this.setCurrentStep(stepIndex);
   }
+  /**
+   * 添加步骤
+   * @param step 步骤
+   * @param key 步骤的 key，如果存在则插入到该步骤之后，否则插入到当前步骤之后
+   */
+  addStep(step, key) {
+    let stepList = this.store.stepList;
+    const index = stepList.findIndex((n) => n.key === step.key);
+    if (index !== -1) {
+      console.log("[StepModule] 步骤已存在，添加失败");
+      return;
+    }
+    if (key) {
+      const index2 = this.store.stepList.findIndex((n) => n.key === key);
+      if (index2 !== -1) {
+        stepList.splice(index2 + 1, 0, step);
+      } else {
+        stepList = [...stepList, step];
+      }
+    } else {
+      stepList.splice(this.store.currentStepIndex + 1, 0, step);
+    }
+    this.store.stepList = [...stepList];
+  }
+  /**
+   * 删除步骤
+   * @param key 步骤的 key
+   */
+  removeStep(key) {
+    const newStepList = this.store.stepList.filter((n) => n.key !== key);
+    this.store.stepList = [...newStepList];
+  }
   storeChange() {
     if (this.openCache) {
-      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store: this.store, cacheKey: ["currentStepIndex", "currentStep", "stepList"] });
+      this.checkSaveCache({
+        cacheId: this.cacheId,
+        fatherModule: this.fatherModule,
+        store: this.store,
+        cacheKey: ["currentStepIndex", "currentStep", "stepList"]
+      });
     }
   }
 };

package/lib/modules/Summary/index.d.ts

@@ -1,7 +1,7 @@
-import { Module, PisellCore, ModuleOptions } from "../../types";
-import { BaseModule } from "../BaseModule";
-import { CartItem } from "../Cart/types";
-import { ISummaryState, ISummaryModuleAPI } from "./types";
+import { Module, PisellCore, ModuleOptions } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { CartItem } from '../Cart/types';
+import { ISummaryState, ISummaryModuleAPI } from './types';
 export declare class SummaryModule extends BaseModule implements Module, ISummaryModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -13,7 +13,7 @@ export declare class SummaryModule extends BaseModule implements Module, ISummar
     private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
-    getSummary(cartItems: CartItem[]): Promise<ISummaryState["summary"]>;
+    getSummary(cartItems: CartItem[]): Promise<ISummaryState['summary']>;
     /**
      * 获取协议
      * @param protocolId 协议ID

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

@@ -1,4 +1,4 @@
-import { CartItem } from "../Cart/types";
+import { CartItem } from '../Cart/types';
 export interface ISummaryState {
     summary: {
         /** 商品总价 */
@@ -30,5 +30,5 @@ export interface IProtocol {
     id: string;
 }
 export interface ISummaryModuleAPI {
-    getSummary(cartItems: CartItem[]): Promise<ISummaryState["summary"]>;
+    getSummary(cartItems: CartItem[]): Promise<ISummaryState['summary']>;
 }

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

@@ -1,7 +1,7 @@
-import Decimal from "decimal.js";
-import { CartItem } from "../Cart/types";
-import { ISummaryState } from "./types";
-export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[]) => ISummaryState["summary"];
+import Decimal from 'decimal.js';
+import { CartItem } from '../Cart/types';
+import { ISummaryState } from './types';
+export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[]) => ISummaryState['summary'];
 /**
  * 计算商品小计（不含其他费用）
  * @param items - 购物车商品数组

package/lib/plugins/index.d.ts

@@ -1,3 +1,3 @@
-export * from "./request";
-export * from "./window";
-export * from "./shopStore";
+export * from './request';
+export * from './window';
+export * from './shopStore';

package/lib/plugins/request.d.ts

@@ -1,4 +1,4 @@
-import { Plugin } from "../types";
+import { Plugin } from '../types';
 /**
  * RequestPlugin 接口定义
  */
@@ -40,13 +40,13 @@ export interface RequestPlugin extends Plugin {
  */
 export interface RequestOptions {
     url?: string;
-    method?: "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "HEAD" | "OPTIONS";
+    method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'HEAD' | 'OPTIONS';
     headers?: Record<string, string>;
     data?: any;
     body?: any;
     params?: Record<string, string | number | boolean>;
     timeout?: number;
-    responseType?: "json" | "text" | "arraybuffer" | "blob";
+    responseType?: 'json' | 'text' | 'arraybuffer' | 'blob';
     withCredentials?: boolean;
     useCache?: boolean;
 }

package/lib/plugins/request.js

@@ -148,11 +148,16 @@ var RequestPluginImpl = class {
       try {
         config = await Promise.resolve(interceptor(config));
       } catch (error) {
-        const requestError = error instanceof RequestError ? error : new RequestError(error instanceof Error ? error.message : "请求拦截器错误", config);
+        const requestError = error instanceof RequestError ? error : new RequestError(
+          error instanceof Error ? error.message : "请求拦截器错误",
+          config
+        );
         let processedError = requestError;
         for (const errorInterceptor of this.interceptors.error) {
           try {
-            processedError = await Promise.resolve(errorInterceptor(processedError));
+            processedError = await Promise.resolve(
+              errorInterceptor(processedError)
+            );
           } catch (e) {
           }
         }
@@ -164,13 +169,22 @@ var RequestPluginImpl = class {
       let processedResponse = response;
       for (const interceptor of this.interceptors.response) {
         try {
-          processedResponse = await Promise.resolve(interceptor(processedResponse));
+          processedResponse = await Promise.resolve(
+            interceptor(processedResponse)
+          );
         } catch (error) {
-          const requestError = error instanceof RequestError ? error : new RequestError(error instanceof Error ? error.message : "响应拦截器错误", config, null, response);
+          const requestError = error instanceof RequestError ? error : new RequestError(
+            error instanceof Error ? error.message : "响应拦截器错误",
+            config,
+            null,
+            response
+          );
           let processedError = requestError;
           for (const errorInterceptor of this.interceptors.error) {
             try {
-              processedError = await Promise.resolve(errorInterceptor(processedError));
+              processedError = await Promise.resolve(
+                errorInterceptor(processedError)
+              );
             } catch (e) {
             }
           }
@@ -179,11 +193,16 @@ var RequestPluginImpl = class {
       }
       return processedResponse.data;
     } catch (error) {
-      const requestError = error instanceof RequestError ? error : new RequestError(error instanceof Error ? error.message : "请求错误", config);
+      const requestError = error instanceof RequestError ? error : new RequestError(
+        error instanceof Error ? error.message : "请求错误",
+        config
+      );
       let processedError = requestError;
       for (const errorInterceptor of this.interceptors.error) {
         try {
-          processedError = await Promise.resolve(errorInterceptor(processedError));
+          processedError = await Promise.resolve(
+            errorInterceptor(processedError)
+          );
         } catch (e) {
         }
       }
@@ -195,13 +214,24 @@ var RequestPluginImpl = class {
    * 这里实现了一个基于 fetch API 的请求
    */
   async performRequest(config) {
-    const { url, method, headers, data, params, timeout, responseType, withCredentials } = config;
+    const {
+      url,
+      method,
+      headers,
+      data,
+      params,
+      timeout,
+      responseType,
+      withCredentials
+    } = config;
     if (!url) {
       throw new RequestError("URL不能为空", config);
     }
     let fullUrl = url;
     if (params && Object.keys(params).length > 0) {
-      const queryString = Object.entries(params).map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`).join("&");
+      const queryString = Object.entries(params).map(
+        ([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`
+      ).join("&");
       fullUrl += (url.includes("?") ? "&" : "?") + queryString;
     }
     const fetchOptions = {
@@ -230,7 +260,9 @@ var RequestPluginImpl = class {
       }
     });
     try {
-      const fetchPromise = typeof fetch !== "undefined" ? fetch(fullUrl, fetchOptions) : Promise.reject(new RequestError("当前环境不支持 fetch API", config));
+      const fetchPromise = typeof fetch !== "undefined" ? fetch(fullUrl, fetchOptions) : Promise.reject(
+        new RequestError("当前环境不支持 fetch API", config)
+      );
       const response = await Promise.race([fetchPromise, timeoutPromise]);
       const responseHeaders = {};
       response.headers.forEach((value, key) => {
@@ -264,7 +296,12 @@ var RequestPluginImpl = class {
         config
       };
       if (!response.ok) {
-        throw new RequestError(`请求失败，状态码: ${response.status}`, config, fetchOptions, result);
+        throw new RequestError(
+          `请求失败，状态码: ${response.status}`,
+          config,
+          fetchOptions,
+          result
+        );
       }
       return result;
     } finally {

package/lib/plugins/shopStore.d.ts

@@ -1,4 +1,4 @@
-import { Plugin } from "../types";
+import { Plugin } from '../types';
 export interface ShopStorePlugin extends Plugin {
     get(model: string): any;
 }