@pisell/private-materials 6.2.51 → 6.2.52

package/es/components/systemSettings/registry/utils/typeValidation.js

@@ -0,0 +1,284 @@
+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); }
+/**
+ * 类型验证工具函数
+ * 用于验证默认值是否符合指定的字段类型
+ */
+
+/**
+ * 验证字符串类型
+ */
+var validateString = function validateString(value) {
+  if (value === null || value === undefined || value === '') {
+    return {
+      isValid: true
+    };
+  }
+  if (typeof value === 'string') {
+    return {
+      isValid: true
+    };
+  }
+  return {
+    isValid: false,
+    error: '默认值必须是字符串类型'
+  };
+};
+
+/**
+ * 验证整数类型
+ */
+var validateInteger = function validateInteger(value) {
+  if (value === null || value === undefined || value === '') {
+    return {
+      isValid: true
+    };
+  }
+
+  // 如果是数字，检查是否为整数
+  if (typeof value === 'number') {
+    if (!Number.isInteger(value)) {
+      return {
+        isValid: false,
+        error: '默认值必须是整数'
+      };
+    }
+    return {
+      isValid: true
+    };
+  }
+
+  // 如果是字符串，尝试转换
+  if (typeof value === 'string') {
+    var trimmed = value.trim();
+    if (trimmed === '') {
+      return {
+        isValid: true
+      };
+    }
+    var num = Number(trimmed);
+    if (isNaN(num) || !Number.isInteger(num)) {
+      return {
+        isValid: false,
+        error: '默认值必须是有效的整数'
+      };
+    }
+    return {
+      isValid: true
+    };
+  }
+  return {
+    isValid: false,
+    error: '默认值必须是有效的整数'
+  };
+};
+
+/**
+ * 验证浮点数类型
+ */
+var validateFloat = function validateFloat(value) {
+  if (value === null || value === undefined || value === '') {
+    return {
+      isValid: true
+    };
+  }
+
+  // 如果是数字，检查是否有效
+  if (typeof value === 'number') {
+    if (!isFinite(value)) {
+      return {
+        isValid: false,
+        error: '默认值必须是有效的数字'
+      };
+    }
+    return {
+      isValid: true
+    };
+  }
+
+  // 如果是字符串，尝试转换
+  if (typeof value === 'string') {
+    var trimmed = value.trim();
+    if (trimmed === '') {
+      return {
+        isValid: true
+      };
+    }
+    var num = Number(trimmed);
+    if (isNaN(num) || !isFinite(num)) {
+      return {
+        isValid: false,
+        error: '默认值必须是有效的数字'
+      };
+    }
+    return {
+      isValid: true
+    };
+  }
+  return {
+    isValid: false,
+    error: '默认值必须是有效的数字'
+  };
+};
+
+/**
+ * 验证布尔类型
+ */
+var validateBoolean = function validateBoolean(value) {
+  if (value === null || value === undefined || value === '') {
+    return {
+      isValid: true
+    };
+  }
+
+  // 如果是字符串，只接受 'true' 或 'false'
+  if (typeof value === 'string') {
+    var trimmed = value.trim().toLowerCase();
+    if (trimmed === '') {
+      return {
+        isValid: true
+      };
+    }
+    if (trimmed !== 'true' && trimmed !== 'false') {
+      return {
+        isValid: false,
+        error: '默认值必须是 true 或 false'
+      };
+    }
+    return {
+      isValid: true
+    };
+  }
+
+  // 如果是布尔类型
+  if (typeof value === 'boolean') {
+    return {
+      isValid: true
+    };
+  }
+  return {
+    isValid: false,
+    error: '默认值必须是 true 或 false'
+  };
+};
+
+/**
+ * 验证数组类型（JSON对象/数组）
+ */
+var validateArray = function validateArray(value) {
+  if (value === null || value === undefined || value === '') {
+    return {
+      isValid: true
+    };
+  }
+
+  // 如果是字符串，尝试解析为JSON
+  if (typeof value === 'string') {
+    var trimmed = value.trim();
+    if (trimmed === '') {
+      return {
+        isValid: true
+      };
+    }
+    try {
+      var parsed = JSON.parse(trimmed);
+      // 检查解析后的值是否为对象或数组
+      if (_typeof(parsed) !== 'object' || parsed === null) {
+        return {
+          isValid: false,
+          error: '默认值必须是有效的JSON对象或数组'
+        };
+      }
+      return {
+        isValid: true
+      };
+    } catch (error) {
+      return {
+        isValid: false,
+        error: '默认值必须是有效的JSON对象或数组'
+      };
+    }
+  }
+
+  // 如果是对象或数组
+  if (_typeof(value) === 'object' && value !== null) {
+    return {
+      isValid: true
+    };
+  }
+  return {
+    isValid: false,
+    error: '默认值必须是有效的JSON对象或数组'
+  };
+};
+
+/**
+ * 根据字段类型验证默认值
+ */
+export var validateDefaultValue = function validateDefaultValue(fieldType, defaultValue) {
+  if (!fieldType) {
+    return {
+      isValid: false,
+      error: '字段类型不能为空'
+    };
+  }
+  switch (fieldType.toLowerCase()) {
+    case 'string':
+      return validateString(defaultValue);
+    case 'integer':
+      return validateInteger(defaultValue);
+    case 'float':
+      return validateFloat(defaultValue);
+    case 'boolean':
+      return validateBoolean(defaultValue);
+    case 'array':
+      return validateArray(defaultValue);
+    default:
+      return {
+        isValid: false,
+        error: "\u4E0D\u652F\u6301\u7684\u5B57\u6BB5\u7C7B\u578B: ".concat(fieldType)
+      };
+  }
+};
+
+/**
+ * 解析默认值为对应的类型
+ */
+export var parseDefaultValue = function parseDefaultValue(fieldType, defaultValue) {
+  if (defaultValue === null || defaultValue === undefined || defaultValue === '') {
+    return null;
+  }
+  switch (fieldType.toLowerCase()) {
+    case 'string':
+      return String(defaultValue);
+    case 'integer':
+      if (typeof defaultValue === 'string') {
+        var trimmed = defaultValue.trim();
+        if (trimmed === '') return null;
+        return parseInt(trimmed, 10);
+      }
+      return defaultValue;
+    case 'float':
+      if (typeof defaultValue === 'string') {
+        var _trimmed = defaultValue.trim();
+        if (_trimmed === '') return null;
+        return parseFloat(_trimmed);
+      }
+      return defaultValue;
+    case 'boolean':
+      if (typeof defaultValue === 'string') {
+        var _trimmed2 = defaultValue.trim().toLowerCase();
+        if (_trimmed2 === '') return null;
+        return _trimmed2 === 'true';
+      }
+      return Boolean(defaultValue);
+    case 'array':
+      if (typeof defaultValue === 'string') {
+        var _trimmed3 = defaultValue.trim();
+        if (_trimmed3 === '') return null;
+        return JSON.parse(_trimmed3);
+      }
+      return defaultValue;
+    default:
+      return defaultValue;
+  }
+};

