@pisell/pisellos 2.1.138 → 2.1.139

package/dist/solution/VenueBooking/index.js

@@ -828,24 +828,27 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('addonProducts 模块未初始化');
             case 6:
+              _context11.next = 8;
+              return this.loadOpenDataConfig();
+            case 8:
               associatedMenus = ((_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 || (_this$otherParams7 = _this$otherParams7.openData) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7['menu.associated_menus']) || [];
               if (associatedMenus.length) {
-                _context11.next = 9;
+                _context11.next = 11;
                 break;
               }
               throw new Error('未获取到餐牌配置（menu.associated_menus），请检查 OpenData 配置');
-            case 9:
+            case 11:
               menuListIds = associatedMenus.map(function (n) {
                 return Number(n.value);
               });
-              _context11.next = 12;
+              _context11.next = 14;
               return this.store.venueProducts.loadProducts({
                 menu_list_ids: menuListIds,
                 cacheId: this.cacheId,
                 schedule_date: dayjs().format('YYYY-MM-DD'),
                 schedule_datetime: dayjs().format('YYYY-MM-DD HH:mm:ss')
               });
-            case 12:
+            case 14:
               allProducts = _context11.sent;
               list = Array.isArray(allProducts) ? allProducts : [];
               venueList = list.filter(function (p) {
@@ -873,16 +876,16 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 venueProducts: venueList,
                 addonProducts: addonList
               });
-            case 25:
-              _context11.prev = 25;
+            case 27:
+              _context11.prev = 27;
               _context11.t0 = _context11["catch"](1);
               this.logMethodError('loadAllProducts', _context11.t0);
               throw _context11.t0;
-            case 29:
+            case 31:
             case "end":
               return _context11.stop();
           }
-        }, _callee11, this, [[1, 25]]);
+        }, _callee11, this, [[1, 27]]);
       }));
       function _doLoadAllProducts() {
         return _doLoadAllProducts2.apply(this, arguments);
@@ -2593,8 +2596,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadOpenDataConfig",
     value: function () {
       var _loadOpenDataConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
-        var _this11 = this;
-        var lastFetchedAt, cachedData;
+        var lastFetchedAt, cachedData, openDataConfig;
         return _regeneratorRuntime().wrap(function _callee29$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
@@ -2614,27 +2616,35 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               return _context29.abrupt("return", cachedData);
             case 7:
               if (!this.loadOpenDataConfigInFlight) {
-                _context29.next = 9;
+                _context29.next = 11;
                 break;
               }
-              return _context29.abrupt("return", this.loadOpenDataConfigInFlight);
-            case 9:
+              _context29.next = 10;
+              return this.loadOpenDataConfigInFlight;
+            case 10:
+              return _context29.abrupt("return", _context29.sent);
+            case 11:
               this.loadOpenDataConfigInFlight = this.store.openData.fetchOpenData({
                 scope: 'board',
                 target: 'venue_booking+online_store',
                 section_code: [].concat(OPEN_DATA_SECTION_CODES)
-              }).then(function (openDataConfig) {
-                _this11.otherParams.openData = openDataConfig;
-                return openDataConfig;
-              }).finally(function () {
-                _this11.loadOpenDataConfigInFlight = null;
               });
-              return _context29.abrupt("return", this.loadOpenDataConfigInFlight);
-            case 11:
+              _context29.prev = 12;
+              _context29.next = 15;
+              return this.loadOpenDataConfigInFlight;
+            case 15:
+              openDataConfig = _context29.sent;
+              this.otherParams.openData = openDataConfig;
+              return _context29.abrupt("return", openDataConfig);
+            case 18:
+              _context29.prev = 18;
+              this.loadOpenDataConfigInFlight = null;
+              return _context29.finish(18);
+            case 21:
             case "end":
               return _context29.stop();
           }
-        }, _callee29, this);
+        }, _callee29, this, [[12,, 18, 21]]);
       }));
       function loadOpenDataConfig() {
         return _loadOpenDataConfig.apply(this, arguments);
@@ -2814,7 +2824,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "ensureItemRuleConfigsLoaded",
     value: function () {
       var _ensureItemRuleConfigsLoaded = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34() {
-        var _this12 = this;
+        var _this11 = this;
         return _regeneratorRuntime().wrap(function _callee34$(_context34) {
           while (1) switch (_context34.prev = _context34.next) {
             case 0:
@@ -2835,19 +2845,19 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 return _regeneratorRuntime().wrap(function _callee33$(_context33) {
                   while (1) switch (_context33.prev = _context33.next) {
                     case 0:
-                      runtimeConfig = _this12.getItemRuleRuntimeConfig();
+                      runtimeConfig = _this11.getItemRuleRuntimeConfig();
                       staticConfigs = normalizeItemRuleStrategies(runtimeConfig.strategyConfigs);
                       if (!(staticConfigs.length > 0)) {
                         _context33.next = 6;
                         break;
                       }
-                      _this12.itemRuleConfigs = staticConfigs;
-                      _this12.itemRuleEvaluator.setStrategyConfigs(staticConfigs);
-                      return _context33.abrupt("return", _this12.itemRuleConfigs);
+                      _this11.itemRuleConfigs = staticConfigs;
+                      _this11.itemRuleEvaluator.setStrategyConfigs(staticConfigs);
+                      return _context33.abrupt("return", _this11.itemRuleConfigs);
                     case 6:
-                      _this12.itemRuleConfigs = [];
-                      _this12.itemRuleEvaluator.setStrategyConfigs([]);
-                      return _context33.abrupt("return", _this12.itemRuleConfigs);
+                      _this11.itemRuleConfigs = [];
+                      _this11.itemRuleEvaluator.setStrategyConfigs([]);
+                      return _context33.abrupt("return", _this11.itemRuleConfigs);
                     case 9:
                     case "end":
                       return _context33.stop();

package/lib/solution/VenueBooking/index.js

@@ -523,6 +523,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         throw new Error("venueProducts 模块未初始化");
       if (!this.store.addonProducts)
         throw new Error("addonProducts 模块未初始化");
+      await this.loadOpenDataConfig();
       const associatedMenus = ((_b = (_a = this.otherParams) == null ? void 0 : _a.openData) == null ? void 0 : _b["menu.associated_menus"]) || [];
       if (!associatedMenus.length) {
         throw new Error("未获取到餐牌配置（menu.associated_menus），请检查 OpenData 配置");
@@ -1529,18 +1530,19 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       return cachedData;
     }
     if (this.loadOpenDataConfigInFlight)
-      return this.loadOpenDataConfigInFlight;
+      return await this.loadOpenDataConfigInFlight;
     this.loadOpenDataConfigInFlight = this.store.openData.fetchOpenData({
       scope: "board",
       target: "venue_booking+online_store",
       section_code: [...OPEN_DATA_SECTION_CODES]
-    }).then((openDataConfig) => {
+    });
+    try {
+      const openDataConfig = await this.loadOpenDataConfigInFlight;
       this.otherParams.openData = openDataConfig;
       return openDataConfig;
-    }).finally(() => {
+    } finally {
       this.loadOpenDataConfigInFlight = null;
-    });
-    return this.loadOpenDataConfigInFlight;
+    }
   }
   async loadRuntimeConfigs() {
     await this.loadOpenDataConfig();

package/package.json

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