@pisell/private-materials 6.7.7 → 6.7.8

package/es/components/checkout/utils/PaymentResultToastUtils.js

@@ -140,17 +140,15 @@ export var displayPaymentResultToast = /*#__PURE__*/function () {
           }
           _context.next = 5;
           return showPaymentResultToastSuccess({
-            mask: !(autoCloseConfig !== null && autoCloseConfig !== void 0 && autoCloseConfig.autoClose) || false,
             title: calculateTitle(paymentStatus),
             subtitle: calculateSubtitle(paymentStatus, orderTotalAmount, gapAmount, getData),
             autoClose: (autoCloseConfig === null || autoCloseConfig === void 0 ? void 0 : autoCloseConfig.autoClose) || false,
             autoCloseDelay: (autoCloseConfig === null || autoCloseConfig === void 0 ? void 0 : autoCloseConfig.autoCloseDelay) || 3000,
-            clickOutsideToClose: (autoCloseConfig === null || autoCloseConfig === void 0 ? void 0 : autoCloseConfig.autoClose) || false,
             showCountdownProgress: true,
             actionButtons: actionButtons || [],
             onClose: onToastClose || function () {},
             // 提供默认空函数
-            closable: !(autoCloseConfig !== null && autoCloseConfig !== void 0 && autoCloseConfig.autoClose) // 控制关闭按钮显示
+            closable: false // 控制关闭按钮显示
           });
         case 5:
           _context.next = 15;
@@ -162,14 +160,10 @@ export var displayPaymentResultToast = /*#__PURE__*/function () {
           }
           _context.next = 10;
           return showPaymentResultToastSuccess({
-            mask: !(autoCloseConfig !== null && autoCloseConfig !== void 0 && autoCloseConfig.autoClose) || false,
             title: calculateTitle(paymentStatus),
             subtitle: calculateSubtitle(paymentStatus, orderTotalAmount, gapAmount, getData),
             autoClose: (autoCloseConfig === null || autoCloseConfig === void 0 ? void 0 : autoCloseConfig.autoClose) || false,
             actionButtons: actionButtons || [],
-            clickOutsideToClose: (autoCloseConfig === null || autoCloseConfig === void 0 ? void 0 : autoCloseConfig.autoClose) || false,
-            closable: !(autoCloseConfig !== null && autoCloseConfig !== void 0 && autoCloseConfig.autoClose),
-            // 控制关闭按钮显示
             onClose: onToastClose || function () {} // 提供默认空函数
           });
         case 10:
@@ -182,14 +176,10 @@ export var displayPaymentResultToast = /*#__PURE__*/function () {
           }
           _context.next = 15;
           return showPaymentResultToastFailed({
-            mask: !(autoCloseConfig !== null && autoCloseConfig !== void 0 && autoCloseConfig.autoClose) || false,
             title: calculateTitle(paymentStatus, failureReason),
             subtitle: calculateSubtitle(paymentStatus, orderTotalAmount / 100, gapAmount, getData),
             autoClose: (autoCloseConfig === null || autoCloseConfig === void 0 ? void 0 : autoCloseConfig.autoClose) || false,
             actionButtons: actionButtons || [],
-            clickOutsideToClose: (autoCloseConfig === null || autoCloseConfig === void 0 ? void 0 : autoCloseConfig.autoClose) || false,
-            closable: !(autoCloseConfig !== null && autoCloseConfig !== void 0 && autoCloseConfig.autoClose),
-            // 控制关闭按钮显示
             onClose: onToastClose || function () {} // 提供默认空函数
           });
         case 15:

package/es/components/eftpos/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

package/es/components/eftposPay/hooks.d.ts

@@ -15,7 +15,7 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;

package/es/components/eftposPay/linkly/hooks/useTimeQuery.js

@@ -14,8 +14,6 @@ import { LinklyActionStatus } from "../const";
 var GlobalTimeout = 1000 * 60 * 2;
 // 单次请求超时时间
 var RequestTimeout = 1000 * 5;