package/es/components/systemSettings/registry/utils/validators.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 验证器工具函数
+ */
+/**
+ * 创建带前缀的应用标识符验证器
+ * 用于验证设置项的键格式
+ */
+export declare const createPrefixedAppIdentifierValidator: (sectionCode: string) => (_: any, value: string) => Promise<void>;

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

@@ -0,0 +1,44 @@
+/**
+ * 验证器工具函数
+ */
+
+/**
+ * 创建带前缀的应用标识符验证器
+ * 用于验证设置项的键格式
+ */
+export var createPrefixedAppIdentifierValidator = function createPrefixedAppIdentifierValidator(sectionCode) {
+  return function (_, value) {
+    if (!value) {
+      return Promise.resolve();
+    }
+
+    // 检查是否以section code开头
+    var expectedPrefix = "".concat(sectionCode, ".");
+    if (!value.startsWith(expectedPrefix)) {
+      return Promise.reject(new Error("\u952E\u5FC5\u987B\u4EE5 \"".concat(expectedPrefix, "\" \u5F00\u5934")));
+    }
+
+    // 检查剩余部分的格式
+    var remainingPart = value.substring(expectedPrefix.length);
+    if (!remainingPart) {
+      return Promise.reject(new Error('键不能只包含前缀'));
+    }
+
+    // 验证格式：只能包含小写字母、数字、点、下划线
+    var 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();
+  };
+};

package/es/components/ticketBooking/components/ticketBooking/index.less

