@pisell/pisellos 2.0.7 → 2.0.8

package/dist/modules/Rules/index.d.ts

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Rules, RulesModuleAPI, DiscountResult } from "./types";
+import { Rules, RulesModuleAPI, DiscountResult } from './types';
 import { Discount } from "../Discount/types";
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;

package/dist/solution/BookingByStep/index.js

@@ -1182,17 +1182,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         if (cartItem._origin.start_time) {
           var startTime = dayjs("".concat(cartItem._origin.start_date, " ").concat(cartItem._origin.start_time));
           var endTime = dayjs("".concat(cartItem._origin.end_date, " ").concat(cartItem._origin.end_time));
-          // 资源排下序，把单个资源靠前，组合资源排在后面
-          productResources.sort(function (a, b) {
-            var _a$metadata, _b$metadata;
-            var aIsCombined = ((_a$metadata = a.metadata) === null || _a$metadata === void 0 || (_a$metadata = _a$metadata.combined_resource) === null || _a$metadata === void 0 ? void 0 : _a$metadata.status) === 1;
-            var bIsCombined = ((_b$metadata = b.metadata) === null || _b$metadata === void 0 || (_b$metadata = _b$metadata.combined_resource) === null || _b$metadata === void 0 ? void 0 : _b$metadata.status) === 1;
-            if (aIsCombined && !bIsCombined) return 1;
-            if (!aIsCombined && bIsCombined) return -1;
-            return 0;
-          });
           var resourcesUseableMap = {};
           productResources.forEach(function (n) {
+            // 资源排下序，把单个资源靠前，组合资源排在后面
+            n.renderList = n.renderList.sort(function (a, b) {
+              var _a$metadata, _b$metadata;
+              var aIsCombined = ((_a$metadata = a.metadata) === null || _a$metadata === void 0 || (_a$metadata = _a$metadata.combined_resource) === null || _a$metadata === void 0 ? void 0 : _a$metadata.status) === 1;
+              var bIsCombined = ((_b$metadata = b.metadata) === null || _b$metadata === void 0 || (_b$metadata = _b$metadata.combined_resource) === null || _b$metadata === void 0 ? void 0 : _b$metadata.status) === 1;
+              if (aIsCombined && !bIsCombined) return 1;
+              if (!aIsCombined && bIsCombined) return -1;
+              return 0;
+            });
             n.renderList = n.renderList.filter(function (m) {
               var recordCount = capacityMap[m.id] || 0;
               var canUseTime = m.times.find(function (item) {

package/lib/modules/Rules/index.d.ts

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Rules, RulesModuleAPI, DiscountResult } from "./types";
+import { Rules, RulesModuleAPI, DiscountResult } from './types';
 import { Discount } from "../Discount/types";
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;

package/lib/solution/BookingByStep/index.js

@@ -632,18 +632,18 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         const endTime = (0, import_dayjs.default)(
           `${cartItem._origin.end_date} ${cartItem._origin.end_time}`
         );
-        productResources.sort((a, b) => {
-          var _a2, _b2, _c2, _d;
-          const aIsCombined = ((_b2 = (_a2 = a.metadata) == null ? void 0 : _a2.combined_resource) == null ? void 0 : _b2.status) === 1;
-          const bIsCombined = ((_d = (_c2 = b.metadata) == null ? void 0 : _c2.combined_resource) == null ? void 0 : _d.status) === 1;
-          if (aIsCombined && !bIsCombined)
-            return 1;
-          if (!aIsCombined && bIsCombined)
-            return -1;
-          return 0;
-        });
         const resourcesUseableMap = {};
         productResources.forEach((n) => {
+          n.renderList = n.renderList.sort((a, b) => {
+            var _a2, _b2, _c2, _d;
+            const aIsCombined = ((_b2 = (_a2 = a.metadata) == null ? void 0 : _a2.combined_resource) == null ? void 0 : _b2.status) === 1;
+            const bIsCombined = ((_d = (_c2 = b.metadata) == null ? void 0 : _c2.combined_resource) == null ? void 0 : _d.status) === 1;
+            if (aIsCombined && !bIsCombined)
+              return 1;
+            if (!aIsCombined && bIsCombined)
+              return -1;
+            return 0;
+          });
           n.renderList = n.renderList.filter((m) => {
             const recordCount = capacityMap[m.id] || 0;
             const canUseTime = m.times.find((item) => {

package/package.json

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