@pisell/private-materials 6.11.16 → 6.11.18

package/es/components/checkout/hooks/useWalletPass.js

@@ -550,6 +550,7 @@ export var useWalletPass = function useWalletPass(props) {
         title: 'useWalletPass_onOrderCreated onSelectChange 开始调用',
         metadata: {}
       });
+
       // 设置默认选中钱包
       onSelectChange === null || onSelectChange === void 0 || onSelectChange(_select);
     } else {
@@ -699,6 +700,8 @@ export var useWalletPass = function useWalletPass(props) {
         wallet_pass_usage_unit: item.wallet_pass_usage_unit,
         wallet_pass_use_value: item.wallet_pass_use_value
       };
+    }).filter(function (item) {
+      return !!item.amount;
     });
     logger === null || logger === void 0 || logger.addLog({
       type: 'info',

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

@@ -15,7 +15,7 @@ import React, { forwardRef, useCallback, useImperativeHandle, useMemo, useRef, u
 import ProductSelect from "../../../../plus/productSelect";
 import List from "../../../list/List";
 import SkuCard from "../../../../plus/productSelect/ProductCard/SkuCard";
-import { formatSkuDataSource, generateProductTabs } from "./utils";
+import { formatSkuDataSource, generateProductTabs, sortProductsByTabOrder } from "./utils";
 import "./index.less";
 import { locales } from "@pisell/utils";
 /**
@@ -135,6 +135,11 @@ var ProductDisplayAdapter = function ProductDisplayAdapter(props, ref) {
         })) || []
       });
     });
+
+    // 当 isTreeTab 为 false 时，按 tabData 分类顺序排序，再按商品 sort 降序
+    if (!isTreeTab && tabData && Array.isArray(tabData)) {
+      sortProductsByTabOrder(filteredData, tabData);
+    }
     var emptyText = emptyDescription;
     if (Array.isArray(activeTab) && activeTab.length === 0 && keyword === '') {
       emptyText = locales.getText('pisell2.ticket-booking.input-search-to-show-data');

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

@@ -82,4 +82,13 @@ export interface CategoryTreeNode {
  * @returns Switch 模式返回 CategoryTreeNode[]，Anchor 模式返回 TabItem[]
  */
 export declare const generateProductTabs: (products: Product[], tabStyle?: 'switch' | 'anchor', isTreeTab?: boolean) => CategoryTreeNode[] | TabItem[];
+/**
+ * 按 tabData 分类顺序对商品列表排序，同分类内按商品 sort 降序
+ * 仅在 isTreeTab 为 false 时使用
+ *
+ * @param data 商品列表（category 已转为 string[] 格式）
+ * @param tabData 分类 tab 列表（CategoryTreeNode[]）
+ * @returns 排序后的商品列表（原地排序）
+ */
+export declare const sortProductsByTabOrder: (data: any[], tabData: CategoryTreeNode[]) => any[];
 export {};

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

@@ -342,4 +342,36 @@ var buildCategoryTree = function buildCategoryTree(products) {
     return _toConsumableArray(rootNodes);
   }
   return rootNodes;
+};
+
+/**
+ * 按 tabData 分类顺序对商品列表排序，同分类内按商品 sort 降序
+ * 仅在 isTreeTab 为 false 时使用
+ *
+ * @param data 商品列表（category 已转为 string[] 格式）
+ * @param tabData 分类 tab 列表（CategoryTreeNode[]）
+ * @returns 排序后的商品列表（原地排序）
+ */
+export var sortProductsByTabOrder = function sortProductsByTabOrder(data, tabData) {
+  var categoryOrderMap = new Map();
+  tabData.forEach(function (tab, index) {
+    categoryOrderMap.set(String(tab.id), index);
+  });
+  return data.sort(function (a, b) {
+    var _a$category, _b$category, _categoryOrderMap$get, _categoryOrderMap$get2;
+    var aIndex = Math.max(Array.isArray(a.category) ? a.category.length - 1 : 0, 0);
+    var bIndex = Math.max(Array.isArray(b.category) ? b.category.length - 1 : 0, 0);
+    var aCategoryId = (_a$category = a.category) === null || _a$category === void 0 ? void 0 : _a$category[aIndex];
+    var bCategoryId = (_b$category = b.category) === null || _b$category === void 0 ? void 0 : _b$category[bIndex];
+
+    // 按 tabData 分类顺序排序（无分类的排到最后）
+    var aOrder = aCategoryId !== undefined ? (_categoryOrderMap$get = categoryOrderMap.get(String(aCategoryId))) !== null && _categoryOrderMap$get !== void 0 ? _categoryOrderMap$get : Infinity : Infinity;
+    var bOrder = bCategoryId !== undefined ? (_categoryOrderMap$get2 = categoryOrderMap.get(String(bCategoryId))) !== null && _categoryOrderMap$get2 !== void 0 ? _categoryOrderMap$get2 : Infinity : Infinity;
+    if (aOrder !== bOrder) {
+      return aOrder - bOrder;
+    }
+
+    // 同分类内按商品 sort 降序（越大越前）
+    return (b.sort || 0) - (a.sort || 0);
+  });
 };

package/lib/components/checkout/hooks/useWalletPass.js

@@ -494,7 +494,7 @@ var useWalletPass = (props) => {
       code: item.tag,
       wallet_pass_usage_unit: item.wallet_pass_usage_unit,
       wallet_pass_use_value: item.wallet_pass_use_value
-    }));
+    })).filter((item) => !!item.amount);
     logger == null ? void 0 : logger.addLog({
       type: "info",
       title: "useWalletPass_notifySelectChange 通知外部选择变化",

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

@@ -135,6 +135,9 @@ var ProductDisplayAdapter = (props, ref) => {
         category: ((_b = (_a = item.category) == null ? void 0 : _a.map) == null ? void 0 : _b.call(_a, (category) => `${category.id}`)) || []
       };
     });
