@pisell/private-materials 3.3.76 → 3.3.77

package/lib/components/ticketBooking/utils/index.d.ts

@@ -12,8 +12,12 @@ export declare const restoreProductOtherData: (data: any) => {
     product_variant_id: number;
     quantity: number;
 } | undefined;
-export declare const addService: (list: any[], addItem: any) => {
+export declare const addService: (list: any[], addItem: any, state: any) => {
     list: any[];
     quantity: any;
 };
 export declare const addServiceScroll: (rowKey: string, cacheItem: any) => void;
+export declare const getCartProductOverlay: (state: any) => any;
+export declare const getIsOverlayProduct: (item: any, state: any) => any;
+export declare const getIsShowNumber: (item: any, state: any) => any;
+export declare const genServiceKey: (item: any) => string;

package/lib/components/ticketBooking/utils/index.js

@@ -33,8 +33,12 @@ __export(utils_exports, {
   addServiceScroll: () => addServiceScroll,
   formatBookingList: () => formatBookingList,
   formatDateToStr: () => formatDateToStr,
+  genServiceKey: () => genServiceKey,
+  getCartProductOverlay: () => getCartProductOverlay,
   getDefaultStartParam: () => getDefaultStartParam,
   getDisabledEdit: () => getDisabledEdit,
+  getIsOverlayProduct: () => getIsOverlayProduct,
+  getIsShowNumber: () => getIsShowNumber,
   getNextTimeSlice: () => getNextTimeSlice,
   restoreProductOtherData: () => restoreProductOtherData
 });
@@ -124,23 +128,29 @@ var restoreProductOtherData = (data) => {
   };
 };
 var isSameProduct = (a, b) => {
-  var _a, _b, _c, _d;
-  return ((_b = (_a = a._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.rowKey) === ((_d = (_c = b._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.rowKey);
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  if ((0, import_utils.isNormalProductByDurationSchedule)(a) && (0, import_utils.isNormalProductByDurationSchedule)(b)) {
+    return ((_b = (_a = a._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.rowKey) === ((_d = (_c = b._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.rowKey);
+  }
+  return ((_f = (_e = a._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.rowKey) === ((_h = (_g = b._extend) == null ? void 0 : _g.other) == null ? void 0 : _h.rowKey) && a._serviceKey === b._serviceKey;
 };
-var addService = (list, addItem) => {
+var addService = (list, addItem, state) => {
   let value = list;
   let count;
-  if (!(0, import_utils.isNormalProductByDurationSchedule)(addItem)) {
+  if (!(0, import_utils.isNormalProductByDurationSchedule)(addItem) && !getIsOverlayProduct(addItem, state)) {
     value.push(addItem);
     count = addItem._extend.quantity;
   } else {
     let isNotSame = true;
+    let isSetCount = false;
     value = list.map((item) => {
       var _a, _b, _c;
-      if (isSameProduct(item, addItem)) {
+      const isGoodPassDiscountProduct = (item.discount_list || []).some((item2) => item2.type === "good_pass");
+      if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct) {
         isNotSame = false;
         const quantity = (((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.quantity) || 1) + (((_b = addItem == null ? void 0 : addItem._extend) == null ? void 0 : _b.quantity) || 1);
         count = quantity;
+        isSetCount = true;
         return {
           ...item,
           _extend: {
@@ -183,14 +193,47 @@ var addServiceScroll = (rowKey, cacheItem) => {
     }
   });
 };
+var getCartProductOverlay = (state) => {
+  var _a, _b, _c;
+  return ((_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.cart_product_overlay) || { type: "product_all" };
+};
+var getIsOverlayProduct = (item, state) => {
+  const { type, product_ids } = getCartProductOverlay(state);
+  if (type === "product_all") {
+    return true;
+  }
+  return product_ids.includes(item.product_id || item.id);
+};
+var getIsShowNumber = (item, state) => {
+  const isBookingTicket2 = state.isBookingTicket2;
+  return (0, import_utils.isNormalProductByDurationSchedule)(item) || isBookingTicket2 && getIsOverlayProduct(item, state);
+};
+var genServiceKey = (item) => {
+  var _a, _b, _c;
+  const product_id = item.product_id;
+  const durationKey = (_a = item._extend) == null ? void 0 : _a.duration;
+  const start_time = (_b = item._extend) == null ? void 0 : _b.start_time;
+  const total = (_c = item._extend) == null ? void 0 : _c.total;
+  let resourceKey = "";
+  Object.values(item._extend.resource).forEach((resources) => {
+    resources.forEach((resource) => {
+      resourceKey += `${resource.relation_id}`;
+    });
+  });
+  return `${product_id}-${durationKey}-${resourceKey}-${start_time}-${total}`;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   addService,
   addServiceScroll,
   formatBookingList,
   formatDateToStr,
+  genServiceKey,
+  getCartProductOverlay,
   getDefaultStartParam,
   getDisabledEdit,
+  getIsOverlayProduct,
+  getIsShowNumber,
   getNextTimeSlice,
   restoreProductOtherData
 });

package/lib/components/wallet/hooks/useWalletCard.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IWalletListItemProps } from '../serve';
 /**
  * 钱包卡片Hook的参数

package/lib/hooks/useWindowSize.d.ts

@@ -0,0 +1,5 @@
+interface UseWindowSizeOptions {
+    debounceMs?: number;
+}
+export declare const useWindowSize: (options?: UseWindowSizeOptions) => void;
+export {};

package/lib/hooks/useWindowSize.js

@@ -0,0 +1,51 @@
+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);
+
+// src/hooks/useWindowSize.ts
+var useWindowSize_exports = {};
+__export(useWindowSize_exports, {
+  useWindowSize: () => useWindowSize
+});
+module.exports = __toCommonJS(useWindowSize_exports);
+var import_react = require("react");
+var useWindowSize = (options = {}) => {
+  const {
+    debounceMs = 100
+  } = options;
+  (0, import_react.useEffect)(() => {
+    let timeoutId;
+    const setRealVH = () => {
+      const vh = window.innerHeight * 0.01;
+      document.documentElement.style.setProperty("--vh", `${vh}px`);
+    };
+    const debouncedHandleResize = () => {
+      clearTimeout(timeoutId);
+      timeoutId = setTimeout(setRealVH, debounceMs);
+    };
+    debouncedHandleResize();
+    window.addEventListener("resize", debouncedHandleResize);
+    return () => {
+      window.removeEventListener("resize", debouncedHandleResize);
+      clearTimeout(timeoutId);
+    };
+  }, [debounceMs]);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  useWindowSize
+});

package/lib/index.d.ts

@@ -43,3 +43,4 @@ export { default as AppointmentBooking } from './components/appointmentBooking';
 export { default as AppointmentDeposit } from './components/appointmentBooking/deposit';
 export { default as TicketBooking } from './components/ticketBooking';
 export { default as SubTotal } from './components/subTotal';
+export { default as StepController } from './components/stepController';

package/lib/index.js

@@ -63,6 +63,7 @@ __export(src_exports, {
   RuleSetting: () => import_ruleSetting.default,
   Schedules: () => import_schedules.default,
   ShoppingCart: () => import_shoppingCart.default,
+  StepController: () => import_stepController.default,
   SubTotal: () => import_subTotal.default,
   TaxSelect: () => import_taxSelect.default,
   TicketBooking: () => import_ticketBooking.default,
@@ -122,6 +123,7 @@ var import_appointmentBooking = __toESM(require("./components/appointmentBooking
 var import_deposit2 = __toESM(require("./components/appointmentBooking/deposit"));
 var import_ticketBooking = __toESM(require("./components/ticketBooking"));
 var import_subTotal = __toESM(require("./components/subTotal"));
+var import_stepController = __toESM(require("./components/stepController"));
 import_dayjs.default.extend(import_weekday.default);
 import_dayjs.default.extend(import_localeData.default);
 // Annotate the CommonJS export names for ESM import in node:
@@ -160,6 +162,7 @@ import_dayjs.default.extend(import_localeData.default);
   RuleSetting,
   Schedules,
   ShoppingCart,
+  StepController,
   SubTotal,
   TaxSelect,
   TicketBooking,

package/lib/utils/index.d.ts

@@ -18,6 +18,6 @@ declare let modal: Omit<ModalStaticFunctions, 'warn'>;
 export declare const setModal: (m: Omit<ModalStaticFunctions, 'warn'>) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
 }>;
 export { modal };

package/lowcode/step-controller/meta.ts

@@ -0,0 +1,88 @@
+
+import { ComponentMetadata, Snippet } from '@alilc/lowcode-types';
+
+const StepControllerMeta: ComponentMetadata = {
+  "componentName": "StepController",
+  "title": "StepController",
+  "docUrl": "",
+  "screenshot": "",
+  "devMode": "proCode",
+  "npm": {
+    "package": "@pisell/private-materials",
+    "version": "1.0.4",
+    "exportName": "StepController",
+    "main": "src/index.ts",
+    "destructuring": true,
+    "subName": ""
+  },
+  "configure": {
+    props: [
+      {
+        name: 'steps',
+        title: { label: '步骤列表', tip: 'steps | 步骤列表' },
+        setter: 'JsonSetter',
+        defaultValue: [],
+      },
+      {
+        name: 'currentStep',
+        title: { label: '当前步骤', tip: 'currentStep | 当前步骤' },
+        setter: 'StringSetter',
+      },
+      {
+        name: 'children',
+        title: { label: '内容', tip: 'leftChildren | 内容' },
+        setter: 'SlotSetter',
+      },
+      {
+        name: 'confirmCloseProps',
+        title: { label: '关闭流程确认弹窗内容', tip: 'confirmCloseProps | 关闭流程确认弹窗内容' },
+        setter: 'JsonSetter',
+      },
+      {
+        name: 'showFooter',
+        title: { label: '是否显示底部', tip: 'showFooter | 是否显示底部' },
+        setter: 'BoolSetter',
+      },
+      {
+        name: 'footerContent',
+        title: { label: '底部内容', tip: 'footerContent | 底部内容' },
+        setter: 'SlotSetter',
+        condition(target) {
+          return !!target.getProps().getPropValue("showFooter");
+        },
+      },
+    ],
+    "supports": {
+      style: true,
+      events: [
+        {
+          name: "onBack",
+          template:
+            "onBack(key){\n//console.log('返回上一步',key);}",
+        },
+        {
+          name: "onClose",
+          template:
+            "onClose(){\n//console.log('关闭流程');}",
+        },
+      ],
+    },
+    "component": {}
+  }
+};
+const snippets: Snippet[] = [
+  {
+    "title": "StepController",
+    "screenshot": "",
+    "schema": {
+      "componentName": "StepController",
+      "props": {
+      }
+    }
+  }
+];
+
+export default {
+  ...StepControllerMeta,
+  snippets
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.3.76",
+  "version": "3.3.77",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,8 +59,8 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/materials": "3.3.28",
     "@pisell/utils": "1.0.42",
+    "@pisell/materials": "3.3.29",
     "@pisell/date-picker": "3.0.2",
     "@pisell/icon": "0.0.11"
   },