@pisell/pisellos 2.3.137 → 2.3.139

package/lib/solution/RegisterAndLogin/config.js

@@ -588,6 +588,16 @@ const defaultConfig = {
 /**
  * webpos 渠道配置
  */
+const webposPasswordResetOptions = {
+  prefix: false,
+  isDefaultSaasDomain: true,
+  cache: false,
+  noToast: true,
+  headers: {
+    Accept: 'application/json',
+    'Content-Type': 'application/json'
+  }
+};
 const webposConfig = {
   sendEmailVerificationCode: {
     url: '/auth/email/register-code',
@@ -710,13 +720,20 @@ const webposConfig = {
     })
   },
   checkEmailCode: {
-    url: '/auth/email/check-email-code',
-    method: 'GET',
+    url: '/tenant/account/reset-password/email-code/verify',
+    method: 'POST',
     transformParams: params => ({
       email: params.email,
-      code: params.code,
-      action: params.action
-    })
+      code: params.code
+    }),
+    // SaaS 成功时 data 为 null，统一为既有验证码校验返回结构。
+    transformResponse: response => response?.status === true ? {
+      ...response,
+      data: {
+        valid: true
+      }
+    } : response,
+    options: webposPasswordResetOptions
   },
   checkMobileCode: {
     url: '/auth/mobile/check-mobile-code',
@@ -738,11 +755,12 @@ const webposConfig = {
     })
   },
   sendPasswordResetEmail: {
-    url: '/auth/email/reset-password-code',
-    method: 'GET',
+    url: '/tenant/account/reset-password/email-code/send',
+    method: 'POST',
     transformParams: params => ({
       email: params.email
-    })
+    }),
+    options: webposPasswordResetOptions
   },
   sendPasswordResetSms: {
     url: '/auth/mobile/sms-forget',
@@ -775,13 +793,16 @@ const webposConfig = {
     })
   },
   resetPasswordByEmail: {
-    url: '/auth/email/reset-password',
+    url: '/tenant/account/reset-password/email-code',
     method: 'POST',
     transformParams: params => ({
       email: params.email,
       password: params.password,
-      code: params.code
-    })
+      code: params.code,
+      // 页面先校验两次输入完全一致，SDK 保持原有重置参数。
+      password_confirmation: params.password
+    }),
+    options: webposPasswordResetOptions
   },
   resetPasswordByPhone: {
     url: '/auth/mobile/reset-password',

package/lib/solution/RegisterAndLogin/index.d.ts

@@ -4,6 +4,8 @@ import { RegisterParams, LoginParams, OAuthLoginParams, SendVerificationCodePara
 import { ApiCaller } from './config';
 export * from './types';
 export * from './config';
+export { validatePassword } from './utils';
+export type { PasswordValidationOptions } from './utils';
 /**
  * 注册登录解决方案实现
  */

package/lib/solution/RegisterAndLogin/index.js

@@ -4,9 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  RegisterAndLoginImpl: true
+  RegisterAndLoginImpl: true,
+  validatePassword: true
 };
 exports.RegisterAndLoginImpl = void 0;
+Object.defineProperty(exports, "validatePassword", {
+  enumerable: true,
+  get: function () {
+    return _utils.validatePassword;
+  }
+});
 var _BaseModule = require("../../modules/BaseModule");
 var _types = require("./types");
 Object.keys(_types).forEach(function (key) {
@@ -32,6 +39,7 @@ Object.keys(_config).forEach(function (key) {
     }
   });
 });
+var _utils = require("./utils");
 /**
  * 注册登录解决方案实现
  */

package/lib/solution/RegisterAndLogin/utils.d.ts

@@ -10,10 +10,18 @@ export declare function validateEmail(email: string): boolean;
  * 验证手机号格式（支持多种国际格式）
  */
 export declare function validatePhone(phone: string): boolean;