-// 轮询间隔时间（2秒）
-var QUERY_INTERVAL = 1000 * 2;
 export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, handleLinklySuccess) {
   var dispatch = useDispatch();
   var _useStoreRef = useStoreRef(),
@@ -40,8 +38,6 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
   var isQueryFinishedRef = useRef(true);
   // 每轮查询的唯一标识
   var queryIdRef = useRef(null);
-  // 轮询间隔定时器
-  var queryIntervalTimerRef = useRef(null);
   var _resultQuery = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _deviceRef$current;
@@ -110,9 +106,9 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
                 console.log('交易状态为0需要继续查询');
                 _log("Querying", result);
                 isQueryFinishedRef.current = false;
-                queryIntervalTimerRef.current = setTimeout(function () {
+                setTimeout(function () {
                   _resultQuery();
-                }, QUERY_INTERVAL);
+                }, 1500);
                 return;
               }
 
@@ -161,9 +157,9 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
                 _log("AbortError");
                 console.log('Error: 请求被取消，将继续查询');
                 isQueryFinishedRef.current = false;
-                queryIntervalTimerRef.current = setTimeout(function () {
+                setTimeout(function () {
                   _resultQuery();
-                }, QUERY_INTERVAL);
+                }, 1500);
                 return;
               }
 
@@ -172,9 +168,9 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
                 _log("NetworkError");
                 console.log('Error: 网关类报错，将继续查询');
                 isQueryFinishedRef.current = false;
-                queryIntervalTimerRef.current = setTimeout(function () {
+                setTimeout(function () {
                   _resultQuery();
-                }, QUERY_INTERVAL);
+                }, 1500);
                 return;
               }
               _log("Error", error);
@@ -246,10 +242,6 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
       clearTimeout(requestTimeoutIdRef.current);
       requestTimeoutIdRef.current = null;
     }