@@ -36,7 +36,8 @@
       .booking-info-create-new,
       .pisell-lowcode__booking-field-title,
       .pisell-lowcode__shopping-cart-empty,
-      .pisell-lowcode__booking-service-clear-btn {
+      .pisell-lowcode__booking-service-clear-btn,
+      .pisell-lowcode__booking-contact-info-title {
         color: #ffffff;
       }
     }

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

@@ -41,7 +41,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
+    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;

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

@@ -1,28 +1,3 @@
-import React from 'react';
 import './index.less';
-declare module 'react' {
-    interface HTMLAttributes<T> {
-        role?: string;
-    }
-}
-declare global {
-    namespace JSX {
-        interface IntrinsicElements {
-            div: React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> & {
-                children?: React.ReactNode;
-                onClick?: React.MouseEventHandler<HTMLDivElement>;
-                onMouseDown?: React.MouseEventHandler<HTMLDivElement>;
-                onMouseUp?: React.MouseEventHandler<HTMLDivElement>;
-                onTouchStart?: React.TouchEventHandler<HTMLDivElement>;
-                onTouchEnd?: React.TouchEventHandler<HTMLDivElement>;
-                role?: string;
-            };
-            img: React.DetailedHTMLProps<React.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>;
-            span: React.DetailedHTMLProps<React.HTMLAttributes<HTMLSpanElement>, HTMLSpanElement> & {
-                children?: React.ReactNode;
-            };
-        }
-    }
-}
 declare const WalletList: (props: any) => JSX.Element;
 export default WalletList;

package/es/components/walletList/index.js

@@ -21,7 +21,7 @@ import { Provider, Context } from "./model";
 import { WalletCard, Carousel } from '@pisell/materials';
 import { LeftOutlined, RightOutlined } from '@ant-design/icons';
 import useEngineContext from "./../../hooks/useEngineContext";
-import { getWalletList, getWalletBalance, getWalletShopList } from "./serve";
+import { getWalletList, batchGetWalletBalance, getWalletShopList } from "./serve";
 import { locales, getUniqueId } from '@pisell/utils';
 import { request } from "./../../utils";
 import { defaultWalletGuideConfig } from "./status";
@@ -29,7 +29,7 @@ import localeTexts from "./locales";
 import "./index.less";
 import classNames from 'classnames';
 // 导入所有类型
-import { WalletCardItem, DEFAULT_CARD_CONFIG } from "./types";
+import { DEFAULT_CARD_CONFIG } from "./types";
 import PinModal from "../pinModal";
 
 // 添加 localStorage 相关的操作函数
@@ -73,10 +73,6 @@ var getFromLocalStorage = function getFromLocalStorage(key) {
   }
 };
 
