@pisell/private-materials 6.7.4 → 6.7.6

package/lib/components/systemSettings/registry/utils/validators.js

@@ -0,0 +1,54 @@
+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/components/systemSettings/registry/utils/validators.ts
+var validators_exports = {};
+__export(validators_exports, {
+  createPrefixedAppIdentifierValidator: () => createPrefixedAppIdentifierValidator
+});
+module.exports = __toCommonJS(validators_exports);
+var createPrefixedAppIdentifierValidator = (sectionCode) => {
+  return (_, value) => {
+    if (!value) {
+      return Promise.resolve();
+    }
+    const expectedPrefix = `${sectionCode}.`;
+    if (!value.startsWith(expectedPrefix)) {
+      return Promise.reject(new Error(`键必须以 "${expectedPrefix}" 开头`));
+    }
+    const remainingPart = value.substring(expectedPrefix.length);
+    if (!remainingPart) {
+      return Promise.reject(new Error("键不能只包含前缀"));
+    }
+    const validPattern = /^[a-z0-9._]+$/;
+    if (!validPattern.test(remainingPart)) {
+      return Promise.reject(new Error("键只能包含小写字母、数字、点、下划线"));
+    }
+    if (remainingPart.startsWith(".") || remainingPart.startsWith("_") || remainingPart.endsWith(".") || remainingPart.endsWith("_")) {
+      return Promise.reject(new Error("键不能以点或下划线开头或结尾"));
+    }
+    if (remainingPart.includes("..") || remainingPart.includes("__") || remainingPart.includes("._") || remainingPart.includes("_.")) {
+      return Promise.reject(new Error("键不能包含连续的点或下划线"));
+    }
+    return Promise.resolve();
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createPrefixedAppIdentifierValidator
+});

package/lib/components/taxSelect/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from "antd";
 import "./index.less";
 interface TaxSelectProps {

package/lib/components/ticketBooking/components/ProductDisplayAdapter/ProductDisplayAdapter.js

@@ -107,6 +107,7 @@ var ProductDisplayAdapter = (props) => {
         category: ((_b = (_a = item.category) == null ? void 0 : _a.map) == null ? void 0 : _b.call(_a, (category) => `${category.id}`)) || []
       };
     });
