@pisell/pisellos 0.0.44 → 0.0.46

package/lib/solution/BookingByStep/utils/products.js

@@ -50,6 +50,9 @@ var getAvailableProductResources = (products) => {
     if (tempResourceIds) {
       rule.resourceFormIds = [...new Set(tempResourceIds)];
     }
+    if (product == null ? void 0 : product._schedule) {
+      rule.schedule = product == null ? void 0 : product._schedule;
+    }
     rules.push(rule);
   });
   return { resourceIds: [...new Set(resourceIds)], rules, resourcesMap };

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

@@ -27,7 +27,7 @@ interface BookingItem {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount }: {
+export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount, }: {
     timeSlice: TimeSliceItem;
     time: any;
     resource: ResourceItem;
@@ -36,6 +36,7 @@ export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, curren
     afterToDay: boolean;
     capacity: boolean;
     usable: boolean;
+    remainingCapacity: number;
 };
 /**
  * @title: 获取商品下绑定的资源列表
@@ -53,7 +54,7 @@ export declare const getResourcesByProduct: (resourcesMap: Record<string, Resour
  * @Author: zhiwei.Wang
  * @Date: 2024-01-09 13:38
  */
-export declare const formatResources: ({ booking, resources }: {
+export declare const formatResources: ({ booking, resources, }: {
     booking: BookingItem;
     resources: ResourceItem[];
 }) => {
@@ -66,7 +67,7 @@ export declare const formatResources: ({ booking, resources }: {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity }: {
+export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, }: {
     resource: ResourceItem;
     duration: number;
     split: number;
@@ -100,7 +101,7 @@ export declare const getResourcesByIds: (resourcesMap: Record<string, ResourceIt
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity }: {
+export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, }: {
     resourceIds: number[];
     resourcesMap: any;
     duration: number;
@@ -129,7 +130,7 @@ interface CapacityItem {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const formatDefaultCapacitys: ({ capacity, product_bundle }: any) => CapacityItem[];
+export declare const formatDefaultCapacitys: ({ capacity, product_bundle, }: any) => CapacityItem[];
 /**
  * @title: 获取总容量
  * @description:

package/lib/solution/BookingByStep/utils/resources.js

@@ -74,42 +74,79 @@ var formatResource = (resourceItem, booking) => {
   _resourceItem.labelText = _resourceItem.main_field;
   return _resourceItem;
 };
-var checkCapacity = ({ event_list, timeSlice, resource, currentCount = 1 }) => {
+var checkCapacity = ({
+  event_list,
+  timeSlice,
+  resource,
+  currentCount = 1
+}) => {
   if (currentCount > resource.capacity) {
-    return false;
+    return {
+      status: false,
+      capacity: resource.capacity
+    };
   }
   let conflict = (event_list || []).filter((d) => {
-    return isConflict({ start_at: d.start_at, end_at: d.end_at }, { start_at: timeSlice.start_at, end_at: timeSlice.end_at });
+    return isConflict(
+      { start_at: d.start_at, end_at: d.end_at },
+      { start_at: timeSlice.start_at, end_at: timeSlice.end_at }
+    );
   });
   if (resource.resourceType === "single") {
     if (conflict.length === 0) {
-      return true;
+      return {
+        status: true,
+        capacity: 1
+      };
     } else {
-      return false;
+      return {
+        status: false,
+        capacity: 1
+      };
     }
   } else {
     let conflictCount = getUseableEventCount(conflict, resource.capacity);
     if (currentCount <= conflictCount) {
-      return true;
+      return {
+        status: true,
+        capacity: conflictCount
+      };
     } else {
-      return false;
+      return {
+        status: false,
+        capacity: conflictCount
+      };
     }
   }
 };
-var getIsUsableByTimeItem = ({ timeSlice, time, resource, currentCount = 1 }) => {
+var getIsUsableByTimeItem = ({
+  timeSlice,
+  time,
+  resource,
+  currentCount = 1
+}) => {
   let status = {
     afterToDay: false,
     capacity: false,
-    usable: false
+    usable: false,
+    remainingCapacity: 0
+    // 剩余容量
   };
   let earliest = (0, import_dayjs.default)();
   if (!checkAfterToDay(timeSlice.start_at, earliest)) {
     return status;
   }
   status.afterToDay = true;
-  if (!checkCapacity({ event_list: time == null ? void 0 : time.event_list, timeSlice, resource, currentCount })) {
+  const checkCapacityResult = checkCapacity({
+    event_list: time == null ? void 0 : time.event_list,
+    timeSlice,
+    resource,
+    currentCount
+  });
+  if (!checkCapacityResult.status) {
     return status;
   }
+  status.remainingCapacity = checkCapacityResult.capacity;
   status.capacity = true;
   status.usable = true;
   return status;
@@ -121,51 +158,65 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
       item.optional_resource = (item.optional_resource || []).filter(
         (d) => item.default_resource.indexOf(d) == -1
       );
-      let optional_resource = item.optional_resource.reduce((childAcc, d) => {
-        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id) && capacity <= resourcesMap[d].capacity) {
-          const combiningResources = [];
-          if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
-            resourcesMap[d].combined_resource.resource_ids.forEach((id) => {
-              if (resourcesMap[id]) {
-                combiningResources.push(resourcesMap[id]);
-              }
-            });
-          }
-          childAcc.push(Object.assign({}, resourcesMap[d], {
-            form_id,
-            resourceType: item.type,
-            children: combiningResources,
-            metadata: {
-              ...resourcesMap[d].metadata,
-              combined_resource: resourcesMap[d].combined_resource
+      let optional_resource = item.optional_resource.reduce(
+        (childAcc, d) => {
+          if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id) && capacity <= resourcesMap[d].capacity) {
+            const combiningResources = [];
+            if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
+              resourcesMap[d].combined_resource.resource_ids.forEach(
+                (id) => {
+                  if (resourcesMap[id]) {
+                    combiningResources.push(resourcesMap[id]);
+                  }
+                }
+              );
             }
-          }));
-        }
-        return childAcc;
-      }, []);
-      let default_resource = item.default_resource.reduce((childAcc, d) => {
-        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id) && capacity <= resourcesMap[d].capacity) {
-          const combiningResources = [];
-          if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
-            resourcesMap[d].combined_resource.resource_ids.forEach((id) => {
-              if (resourcesMap[id]) {
-                combiningResources.push(resourcesMap[id]);
-              }
-            });
+            childAcc.push(
+              Object.assign({}, resourcesMap[d], {
+                form_id,
+                resourceType: item.type,
+                children: combiningResources,
+                metadata: {
+                  ...resourcesMap[d].metadata,
+                  combined_resource: resourcesMap[d].combined_resource
+                }
+              })
+            );
           }
-          childAcc.push(Object.assign({}, resourcesMap[d], {
-            form_id,
-            resourceType: item.type,
-            is_default: 1,
-            children: combiningResources,
-            metadata: {
-              ...resourcesMap[d].metadata,
-              combined_resource: resourcesMap[d].combined_resource
+          return childAcc;
+        },
+        []
+      );
+      let default_resource = item.default_resource.reduce(
+        (childAcc, d) => {
+          if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id) && capacity <= resourcesMap[d].capacity) {
+            const combiningResources = [];
+            if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
+              resourcesMap[d].combined_resource.resource_ids.forEach(
+                (id) => {
+                  if (resourcesMap[id]) {
+                    combiningResources.push(resourcesMap[id]);
+                  }
+                }
+              );
             }
-          }));
-        }
-        return childAcc;
-      }, []);
+            childAcc.push(
+              Object.assign({}, resourcesMap[d], {
+                form_id,
+                resourceType: item.type,
+                is_default: 1,
+                children: combiningResources,
+                metadata: {
+                  ...resourcesMap[d].metadata,
+                  combined_resource: resourcesMap[d].combined_resource
+                }
+              })
+            );
+          }
+          return childAcc;
+        },
+        []
+      );
       item.renderList = optional_resource.concat(default_resource);
       item.renderList = item.renderList.filter((d) => {
         const latestTime = d.times.reduce((latest, current) => {
@@ -179,7 +230,10 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
     return acc;
   }, []);
 };
-var formatResources = ({ booking, resources }) => {
+var formatResources = ({
+  booking,
+  resources
+}) => {
   try {
     let _list = [...resources];
     let maps = {};
@@ -274,9 +328,20 @@ var getTimeSlicesByResources = ({
   capacity
 }) => {
   let resources = getResourcesByIds(resourcesMap, resourceIds);
-  let timeSliceList = resources.reduce((acc, item) => {
-    return acc.concat(getTimeSlicesByResource({ resource: item, duration, split, currentDate, capacity }));
-  }, []);
+  let timeSliceList = resources.reduce(
+    (acc, item) => {
+      return acc.concat(
+        getTimeSlicesByResource({
+          resource: item,
+          duration,
+          split,
+          currentDate,
+          capacity
+        })
+      );
+    },
+    []
+  );
   let intersection = getTimesIntersection(timeSliceList, resources.length);
   return intersection;
 };
@@ -287,7 +352,9 @@ var getOthersSelectedResources = (cartItems, accountId, resourcesMap) => {
       if ((_a = d._origin) == null ? void 0 : _a.resources) {
         d._origin.resources.forEach((n) => {
           if (n.metadata.combined_resource && n.metadata.combined_resource.status === 1) {
-            if (n.metadata.combined_resource.resource_ids.some((m) => acc.includes(m))) {
+            if (n.metadata.combined_resource.resource_ids.some(
+              (m) => acc.includes(m)
+            )) {
               return acc;
             }
             acc.push(...n.metadata.combined_resource.resource_ids);
@@ -307,7 +374,10 @@ var getOthersSelectedResources = (cartItems, accountId, resourcesMap) => {
     return acc;
   }, []);
 };
-var formatDefaultCapacitys = ({ capacity, product_bundle }) => {
+var formatDefaultCapacitys = ({
+  capacity,
+  product_bundle
+}) => {
   if ((capacity == null ? void 0 : capacity.type) === "package") {
     return (product_bundle || []).map((d) => {
       const id = d.bundle_product_id;

package/lib/solution/BuyTickets/index.js

@@ -53,22 +53,21 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
   }
   // 通过 ids 获取产品，在当前解决方案下，获取到的就是主商品
   async loadProductsByIds(ids) {
-    const productsData = await this.request.post(
-      "/product/query",
-      {
-        ids,
-        open_quotation: 1,
-        open_bundle: 1,
-        with: ["bundleGroup.bundleItem"],
-        status: "published",
-        num: 10,
-        skip: 1
-      }
-    );
+    const productsData = await this.request.post("/product/query", {
+      ids,
+      open_quotation: 1,
+      open_bundle: 1,
+      with: ["bundleGroup.bundleItem"],
+      status: "published",
+      num: 10,
+      skip: 1
+    });
     const mainProducts = new import_modules.ProductList(`product-kiosk-main-list`);
-    this.core.registerModule(mainProducts, { initialState: {
-      list: productsData.data.list
-    } });
+    this.core.registerModule(mainProducts, {
+      initialState: {
+        list: productsData.data.list
+      }
+    });
     this.store.mainProducts = mainProducts;
     await this.core.effects.emit(import_types.BuyTicketsHooks.onMainProductsLoaded, {});
   }
@@ -84,7 +83,10 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
     var _a;
     const mainData = await this.store.mainProducts.getProducts() || [];
     const otherData = await ((_a = this.store.otherProducts) == null ? void 0 : _a.getProducts()) || [];
-    await this.core.effects.emit(import_types.BuyTicketsHooks.OnGetProducts, [...mainData, ...otherData]);
+    await this.core.effects.emit(import_types.BuyTicketsHooks.OnGetProducts, [
+      ...mainData,
+      ...otherData
+    ]);
     return [...mainData, ...otherData];
   }
   // 根据 id 获取商品详情，他会尝试先去主列表里找，找不到再去子列表，还找不到就报错
@@ -100,19 +102,31 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
   }
   // 商品列表页提交
   async listSubmit(data) {
-    const res = await this.core.effects.emit(import_types.BuyTicketsHooks.onListSubmit, { ...data, products: this.getProducts() });
+    const res = await this.core.effects.emit(import_types.BuyTicketsHooks.onListSubmit, {
+      ...data,
+      products: this.getProducts()
+    });
     if (res.status === false)
       return res;
-    this.window.localStorage.setItem("buyTickets:listSubmit", JSON.stringify({ ...data, products: this.getProducts() }));
+    this.window.localStorage.setItem(
+      "buyTickets:listSubmit",
+      JSON.stringify({ ...data, products: this.getProducts() })
+    );
     console.log("listSubmit 应该走逻辑层的 API 发请求了");
   }
   // 购物车提交
   async cartSubmit(data) {
-    await this.core.effects.emit(import_types.BuyTicketsHooks.onCartSubmit, { ...data, products: this.getProducts() });
+    await this.core.effects.emit(import_types.BuyTicketsHooks.onCartSubmit, {
+      ...data,
+      products: this.getProducts()
+    });
   }
   // 结算提交
   async checkoutSubmit(data) {
-    await this.core.effects.emit(import_types.BuyTicketsHooks.onCheckoutSubmit, { ...data, products: this.getProducts() });
+    await this.core.effects.emit(import_types.BuyTicketsHooks.onCheckoutSubmit, {
+      ...data,
+      products: this.getProducts()
+    });
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -1,7 +1,7 @@
-import { Module, PisellCore } from "../../types";
-import { BaseModule } from "../../modules/BaseModule";
-import { Customer } from "./types";
-import { Discount } from "../../modules/Discount/types";
+import { Module, PisellCore } from '../../types';
+import { BaseModule } from '../../modules/BaseModule';
+import { Customer } from './types';
+import { Discount } from '../../modules/Discount/types';
 export declare class ShopDiscountImpl extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;

package/lib/solution/ShopDiscount/index.js

@@ -288,7 +288,13 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         });
       }
     });
-    const newDiscountList = (0, import_utils.uniqueById)([...editModeDiscountList, ...discountList.filter((item) => !item.isDisabled)], "product_id");
+    const newDiscountList = (0, import_utils.uniqueById)(
+      [
+        ...editModeDiscountList,
+        ...discountList.filter((item) => !item.isDisabled)
+      ],
+      "product_id"
+    );
     (_a = this.store.discount) == null ? void 0 : _a.setDiscountList(newDiscountList);
     this.emitDiscountListChange(newDiscountList);
     return newDiscountList;
@@ -322,7 +328,9 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         action: "create",
         with_good_pass: 1
       }));
-      const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter((item) => item.isScan);
+      const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
+        (item) => item.isScan
+      );
       const newDiscountList = [...scanDiscount, ...goodPassList || []];
       this.setDiscountList(newDiscountList || []);
       if ((_d = this.store.productList) == null ? void 0 : _d.length) {

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

@@ -1,5 +1,5 @@
-import { DiscountModule } from "../../modules/Discount";
-import { RulesModule } from "../../modules/Rules";
+import { DiscountModule } from '../../modules/Discount';
+import { RulesModule } from '../../modules/Rules';
 export declare enum ShopDiscountHooks {
     onInited = "shopDiscount:onInited",
     onDestroy = "shopDiscount:onDestroy",

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,6 +14,7 @@
     "dev": "father dev --watch",
     "test": "vitest",
     "lint": "eslint src --ext .ts",
+    "format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,md}\"",
     "changeset": "changeset",
     "version": "changeset version",
     "release": "changeset publish --registry=https://registry.npmjs.com/ && npm run sync && git push",
@@ -54,6 +55,7 @@
     "axios": "1.7.2",
     "eslint": "^8.37.0",
     "father": "^4.1.0",
+    "prettier": "^3.5.3",
     "ts-node": "^10.9.1",
     "typedoc": "^0.28.2",
     "typescript": "^5.0.3",
@@ -65,4 +67,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}