-// @ts-ignore
-
-// @ts-ignore
-
 // 定义轮播图配置
 var CAROUSEL_CONFIG = {
   className: 'pisell-lowcode__walletList',
@@ -126,8 +122,43 @@ var DEFAULT_WALLET_CARD = {
       en: 'Level'
     },
     metadata: {
-      barcodetype: 'barCode',
-      showcaseWalletPass: ['rechargeable', 'piont', 'voucher', 'discount'],
+      showcaseWalletPassNew: [{
+        type: 'rechargeable',
+        display: 1,
+        custom_title: {
+          original: 'Balance',
+          'zh-CN': '充值卡',
+          'zh-HK': '充值卡',
+          en: 'Balance'
+        }
+      }, {
+        type: 'point',
+        display: 1,
+        custom_title: {
+          original: 'Points',
+          'zh-CN': '积分卡',
+          'zh-HK': '積分卡',
+          en: 'Points'
+        }
+      }, {
+        type: 'voucher',
+        display: 1,
+        custom_title: {
+          original: 'Voucher',
+          'zh-CN': '代金券',
+          'zh-HK': '代金券',
+          en: 'Voucher'
+        }
+      }, {
+        type: 'discount',
+        display: 1,
+        custom_title: {
+          original: 'Discount',
+          'zh-CN': '折扣卡',
+          'zh-HK': '折扣卡',
+          en: 'Discount'
+        }
+      }],
       coverImage: '',
       icon: ''
     }
@@ -243,7 +274,7 @@ var WalletList = Provider(function (props) {
       if (isMountedRef.current) {
         setState({
           list: [DEFAULT_WALLET_CARD],
-          balance: DEFAULT_BALANCE,
+          balance: [],
           hasAttempted: true,
           isLoggedIn: false
         });
@@ -392,7 +423,7 @@ var WalletList = Provider(function (props) {
   };
   var initData = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(requestId) {
-      var cachedList, cachedBalance, _yield$Promise$all, _yield$Promise$all2, walletListData, walletBalanceData, _message, _data, isAuthError;
+      var cachedList, cachedBalance, walletListData, walletBalanceData, _message, _data, isAuthError;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -415,7 +446,7 @@ var WalletList = Provider(function (props) {
             // 设置状态为已尝试请求，提供默认数据而不是空列表
             setState({
               list: [DEFAULT_WALLET_CARD],
-              balance: DEFAULT_BALANCE,
+              balance: [],
               hasAttempted: true,
               isLoggedIn: false
             });
@@ -433,6 +464,13 @@ var WalletList = Provider(function (props) {
             try {
               cachedList = getFromLocalStorage(STORAGE_KEY);
               cachedBalance = getFromLocalStorage(STORAGE_KEY_BALANCE);
+              // 避免使用旧版数据
+              if (!Array.isArray(cachedBalance) || !cachedBalance.some(function (item) {
+                var _item$hasOwnProperty;
+                return (_item$hasOwnProperty = item.hasOwnProperty) === null || _item$hasOwnProperty === void 0 ? void 0 : _item$hasOwnProperty.call(item, 'gift_card_balance');
+              })) {
+                cachedBalance = null;
+              }
             } catch (e) {
               console.error('Error fetching from localStorage:', e);
             }
@@ -453,12 +491,15 @@ var WalletList = Provider(function (props) {
             return _context3.abrupt("return");
           case 16:
             _context3.next = 18;
-            return Promise.all([getWalletList(), getWalletBalance()]);
+            return getWalletList();
           case 18:
-            _yield$Promise$all = _context3.sent;
-            _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
-            walletListData = _yield$Promise$all2[0];
-            walletBalanceData = _yield$Promise$all2[1];
+            walletListData = _context3.sent;
+            _context3.next = 21;
+            return batchGetWalletBalance(walletListData.map(function (item) {
+              return item.wallet_id;
+            }));
+          case 21:
+            walletBalanceData = _context3.sent;
             if (!(!isMountedRef.current || requestIdRef.current !== requestId)) {
               _context3.next = 24;
               break;
@@ -498,36 +539,38 @@ var WalletList = Provider(function (props) {
                       _context2.prev = 2;
                       // 准备重试请求
                       retryBalanceData = walletBalanceData;
-                      retryListData = walletListData; // 如果余额数据为空，重试请求余额
-                      if (walletBalanceData) {
+                      retryListData = walletListData; // 如果列表数据为空，重试请求列表
+                      if (!(Array.isArray(walletListData) && walletListData.length === 0)) {
                         _context2.next = 10;
                         break;
                       }
                       _context2.next = 8;
-                      return getWalletBalance();
+                      return getWalletList();
                     case 8:
-                      retryBalanceData = _context2.sent;
-                      if (retryBalanceData) {
+                      retryListData = _context2.sent;
+                      if (retryListData && retryListData.length > 0) {
                         try {
-                          saveToLocalStorage(STORAGE_KEY_BALANCE, retryBalanceData);
+                          saveToLocalStorage(STORAGE_KEY, retryListData);
                         } catch (e) {
-                          console.error('Error saving retry balance to localStorage:', e);
+                          console.error('Error saving retry list to localStorage:', e);
                         }
                       }
                     case 10:
-                      if (!(Array.isArray(walletListData) && walletListData.length === 0)) {
+                      if (walletBalanceData) {
                         _context2.next = 15;
                         break;
                       }
                       _context2.next = 13;
-                      return getWalletList({});
+                      return batchGetWalletBalance(retryListData.map(function (item) {
+                        return item.wallet_id;
+                      }));
                     case 13:
-                      retryListData = _context2.sent;
-                      if (retryListData && retryListData.length > 0) {
+                      retryBalanceData = _context2.sent;
+                      if (retryBalanceData) {
                         try {
-                          saveToLocalStorage(STORAGE_KEY, retryListData);
+                          saveToLocalStorage(STORAGE_KEY_BALANCE, retryBalanceData);
                         } catch (e) {
-                          console.error('Error saving retry list to localStorage:', e);
+                          console.error('Error saving retry balance to localStorage:', e);
                         }
                       }
                     case 15:
@@ -608,57 +651,46 @@ var WalletList = Provider(function (props) {
       metadata = _ref5.metadata,
       name = _ref5.name;
     var _ref6 = metadata || {},
-      _ref6$barcodetype = _ref6.barcodetype,
-      barcodetype = _ref6$barcodetype === void 0 ? 'barCode' : _ref6$barcodetype,
-      _ref6$showcaseWalletP = _ref6.showcaseWalletPass,
-      showcaseWalletPass = _ref6$showcaseWalletP === void 0 ? [] : _ref6$showcaseWalletP,
+      _ref6$showcaseWalletP = _ref6.showcaseWalletPassNew,
+      showcaseWalletPassNew = _ref6$showcaseWalletP === void 0 ? [] : _ref6$showcaseWalletP,
       _ref6$coverImage = _ref6.coverImage,
       coverImage = _ref6$coverImage === void 0 ? '' : _ref6$coverImage,
       _ref6$icon = _ref6.icon,
       icon = _ref6$icon === void 0 ? '' : _ref6$icon;
     var shopName = shop.name;
-    var balance = state.balance;
+    var _state$balance = state.balance,
+      balance = _state$balance === void 0 ? [] : _state$balance;
+    var balanceItem = balance.find(function (bi) {
+      return bi.wallet_id == item.wallet_id;
+    }) || DEFAULT_BALANCE;
 
     // 字段映射关系
-    var balanceKeyMap = {
-      gift_card_balance: 'rechargeable',
-      point_card_balance: 'piont',
-      voucher_count: 'voucher',
-      discount_card_count: 'discount'
+    var _balanceKeyMap = {
+      rechargeable: 'gift_card_balance',
+      point: 'point_card_balance',
+      voucher: 'voucher_count',
+      discount: 'discount_card_count'
     };
-
-    // 根据showcaseWalletPass生成items数组
-    var cardItems = (showcaseWalletPass || []).map(function (key) {
-      var _Object$entries$find;
-      // 找到对应的balance字段
-      var balanceKey = (_Object$entries$find = Object.entries(balanceKeyMap).find(function (_ref7) {
-        var _ref8 = _slicedToArray(_ref7, 2),
-          _ = _ref8[0],
-          value = _ref8[1];
-        return value === key;
-      })) === null || _Object$entries$find === void 0 ? void 0 : _Object$entries$find[0];
-      var value = balanceKey ? balance[balanceKey] || 0 : 0;
-      if (balanceKey === 'voucher_count') {
-        value += balance.good_pass_count;
-      }
-      return {
-        key: key,
-        label: key,
-        hidden: false,
+    var cardItems = showcaseWalletPassNew.map(function (showCaseItem) {
+      var balanceKey = _balanceKeyMap[showCaseItem.type];
+      var value = balanceKey ? balanceItem[balanceKey] || 0 : 0;
+      return _objectSpread(_objectSpread({}, showCaseItem), {}, {
         value: value
-      };
+      });
     });
+
     // 构建WalletCard的props
     // 优先级：接口返回值 > globalState > DEFAULT_CARD_CONFIG
     var cardProps = _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_CARD_CONFIG), globalState), {}, {
       // 最后应用API返回的数据，这些拥有最高优先级
+      id: wallet.id,
       iconImg: icon,
       symbol: symbol,
       cardNo: code,
       walletName: getLocalizedName(name, dvaStore === null || dvaStore === void 0 || (_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale),
       shopName: shopName,
-      codeType: barcodetype,
-      items: cardItems,
+      // codeType: barcodetype,
+      items: cardItems.slice(0, 4),
       customBackgroundImage: coverImage,
       isLogin: isUserLoggedIn // 添加登录状态
     });

package/es/components/walletList/serve.d.ts

@@ -10,6 +10,10 @@ export declare const getWalletList: () => Promise<WalletPass[]>;
  * @returns
  */
 export declare const getWalletBalance: () => Promise<WalletBalance | null>;
+/**
+ * 批量获取钱包余额信息
+ */
+export declare const batchGetWalletBalance: (walletIds: string[]) => Promise<Record<string, WalletBalance> | null>;
 /**
  * @title: 获取钱包店铺列表
  * @description: