@pisell/private-materials 6.7.6 → 6.7.8

package/es/components/schedules/schedules/index.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const SchedulesConnect: () => JSX.Element;
+import React from "react";
+declare const SchedulesConnect: () => React.JSX.Element;
 export default SchedulesConnect;

package/es/components/shoppingCart/Provider.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 export declare const CartContext: React.Context<any>;
-export declare const CartProvider: ({ children, props, onCard, onAction, onChange, onAddProduct, onActiveKey, }: any) => JSX.Element;
+export declare const CartProvider: ({ children, props, onCard, onAction, onChange, onAddProduct, onActiveKey, }: any) => React.JSX.Element;

package/es/components/shoppingCart/components/Cart/Product.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import { ProductProps } from '../../type';
-declare const Product: (props: ProductProps) => JSX.Element;
+declare const Product: (props: ProductProps) => React.JSX.Element;
 export default Product;

package/es/components/shoppingCart/components/Cart/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import './index.less';
-declare const Cart: () => JSX.Element;
+declare const Cart: () => React.JSX.Element;
 export default Cart;

package/es/components/shoppingCart/components/Empty/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
-declare const Empty: (props: any) => JSX.Element;
+declare const Empty: (props: any) => import("react").JSX.Element;
 export default Empty;

package/es/components/shoppingCart/components/Render/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import './index.less';
-declare const Content: () => JSX.Element;
+declare const Content: () => React.JSX.Element;
 export default Content;

package/es/components/shoppingCart/hooks/useAddService.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const useAddService: (id?: number, type?: string) => JSX.Element | null;
+import React from 'react';
+declare const useAddService: (id?: number, type?: string) => React.JSX.Element | null;
 export default useAddService;

package/es/components/shoppingCart/hooks/useClearCart.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const useClearCart: (key?: number | undefined) => JSX.Element | null;
+import React from 'react';
+declare const useClearCart: (key?: number | undefined) => React.JSX.Element | null;
 export default useClearCart;

package/es/components/shoppingCart/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import { shoppingCartProps } from './type';
-declare const shoppingCart: ({ onCard, onAction, onChange, onAddProduct, onActiveKey, ...props }: shoppingCartProps) => JSX.Element;
+declare const shoppingCart: ({ onCard, onAction, onChange, onAddProduct, onActiveKey, ...props }: shoppingCartProps) => React.JSX.Element;
 export default shoppingCart;

package/es/components/subTotal/index.d.ts

@@ -18,5 +18,5 @@ interface SubTotalProps extends React.HTMLAttributes<HTMLDivElement> {
     mode?: 'column1' | 'column2';
     describe?: string;
 }
-declare const SubTotal: (props: SubTotalProps) => JSX.Element;
+declare const SubTotal: (props: SubTotalProps) => React.JSX.Element;
 export default SubTotal;

package/es/components/subTotal/index.js

@@ -62,7 +62,7 @@ var Item = function Item(props) {
     }
     var str = '';
     str = str + (tax === null || tax === void 0 ? void 0 : tax.title);
-    str = str + ' ' + (Number(tax.rate) * 100).toFixed(2) + '%';
+    str = str + ' ' + Number(tax.rate) * 100 + '%';
 
     // 判断税费是 包含在订单内  还是单独的
     if (tax !== null && tax !== void 0 && tax.is_price_include_tax) {

package/es/components/tabProduct/index.d.ts

@@ -12,5 +12,5 @@ export interface TabProductProps {
     stickyTop?: number;
     name?: string | number;
 }
-declare const TabProduct: (props: TabProductProps) => JSX.Element;
+declare const TabProduct: (props: TabProductProps) => React.JSX.Element;
 export default TabProduct;

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

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { SelectProps } from "antd";
+import React from "react";
 import "./index.less";
 interface TaxSelectProps {
     selectProps?: SelectProps;
@@ -8,5 +8,5 @@ interface TaxSelectProps {
     tax_title?: string;
     onChange: (value: string) => void;
 }
-declare const TaxSelect: (props: TaxSelectProps) => JSX.Element;
+declare const TaxSelect: (props: TaxSelectProps) => React.JSX.Element;
 export default TaxSelect;

package/es/components/ticketBooking/components/ProductDisplayAdapter/ProductDisplayAdapter.js

@@ -90,7 +90,6 @@ var ProductDisplayAdapter = function ProductDisplayAdapter(props) {
         })) || []
       });
     });
-    console.log(tabData, 'tabData123');
     return /*#__PURE__*/React.createElement("div", {
       className: "sku-list-container ".concat(className || ''),
       style: style,

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

@@ -28,8 +28,6 @@ interface ProductCategory {
     icon?: string;
     slug?: string;
     sort?: number;
-    /** 父级分类 ID，0 或 null/undefined 表示一级分类 */
-    parent_id?: number | null;
 }
 /**
  * 产品项接口
@@ -40,42 +38,13 @@ 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 Switch 模式返回 CategoryTreeNode[]，Anchor 模式返回 TabItem[]
+ * @returns TabItem 数组
  */
-export declare const generateProductTabs: (products: Product[], tabStyle?: 'switch' | 'anchor') => CategoryTreeNode[] | TabItem[];
+export declare const generateProductTabs: (products: Product[], tabStyle?: 'switch' | 'anchor') => TabItem[];
 export {};

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

@@ -1,7 +1,3 @@
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -38,32 +34,55 @@ export var formatSkuDataSource = function formatSkuDataSource(dataSource) {
  * 产品项接口
  */
 
-/**
- * 分类树节点接口（Switch 模式返回值）
- */
-
 /**
  * 根据产品数据生成分类 Tabs（Switch 模式）
  * 参考 TestResponsiveWrapper 的 generateSimpleTabItems 函数
  * 
  * @param products 产品列表
  * @param tabStyle tab 样式类型
- * @returns Switch 模式返回 CategoryTreeNode[]，Anchor 模式返回 TabItem[]
+ * @returns TabItem 数组
  */
 export var generateProductTabs = function generateProductTabs(products) {
   var tabStyle = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'switch';
   if (!products || products.length === 0) {
-    if (tabStyle === 'switch') {
-      return [];
-    }
     return [{
       key: 'all',
       label: locales.getText('pisell2.ticket-booking.all')
     }];
   }
   if (tabStyle === 'switch') {
-    // 切换模式：构建多级分类树形结构
-    return buildCategoryTree(products);
+    // 切换模式：提取产品的分类信息，不显示动态数量
+    var categoryMap = new Map();
+
+    // 收集所有分类
+    products.forEach(function (product) {
+      if (product.category && Array.isArray(product.category)) {
+        product.category.forEach(function (cat) {
+          if (!categoryMap.has(cat.id)) {
+            categoryMap.set(cat.id, cat);
+          }
+        });
+      }
+    });
+
+    // 按 sort 字段排序（降序，sort 越大越靠前）
+    var sortedCategories = Array.from(categoryMap.values()).sort(function (a, b) {
+      return (b.sort || 0) - (a.sort || 0);
+    });
+
+    // 生成 tabs
+    var tabs = [{
+      key: 'all',
+      label: locales.getText('pisell2.ticket-booking.all')
+    }];
+    sortedCategories.forEach(function (category) {
+      tabs.push({
+        key: String(category.id),
+        label: category.name,
+        group: String(category.id)
+      });
+    });
+    return tabs;
   } else {
     // 锚点模式：基于实际数据统计数量
     var categoryCount = products.reduce(function (acc, product) {
@@ -83,7 +102,7 @@ export var generateProductTabs = function generateProductTabs(products) {
     }, {});
 
     // 生成 tabs
-    var tabs = [{
+    var _tabs = [{
       key: 'all',
       label: "".concat(locales.getText('pisell2.ticket-booking.all'), " (").concat(products.length, ")")
     }];
@@ -102,134 +121,12 @@ export var generateProductTabs = function generateProductTabs(products) {
         _ref6$ = _ref6[1],
         count = _ref6$.count,
         category = _ref6$.category;
-      tabs.push({
+      _tabs.push({
         key: key,
         label: "".concat(category.name, " (").concat(count, ")"),
         group: key
       });
     });
-    return tabs;
-  }
-};
-
-/**
- * 构建分类树形结构（Switch 模式专用）
- * 
- * @param products 产品列表
- * @returns CategoryTreeNode[] 树形分类结构
- */
-var buildCategoryTree = function buildCategoryTree(products) {
-  // 1. 收集所有分类及其对应的商品 ID
-  var categoryMap = new Map();
-  var categoryProductMap = new Map();
-  products.forEach(function (product) {
-    if (product.category && Array.isArray(product.category)) {
-      product.category.forEach(function (cat) {
-        // 收集分类信息
-        if (!categoryMap.has(cat.id)) {
-          categoryMap.set(cat.id, cat);
-        }
-        // 收集分类对应的商品 ID
-        if (!categoryProductMap.has(cat.id)) {
-          categoryProductMap.set(cat.id, new Set());
-        }
-        categoryProductMap.get(cat.id).add(product.id);
-      });
-    }
-  });
-
-  // 2. 构建父子关系映射
-  var childrenMap = new Map();
-  var rootCategories = [];
-  categoryMap.forEach(function (category, id) {
-    var parentId = category.parent_id;
-    // parent_id 为 0、null 或 undefined 表示一级分类
-    if (!parentId || parentId === 0) {
-      rootCategories.push(id);
-    } else {
-      if (!childrenMap.has(parentId)) {
-        childrenMap.set(parentId, []);
-      }
-      childrenMap.get(parentId).push(id);
-    }
-  });
-
-  // 3. 按 sort 字段排序
-  var sortBySort = function sortBySort(ids) {
-    return ids.sort(function (a, b) {
-      var catA = categoryMap.get(a);
-      var catB = categoryMap.get(b);
-      return ((catB === null || catB === void 0 ? void 0 : catB.sort) || 0) - ((catA === null || catA === void 0 ? void 0 : catA.sort) || 0);
-    });
-  };
-
-  /**
-   * 递归构建分类节点
-   * 
-   * @param categoryId 分类 ID
-   * @param parentPath 父级路径（用于生成 pid）
-   * @returns CategoryTreeNode 分类节点
-   */
-  var buildNode = function buildNode(categoryId, parentPath) {
-    var category = categoryMap.get(categoryId);
-    var childIds = childrenMap.get(categoryId) || [];
-    var sortedChildIds = sortBySort(_toConsumableArray(childIds));
-
-    // 当前分类直接关联的商品 ID
-    var directProductIds = Array.from(categoryProductMap.get(categoryId) || []);
-
-    // 计算当前节点的 pid
-    var currentPath = parentPath ? "".concat(parentPath, "_").concat(categoryId) : String(categoryId);
-    var pid = parentPath || undefined;
-
-    // 基础节点
-    var node = {
-      id: categoryId,
-      key: categoryId,
-      group: categoryId,
-      label: category.name,
-      name: category.name,
-      icon: category.icon,
-      productIds: directProductIds
-    };
-
-    // 添加 pid（一级分类没有 pid）
-    if (pid) {
-      node.pid = pid;
-    }
-
-    // 如果有子分类，递归构建
-    if (sortedChildIds.length > 0) {
-      var childNodes = sortedChildIds.map(function (childId) {
-        return buildNode(childId, currentPath);
-      });
-
-      // 递归汇总所有子分类的商品 ID
-      var allChildProductIds = childNodes.reduce(function (acc, child) {
-        return acc.concat(child.productIds);
-      }, []);
-
-      // 合并当前分类和所有子分类的商品 ID（去重）
-      var mergedProductIds = Array.from(new Set([].concat(directProductIds, _toConsumableArray(allChildProductIds))));
-      node.productIds = mergedProductIds;
-      node.children = _toConsumableArray(childNodes);
-    }
-    return node;
-  };
-
-  // 4. 从根分类开始构建树
-  var sortedRootIds = sortBySort([].concat(rootCategories));
-  var rootNodes = sortedRootIds.map(function (rootId) {
-    return buildNode(rootId, '');
-  });
-
-  // 5. 如果有根分类，在根级别追加 All 节点
-  if (rootNodes.length > 0) {
-    // 汇总所有根分类的商品 ID
-    var allProductIds = Array.from(new Set(rootNodes.flatMap(function (node) {
-      return node.productIds;
-    })));
-    return _toConsumableArray(rootNodes);
+    return _tabs;
   }
-  return rootNodes;
 };

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

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter';
 import './index.less';
 interface AddServiceProps {
@@ -28,5 +28,5 @@ interface AddServiceProps {
      */
     productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
 }
-declare const AddSerivce: (props: AddServiceProps) => JSX.Element | null;
+declare const AddSerivce: (props: AddServiceProps) => React.JSX.Element | null;
 export default AddSerivce;

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

@@ -60,6 +60,7 @@ var AddSerivce = function AddSerivce(props) {
   var context = useEngineContext();
   var platform = usePlatform();
   var notAvailableRef = useRef(null);
+  var isLoadedServiceRef = useRef(false);
   request.setRequest(context.appHelper.utils.request);
   var isActive = useIsActive();
   var Toast = useToast();
@@ -207,6 +208,90 @@ var AddSerivce = function AddSerivce(props) {
       setHandleSetService(scanAddService);
     }
   }, [isActive]);
+
+  /*
+  const removeNotAvailableService = (list: any) => {
+    if (!stateRef.current?.service?.value?.length) return;
+    const listMap = list.reduce((acc: any, cur: any) => {
+      acc[cur.id] = cur;
+      return acc;
+    }, {});
+    const newValue = (stateRef.current?.service?.value || []).filter(
+      (item: any) => listMap[item.product_id]
+    );
+    dispatch({
+      type: 'setService',
+      payload: {
+        value: newValue,
+        edit: true,
+      },
+    });
+  };
+   const getServices = async (params?: any) => {
+    setLoading(true);
+    // 活动预约如果没有绑定商品id不查询
+    if (
+      state.renderType === 'eventBooking' &&
+      !state.eventOtherParams?.productIds?.length
+    ) {
+      dispatch({
+        type: 'setService',
+        payload: {
+          services: [],
+        },
+      });
+      setLoading(false);
+      return;
+    }
+     let data = await getProductList({
+      skip: 1,
+      num: 500,
+      // extension_type: state.productExtensionType,
+      exclude_extension_type: [
+        'product_party',
+        'product_event',
+        'product_series_event',
+        'product_package_ticket',
+        'ticket',
+        'event_item',
+      ],
+      with: ['category'],
+      open_quotation: 1,
+      with_schedule: 1,
+      with_count: ['bundleGroup', 'optionGroup'],
+      order_by_string: 'sort:desc',
+      status: 'published',
+      schedule_date: params?.schedule_date,
+      schedule_datetime: params?.schedule_datetime,
+      customer_id: params?.customer_id,
+      menu_list_ids: params?.menu_list_ids,
+      _config: {
+        fullResult: true,
+        customResponse: true,
+      },
+    });
+     setLoading(false);
+     if (data?.code === 607100) {
+      // 第一次加载时，或者之前有数据
+      if (!isLoadedServiceRef.current || state.service?.services?.length) {
+        notAvailableRef.current?.open();
+      }
+    }
+     // 只有自动获取列表的时候才设置商品, 手动点击添加按钮的时候不设置
+    if (!state.service.addModal) {
+      setDefaultService(data?.data?.list);
+    }
+     removeNotAvailableService(data?.data?.list);
+     isLoadedServiceRef.current = true;
+     dispatch({
+      type: 'setService',
+      payload: {
+        services: data?.data?.list || [],
+      },
+    });
+  };
+  */
+
   var handleAddToast = function handleAddToast(title, quantity) {
     var _Toast$success;
     Toast === null || Toast === void 0 || (_Toast$success = Toast.success) === null || _Toast$success === void 0 || _Toast$success.call(Toast, /*#__PURE__*/React.createElement("div", {
@@ -763,7 +848,6 @@ var AddSerivce = function AddSerivce(props) {
           },
           new: 1,
         };
-        cacheItem._extend.price = getMainPrice(cacheItem,_detail.price);
         let _total = getProductTotalPrice(cacheItem);
         // 用于折扣 可修改
         cacheItem._extend.total = _total;
@@ -792,7 +876,7 @@ var AddSerivce = function AddSerivce(props) {
            cacheItem._serviceKey = genServiceKey(cacheItem);
            const val = getCurrentServiceValue();
           let { list: _list, quantity } = addService(
-            [...stateRef.current.service.value],
+            [...val],
             cacheItem,
             stateRef.current
           );

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

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter/types';
 interface AddServiceVariantProps {
     globalState: any;
@@ -7,5 +7,5 @@ interface AddServiceVariantProps {
     onGetProductsReady?: (getProducts: any) => void;
     productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
 }
-declare const AddServiceVariant: (props: AddServiceVariantProps) => JSX.Element;
+declare const AddServiceVariant: (props: AddServiceVariantProps) => React.JSX.Element;
 export default AddServiceVariant;

package/es/components/ticketBooking/components/floatButtons/index.d.ts

@@ -7,5 +7,5 @@ interface FloatButtonsProps {
         key: string;
     }[];
 }
-declare const FloatButtons: (props: FloatButtonsProps) => JSX.Element;
+declare const FloatButtons: (props: FloatButtonsProps) => React.JSX.Element;
 export default FloatButtons;

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

@@ -1,8 +1,8 @@
-/// <reference types="react" />
+import React from 'react';
 import './index.less';
 interface MenuBarProps {
     activeNavKey?: string;
     onNavChange?: (key: string) => void;
 }
-declare const index: (props: MenuBarProps) => JSX.Element;
+declare const index: (props: MenuBarProps) => React.JSX.Element;
 export default index;