@pisell/pisellos 0.0.567 → 0.0.569

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

@@ -110,6 +110,8 @@ export interface CustomerState {
 export interface CustomerModuleAPI {
     /** 获取客户列表 */
     getCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
+    /** 查询客户列表但不更新列表分页状态 */
+    queryCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
     /** 设置客户列表 */
     setCustomerList: (customers: ShopCustomer[], total?: number) => void;
     /** 设置当前选择的客户 */

package/lib/modules/Customer/types.js

@@ -1,37 +1,40 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/Customer/types.ts
-var types_exports = {};
-__export(types_exports, {
-  CustomerHooks: () => CustomerHooks
-});
-module.exports = __toCommonJS(types_exports);
-var CustomerHooks = /* @__PURE__ */ ((CustomerHooks2) => {
-  CustomerHooks2["OnCustomerListUpdate"] = "customer:onCustomerListUpdate";
-  CustomerHooks2["OnCustomerListError"] = "customer:onError";
-  CustomerHooks2["OnCustomerSelected"] = "customer:onCustomerSelected";
-  CustomerHooks2["OnPaginationChange"] = "customer:onPaginationChange";
-  CustomerHooks2["OnScrollLoadMore"] = "customer:onScrollLoadMore";
-  CustomerHooks2["OnScrollLoadComplete"] = "customer:onScrollLoadComplete";
-  return CustomerHooks2;
-})(CustomerHooks || {});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  CustomerHooks
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
+exports.CustomerHooks = void 0;
+let CustomerHooks = exports.CustomerHooks = /*#__PURE__*/function (CustomerHooks) {
+  CustomerHooks["OnCustomerListUpdate"] = "customer:onCustomerListUpdate";
+  CustomerHooks["OnCustomerListError"] = "customer:onError";
+  CustomerHooks["OnCustomerSelected"] = "customer:onCustomerSelected";
+  CustomerHooks["OnPaginationChange"] = "customer:onPaginationChange";
+  CustomerHooks["OnScrollLoadMore"] = "customer:onScrollLoadMore";
+  CustomerHooks["OnScrollLoadComplete"] = "customer:onScrollLoadComplete";
+  return CustomerHooks;
+}({});
+/**
+ * 客户数据
+ */
+/**
+ * 客户列表关联查询参数
+ * 
+ * formRecord: 用户表单记录
+ * walletDetails.wallet: 用户所有wallet
+ * latestWalletDetail.wallet: 用户最新wallet
+ */
+/**
+ * 获取客户列表参数
+ */
+/**
+ * 分页信息
+ */
+/**
+ * 客户列表响应
+ */
+/**
+ * 客户列表状态
+ */
+/**
+ * 客户模块 API
+ */

package/lib/modules/Date/index.js

@@ -1,72 +1,48 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/Date/index.ts
-var Date_exports = {};
-__export(Date_exports, {
-  DateModule: () => DateModule
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(Date_exports);
-var import_dayjs = __toESM(require("dayjs"));
-var import_BaseModule = require("../BaseModule");
-var import_utils = require("./utils");
-var import_cloneDeep = __toESM(require("lodash-es/cloneDeep"));
-var DateModule = class extends import_BaseModule.BaseModule {
+exports.DateModule = void 0;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _BaseModule = require("../BaseModule");
+var _utils = require("./utils");
+var _cloneDeep = _interopRequireDefault(require("lodash-es/cloneDeep"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+class DateModule extends _BaseModule.BaseModule {
+  defaultName = 'date';
+  defaultVersion = '1.0.0';
+  store;
+  request;
+  cacheId;
+  openCache = false;
+  fatherModule;
   constructor(name, version) {
     super(name, version);
-    this.defaultName = "date";
-    this.defaultVersion = "1.0.0";
-    this.openCache = false;
   }
   async initialize(core, options) {
-    var _a, _b;
     this.core = core;
     this.store = options.store;
-    this.request = this.core.getPlugin("request");
+    this.request = this.core.getPlugin('request');
     if (options.initialState) {
       this.store.dateRange = options.initialState.dateRange;
       this.store.dateList = options.initialState.dateList;
     }
     if (!this.request) {
-      throw new Error("DateModule 需要 request 插件支持");
+      throw new Error('DateModule 需要 request 插件支持');
     }
-    if ((_a = options.otherParams) == null ? void 0 : _a.cacheId) {
+    if (options.otherParams?.cacheId) {
       this.openCache = options.otherParams.openCache;
       this.cacheId = options.otherParams.cacheId;
     }
-    if ((_b = options.otherParams) == null ? void 0 : _b.fatherModule) {
+    if (options.otherParams?.fatherModule) {
       this.fatherModule = options.otherParams.fatherModule;
     }
   }
   setDateRange(dateRange) {
-    dateRange.forEach((item) => {
-      var _a;
-      if (!((_a = item.resource) == null ? void 0 : _a.length)) {
+    // 如果 dateRange 传入的日期里没有 resource，但是本地有的，要尝试补充下
+    dateRange.forEach(item => {
+      if (!item.resource?.length) {
         item.resource = this.getResourcesListByDate(item.date);
       }
     });
@@ -76,17 +52,14 @@ var DateModule = class extends import_BaseModule.BaseModule {
     return this.store.dateRange;
   }
   async getResourceDates(params) {
-    var _a;
     if (params.useCache) {
+      // 发请求之前，做一道检测，看 dateList 里是否有对应日期，且对应日期里是否都有对应 resource_ids 的资源
       const currentDateList = this.getDateList() || [];
-      const currentDateListMap = new Map(
-        currentDateList.map((item) => [item.date, item])
-      );
-      const resourceIds = ((_a = params.query) == null ? void 0 : _a.resource_ids) || [];
-      const hasResource = resourceIds.every((id) => {
-        var _a2;
+      const currentDateListMap = new Map(currentDateList.map(item => [item.date, item]));
+      const resourceIds = params.query?.resource_ids || [];
+      const hasResource = resourceIds.every(id => {
         const currentItem = currentDateListMap.get(id.toString());
-        return (_a2 = currentItem == null ? void 0 : currentItem.resource) == null ? void 0 : _a2.some((n) => n.id === id);
+        return currentItem?.resource?.some(n => n.id === id);
       });
       if (hasResource) {
         return currentDateList;
@@ -100,31 +73,24 @@ var DateModule = class extends import_BaseModule.BaseModule {
     return this.store.dateList;
   }
   setDateList(dateList) {
-    const currentDateList = (0, import_cloneDeep.default)(this.store.dateList) || [];
-    dateList.forEach((item) => {
-      var _a, _b;
-      const currentItemIndex = currentDateList.findIndex(
-        (n) => n.date === item.date
-      );
+    // this.store.dateList = dateList;
+    // 并不能直接简单的进行复制
+    // 我们需要把每一天的资源都进行一个合并
+    const currentDateList = (0, _cloneDeep.default)(this.store.dateList) || [];
+    dateList.forEach(item => {
+      const currentItemIndex = currentDateList.findIndex(n => n.date === item.date);
       if (currentItemIndex !== -1) {
         const currentItem = currentDateList[currentItemIndex];
-        const newResource = (_a = item.resource) == null ? void 0 : _a.filter(
-          (n) => {
-            var _a2;
-            return !((_a2 = currentItem.resource) == null ? void 0 : _a2.some((m) => m.id === n.id));
-          }
-        );
-        (_b = currentItem.resource) == null ? void 0 : _b.forEach((n) => {
-          var _a2;
-          const newResource2 = (_a2 = item.resource) == null ? void 0 : _a2.find((m) => m.id === n.id);
-          if (newResource2) {
-            n.times = newResource2.times;
+        // 看那一天的数据有没有相同的，把不同的资源合并进去即可
+        const newResource = item.resource?.filter(n => !currentItem.resource?.some(m => m.id === n.id));
+        // 如果有相同的资源，则使用 item 中的新的resource.times，而不是 currentItem 中的
+        currentItem.resource?.forEach(n => {
+          const newResource = item.resource?.find(m => m.id === n.id);
+          if (newResource) {
+            n.times = newResource.times;
           }
         });
-        currentItem.resource = [
-          ...currentItem.resource || [],
-          ...newResource || []
-        ];
+        currentItem.resource = [...(currentItem.resource || []), ...(newResource || [])];
         currentDateList[currentItemIndex] = currentItem;
       } else {
         currentDateList.push(item);
@@ -133,9 +99,17 @@ var DateModule = class extends import_BaseModule.BaseModule {
     this.store.dateList = currentDateList;
   }
   async fetchResourceDates(params) {
-    const { url, query, useCache = true } = params;
-    const fetchUrl = url || "/schedule/resource/list";
-    const { start_date, end_date, resource_ids } = query || {};
+    const {
+      url,
+      query,
+      useCache = true
+    } = params;
+    const fetchUrl = url || '/schedule/resource/list';
+    const {
+      start_date,
+      end_date,
+      resource_ids
+    } = query || {};
     try {
       const res = await this.request.get(fetchUrl, {
         start_date,
@@ -145,7 +119,9 @@ var DateModule = class extends import_BaseModule.BaseModule {
       }, {
         useCache
       });
-      if ((res == null ? void 0 : res.data) && Array.isArray(res.data)) {
+
+      // 校正资源时间段数据
+      if (res?.data && Array.isArray(res.data)) {
         res.data = this.correctResourceTimeSlots(res.data);
       }
       return res;
@@ -153,6 +129,7 @@ var DateModule = class extends import_BaseModule.BaseModule {
       console.error(error);
     }
   }
+
   /**
    * 将时间向上取整到下一个10分钟整数
    * 
@@ -163,13 +140,16 @@ var DateModule = class extends import_BaseModule.BaseModule {
     const minutes = time.minute();
     const remainder = minutes % 10;
     if (remainder === 0) {
-      return time.format("YYYY-MM-DD HH:mm");
+      // 如果已经是10分钟的整数，保持不变
+      return time.format('YYYY-MM-DD HH:mm');
     } else {
+      // 向上取整到下一个10分钟
       const minutesToAdd = 10 - remainder;
-      const roundedTime = time.add(minutesToAdd, "minute");
-      return roundedTime.format("YYYY-MM-DD HH:mm");
+      const roundedTime = time.add(minutesToAdd, 'minute');
+      return roundedTime.format('YYYY-MM-DD HH:mm');
     }
   }
+
   /**
    * 校正资源时间段数据
    * 
@@ -180,36 +160,47 @@ var DateModule = class extends import_BaseModule.BaseModule {
    * @returns 校正后的资源数据数组
    */
   correctResourceTimeSlots(resourcesData) {
-    return resourcesData.map((resource) => {
+    return resourcesData.map(resource => {
+      // 检查资源是否有 times 数组和 start_time
       if (!resource.times || !Array.isArray(resource.times) || !resource.start_time) {
         return resource;
       }
+      // 如果resource.advanced 为 null 或者 resource.advanced.unit 为 0，则不进行修正
       if (!resource.advanced || resource.advanced.unit === 0) {
         return resource;
       }
-      const resourceStartTime = (0, import_dayjs.default)(resource.start_time);
-      const correctedTimes = resource.times.map((timeSlot) => {
+      const resourceStartTime = (0, _dayjs.default)(resource.start_time);
+
+      // 过滤和修正时间段
+      const correctedTimes = resource.times.map(timeSlot => {
         if (!timeSlot.start_at || !timeSlot.end_at) {
           return timeSlot;
         }
-        const startAt = (0, import_dayjs.default)(timeSlot.start_at);
-        const endAt = (0, import_dayjs.default)(timeSlot.end_at);
+        const startAt = (0, _dayjs.default)(timeSlot.start_at);
+        const endAt = (0, _dayjs.default)(timeSlot.end_at);
+
+        // 如果 start_at 早于资源的 start_time，需要修正
         if (startAt.isBefore(resourceStartTime)) {
+          // 将 start_time 向上取整到下一个10分钟整数
           const roundedStartTime = this.roundUpToNext10Minutes(resourceStartTime);
-          const roundedStartTimeDayjs = (0, import_dayjs.default)(roundedStartTime);
-          console.log(`[DateModule] 修正时间段开始时间: ${timeSlot.start_at} -> ${roundedStartTime} (资源ID: ${resource.id}, 原始start_time: ${resource.start_time})`);
+          const roundedStartTimeDayjs = (0, _dayjs.default)(roundedStartTime);
+          // 将 start_at 修正为向上取整后的时间
           const correctedTimeSlot = {
             ...timeSlot,
             start_at: roundedStartTime
           };
+
+          // 检查修正后的 end_at 是否也早于修正后的 start_time
           if (endAt.isBefore(roundedStartTimeDayjs)) {
-            console.log(`[DateModule] 时间段无效，将被删除: ${timeSlot.start_at} - ${timeSlot.end_at} (资源ID: ${resource.id}, 修正后start_time: ${roundedStartTime})`);
-            return null;
+            return null; // 标记为删除
           }
           return correctedTimeSlot;
         }
+
+        // 不需要修正的时间段直接返回
         return timeSlot;
-      }).filter((timeSlot) => timeSlot !== null);
+      }).filter(timeSlot => timeSlot !== null); // 过滤掉被删除的时间段
+
       return {
         ...resource,
         times: correctedTimes
@@ -217,29 +208,43 @@ var DateModule = class extends import_BaseModule.BaseModule {
     });
   }
   async getResourceAvailableTimeList(params) {
-    var _a;
-    const { query, rules, type } = params;
-    const { start_date, end_date, resource_ids } = query || {};
+    const {
+      query,
+      rules,
+      type
+    } = params;
+    const {
+      start_date,
+      end_date,
+      resource_ids
+    } = query || {};
     if (!start_date || !end_date) {
       return [];
     }
-    let dates = (0, import_utils.generateMonthDates)(start_date, end_date, type);
-    if (!(resource_ids == null ? void 0 : resource_ids.length)) {
-      return (0, import_utils.disableAllDates)(dates);
+
+    // 1.生成当前月份的所有日期，默认都是可用的
+    let dates = (0, _utils.generateMonthDates)(start_date, end_date, type);
+
+    // 如果没有资源或者结束日期在今天之前，则所有日期均不可用
+    if (!resource_ids?.length) {
+      return (0, _utils.disableAllDates)(dates);
     }
     try {
       const res = await this.fetchResourceDates(params);
-      if (!((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.length)) {
-        return (0, import_utils.disableAllDates)(dates);
+      // 如果资源列表为空，则所有日期均不可用
+      if (!res?.data?.length) {
+        return (0, _utils.disableAllDates)(dates);
       }
-      dates = (0, import_utils.handleAvailableDateByResource)(res.data, dates);
-      if (rules == null ? void 0 : rules.length) {
-        dates = (0, import_utils.handleAvailableDatesByRules)(dates, rules);
+      // 2.根据资源times判定哪些日期内存在可用资源
+      dates = (0, _utils.handleAvailableDateByResource)(res.data, dates);
+
+      // 3.根据提前量和当前日期判定哪些日期可用
+      if (rules?.length) {
+        dates = (0, _utils.handleAvailableDatesByRules)(dates, rules);
       }
       return dates;
     } catch (error) {
-      console.log("getAvailableTimeList_error", error);
-      return (0, import_utils.disableAllDates)(dates);
+      return (0, _utils.disableAllDates)(dates);
     }
   }
   clearDateRange() {
@@ -251,18 +256,14 @@ var DateModule = class extends import_BaseModule.BaseModule {
         cacheId: this.cacheId,
         fatherModule: this.fatherModule,
         store: this.store,
-        cacheKey: ["dateRange", "dateList"]
+        cacheKey: ['dateRange', 'dateList']
       });
     }
   }
   getResourcesListByDate(date) {
-    var _a;
     const dateList = this.store.dateList;
-    const resourcesList = ((_a = dateList == null ? void 0 : dateList.find((item) => item.date === date)) == null ? void 0 : _a.resource) || [];
+    const resourcesList = dateList?.find(item => item.date === date)?.resource || [];
     return resourcesList;
   }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  DateModule
-});
+}
+exports.DateModule = DateModule;

package/lib/modules/Date/types.js

@@ -1,30 +1,18 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/Date/types.ts
-var types_exports = {};
-__export(types_exports, {
-  DateHooks: () => DateHooks
-});
-module.exports = __toCommonJS(types_exports);
-var DateHooks = /* @__PURE__ */ ((DateHooks2) => {
-})(DateHooks || {});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  DateHooks
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
+exports.DateHooks = void 0;
+let DateHooks = exports.DateHooks = /*#__PURE__*/function (DateHooks) {
+  return DateHooks;
+}({});
+/**
+ * 日期模块状态
+ */
+/**
+ * 时间
+ */
+/**
+ * 日期模块 API
+ */