@pisell/pisellos 0.0.205 → 0.0.208

package/dist/modules/Order/utils.js

@@ -40,9 +40,15 @@ export var mergeRelationForms = function mergeRelationForms(relationForms) {
 
     // 兼容 form_record_id 可能是数组或单个数字
     var ids = Array.isArray(form_record_ids) ? form_record_ids : [form_record_ids];
-    (_acc$form_id$form_rec = acc[form_id].form_record_ids).push.apply(_acc$form_id$form_rec, _toConsumableArray(ids));
+    // 过滤掉空值（null、undefined等）
+    var validIds = ids.filter(function (id) {
+      return id != null;
+    });
+    (_acc$form_id$form_rec = acc[form_id].form_record_ids).push.apply(_acc$form_id$form_rec, _toConsumableArray(validIds));
     // 去重
     acc[form_id].form_record_ids = _toConsumableArray(new Set(acc[form_id].form_record_ids));
     return acc;
-  }, {}));
+  }, {})).filter(function (item) {
+    return item.form_record_ids.length > 0;
+  }); // 过滤掉没有有效记录的表单
 };

package/dist/solution/BookingByStep/index.d.ts

@@ -21,6 +21,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     private otherParams;
     private cacheId;
     private otherData;
+    private platform;
     initialize(core: PisellCore, options: any): Promise<void>;
     initStep(stepList: (keyof BookingByStepState)[]): void;
     getCurrentStep(): {

package/dist/solution/BookingByStep/index.js

@@ -61,15 +61,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "otherParams", {});
     _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
     _defineProperty(_assertThisInitialized(_this), "otherData", {});
+    // 提供给 UI 层的临时数据存储，会进缓存
+    _defineProperty(_assertThisInitialized(_this), "platform", void 0);
     return _this;
   }
   _createClass(BookingByStepImpl, [{
     key: "initialize",
-    value: // 提供给 UI 层的临时数据存储，会进缓存
+    value: // 平台类型，用于判断是 PC / H5
     function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
         var _this$otherParams,
           _this$otherParams2,
+          _this$otherParams3,
           _this2 = this;
         var targetCacheData, sessionData, _data$this$otherParam, data, moduleArr;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -99,7 +102,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               // 并且在上面 registerModule 的时候，读取 sessionStroage 里的数据，塞进默认值
               targetCacheData = {};
               this.cacheId = (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.cacheId;
-              if ((_this$otherParams2 = this.otherParams) !== null && _this$otherParams2 !== void 0 && _this$otherParams2.cacheId) {
+              this.platform = (_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.platform;
+              if ((_this$otherParams3 = this.otherParams) !== null && _this$otherParams3 !== void 0 && _this$otherParams3.cacheId) {
                 sessionData = this.window.sessionStorage.getItem(this.name);
                 if (sessionData) {
                   data = JSON.parse(sessionData); // 匹配 cacheid，如果匹配不到，直接把 sessionData 清掉即可
@@ -128,7 +132,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.schedule.loadAllSchedule();
               this.core.effects.emit(BookingByStepHooks.onInited, {});
-            case 18:
+            case 19:
             case "end":
               return _context.stop();
           }
@@ -954,7 +958,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "submitOrder",
     value: function () {
       var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
-        var _this$otherParams3;
         var cartItems, newCartItems, type;
         return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
@@ -991,7 +994,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 query: {
                   cartItems: newCartItems,
                   type: type,
-                  platform: (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.platform
+                  platform: this.platform
                 }
               }));
             case 6:

package/lib/modules/Order/utils.js

@@ -48,11 +48,12 @@ var mergeRelationForms = (relationForms) => {
         acc[form_id] = { form_id, form_record_ids: [] };
       }
       const ids = Array.isArray(form_record_ids) ? form_record_ids : [form_record_ids];
-      acc[form_id].form_record_ids.push(...ids);
+      const validIds = ids.filter((id) => id != null);
+      acc[form_id].form_record_ids.push(...validIds);
       acc[form_id].form_record_ids = [...new Set(acc[form_id].form_record_ids)];
       return acc;
     }, {})
-  );
+  ).filter((item) => item.form_record_ids.length > 0);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -21,6 +21,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     private otherParams;
     private cacheId;
     private otherData;
+    private platform;
     initialize(core: PisellCore, options: any): Promise<void>;
     initStep(stepList: (keyof BookingByStepState)[]): void;
     getCurrentStep(): {

package/lib/solution/BookingByStep/index.js

@@ -58,9 +58,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     this.otherParams = {};
     this.otherData = {};
   }
-  // 提供给 UI 层的临时数据存储，会进缓存
+  // 平台类型，用于判断是 PC / H5
   async initialize(core, options) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     this.core = core;
     this.store = options.store || {};
     this.otherParams = options.otherParams || {};
@@ -76,12 +76,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     let targetCacheData = {};
     this.cacheId = (_a = this.otherParams) == null ? void 0 : _a.cacheId;
-    if ((_b = this.otherParams) == null ? void 0 : _b.cacheId) {
+    this.platform = (_b = this.otherParams) == null ? void 0 : _b.platform;
+    if ((_c = this.otherParams) == null ? void 0 : _c.cacheId) {
       const sessionData = this.window.sessionStorage.getItem(this.name);
       if (sessionData) {
         const data = JSON.parse(sessionData);
         targetCacheData = data[this.otherParams.cacheId];
-        this.otherData = ((_d = (_c = data[this.otherParams.cacheId]) == null ? void 0 : _c[this.name]) == null ? void 0 : _d["otherData"]) || {};
+        this.otherData = ((_e = (_d = data[this.otherParams.cacheId]) == null ? void 0 : _d[this.name]) == null ? void 0 : _e["otherData"]) || {};
       }
     }
     const moduleArr = [
@@ -501,11 +502,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 购物车提交订单
   async submitOrder() {
-    var _a;
     const cartItems = this.store.cart.getItems();
     const newCartItems = (0, import_lodash_es.cloneDeep)(cartItems);
     newCartItems.forEach((item) => {
-      var _a2;
+      var _a;
       if (item._origin.resources && item._origin.resources.length) {
         item._origin.resources = item._origin.resources.map((n) => {
           const newResourcesItem = (0, import_lodash_es.cloneDeep)(n);
@@ -515,7 +515,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           return { ...newResourcesItem };
         });
         const { currentCapacity, formatCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(item);
-        if (!((_a2 = item._origin) == null ? void 0 : _a2.metadata)) {
+        if (!((_a = item._origin) == null ? void 0 : _a.metadata)) {
           item._origin.metadata = {};
         }
         item._origin.metadata.capacity = formatCapacity;
@@ -532,7 +532,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       query: {
         cartItems: newCartItems,
         type,
-        platform: (_a = this.otherParams) == null ? void 0 : _a.platform
+        platform: this.platform
       }
     });
   }

package/package.json

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