+    if (!isTreeTab && tabData && Array.isArray(tabData)) {
+      (0, import_utils.sortProductsByTabOrder)(filteredData, tabData);
+    }
     let emptyText = emptyDescription;
     if (Array.isArray(activeTab) && activeTab.length === 0 && keyword === "") {
       emptyText = import_utils2.locales.getText("pisell2.ticket-booking.input-search-to-show-data");

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

@@ -82,4 +82,13 @@ export interface CategoryTreeNode {
  * @returns Switch 模式返回 CategoryTreeNode[]，Anchor 模式返回 TabItem[]
  */
 export declare const generateProductTabs: (products: Product[], tabStyle?: 'switch' | 'anchor', isTreeTab?: boolean) => CategoryTreeNode[] | TabItem[];
+/**
+ * 按 tabData 分类顺序对商品列表排序，同分类内按商品 sort 降序
+ * 仅在 isTreeTab 为 false 时使用
+ *
+ * @param data 商品列表（category 已转为 string[] 格式）
+ * @param tabData 分类 tab 列表（CategoryTreeNode[]）
+ * @returns 排序后的商品列表（原地排序）
+ */
+export declare const sortProductsByTabOrder: (data: any[], tabData: CategoryTreeNode[]) => any[];
 export {};

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

@@ -30,7 +30,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   formatSkuDataSource: () => formatSkuDataSource,
-  generateProductTabs: () => generateProductTabs
+  generateProductTabs: () => generateProductTabs,
+  sortProductsByTabOrder: () => sortProductsByTabOrder
 });
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
@@ -245,8 +246,28 @@ var buildCategoryTree = (products) => {
   }
   return rootNodes;
 };
+var sortProductsByTabOrder = (data, tabData) => {
+  const categoryOrderMap = /* @__PURE__ */ new Map();
+  tabData.forEach((tab, index) => {
+    categoryOrderMap.set(String(tab.id), index);
+  });
+  return data.sort((a, b) => {
+    var _a, _b;
+    const aIndex = Math.max(Array.isArray(a.category) ? a.category.length - 1 : 0, 0);
+    const bIndex = Math.max(Array.isArray(b.category) ? b.category.length - 1 : 0, 0);
+    const aCategoryId = (_a = a.category) == null ? void 0 : _a[aIndex];
+    const bCategoryId = (_b = b.category) == null ? void 0 : _b[bIndex];
+    const aOrder = aCategoryId !== void 0 ? categoryOrderMap.get(String(aCategoryId)) ?? Infinity : Infinity;
+    const bOrder = bCategoryId !== void 0 ? categoryOrderMap.get(String(bCategoryId)) ?? Infinity : Infinity;
+    if (aOrder !== bOrder) {
+      return aOrder - bOrder;
+    }
+    return (b.sort || 0) - (a.sort || 0);
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   formatSkuDataSource,
-  generateProductTabs
+  generateProductTabs,
+  sortProductsByTabOrder
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.16",
+  "version": "6.11.18",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -68,8 +68,8 @@
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
     "@pisell/utils": "3.0.2",
-    "@pisell/icon": "0.0.11",
     "@pisell/materials": "6.11.6",
+    "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.8"
   },
   "peerDependencies": {