@pisell/pisellos 2.3.68 → 2.3.69

package/dist/server/modules/floor-plan/index.d.ts

@@ -10,6 +10,7 @@ export declare class FloorPlanModule extends BaseModule implements Module {
     private store;
     private request;
     private logger;
+    private dbManager;
     private floorPlanDataSource;
     private pendingSyncMessages;
     private syncTimer?;
@@ -28,6 +29,9 @@ export declare class FloorPlanModule extends BaseModule implements Module {
     private mergeItems;
     private removeByIds;
     private loadListFromServer;
+    private loadListFromSQLite;
+    private saveListToSQLite;
+    private refreshListFromServer;
     fetchByIdFromServer(id: number | string): Promise<FloorPlanItem | null>;
     fetchByCodeFromServer(code: string): Promise<FloorPlanItem | null>;
     preload(): Promise<void>;

package/dist/server/modules/floor-plan/index.js

@@ -29,6 +29,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { BaseModule } from "../../../modules/BaseModule";
 import { FloorPlanHooks } from "./types";
 var FLOOR_PLAN_SYNC_DEBOUNCE_MS = 3000;
+var FLOOR_PLAN_STORE_NAME = 'floor_plans';
 
 /**
  * 平面图模块：预加载列表、pubsub 同步、供 OS Server 路由读本地 store
@@ -45,6 +46,7 @@ export var FloorPlanModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "logger", void 0);
+    _defineProperty(_assertThisInitialized(_this), "dbManager", void 0);
     _defineProperty(_assertThisInitialized(_this), "floorPlanDataSource", void 0);
     _defineProperty(_assertThisInitialized(_this), "pendingSyncMessages", []);
     _defineProperty(_assertThisInitialized(_this), "syncTimer", void 0);
@@ -75,6 +77,7 @@ export var FloorPlanModule = /*#__PURE__*/function (_BaseModule) {
               if (appPlugin) {
                 app = appPlugin.getApp();
                 this.logger = app.logger;
+                this.dbManager = app.sqlite || app.dbManager;
               }
               this.initFloorPlanDataSource();
               this.setupFloorPlanSync();
@@ -261,34 +264,154 @@ export var FloorPlanModule = /*#__PURE__*/function (_BaseModule) {
       return loadListFromServer;
     }()
   }, {
-    key: "fetchByIdFromServer",
+    key: "loadListFromSQLite",
     value: function () {
-      var _fetchByIdFromServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(id) {
-        var res, body, data;
+      var _loadListFromSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var list;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _context3.prev = 0;
-              _context3.next = 3;
+              if (this.dbManager) {
+                _context3.next = 2;
+                break;
+              }
+              return _context3.abrupt("return", []);
+            case 2:
+              _context3.prev = 2;
+              _context3.next = 5;
+              return this.dbManager.getAll(FLOOR_PLAN_STORE_NAME);
+            case 5:
+              list = _context3.sent;
+              return _context3.abrupt("return", Array.isArray(list) ? list : []);
+            case 9:
+              _context3.prev = 9;
+              _context3.t0 = _context3["catch"](2);
+              this.logWarning('从 SQLite 读取平面图失败', {
+                error: _context3.t0 instanceof Error ? _context3.t0.message : String(_context3.t0)
+              });
+              return _context3.abrupt("return", []);
+            case 13:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this, [[2, 9]]);
+      }));
+      function loadListFromSQLite() {
+        return _loadListFromSQLite.apply(this, arguments);
+      }
+      return loadListFromSQLite;
+    }()
+  }, {
+    key: "saveListToSQLite",
+    value: function () {
+      var _saveListToSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(list) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              if (this.dbManager) {
+                _context4.next = 2;
+                break;
+              }
+              return _context4.abrupt("return");
+            case 2:
+              _context4.prev = 2;
+              _context4.next = 5;
+              return this.dbManager.clear(FLOOR_PLAN_STORE_NAME);
+            case 5:
+              if (!(list.length > 0)) {
+                _context4.next = 8;
+                break;
+              }
+              _context4.next = 8;
+              return this.dbManager.bulkAdd(FLOOR_PLAN_STORE_NAME, list);
+            case 8:
+              _context4.next = 13;
+              break;
+            case 10:
+              _context4.prev = 10;
+              _context4.t0 = _context4["catch"](2);
+              this.logWarning('保存平面图到 SQLite 失败', {
+                count: list.length,
+                error: _context4.t0 instanceof Error ? _context4.t0.message : String(_context4.t0)
+              });
+            case 13:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this, [[2, 10]]);
+      }));
+      function saveListToSQLite(_x3) {
+        return _saveListToSQLite.apply(this, arguments);
+      }
+      return saveListToSQLite;
+    }()
+  }, {
+    key: "refreshListFromServer",
+    value: function () {
+      var _refreshListFromServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+        var list;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              _context5.next = 2;
+              return this.loadListFromServer();
+            case 2:
+              list = _context5.sent;
+              if (!(list.length === 0)) {
+                _context5.next = 6;
+                break;
+              }
+              this.logWarning('远端平面图刷新完成但列表为空');
+              return _context5.abrupt("return");
+            case 6:
+              this.replaceStore(list);
+              _context5.next = 9;
+              return this.saveListToSQLite(list);
+            case 9:
+              this.core.effects.emit(FloorPlanHooks.onFloorPlansChanged, this.getSortedList());
+              this.logInfo('远端平面图刷新完成', {
+                count: list.length
+              });
+            case 11:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5, this);
+      }));
+      function refreshListFromServer() {
+        return _refreshListFromServer.apply(this, arguments);
+      }
+      return refreshListFromServer;
+    }()
+  }, {
+    key: "fetchByIdFromServer",
+    value: function () {
+      var _fetchByIdFromServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(id) {
+        var res, body, data;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              _context6.prev = 0;
+              _context6.next = 3;
               return this.request.get("/schedule/floor-plan/".concat(id), {}, {
                 isShopApi: true
               });
             case 3:
-              res = _context3.sent;
+              res = _context6.sent;
               body = res;
               data = (body === null || body === void 0 ? void 0 : body.data) !== undefined ? body.data : body;
-              return _context3.abrupt("return", data && _typeof(data) === 'object' ? data : null);
+              return _context6.abrupt("return", data && _typeof(data) === 'object' ? data : null);
             case 9:
-              _context3.prev = 9;
-              _context3.t0 = _context3["catch"](0);
-              return _context3.abrupt("return", null);
+              _context6.prev = 9;
+              _context6.t0 = _context6["catch"](0);
+              return _context6.abrupt("return", null);
             case 12:
             case "end":
-              return _context3.stop();
+              return _context6.stop();
           }
-        }, _callee3, this, [[0, 9]]);
+        }, _callee6, this, [[0, 9]]);
       }));
-      function fetchByIdFromServer(_x3) {
+      function fetchByIdFromServer(_x4) {
         return _fetchByIdFromServer.apply(this, arguments);
       }
       return fetchByIdFromServer;
@@ -296,33 +419,33 @@ export var FloorPlanModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "fetchByCodeFromServer",
     value: function () {
-      var _fetchByCodeFromServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(code) {
+      var _fetchByCodeFromServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(code) {
         var enc, res, body, data;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context4.prev = 0;
+              _context7.prev = 0;
               enc = encodeURIComponent(code);
-              _context4.next = 4;
+              _context7.next = 4;
               return this.request.get("/schedule/floor-plan/code/".concat(enc), {}, {
                 isShopApi: true
               });
             case 4:
-              res = _context4.sent;
+              res = _context7.sent;
               body = res;
               data = (body === null || body === void 0 ? void 0 : body.data) !== undefined ? body.data : body;
-              return _context4.abrupt("return", data && _typeof(data) === 'object' ? data : null);
+              return _context7.abrupt("return", data && _typeof(data) === 'object' ? data : null);
             case 10:
-              _context4.prev = 10;
-              _context4.t0 = _context4["catch"](0);
-              return _context4.abrupt("return", null);
+              _context7.prev = 10;
+              _context7.t0 = _context7["catch"](0);
+              return _context7.abrupt("return", null);
             case 13:
             case "end":
-              return _context4.stop();
+              return _context7.stop();
           }
-        }, _callee4, this, [[0, 10]]);
+        }, _callee7, this, [[0, 10]]);
       }));
-      function fetchByCodeFromServer(_x4) {
+      function fetchByCodeFromServer(_x5) {
         return _fetchByCodeFromServer.apply(this, arguments);
       }
       return fetchByCodeFromServer;
@@ -330,30 +453,42 @@ export var FloorPlanModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "preload",
     value: function () {
-      var _preload = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var list;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _preload = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        var _this3 = this;
+        var cachedList;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               this.logInfo('开始预加载平面图列表');
-              _context5.next = 3;
-              return this.loadListFromServer();
+              _context8.next = 3;
+              return this.loadListFromSQLite();
             case 3:
-              list = _context5.sent;
-              if (list.length > 0) {
-                this.replaceStore(list);
-                this.core.effects.emit(FloorPlanHooks.onFloorPlansChanged, this.getSortedList());
-                this.logInfo('预加载完成', {
-                  count: list.length
-                });
-              } else {
-                this.logWarning('预加载完成但列表为空');
+              cachedList = _context8.sent;
+              if (!(cachedList.length > 0)) {
+                _context8.next = 10;
+                break;
               }
-            case 5:
+              this.replaceStore(cachedList);
+              this.core.effects.emit(FloorPlanHooks.onFloorPlansChanged, this.getSortedList());
+              this.logInfo('预加载完成（SQLite）', {
+                count: cachedList.length
+              });
+
+              // 二次启动立即使用本地平面图，远端刷新完成后自动更新 store 与订阅者。
+              void this.refreshListFromServer().catch(function (error) {
+                _this3.logWarning('后台刷新平面图失败，继续使用本地数据', {
+                  error: error instanceof Error ? error.message : String(error)
+                });
+              });
+              return _context8.abrupt("return");
+            case 10:
+              _context8.next = 12;
+              return this.refreshListFromServer();
+            case 12:
             case "end":
-              return _context5.stop();
+              return _context8.stop();
           }
-        }, _callee5, this);
+        }, _callee8, this);
       }));
       function preload() {
         return _preload.apply(this, arguments);
@@ -375,12 +510,12 @@ export var FloorPlanModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setupFloorPlanSync",
     value: function setupFloorPlanSync() {
-      var _this3 = this;
+      var _this4 = this;
       if (!this.floorPlanDataSource) return;
       var flush = function flush() {
-        if (_this3.syncTimer) clearTimeout(_this3.syncTimer);
-        _this3.syncTimer = setTimeout(function () {
-          _this3.processFloorPlanSyncMessages();
+        if (_this4.syncTimer) clearTimeout(_this4.syncTimer);
+        _this4.syncTimer = setTimeout(function () {
+          _this4.processFloorPlanSyncMessages();
         }, FLOOR_PLAN_SYNC_DEBOUNCE_MS);
       };
       this.floorPlanDataSource.run({
@@ -388,12 +523,12 @@ export var FloorPlanModule = /*#__PURE__*/function (_BaseModule) {
           callback: function callback(res) {
             var data = (res === null || res === void 0 ? void 0 : res.data) || res;
             if (!data || data.module !== 'floor_plan') return;
-            _this3.pendingSyncMessages.push(_objectSpread({}, data));
+            _this4.pendingSyncMessages.push(_objectSpread({}, data));
             flush();
           }
         }
       }).catch(function (err) {
-        _this3.logError('setupFloorPlanSync: DataSource run 出错', {
+        _this4.logError('setupFloorPlanSync: DataSource run 出错', {
           error: err instanceof Error ? err.message : String(err)
         });
       });
@@ -402,18 +537,18 @@ export var FloorPlanModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "processFloorPlanSyncMessages",
     value: function () {
-      var _processFloorPlanSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+      var _processFloorPlanSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
         var messages, changed, deleteIds, bodyItems, needFullList, partialIds, _iterator3, _step3, _msg$ids2, msg, _msg$ids, body, hasBody, uniqueDeletes, list, fetched, _iterator4, _step4, id, one;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               messages = _toConsumableArray(this.pendingSyncMessages);
               this.pendingSyncMessages = [];
               if (!(messages.length === 0)) {
-                _context6.next = 4;
+                _context9.next = 4;
                 break;
               }
-              return _context6.abrupt("return");
+              return _context9.abrupt("return");
             case 4:
               this.logInfo('processFloorPlanSyncMessages 开始', {
                 count: messages.length
@@ -424,16 +559,16 @@ export var FloorPlanModule = /*#__PURE__*/function (_BaseModule) {
               needFullList = false;
               partialIds = new Set();
               _iterator3 = _createForOfIteratorHelper(messages);
-              _context6.prev = 11;
+              _context9.prev = 11;
               _iterator3.s();
             case 13:
               if ((_step3 = _iterator3.n()).done) {
-                _context6.next = 29;
+                _context9.next = 29;
                 break;
               }
               msg = _step3.value;
               if (!(msg.operation === 'delete' || msg.action === 'delete')) {
-                _context6.next = 18;
+                _context9.next = 18;
                 break;
               }
               if ((_msg$ids = msg.ids) !== null && _msg$ids !== void 0 && _msg$ids.length) {
@@ -441,23 +576,23 @@ export var FloorPlanModule = /*#__PURE__*/function (_BaseModule) {
               } else if (msg.id != null) {
                 deleteIds.push(msg.id);
               }
-              return _context6.abrupt("continue", 27);
+              return _context9.abrupt("continue", 27);
             case 18:
               body = msg.body;
               hasBody = body && _typeof(body) === 'object' && Object.keys(body).length > 0 && body.id != null;
               if (!hasBody) {
-                _context6.next = 23;
+                _context9.next = 23;
                 break;
               }
               bodyItems.push(body);
-              return _context6.abrupt("continue", 27);
+              return _context9.abrupt("continue", 27);
             case 23:
               if (!(msg.ids && msg.ids.length > 1)) {
-                _context6.next = 26;
+                _context9.next = 26;
                 break;
               }
               needFullList = true;
-              return _context6.abrupt("continue", 27);
+              return _context9.abrupt("continue", 27);
             case 26:
               if (((_msg$ids2 = msg.ids) === null || _msg$ids2 === void 0 ? void 0 : _msg$ids2.length) === 1) {
                 partialIds.add(msg.ids[0]);
@@ -465,19 +600,19 @@ export var FloorPlanModule = /*#__PURE__*/function (_BaseModule) {
                 partialIds.add(msg.id);
               }
             case 27:
-              _context6.next = 13;
+              _context9.next = 13;
               break;
             case 29:
-              _context6.next = 34;
+              _context9.next = 34;
               break;
             case 31:
-              _context6.prev = 31;
-              _context6.t0 = _context6["catch"](11);
-              _iterator3.e(_context6.t0);
+              _context9.prev = 31;
+              _context9.t0 = _context9["catch"](11);
+              _iterator3.e(_context9.t0);
             case 34:
-              _context6.prev = 34;
+              _context9.prev = 34;
               _iterator3.f();
-              return _context6.finish(34);
+              return _context9.finish(34);
             case 37:
               uniqueDeletes = _toConsumableArray(new Set(deleteIds));
               if (uniqueDeletes.length > 0) {
@@ -489,66 +624,71 @@ export var FloorPlanModule = /*#__PURE__*/function (_BaseModule) {
                 changed = true;
               }
               if (!needFullList) {
-                _context6.next = 48;
+                _context9.next = 48;
                 break;
               }
-              _context6.next = 43;
+              _context9.next = 43;
               return this.loadListFromServer();
             case 43:
-              list = _context6.sent;
+              list = _context9.sent;
               this.replaceStore(list);
               changed = true;
-              _context6.next = 70;
+              _context9.next = 70;
               break;
             case 48:
               if (!(partialIds.size > 0)) {
-                _context6.next = 70;
+                _context9.next = 70;
                 break;
               }
               fetched = [];
               _iterator4 = _createForOfIteratorHelper(partialIds);
-              _context6.prev = 51;
+              _context9.prev = 51;
               _iterator4.s();
             case 53:
               if ((_step4 = _iterator4.n()).done) {
-                _context6.next = 61;
+                _context9.next = 61;
                 break;
               }
               id = _step4.value;
-              _context6.next = 57;
+              _context9.next = 57;
               return this.fetchByIdFromServer(id);
             case 57:
-              one = _context6.sent;
+              one = _context9.sent;
               if (one) fetched.push(one);
             case 59:
-              _context6.next = 53;
+              _context9.next = 53;
               break;
             case 61:
-              _context6.next = 66;
+              _context9.next = 66;
               break;
             case 63:
-              _context6.prev = 63;
-              _context6.t1 = _context6["catch"](51);
-              _iterator4.e(_context6.t1);
+              _context9.prev = 63;
+              _context9.t1 = _context9["catch"](51);
+              _iterator4.e(_context9.t1);
             case 66:
-              _context6.prev = 66;
+              _context9.prev = 66;
               _iterator4.f();
-              return _context6.finish(66);
+              return _context9.finish(66);
             case 69:
               if (fetched.length > 0) {
                 this.mergeItems(fetched);
                 changed = true;
               }
             case 70:
-              if (changed) {
-                this.core.effects.emit(FloorPlanHooks.onFloorPlansChanged, this.getSortedList());
-                this.core.effects.emit(FloorPlanHooks.onFloorPlanSyncCompleted, null);
+              if (!changed) {
+                _context9.next = 75;
+                break;
               }
-            case 71:
+              _context9.next = 73;
+              return this.saveListToSQLite(this.store.list);
+            case 73:
+              this.core.effects.emit(FloorPlanHooks.onFloorPlansChanged, this.getSortedList());
+              this.core.effects.emit(FloorPlanHooks.onFloorPlanSyncCompleted, null);
+            case 75:
             case "end":
-              return _context6.stop();
+              return _context9.stop();
           }
-        }, _callee6, this, [[11, 31, 34, 37], [51, 63, 66, 69]]);
+        }, _callee9, this, [[11, 31, 34, 37], [51, 63, 66, 69]]);
       }));
       function processFloorPlanSyncMessages() {
         return _processFloorPlanSyncMessages.apply(this, arguments);
@@ -558,18 +698,20 @@ export var FloorPlanModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clear",
     value: function () {
-      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               this.store.list = [];
               this.store.map.clear();
               this.store.codeMap.clear();
-            case 3:
+              _context10.next = 5;
+              return this.saveListToSQLite([]);
+            case 5:
             case "end":
-              return _context7.stop();
+              return _context10.stop();
           }
-        }, _callee7, this);
+        }, _callee10, this);
       }));
       function clear() {
         return _clear.apply(this, arguments);