+    console.log(tabData, "tabData123");
     return /* @__PURE__ */ import_react.default.createElement(
       "div",
       {

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

@@ -28,6 +28,8 @@ interface ProductCategory {
     icon?: string;
     slug?: string;
     sort?: number;
+    /** 父级分类 ID，0 或 null/undefined 表示一级分类 */
+    parent_id?: number | null;
 }
 /**
  * 产品项接口
@@ -38,13 +40,42 @@ interface Product {
     category?: ProductCategory[];
     [key: string]: any;
 }
+/**
+ * 分类树节点接口（Switch 模式返回值）
+ */
+export interface CategoryTreeNode {
+    /** 分类 ID，All 节点为 '{父级路径}_all' 格式 */
+    id: number | string;
+    /** 分类唯一标识 兼容 List 组件的 key 字段 */
+    key: number | string;
+    /** 分类名称 兼容 List 组件的 label 字段 */
+    label: string;
+    /** 分类分组 兼容 List 组件的 group 字段 */
+    group: number | string;
+    /** 分类名称 */
+    name: string;
+    /** 分类图标 */
+    icon?: string;
+    /**
+     * 路径式父级标识
+     * - 一级分类：无此字段
+     * - 二级分类：'1'（父级 id）
+     * - 三级分类：'1_2'（路径格式）
+     * - 以此类推
+     */
+    pid?: string;
+    /** 该分类下所有商品的 ID 数组（包含子分类的商品） */
+    productIds: number[];
+    /** 子分类列表，如果有子分类，第一个为 All 节点 */
+    children?: CategoryTreeNode[];
+}
 /**
  * 根据产品数据生成分类 Tabs（Switch 模式）
  * 参考 TestResponsiveWrapper 的 generateSimpleTabItems 函数
  *
  * @param products 产品列表
  * @param tabStyle tab 样式类型
- * @returns TabItem 数组
+ * @returns Switch 模式返回 CategoryTreeNode[]，Anchor 模式返回 TabItem[]
  */
-export declare const generateProductTabs: (products: Product[], tabStyle?: 'switch' | 'anchor') => TabItem[];
+export declare const generateProductTabs: (products: Product[], tabStyle?: 'switch' | 'anchor') => CategoryTreeNode[] | TabItem[];
 export {};

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

@@ -38,33 +38,13 @@ var formatSkuDataSource = (dataSource) => {
 };
 var generateProductTabs = (products, tabStyle = "switch") => {
   if (!products || products.length === 0) {
+    if (tabStyle === "switch") {
+      return [];
+    }
     return [{ key: "all", label: import_utils.locales.getText("pisell2.ticket-booking.all") }];
   }
   if (tabStyle === "switch") {
-    const categoryMap = /* @__PURE__ */ new Map();
-    products.forEach((product) => {
-      if (product.category && Array.isArray(product.category)) {
-        product.category.forEach((cat) => {
-          if (!categoryMap.has(cat.id)) {
-            categoryMap.set(cat.id, cat);
-          }
-        });
-      }
-    });
-    const sortedCategories = Array.from(categoryMap.values()).sort(
-      (a, b) => (b.sort || 0) - (a.sort || 0)
-    );
-    const tabs = [
-      { key: "all", label: import_utils.locales.getText("pisell2.ticket-booking.all") }
-    ];
-    sortedCategories.forEach((category) => {
-      tabs.push({
-        key: String(category.id),
-        label: category.name,
-        group: String(category.id)
-      });
-    });
-    return tabs;
+    return buildCategoryTree(products);
   } else {
     const categoryCount = products.reduce((acc, product) => {
       if (product.category && Array.isArray(product.category)) {
@@ -94,6 +74,86 @@ var generateProductTabs = (products, tabStyle = "switch") => {
     return tabs;
   }
 };
+var buildCategoryTree = (products) => {
+  const categoryMap = /* @__PURE__ */ new Map();
+  const categoryProductMap = /* @__PURE__ */ new Map();
+  products.forEach((product) => {
+    if (product.category && Array.isArray(product.category)) {
+      product.category.forEach((cat) => {
+        if (!categoryMap.has(cat.id)) {
+          categoryMap.set(cat.id, cat);
+        }
+        if (!categoryProductMap.has(cat.id)) {
+          categoryProductMap.set(cat.id, /* @__PURE__ */ new Set());
+        }
+        categoryProductMap.get(cat.id).add(product.id);
+      });
+    }
+  });
+  const childrenMap = /* @__PURE__ */ new Map();
+  const rootCategories = [];
+  categoryMap.forEach((category, id) => {
+    const parentId = category.parent_id;
+    if (!parentId || parentId === 0) {
+      rootCategories.push(id);
+    } else {
+      if (!childrenMap.has(parentId)) {
+        childrenMap.set(parentId, []);
+      }
+      childrenMap.get(parentId).push(id);
+    }
+  });
+  const sortBySort = (ids) => {
+    return ids.sort((a, b) => {
+      const catA = categoryMap.get(a);
+      const catB = categoryMap.get(b);
+      return ((catB == null ? void 0 : catB.sort) || 0) - ((catA == null ? void 0 : catA.sort) || 0);
+    });
+  };
+  const buildNode = (categoryId, parentPath) => {
+    const category = categoryMap.get(categoryId);
+    const childIds = childrenMap.get(categoryId) || [];
+    const sortedChildIds = sortBySort([...childIds]);
+    const directProductIds = Array.from(categoryProductMap.get(categoryId) || []);
+    const currentPath = parentPath ? `${parentPath}_${categoryId}` : String(categoryId);
+    const pid = parentPath || void 0;
+    const node = {
+      id: categoryId,
+      key: categoryId,
+      group: categoryId,
+      label: category.name,
+      name: category.name,
+      icon: category.icon,
+      productIds: directProductIds
+    };
+    if (pid) {
+      node.pid = pid;
+    }
+    if (sortedChildIds.length > 0) {
+      const childNodes = sortedChildIds.map(
+        (childId) => buildNode(childId, currentPath)
+      );
+      const allChildProductIds = childNodes.reduce((acc, child) => {
+        return acc.concat(child.productIds);
+      }, []);
+      const mergedProductIds = Array.from(
+        /* @__PURE__ */ new Set([...directProductIds, ...allChildProductIds])
+      );
+      node.productIds = mergedProductIds;
+      node.children = [...childNodes];
+    }
+    return node;
+  };
+  const sortedRootIds = sortBySort([...rootCategories]);
+  const rootNodes = sortedRootIds.map((rootId) => buildNode(rootId, ""));
+  if (rootNodes.length > 0) {
+    const allProductIds = Array.from(
+      new Set(rootNodes.flatMap((node) => node.productIds))
+    );
+    return [...rootNodes];
+  }
+  return rootNodes;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   formatSkuDataSource,

package/lib/components/ticketBooking/components/addServiceVariant/addService.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter';
 import './index.less';
 interface AddServiceProps {

package/lib/components/ticketBooking/components/addServiceVariant/addService.js

@@ -76,7 +76,6 @@ var AddSerivce = (props) => {
   const context = (0, import_useEngineContext.default)();
   const platform = (0, import_useEngineContext.usePlatform)();
   const notAvailableRef = (0, import_react.useRef)(null);
-  const isLoadedServiceRef = (0, import_react.useRef)(false);
   import_utils2.request.setRequest(context.appHelper.utils.request);
   const isActive = (0, import_IsActiveContext.useIsActive)();
   const Toast = (0, import_materials.useToast)();

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter/types';
 interface AddServiceVariantProps {
     globalState: any;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface MenuBarProps {
     activeNavKey?: string;

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

@@ -39,20 +39,43 @@ var import_antd = require("antd");
 var import_icons = require("@ant-design/icons");
 var import_utils = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
+var import_serve = require("../../serve");
+var import_hooks = require("../../../../hooks");
 var index = (props) => {
   const { activeNavKey = "ticket", onNavChange } = props;
   const status = (0, import_useNetworkStatus.useNetworkStatus)();
+  const [showFoodMenu, setShowFoodMenu] = (0, import_react.useState)(false);
+  const context = (0, import_hooks.useEngineContext)();
+  (0, import_react.useEffect)(() => {
+    const checkFoodConfig = async () => {
+      try {
+        const data = await (0, import_serve.getBookingConfig)({
+          item_type: "appointment_booking",
+          sub_type: "food",
+          source_type: "pos"
+        });
+        if (data) {
+          setShowFoodMenu(true);
+        }
+      } catch (error) {
+        console.error("获取 food 配置失败:", error);
+      }
+    };
+    checkFoodConfig();
+  }, []);
   const navItems = [
     {
       key: "ticket",
       icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-ticket", style: { fontSize: 32 } }),
       label: ""
     },
-    {
-      key: "food",
-      label: "",
-      icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-food", style: { fontSize: 32 } })
-    }
+    ...showFoodMenu ? [
+      {
+        key: "food",
+        label: "",
+        icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-food", style: { fontSize: 32 } })
+      }
+    ] : []
   ];
   const items = [
     {
@@ -87,8 +110,21 @@ var index = (props) => {
         return "Offline";
     }
   };
-  const handleClick = ({ key }) => {
+  const handleClick = async ({ key }) => {
+    var _a, _b;
     if (key === "reload") {
+      try {
+        const { getApp } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
+        const app = getApp();
+        if (app) {
+          app.logger.addLog({
+            type: "info",
+            title: "Reload App"
+          });
+          await ((_b = app == null ? void 0 : app.logger) == null ? void 0 : _b.storeLog());
+        }
+      } catch (err) {
+      }
       window.location.reload();
     }
     if (key === "logout") {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter/types';
 export declare const _formatBookingDetail: (data: any, modalState: any) => any;

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

@@ -448,12 +448,12 @@ var TicketBooking = (props) => {
     };
   }, []);
   const _getProducts = (date) => {
-    var _a2, _b2, _c2, _d2, _e2, _f;
+    var _a2, _b2, _c2, _d2, _e2, _f, _g;
     const currentDate2 = date.format("YYYY-MM-DD");
     const currentDatetime = date.format("YYYY-MM-DD HH:mm:ss");
     const customerId = (_c2 = (_b2 = (_a2 = state.modalState) == null ? void 0 : _a2.client) == null ? void 0 : _b2.value) == null ? void 0 : _c2.id;
     const menuList = ((_f = (_e2 = (_d2 = state.bookingConfig) == null ? void 0 : _d2.config) == null ? void 0 : _e2.menu_list_tab) == null ? void 0 : _f.menu_list) || [];
-    getProductsRef.current({
+    (_g = getProductsRef == null ? void 0 : getProductsRef.current) == null ? void 0 : _g.call(getProductsRef, {
       schedule_date: currentDate2,
       customer_id: customerId,
       menu_list_ids: menuList,

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { Dayjs } from 'dayjs';
 import './index.less';
 interface ITimeBarProps {

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

@@ -41,9 +41,43 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_classnames = __toESM(require("classnames"));
 var import_utils = require("@pisell/utils");
 var import_index = require("./index.less");
+var import_materials2 = require("@pisell/materials");
 var TimeBar = (props) => {
   var _a, _b;
   const { globalState: state, setGlobalState, locale, onCreateClick, setNowTime } = props;
+  const [collapsed, setCollapsed] = (0, import_react.useState)(true);
+  const [scaleCompensation, setScaleCompensation] = (0, import_react.useState)(1);
+  (0, import_react.useEffect)(() => {
+    const getBodyScale = () => {
+      const body = document.body;
+      const computedStyle = window.getComputedStyle(body);
+      const transform = computedStyle.transform;
+      if (transform && transform !== "none") {
+        const matrix = transform.match(/matrix\(([^)]+)\)/);
+        if (matrix) {
+          const values = matrix[1].split(",").map((v) => parseFloat(v.trim()));
+          const scale = values[0] || 1;
+          return scale;
+        }
+      }
+      return 1;
+    };
+    const updateScale = () => {
+      const scale = getBodyScale();
+      setScaleCompensation(scale);
+    };
+    updateScale();
+    const observer = new MutationObserver(updateScale);
+    observer.observe(document.body, {
+      attributes: true,
+      attributeFilter: ["style", "class"]
+    });
+    window.addEventListener("resize", updateScale);
+    return () => {
+      observer.disconnect();
+      window.removeEventListener("resize", updateScale);
+    };
+  }, []);
   const _onClickNext = (0, import_ahooks.useMemoizedFn)(() => {
     var _a2, _b2, _c, _d;
     const currentTime = (_b2 = (_a2 = state.modalState) == null ? void 0 : _a2.date) == null ? void 0 : _b2.value;
@@ -79,8 +113,62 @@ var TimeBar = (props) => {
     });
     (_d = props.setIntervalTime) == null ? void 0 : _d.call(props, timeString === (0, import_dayjs.default)().format("HH:mm"));
   });
+  const _onToggleCollapse = (0, import_ahooks.useMemoizedFn)(() => {
+    setCollapsed(!collapsed);
+  });
   return (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c, _d;
+    var _a2, _b2, _c, _d, _e, _f;
+    if (collapsed) {
+      const currentDate = (_b2 = (_a2 = state == null ? void 0 : state.modalState) == null ? void 0 : _a2.date) == null ? void 0 : _b2.value;
+      const isToday = currentDate && currentDate.isSame((0, import_dayjs.default)(), "day");
+      const displayText = isToday ? import_utils.locales.getText("pisell2.ticket-booking.today") : (currentDate == null ? void 0 : currentDate.format("YYYY-MM-DD")) || "";
+      const targetHeight = 40;
+      const compensatedHeight = targetHeight / scaleCompensation;
+      return /* @__PURE__ */ import_react.default.createElement(
+        "div",
+        {
+          className: (0, import_classnames.default)("pisell-ticket-booking-time-bar", "collapsed"),
+          style: {
+            height: `${compensatedHeight}px`,
+            minHeight: `${compensatedHeight}px`,
+            maxHeight: `${compensatedHeight}px`
+          }
+        },
+        /* @__PURE__ */ import_react.default.createElement(
+          "div",
+          {
+            className: "pisell-ticket-booking-time-bar-collapsed-content",
+            style: {
+              height: `${compensatedHeight}px`
+            }
+          },
+          /* @__PURE__ */ import_react.default.createElement(
+            "span",
+            {
+              className: "pisell-ticket-booking-time-bar-collapsed-today",
+              style: {
+                lineHeight: `${compensatedHeight}px`
+              }
+            },
+            displayText
+          ),
+          /* @__PURE__ */ import_react.default.createElement(
+            import_antd.Button,
+            {
+              type: "link",
+              size: "small",
+              className: "pisell-ticket-booking-time-bar-collapsed-expand",
+              onClick: _onToggleCollapse,
+              style: {
+                lineHeight: `${compensatedHeight}px`
+              }
+            },
+            /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.ticket-booking.expand")),
+            /* @__PURE__ */ import_react.default.createElement(import_materials2.Iconfont, { type: "pisell2-chevron-right-double" })
+          )
+        )
+      );
+    }
     return /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
@@ -116,7 +204,7 @@ var TimeBar = (props) => {
           import_materials.DatePicker,
           {
             inputReadOnly: true,
-            value: (_b2 = (_a2 = state == null ? void 0 : state.modalState) == null ? void 0 : _a2.date) == null ? void 0 : _b2.value,
+            value: (_d = (_c = state == null ? void 0 : state.modalState) == null ? void 0 : _c.date) == null ? void 0 : _d.value,
             format: locale === "en" ? "dddd, DD MMM YYYY" : "YYYY年MM月DD日",
             onChange: props == null ? void 0 : props.onDateChange,
             size: "large",
@@ -142,7 +230,7 @@ var TimeBar = (props) => {
         /* @__PURE__ */ import_react.default.createElement(
           import_materials.SelectTime,
           {
-            value: (_d = (_c = state == null ? void 0 : state.modalState) == null ? void 0 : _c.date) == null ? void 0 : _d.value.format("HH:mm"),
+            value: (_f = (_e = state == null ? void 0 : state.modalState) == null ? void 0 : _e.date) == null ? void 0 : _f.value.format("HH:mm"),
             onChange: _onDateTimeChange,
             popoverProps: {
               style: { zoom: 0.8 }
@@ -172,14 +260,27 @@ var TimeBar = (props) => {
           type: "primary"
         },
         import_utils.locales.getText("pisell2.ticket-booking.create-new")
+      ),
+      /* @__PURE__ */ import_react.default.createElement(
+        import_antd.Button,
+        {
+          type: "link",
+          style: { marginLeft: "auto" },
+          onClick: _onToggleCollapse
+        },
+        /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.ticket-booking.collapse")),
+        /* @__PURE__ */ import_react.default.createElement(import_materials2.Iconfont, { type: "pisell2-chevron-left-double" })
       )
     );
   }, [
+    collapsed,
     (_b = (_a = state.modalState) == null ? void 0 : _a.date) == null ? void 0 : _b.value,
     state.intervalSetTime,
     state.isTimeChange,
     state.isDateChange,
-    locale
+    locale,
+    _onToggleCollapse,
+    scaleCompensation
   ]);
 };
 var timeBar_default = TimeBar;

package/lib/components/ticketBooking/components/timeBar/index.less

@@ -20,4 +20,63 @@
       }
     }
   }
+
+  // 收起状态
+  &.collapsed {
+    position: fixed;
+    bottom: 0;
+    left: 86px;
+    padding: 0;
+    background-color: transparent;
+    display: block;
+    // 高度通过内联样式动态设置以补偿 body 的 scale
+
+    .pisell-ticket-booking-time-bar-collapsed-content {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      width: 100%;
+      // 高度通过内联样式动态设置以补偿 body 的 scale
+      padding: 0 16px;
+      background-color: #fff;
+      border-radius: 0 8px 8px 0;
+      box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
+      box-sizing: border-box;
+      overflow: hidden;
+
+      .pisell-ticket-booking-time-bar-collapsed-today {
+        font-weight: 600;
+        font-size: 18px;
+        color: #000;
+        flex-shrink: 0;
+        margin-right: 16px;
+        // line-height 通过内联样式动态设置
+      }
+
+      .pisell-ticket-booking-time-bar-collapsed-expand {
+        color: #7F56DA;
+        padding: 0;
+        margin: 0;
+        height: auto;
+        font-size: 18px;
+        font-weight: 500;
+        display: inline-flex;
+        align-items: center;
+        flex-shrink: 0;
+        // line-height 通过内联样式动态设置
+
+        &:hover {
+          color: #6941c6;
+        }
+
+        span {
+          margin-right: 2px;
+        }
+        .anticon {
+          margin-left: 0px;
+          margin-right: 0px;
+        }
+      }
+    }
+  }
 }