@pisell/pisellos 2.2.244 → 2.2.246

package/dist/server/modules/resource/index.d.ts

@@ -61,6 +61,8 @@ export declare class ResourceModule extends BaseModule implements Module {
      */
     clear(): Promise<void>;
     private attachBookingsToResource;
+    private normalizeIntegerIdValue;
+    private normalizeResourceIdFields;
     private normalizeResource;
     private safeEmit;
     private syncResourcesMap;

package/dist/server/modules/resource/index.js

@@ -428,15 +428,41 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
         bookings: this.getBookingsByResourceId(resource.id)
       });
     }
+  }, {
+    key: "normalizeIntegerIdValue",
+    value: function normalizeIntegerIdValue(value) {
+      if (typeof value !== 'string') return value;
+      var matched = value.match(/^(-?\d+)\.0+$/);
+      if (!matched) return value;
+      return matched[1];
+    }
+  }, {
+    key: "normalizeResourceIdFields",
+    value: function normalizeResourceIdFields(resource) {
+      resource.id = this.normalizeIntegerIdValue(resource.id);
+      if (resource.form_record_id !== undefined) {
+        resource.form_record_id = this.normalizeIntegerIdValue(resource.form_record_id);
+      }
+      if (resource.form_id !== undefined) {
+        resource.form_id = this.normalizeIntegerIdValue(resource.form_id);
+      }
+      if (resource.resource_form_id !== undefined) {
+        resource.resource_form_id = this.normalizeIntegerIdValue(resource.resource_form_id);
+      }
+      if (resource.resource_id !== undefined) {
+        resource.resource_id = this.normalizeIntegerIdValue(resource.resource_id);
+      }
+      return resource;
+    }
   }, {
     key: "normalizeResource",
     value: function normalizeResource(resource) {
       var _ref2,
         _resource$id,
         _this7 = this;
-      var normalized = _objectSpread(_objectSpread({}, resource), {}, {
-        id: (_ref2 = (_resource$id = resource === null || resource === void 0 ? void 0 : resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource === null || resource === void 0 ? void 0 : resource.form_record_id) !== null && _ref2 !== void 0 ? _ref2 : ''
-      });
+      var normalized = this.normalizeResourceIdFields(_objectSpread(_objectSpread({}, resource), {}, {
+        id: this.normalizeIntegerIdValue((_ref2 = (_resource$id = resource === null || resource === void 0 ? void 0 : resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource === null || resource === void 0 ? void 0 : resource.form_record_id) !== null && _ref2 !== void 0 ? _ref2 : '')
+      }));
       if (normalized.form_record_id === undefined && normalized.id !== '') {
         normalized.form_record_id = normalized.id;
       }

package/dist/server/modules/schedule/index.d.ts

@@ -64,15 +64,15 @@ export declare class ScheduleModuleEx extends BaseModule implements Module, Sche
      */
     getDateIsInSchedule(date: string, scheduleList: (ScheduleItem | number)[]): boolean;
     /**
-     * 从 IndexDB 加载日程数据
+     * 从 SQLite 加载日程数据
      * @private
      */
-    private loadScheduleFromIndexDB;
+    private loadScheduleFromSQLite;
     /**
-     * 保存日程数据到 IndexDB
+     * 保存日程数据到 SQLite
      * @private
      */
-    private saveScheduleToIndexDB;
+    private saveScheduleToSQLite;
     /**
      * 预加载模块数据（统一接口）
      * 在模块注册后自动调用

package/dist/server/modules/schedule/index.js

@@ -32,9 +32,9 @@ dayjs.extend(isSameOrBefore);
 dayjs.extend(isSameOrAfter);
 
 /**
- * IndexDB 存储名称
+ * SQLite 存储名称
  */
-var INDEXDB_STORE_NAME = 'schedule';
+var SCHEDULE_STORE_NAME = 'schedule';
 
 /**
  * Schedule 模块（扩展版本）
@@ -54,7 +54,7 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", {});
     _defineProperty(_assertThisInitialized(_this), "dbManager", void 0);
-    // IndexDBManager 实例
+    // SQLiteAdapter 实例
     _defineProperty(_assertThisInitialized(_this), "logger", void 0);
     return _this;
   }
@@ -149,16 +149,16 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
                 this.store.map = new Map();
               }
 
-              // 获取并存储 dbManager 和 logger
+              // 获取并存储 SQLite 和 logger
               appPlugin = core.getPlugin('app');
               if (appPlugin) {
                 app = appPlugin.getApp();
-                this.dbManager = app.dbManager;
+                this.dbManager = app.sqlite;
                 this.logger = app.logger;
                 if (this.dbManager) {
-                  console.log('[Schedule] IndexDB Manager 已初始化');
+                  console.log('[Schedule] SQLite 已初始化');
                 } else {
-                  console.warn('[Schedule] IndexDB Manager 未找到');
+                  console.warn('[Schedule] SQLite 未找到');
                 }
               }
               this.logInfo('模块初始化完成', {
@@ -206,9 +206,9 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
                 duration: "".concat(duration, "ms")
               });
 
-              // 保存到 IndexDB
+              // 保存到 SQLite
               _context2.next = 11;
-              return this.saveScheduleToIndexDB(list);
+              return this.saveScheduleToSQLite(list);
             case 11:
               this.setScheduleList(list);
               return _context2.abrupt("return", list);
@@ -257,6 +257,7 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getScheduleByIds",
     value: function getScheduleByIds(ids) {
+      var _this2 = this;
       if (!ids || ids.length === 0) {
         this.logInfo('getScheduleByIds: 未提供有效的 ids', {
           idsCount: 0
@@ -264,15 +265,21 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
         return [];
       }
       var result = [];
+      var scheduleList = this.store.scheduleList || [];
       var _iterator = _createForOfIteratorHelper(ids),
         _step;
       try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _loop = function _loop() {
           var id = _step.value;
-          var schedule = this.store.map.get(id);
+          var schedule = _this2.store.map.get(id) || scheduleList.find(function (item) {
+            return String(item.id) === String(id);
+          });
           if (schedule) {
             result.push(schedule);
           }
+        };
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          _loop();
         }
       } catch (err) {
         _iterator.e(err);
@@ -327,25 +334,25 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.scheduleList = [];
               this.store.map.clear();
-              // 同时清空 IndexDB 中的数据
+              // 同时清空 SQLite 中的数据
               if (!this.dbManager) {
                 _context3.next = 16;
                 break;
               }
               _context3.prev = 4;
               _context3.next = 7;
-              return this.dbManager.clear(INDEXDB_STORE_NAME);
+              return this.dbManager.clear(SCHEDULE_STORE_NAME);
             case 7:
-              console.log('[Schedule] IndexDB 缓存已清空');
-              this.logInfo('IndexDB 缓存已清空');
+              console.log('[Schedule] SQLite 缓存已清空');
+              this.logInfo('SQLite 缓存已清空');
               _context3.next = 16;
               break;
             case 11:
               _context3.prev = 11;
               _context3.t0 = _context3["catch"](4);
               errorMessage = _context3.t0 instanceof Error ? _context3.t0.message : String(_context3.t0);
-              console.error('[Schedule] 清空 IndexDB 缓存失败:', _context3.t0);
-              this.logError('清空 IndexDB 缓存失败', {
+              console.error('[Schedule] 清空 SQLite 缓存失败:', _context3.t0);
+              this.logError('清空 SQLite 缓存失败', {
                 error: errorMessage
               });
             case 16:
@@ -371,11 +378,11 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getDateIsInSchedule",
     value: function getDateIsInSchedule(date, scheduleList) {
-      var _this2 = this;
+      var _this3 = this;
       var scheduleListData = [];
       scheduleList.forEach(function (item) {
         if (typeof item === 'number') {
-          scheduleListData.push.apply(scheduleListData, _toConsumableArray(_this2.getScheduleByIds([item])));
+          scheduleListData.push.apply(scheduleListData, _toConsumableArray(_this3.getScheduleByIds([item])));
         } else {
           scheduleListData.push(item);
         }
@@ -390,13 +397,13 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
     }
 
     /**
-     * 从 IndexDB 加载日程数据
+     * 从 SQLite 加载日程数据
      * @private
      */
   }, {
-    key: "loadScheduleFromIndexDB",
+    key: "loadScheduleFromSQLite",
     value: (function () {
-      var _loadScheduleFromIndexDB = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var _loadScheduleFromSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
         var _scheduleList$length, scheduleList, errorMessage;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
@@ -405,15 +412,15 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
                 _context4.next = 3;
                 break;
               }
-              this.logWarning('loadScheduleFromIndexDB: dbManager 不可用');
+              this.logWarning('loadScheduleFromSQLite: SQLite 不可用');
               return _context4.abrupt("return", []);
             case 3:
               _context4.prev = 3;
               _context4.next = 6;
-              return this.dbManager.getAll(INDEXDB_STORE_NAME);
+              return this.dbManager.getAll(SCHEDULE_STORE_NAME);
             case 6:
               scheduleList = _context4.sent;
-              this.logInfo('从 IndexDB 加载日程数据', {
+              this.logInfo('从 SQLite 加载日程数据', {
                 scheduleCount: (_scheduleList$length = scheduleList === null || scheduleList === void 0 ? void 0 : scheduleList.length) !== null && _scheduleList$length !== void 0 ? _scheduleList$length : 0
               });
               return _context4.abrupt("return", scheduleList || []);
@@ -421,8 +428,8 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
               _context4.prev = 11;
               _context4.t0 = _context4["catch"](3);
               errorMessage = _context4.t0 instanceof Error ? _context4.t0.message : String(_context4.t0);
-              console.error('[Schedule] 从 IndexDB 读取数据失败:', _context4.t0);
-              this.logError('从 IndexDB 读取数据失败', {
+              console.error('[Schedule] 从 SQLite 读取数据失败:', _context4.t0);
+              this.logError('从 SQLite 读取数据失败', {
                 error: errorMessage
               });
               return _context4.abrupt("return", []);
@@ -432,22 +439,22 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee4, this, [[3, 11]]);
       }));
-      function loadScheduleFromIndexDB() {
-        return _loadScheduleFromIndexDB.apply(this, arguments);
+      function loadScheduleFromSQLite() {
+        return _loadScheduleFromSQLite.apply(this, arguments);
       }
-      return loadScheduleFromIndexDB;
+      return loadScheduleFromSQLite;
     }()
     /**
-     * 保存日程数据到 IndexDB
+     * 保存日程数据到 SQLite
      * @private
      */
     )
   }, {
-    key: "saveScheduleToIndexDB",
+    key: "saveScheduleToSQLite",
     value: (function () {
-      var _saveScheduleToIndexDB = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(scheduleList) {
-        var _this3 = this;
-        var savePromises, errorMessage;
+      var _saveScheduleToSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(scheduleList) {
+        var _this4 = this;
+        var errorMessage;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -455,48 +462,70 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
                 _context5.next = 3;
                 break;
               }
-              this.logWarning('saveScheduleToIndexDB: dbManager 不可用');
+              this.logWarning('saveScheduleToSQLite: SQLite 不可用');
               return _context5.abrupt("return");
             case 3:
-              this.logInfo('开始保存日程数据到 IndexDB', {
+              this.logInfo('开始保存日程数据到 SQLite', {
                 scheduleCount: scheduleList.length
               });
               _context5.prev = 4;
               _context5.next = 7;
-              return this.dbManager.clear(INDEXDB_STORE_NAME);
+              return this.dbManager.clear(SCHEDULE_STORE_NAME);
             case 7:
-              // 逐个保存日程（每个日程是独立的记录）
-              savePromises = scheduleList.map(function (schedule) {
-                return _this3.dbManager.add(INDEXDB_STORE_NAME, schedule);
-              });
-              _context5.next = 10;
-              return Promise.all(savePromises);
-            case 10:
-              console.log("[Schedule] \u5DF2\u5C06 ".concat(scheduleList.length, " \u6761\u65E5\u7A0B\u6570\u636E\u4FDD\u5B58\u5230 IndexDB"));
-              this.logInfo('日程数据已保存到 IndexDB', {
+              if (!(scheduleList.length > 0)) {
+                _context5.next = 20;
+                break;
+              }
+              if (!(typeof this.dbManager.bulkAdd === 'function')) {
+                _context5.next = 13;
+                break;
+              }
+              _context5.next = 11;
+              return this.dbManager.bulkAdd(SCHEDULE_STORE_NAME, scheduleList);
+            case 11:
+              _context5.next = 20;
+              break;
+            case 13:
+              if (!(typeof this.dbManager.bulkUpdate === 'function')) {
+                _context5.next = 18;
+                break;
+              }
+              _context5.next = 16;
+              return this.dbManager.bulkUpdate(SCHEDULE_STORE_NAME, scheduleList);
+            case 16:
+              _context5.next = 20;
+              break;
+            case 18:
+              _context5.next = 20;
+              return Promise.all(scheduleList.map(function (schedule) {
+                return _this4.dbManager.add(SCHEDULE_STORE_NAME, schedule);
+              }));
+            case 20:
+              console.log("[Schedule] \u5DF2\u5C06 ".concat(scheduleList.length, " \u6761\u65E5\u7A0B\u6570\u636E\u4FDD\u5B58\u5230 SQLite"));
+              this.logInfo('日程数据已保存到 SQLite', {
                 scheduleCount: scheduleList.length
               });
-              _context5.next = 19;
+              _context5.next = 29;
               break;
-            case 14:
-              _context5.prev = 14;
+            case 24:
+              _context5.prev = 24;
               _context5.t0 = _context5["catch"](4);
               errorMessage = _context5.t0 instanceof Error ? _context5.t0.message : String(_context5.t0);
-              console.error('[Schedule] 保存数据到 IndexDB 失败:', _context5.t0);
-              this.logError('保存数据到 IndexDB 失败', {
+              console.error('[Schedule] 保存数据到 SQLite 失败:', _context5.t0);
+              this.logError('保存数据到 SQLite 失败', {
                 scheduleCount: scheduleList.length,
                 error: errorMessage
               });
-            case 19:
+            case 29:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[4, 14]]);
+        }, _callee5, this, [[4, 24]]);
       }));
-      function saveScheduleToIndexDB(_x3) {
-        return _saveScheduleToIndexDB.apply(this, arguments);
+      function saveScheduleToSQLite(_x3) {
+        return _saveScheduleToSQLite.apply(this, arguments);
       }
-      return saveScheduleToIndexDB;
+      return saveScheduleToSQLite;
     }()
     /**
      * 预加载模块数据（统一接口）
@@ -516,36 +545,36 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('开始预加载数据');
               _context6.prev = 3;
               _context6.next = 6;
-              return this.loadScheduleFromIndexDB();
+              return this.loadScheduleFromSQLite();
             case 6:
               cachedData = _context6.sent;
               if (!(cachedData && cachedData.length > 0)) {
                 _context6.next = 14;
                 break;
               }
-              console.log("[Schedule] \u4ECE IndexDB \u52A0\u8F7D\u4E86 ".concat(cachedData.length, " \u6761\u65E5\u7A0B\u6570\u636E"));
+              console.log("[Schedule] \u4ECE SQLite \u52A0\u8F7D\u4E86 ".concat(cachedData.length, " \u6761\u65E5\u7A0B\u6570\u636E"));
               // 将缓存数据放入 store
               this.store.scheduleList = cloneDeep(cachedData);
               // 同步更新 Map 缓存
               this.syncScheduleMap();
               duration = Date.now() - startTime;
-              this.logInfo('预加载完成（从 IndexDB）', {
+              this.logInfo('预加载完成（从 SQLite）', {
                 scheduleCount: cachedData.length,
                 duration: "".concat(duration, "ms"),
-                source: 'IndexDB'
+                source: 'SQLite'
               });
               return _context6.abrupt("return");
             case 14:
-              console.log('[Schedule] IndexDB 中没有缓存数据，从服务器加载...');
-              this.logInfo('IndexDB 中没有缓存数据，准备从服务器加载');
+              console.log('[Schedule] SQLite 中没有缓存数据，从服务器加载...');
+              this.logInfo('SQLite 中没有缓存数据，准备从服务器加载');
               _context6.next = 23;
               break;
             case 18:
               _context6.prev = 18;
               _context6.t0 = _context6["catch"](3);
               errorMessage = _context6.t0 instanceof Error ? _context6.t0.message : String(_context6.t0);
-              console.warn('[Schedule] 从 IndexDB 加载数据失败:', _context6.t0);
-              this.logWarning('从 IndexDB 加载数据失败，准备从服务器加载', {
+              console.warn('[Schedule] 从 SQLite 加载数据失败:', _context6.t0);
+              this.logWarning('从 SQLite 加载数据失败，准备从服务器加载', {
                 error: errorMessage
               });
             case 23:
@@ -553,30 +582,24 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
               return this.loadAllSchedule();
             case 25:
               scheduleList = _context6.sent;
-              if (!(scheduleList && scheduleList.length > 0)) {
-                _context6.next = 35;
-                break;
+              // 3. 将服务器数据放入 store
+              if (scheduleList && scheduleList.length > 0) {
+                this.store.scheduleList = cloneDeep(scheduleList);
+                // 同步更新 Map 缓存
+                this.syncScheduleMap();
+                _duration2 = Date.now() - startTime;
+                this.logInfo('预加载完成（从服务器）', {
+                  scheduleCount: scheduleList.length,
+                  duration: "".concat(_duration2, "ms"),
+                  source: 'Server'
+                });
+              } else {
+                _duration3 = Date.now() - startTime;
+                this.logWarning('预加载完成但未获取到数据', {
+                  duration: "".concat(_duration3, "ms")
+                });
               }
-              _context6.next = 29;
-              return this.saveScheduleToIndexDB(scheduleList);
-            case 29:
-              this.store.scheduleList = cloneDeep(scheduleList);
-              // 同步更新 Map 缓存
-              this.syncScheduleMap();
-              _duration2 = Date.now() - startTime;
-              this.logInfo('预加载完成（从服务器）', {
-                scheduleCount: scheduleList.length,
-                duration: "".concat(_duration2, "ms"),
-                source: 'Server'
-              });
-              _context6.next = 37;
-              break;
-            case 35:
-              _duration3 = Date.now() - startTime;
-              this.logWarning('预加载完成但未获取到数据', {
-                duration: "".concat(_duration3, "ms")
-              });
-            case 37:
+            case 27:
             case "end":
               return _context6.stop();
           }