-/**
- * 验证密码强度
- */
-export declare function validatePassword(password: string): {
+export interface PasswordValidationOptions {
+    minLength?: number;
+    maxLength?: number;
+    requireLowercase?: boolean;
+    requireUppercase?: boolean;
+    requireNumber?: boolean;
+    requireSpecialCharacters?: boolean;
+    specialCharactersPattern?: RegExp;
+    messages?: Partial<Record<'minLength' | 'maxLength' | 'requireLowercase' | 'requireUppercase' | 'requireNumber' | 'requireSpecialCharacters', string>>;
+}
+/** 验证密码强度；不传 options 时保持原有规则与返回格式。 */
+export declare function validatePassword(password: string, options?: PasswordValidationOptions): {
     isValid: boolean;
     errors: string[];
 };

package/lib/solution/RegisterAndLogin/utils.js

@@ -49,29 +49,36 @@ function validatePhone(phone) {
   const phoneRegex = /^(\+\d{1,3}[- ]?)?\d{10,14}$/;
   return phoneRegex.test(cleanPhone);
 }
-
-/**
- * 验证密码强度
- */
-function validatePassword(password) {
+/** 验证密码强度；不传 options 时保持原有规则与返回格式。 */
+function validatePassword(password, options = {}) {
   const errors = [];
-  if (password.length < 8) {
-    errors.push('密码长度至少为8位');
+  const {
+    minLength = 8,
+    maxLength = 128,
+    requireLowercase = true,
+    requireUppercase = true,
+    requireNumber = true,
+    requireSpecialCharacters = true,
+    specialCharactersPattern = /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/,
+    messages = {}
+  } = options;
+  if (password.length < minLength) {
+    errors.push(messages.minLength ?? `密码长度至少为${minLength}位`);
   }
-  if (password.length > 128) {
-    errors.push('密码长度不能超过128位');
+  if (password.length > maxLength) {
+    errors.push(messages.maxLength ?? `密码长度不能超过${maxLength}位`);
   }
-  if (!/[a-z]/.test(password)) {
-    errors.push('密码必须包含至少一个小写字母');
+  if (requireLowercase && !/[a-z]/.test(password)) {
+    errors.push(messages.requireLowercase ?? '密码必须包含至少一个小写字母');
   }
-  if (!/[A-Z]/.test(password)) {
-    errors.push('密码必须包含至少一个大写字母');
+  if (requireUppercase && !/[A-Z]/.test(password)) {
+    errors.push(messages.requireUppercase ?? '密码必须包含至少一个大写字母');
   }
-  if (!/\d/.test(password)) {
-    errors.push('密码必须包含至少一个数字');
+  if (requireNumber && !/\d/.test(password)) {
+    errors.push(messages.requireNumber ?? '密码必须包含至少一个数字');
   }
-  if (!/[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/.test(password)) {
-    errors.push('密码必须包含至少一个特殊字符');
+  if (requireSpecialCharacters && !specialCharactersPattern.test(password)) {
+    errors.push(messages.requireSpecialCharacters ?? '密码必须包含至少一个特殊字符');
   }
   return {
     isValid: errors.length === 0,

package/lib/solution/Sales/index.d.ts

@@ -105,6 +105,8 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private groupBookingsByResource;
     private isBookingMatchedResource;
     private sortMatchedBookings;
+    /** 已完成：按订单创建时间降序，避免实时追加和重新加载导致显示顺序不同。 */
+    private sortCompletedBookings;
     /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
     private sortUnpaidBookings;
     /**

package/lib/solution/Sales/index.js

@@ -507,6 +507,15 @@ class SalesImpl extends _BaseModule.BaseModule {
     });
   }
 
+  /** 已完成：按订单创建时间降序，避免实时追加和重新加载导致显示顺序不同。 */
+  sortCompletedBookings(bookings) {
+    const createdAt = booking => {
+      const timestamp = (0, _dayjs.default)(booking.order?.created_at || '').valueOf();
+      return Number.isFinite(timestamp) ? timestamp : 0;
+    };
+    return [...bookings].sort((left, right) => createdAt(right) - createdAt(left));
+  }
+
   /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
   sortUnpaidBookings(bookings, currentBookings) {
     const currentOrderIndexes = new Map(currentBookings.map((booking, index) => [String(booking.order.order_id), index]));
@@ -881,7 +890,7 @@ class SalesImpl extends _BaseModule.BaseModule {
     const bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList), {
       includeAllFuture: true
     });
-    const completedBookings = completedBookingList.map(booking => {
+    const completedBookings = this.sortCompletedBookings(completedBookingList).map(booking => {
       return {
         ...booking,
         status: 'compelete',

package/lib/solution/UnifiedBookingSales/index.js

@@ -283,10 +283,9 @@ function assertAvailabilityCatalogProductIds(productIds, context) {
     });
   }
 }
-function normalizeResourceType(_value) {
-  // 当前业务只支持每个资源组选择一个具体资源。
-  // 保留公共联合类型以兼容已有调用方，但暂不启用 multiple/capacity 分支。
-  return 'single';
+function normalizeResourceType(value) {
+  // 预约是否独占与每组选择几个资源是两个独立配置。
+  return value === 'multiple' || value === 'capacity' ? value : 'single';
 }
 function resolveProductKind(product) {
   if (product.duration || product.service_duration) return 'duration';

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.3.137",
+  "version": "2.3.139",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",