-    if (queryIntervalTimerRef.current) {
-      clearTimeout(queryIntervalTimerRef.current);
-      queryIntervalTimerRef.current = null;
-    }
     if (controllerRef.current) {
       controllerRef.current.abort();
       controllerRef.current = null;

package/es/components/eftposPay/payo/config.js

@@ -27,7 +27,6 @@ import { getUuid, getPayParams } from "../helper";
 import { useFail, useStoreRef } from "../hooks";
 import { useContextData, useDispatch, updateNextStep, updateComponent, updateState, updateCustom } from "../store";
 import { useValidate } from "./hooks";
-import { usePayment, ActionType } from "./payment";
 
 // 注意断网与卸载未完成的回调将终止处理
 export var POS = function POS(_ref) {
@@ -60,16 +59,6 @@ export var POS = function POS(_ref) {
   var _useValidate = useValidate(1000 * 60),
     _useValidate2 = _slicedToArray(_useValidate, 1),
     check = _useValidate2[0];
-  var _usePayment = usePayment({
-      payApi: api.pay,
-      checkApi: api.check,
-      shouldContinue: function shouldContinue() {
-        // 无网 或 已卸载 则不进行处理
-        return !(unloadRef.current || !netRef.current);
-      }
-    }),
-    paymentRun = _usePayment.run,
-    paymentClean = _usePayment.clean;
   useEffect(function () {
     failRef.current = fail;
   }, [fail]);
@@ -162,18 +151,17 @@ export var POS = function POS(_ref) {
     }));
     controllerRef.current = new AbortController();
     // 支付 or 退款
-    var isPay = modeRef.current === ModeEnum.Pay || modeRef.current === ModeEnum.FullPay;
-    var apiParams = isPay ? _objectSpread(_objectSpread({}, custom !== null && custom !== void 0 && custom.platform ? {
+    var resultPromise = modeRef.current === ModeEnum.Pay || modeRef.current === ModeEnum.FullPay ? api.pay(_objectSpread(_objectSpread({}, custom !== null && custom !== void 0 && custom.platform ? {
       operator_id: custom.operator_id,
       operator_type: custom.operator_type,
       platform: custom.platform,
-      custom_payment_id: custom.custom_payment_id
-    } : {}), {}, {
-      original_amount: payRef.current.amount,
+      custom_payment_id: custom.custom_payment_id,
       service_charge: {
         amount: payRef.current.surMoney,
         percentage: payRef.current.surPercentRate
       },
+      original_amount: payRef.current.amount
+    } : {}), {}, {
       order_id: orderIdRef.current,
       amount: payRef.current.total,
       card_reader_type: eftposRef.current,
@@ -182,7 +170,9 @@ export var POS = function POS(_ref) {
       pay_param_base64: encodeURIComponent(btoa(encodeURIComponent(JSON.stringify(_objectSpread(_objectSpread({}, dataRef.current), {}, {
         number: numRef.current
       })))))
-    }) : {
+    }), {
+      signal: controllerRef.current.signal
+    }) : api.refund({
       order_id: orderIdRef.current,
       amount: amountRef.current,
       card_reader_type: eftposRef.current,
@@ -191,58 +181,31 @@ export var POS = function POS(_ref) {
       pay_param_base64: encodeURIComponent(btoa(encodeURIComponent(JSON.stringify(_objectSpread(_objectSpread({}, dataRef.current), {}, {
         number: numRef.current
       })))))
-    };
-    // const resultPromise = isPay
-    //   ? api.pay(apiParams, { signal: controllerRef.current.signal })
-    //   : api.refund(apiParams, { signal: controllerRef.current.signal });
-
-    // 支付场景单独接入新的流程 
-    if (isPay) {
-      var _deviceRef$current4;
-      paymentRun({
-        paymentType: ActionType.Pay,
-        paymentNum: numRef.current,
-        orderId: orderIdRef.current,
-        deviceId: (_deviceRef$current4 = deviceRef.current) === null || _deviceRef$current4 === void 0 ? void 0 : _deviceRef$current4.id,
-        params: apiParams,
-        callbacks: {
-          onSuccess: function onSuccess(res) {
-            success(res);
-          },
-          onError: function onError(err) {
-            console.log('err = >>>>>', err);
-            failRef.current(err, true);
-          }
-        }
-      });
-      return;
-    } else {
-      var resultPromise = api.refund(apiParams, {
-        signal: controllerRef.current.signal
-      });
-      resultPromise.then(function (res) {
-        console.log('netRef.current111 = ', netRef.current);
-        if (unloadRef.current || !netRef.current) {
-          return;
-        }
-        if (res && "".concat(res.code) === '200') {
-          success(res);
-          return;
-        }
-        return Promise.reject(res);
-      }).catch(function (err) {
-        console.log('netRef.current222 = ', netRef.current, unloadRef.current, err);
-        if (unloadRef.current || !netRef.current) {
-          return;
-        }
-        // 支付接口超时 进行支付状态查询（超时或者其它错误）
-        if (!(err !== null && err !== void 0 && err.code) || "".concat(err.code) === PayStatus.Timeout) {
-          checkApi();
-          return;
-        }
-        failRef.current(err, true);
-      });
-    }
+    }, {
+      signal: controllerRef.current.signal
+    });
+    resultPromise.then(function (res) {
+      console.log('netRef.current111 = ', netRef.current);
+      if (unloadRef.current || !netRef.current) {
+        return;
+      }
+      if (res && "".concat(res.code) === '200') {
+        success(res);
+        return;
+      }
+      return Promise.reject(res);
+    }).catch(function (err) {
+      console.log('netRef.current222 = ', netRef.current, unloadRef.current, err);
+      if (unloadRef.current || !netRef.current) {
+        return;
+      }
+      // 支付接口超时 进行支付状态查询（超时或者其它错误）
+      if (!(err !== null && err !== void 0 && err.code) || "".concat(err.code) === PayStatus.Timeout) {
+        checkApi();
+        return;
+      }
+      failRef.current(err, true);
+    });
   }, [api, check, dispatch, onChange]);
   useEffect(function () {
     return function () {
@@ -252,7 +215,6 @@ export var POS = function POS(_ref) {
       if (clearRef.current) {
         clearTimeout(clearRef.current);
       }
-      paymentClean();
     };
   }, []);
   return /*#__PURE__*/React.createElement(Step, props);

package/es/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "success" | "warn" | "fail" | "question";
+        status: "loading" | "warn" | "success" | "fail" | "question";
     };
 };
 /**
@@ -295,10 +295,10 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
+        mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
         eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
-        action?: "deviceList" | "amount" | "pay" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/es/components/eftposPay/tyro/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 获取 Tyro 资源
  * @description:

package/es/components/eftposPay/tyro/index.js

@@ -180,12 +180,6 @@ export default (function (_ref) {
       response: {},
       metadata: {
         receipt: []
-      },
-      _config: {
-        retry: {
-          count: 10,
-          delay: 500
-        }
       }
     }).then(function (res) {
       requestIdRef.current = res.data.id;
@@ -260,12 +254,6 @@ export default (function (_ref) {
       response: {},
       metadata: {
         receipt: []
-      },
-      _config: {
-        retry: {
-          count: 10,
-          delay: 500
-        }
       }
     }).then(function (res) {
       requestIdRef.current = res.data.id;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { CalendarItemProps } from '../../../../../type';
 declare const Item: (props: CalendarItemProps) => import("react").JSX.Element;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts

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

package/es/components/index.d.ts

@@ -20,5 +20,4 @@ import StepController from './stepController';
 import PinModal from './pinModal';
 import PinVerifyModal from './pinVerifyModal';
 import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from './authentication/admin';
-import Registry from './systemSettings/registry';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, Registry, };
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, };

package/es/components/index.js

@@ -20,5 +20,4 @@ import StepController from "./stepController";
 import PinModal from "./pinModal";
 import PinVerifyModal from "./pinVerifyModal";
 import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from "./authentication/admin";
-import Registry from "./systemSettings/registry";
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, Registry };
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth };

package/es/components/list/List.js

@@ -1,4 +1,9 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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); }
@@ -6,14 +11,10 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 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); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React, { useEffect, useMemo, useRef, useCallback, cloneElement, isValidElement } from 'react';
 import { Button } from 'antd';
 import classNames from 'classnames';
+import Tab from "./components/Tab";
 import Pagination from "./components/Pagination";
 import EmptyState from "./components/EmptyState";
 import ScrollLoader from "./components/ScrollLoader";
@@ -21,13 +22,12 @@ import WaterfallList from "./components/WaterfallList";
 import ListItemSkeleton from "./components/ListItemSkeleton";
 import TabSkeleton from "./components/TabSkeleton";
 import "./List.less";
-import { Iconfont, PisellTabbar } from '@pisell/materials';
+import { Iconfont } from '@pisell/materials';
 // import { locales } from '@pisell/utils';
 import listLocales from "./locales";
 import useWaterfall from "./hooks/useWaterfall";
 import { useListState } from "./hooks/useListState";
 import useEngineContext from "../../hooks/useEngineContext";
-import { findProductIdsByPath } from "./utils";
 
 // 虚假数据常量，用于loading状态
 var MOCK_LIST_DATA = function () {
@@ -145,7 +145,6 @@ var List = function List(props) {
       externalCurrentPage: pagination === null || pagination === void 0 ? void 0 : pagination.current,
       tabItems: tabItems,
       defaultPageSize: defaultPageSize,
-      tabStyle: tabStyle,
       onLoadData: onLoadData
     }),
     listState = _useListState.state,
@@ -175,11 +174,6 @@ var List = function List(props) {
     // 否则使用严格相等比较
     return fieldValue === targetValue;
   };
-  var dataIdMap = useMemo(function () {
-    return data.reduce(function (pre, cur) {
-      return _objectSpread(_objectSpread({}, pre), {}, _defineProperty({}, cur.id, cur));
-    }, {});
-  }, [data]);
 
   // 数据分组处理 - 按tab分组数据
   var processedData = useMemo(function () {
@@ -279,51 +273,40 @@ var List = function List(props) {
           items: filteredData
         }];
       }
-      if (Array.isArray(activeTab)) {
-        var productIds = findProductIdsByPath(tabItems, activeTab, 0);
-        var items = productIds.map(function (id) {
-          return dataIdMap[id];
-        });
-        return [{
-          tabKey: activeTab,
-          tabLabel: "",
-          items: items
-        }];
-      } else {
-        // 查找当前选中的tab
-        var currentTab = tabItems.find(function (tab) {
-          return tab.key === activeTab;
+
+      // 查找当前选中的tab
+      var currentTab = tabItems.find(function (tab) {
+        return tab.key === activeTab;
+      });
+      if (currentTab && currentTab.group) {
+        // 如果tab项有group属性，使用group值进行过滤
+        var filterField = 'category'; // 固定使用category字段，因为测试数据都使用这个字段
+        filteredData = filteredData.filter(function (item) {
+          return matchesFieldValue(item[filterField], currentTab.group);
         });
-        if (currentTab && currentTab.group) {
-          // 如果tab项有group属性，使用group值进行过滤
-          var filterField = 'category'; // 固定使用category字段，因为测试数据都使用这个字段
-          filteredData = filteredData.filter(function (item) {
-            return matchesFieldValue(item[filterField], currentTab.group);
-          });
-        } else if (currentTab) {
-          // 如果没有group属性，假设tab的key就是要过滤的值
-          var possibleFields = ['category', 'status', 'type', tabGroup];
-          var _loop2 = function _loop2() {
-            var field = _possibleFields[_i];
-            if (field && field !== '字段' && filteredData.some(function (item) {
+      } else if (currentTab) {
+        // 如果没有group属性，假设tab的key就是要过滤的值
+        var possibleFields = ['category', 'status', 'type', tabGroup];
+        var _loop2 = function _loop2() {
+          var field = _possibleFields[_i];
+          if (field && field !== '字段' && filteredData.some(function (item) {
+            return matchesFieldValue(item[field], activeTab);
+          })) {
+            filteredData = filteredData.filter(function (item) {
               return matchesFieldValue(item[field], activeTab);
-            })) {
-              filteredData = filteredData.filter(function (item) {
-                return matchesFieldValue(item[field], activeTab);
-              });
-              return 1; // break
-            }
-          };
-          for (var _i = 0, _possibleFields = possibleFields; _i < _possibleFields.length; _i++) {
-            if (_loop2()) break;
+            });
+            return 1; // break
           }
+        };
+        for (var _i = 0, _possibleFields = possibleFields; _i < _possibleFields.length; _i++) {
+          if (_loop2()) break;
         }
-        return [{
-          tabKey: activeTab,
-          tabLabel: (currentTab === null || currentTab === void 0 ? void 0 : currentTab.label) || '',
-          items: filteredData
-        }];
       }
+      return [{
+        tabKey: activeTab,
+        tabLabel: (currentTab === null || currentTab === void 0 ? void 0 : currentTab.label) || '',
+        items: filteredData
+      }];
     }
   }, [data, activeTab, tabItems, tabGroup, tabStyle, loading]);
 
@@ -709,9 +692,10 @@ var List = function List(props) {
     return /*#__PURE__*/React.createElement("div", {
       ref: headerRef,
       className: headerClasses
-    }, /*#__PURE__*/React.createElement(PisellTabbar, {
-      dataSource: tabItems,
-      value: activeTab,
+    }, /*#__PURE__*/React.createElement(Tab, {
+      className: classNames('pisell-list-tabs', "pisell-list-tabs-".concat(tabStyle)),
+      activeKey: activeTab,
+      items: tabItems,
       onChange: handleTabChangeWithScroll
     }));
   };

package/es/components/list/hooks/useListState.d.ts

@@ -6,7 +6,7 @@ export interface ListState {
 }
 export declare type ListAction = {
     type: 'SET_ACTIVE_TAB';
-    payload: string[] | string;
+    payload: string;
 } | {
     type: 'SET_CURRENT_PAGE';
     payload: number;
@@ -25,8 +25,6 @@ export interface UseListStateProps {
     defaultPageSize: number;
     /** 数据加载回调 */
     onLoadData?: (params: LoadDataParams) => void;
-    /** tab样式 */
-    tabStyle: 'anchor' | 'switch' | 'none';
 }
 export interface UseListStateReturn {
     state: ListState;
@@ -34,7 +32,7 @@ export interface UseListStateReturn {
     setCurrentPage: (page: number) => void;
     setStickyActive: (active: boolean) => void;
     resetPage: () => void;
-    handleTabChange: (key: string[] | string) => void;
+    handleTabChange: (key: string) => void;
     handlePageChange: (page: number, size?: number) => void;
     handleShowSizeChange: (current: number, size: number) => void;
     handleLoadMore: () => void;
@@ -42,4 +40,4 @@ export interface UseListStateReturn {
     handleScrollLoad: () => void;
     actualCurrentPage: number;
 }
-export declare const useListState: ({ externalCurrentPage, tabItems, defaultPageSize, onLoadData, tabStyle, }: UseListStateProps) => UseListStateReturn;
+export declare const useListState: ({ externalCurrentPage, tabItems, defaultPageSize, onLoadData, }: UseListStateProps) => UseListStateReturn;

package/es/components/list/hooks/useListState.js

@@ -10,7 +10,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { useReducer, useCallback, useEffect, useRef } from 'react';
+import { useReducer, useCallback } from 'react';
 
 // 状态接口
 
@@ -48,32 +48,17 @@ export var useListState = function useListState(_ref) {
   var externalCurrentPage = _ref.externalCurrentPage,
     tabItems = _ref.tabItems,
     defaultPageSize = _ref.defaultPageSize,
-    onLoadData = _ref.onLoadData,
-    tabStyle = _ref.tabStyle;
+    onLoadData = _ref.onLoadData;
   // 初始状态
   var initialState = {
     activeTab: tabItems.length > 0 ? tabItems[0].key : 'all',
     currentPage: 1,
     isStickyActive: false
   };
-
-  // 是否设置过默认tab
-  var isSetDefaultTabRef = useRef(false);
   var _useReducer = useReducer(listStateReducer, initialState),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
-  useEffect(function () {
-    if (tabStyle === 'switch' && tabItems.length > 0 && !isSetDefaultTabRef.current) {
-      var _tabItems$;
-      isSetDefaultTabRef.current = true;
-      var defaultTab = [tabItems[0].key];
-      if (((_tabItems$ = tabItems[0]) === null || _tabItems$ === void 0 || (_tabItems$ = _tabItems$.children) === null || _tabItems$ === void 0 ? void 0 : _tabItems$.length) > 0) {
-        defaultTab.push('0');
-      }
-      setActiveTab(defaultTab);
-    }
-  }, [tabItems, tabStyle]);
 
   // 计算实际使用的当前页码
   var actualCurrentPage = externalCurrentPage || state.currentPage;

package/es/components/list/styles/header.less

@@ -58,12 +58,12 @@
       top: 0;
       z-index: 10;
       /* 毛玻璃效果 */
-      background: transparent;
+      background: rgba(255, 255, 255, 0.80);
       backdrop-filter: blur(12px);
-      padding: 0;
+      border-bottom: 1px solid #D0D5DD;
+      padding-bottom: 12px;
       box-shadow: 0px 1px 2px rgba(16, 24, 40, 0.05);
       transition: box-shadow 0.2s ease, backdrop-filter 0.2s ease, background 0.2s ease;
-      border: none;
     }
 
   }