@pisell/pisellos 0.0.568 → 0.0.570

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

@@ -50,20 +50,19 @@ export declare class ResourceModule extends BaseModule implements Module {
     /**
      * 创建预订
      */
-    createBooking(booking: Partial<ResourceBooking>): ResourceBooking;
     /**
      * 更新预订
      */
-    updateBooking(id: ResourceId, data: Partial<ResourceBooking>): ResourceBooking | undefined;
     /**
      * 删除预订
      */
-    deleteBooking(id: ResourceId): boolean;
     /**
      * 清空缓存
      */
     clear(): Promise<void>;
     private attachBookingsToResource;
+    private normalizeIntegerIdValue;
+    private normalizeResourceIdFields;
     private normalizeResource;
     private safeEmit;
     private syncResourcesMap;

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

@@ -106,8 +106,7 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
                 this.logger = app.logger;
               }
               this.initResourceDataSource();
-              this.setupResourceSync();
-            case 8:
+            case 7:
             case "end":
               return _context.stop();
           }
@@ -150,38 +149,41 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return this.loadResourcesFromSQLite();
+              return this.setupResourceSync();
             case 2:
+              _context2.next = 4;
+              return this.loadResourcesFromSQLite();
+            case 4:
               cachedResources = _context2.sent;
               if (!(cachedResources.length > 0)) {
-                _context2.next = 10;
+                _context2.next = 12;
                 break;
               }
               this.store.list = cloneDeep(cachedResources).map(function (item) {
                 return _this3.normalizeResource(item);
               });
               this.syncResourcesMap();
-              _context2.next = 8;
+              _context2.next = 10;
               return this.safeEmit(ResourceHooks.onResourcesChanged, this.store.list);
-            case 8:
-              _context2.next = 18;
-              break;
             case 10:
-              _context2.next = 12;
-              return this.loadResourcesByServer();
+              _context2.next = 20;
+              break;
             case 12:
+              _context2.next = 14;
+              return this.loadResourcesByServer();
+            case 14:
               resources = _context2.sent;
               if (!(resources.length > 0)) {
-                _context2.next = 18;
+                _context2.next = 20;
                 break;
               }
               this.store.list = cloneDeep(resources).map(function (item) {
                 return _this3.normalizeResource(item);
               });
               this.syncResourcesMap();
-              _context2.next = 18;
+              _context2.next = 20;
               return this.safeEmit(ResourceHooks.onResourcesChanged, this.store.list);
-            case 18:
+            case 20:
             case "end":
               return _context2.stop();
           }
@@ -320,66 +322,57 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
     /**
      * 创建预订
      */
-  }, {
-    key: "createBooking",
-    value: function createBooking(booking) {
-      var _booking$id, _normalized$resource_;
-      var id = (_booking$id = booking === null || booking === void 0 ? void 0 : booking.id) !== null && _booking$id !== void 0 ? _booking$id : Date.now();
-      var normalized = _objectSpread({
-        id: id
-      }, booking);
-      this.store.bookings.push(normalized);
-      var rid = (_normalized$resource_ = normalized.resource_id) !== null && _normalized$resource_ !== void 0 ? _normalized$resource_ : normalized.resourceId;
-      if (rid !== undefined) {
-        var existing = this.resourceIdIndex.get(rid) || [];
-        existing.push(normalized);
-        this.resourceIdIndex.set(rid, existing);
-      }
+    // createBooking(booking: Partial<ResourceBooking>): ResourceBooking {
+    //   const id = booking?.id ?? Date.now()
+    //   const normalized: ResourceBooking = {
+    //     id,
+    //     ...booking,
+    //   } as ResourceBooking
 
-      // this.saveBookingsToSQLite(this.store.bookings).catch(() => {})
-      this.safeEmit(ResourceHooks.onBookingsChanged, this.store.bookings);
-      return normalized;
-    }
+    //   this.store.bookings.push(normalized)
+
+    //   const rid = normalized.resource_id ?? normalized.resourceId
+    //   if (rid !== undefined) {
+    //     const existing = this.resourceIdIndex.get(rid) || []
+    //     existing.push(normalized)
+    //     this.resourceIdIndex.set(rid, existing)
+    //   }
+
+    //   this.saveBookingsToSQLite(this.store.bookings).catch(() => {})
+    //   this.safeEmit(ResourceHooks.onBookingsChanged, this.store.bookings)
+    //   return normalized
+    // }
 
     /**
      * 更新预订
      */
-  }, {
-    key: "updateBooking",
-    value: function updateBooking(id, data) {
-      var _this7 = this;
-      var index = this.store.bookings.findIndex(function (b) {
-        return _this7.getIdKey(b.id) === _this7.getIdKey(id);
-      });
-      if (index === -1) return undefined;
-      var old = this.store.bookings[index];
-      var updated = _objectSpread(_objectSpread(_objectSpread({}, old), data), {}, {
-        id: old.id
-      });
-      this.store.bookings[index] = updated;
-      this.rebuildBookingsIndex();
-      // this.saveBookingsToSQLite(this.store.bookings).catch(() => {})
-      this.safeEmit(ResourceHooks.onBookingsChanged, this.store.bookings);
-      return updated;
-    }
+    // updateBooking(id: ResourceId, data: Partial<ResourceBooking>): ResourceBooking | undefined {
+    //   const index = this.store.bookings.findIndex(b => this.getIdKey(b.id) === this.getIdKey(id))
+    //   if (index === -1) return undefined
+
+    //   const old = this.store.bookings[index]
+    //   const updated: ResourceBooking = { ...old, ...data, id: old.id } as ResourceBooking
+    //   this.store.bookings[index] = updated
+
+    //   this.rebuildBookingsIndex()
+    //   this.saveBookingsToSQLite(this.store.bookings).catch(() => {})
+    //   this.safeEmit(ResourceHooks.onBookingsChanged, this.store.bookings)
+    //   return updated
+    // }
 
     /**
      * 删除预订
      */
-  }, {
-    key: "deleteBooking",
-    value: function deleteBooking(id) {
-      var _this8 = this;
-      var index = this.store.bookings.findIndex(function (b) {
-        return _this8.getIdKey(b.id) === _this8.getIdKey(id);
-      });
-      if (index === -1) return false;
-      this.store.bookings.splice(index, 1);
-      this.rebuildBookingsIndex();
-      // this.saveBookingsToSQLite(this.store.bookings).catch(() => {})
-      this.safeEmit(ResourceHooks.onBookingsChanged, this.store.bookings);
-      return true;
-    }
+    // deleteBooking(id: ResourceId): boolean {
+    //   const index = this.store.bookings.findIndex(b => this.getIdKey(b.id) === this.getIdKey(id))
+    //   if (index === -1) return false
+
+    //   this.store.bookings.splice(index, 1)
+    //   this.rebuildBookingsIndex()
+    //   this.saveBookingsToSQLite(this.store.bookings).catch(() => {})
+    //   this.safeEmit(ResourceHooks.onBookingsChanged, this.store.bookings)
+    //   return true
+    // }
 
     /**
      * 清空缓存
@@ -435,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,
-        _this9 = 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 : ''
-      });
+        _this7 = this;
+      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;
       }
@@ -469,7 +488,7 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
       }
       if (Array.isArray(normalized.children)) {
         normalized.children = normalized.children.map(function (child) {
-          return _this9.normalizeResource(child);
+          return _this7.normalizeResource(child);
         });
       }
       return normalized;
@@ -560,7 +579,7 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadResourcesByServer",
     value: function () {
       var _loadResourcesByServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var _this10 = this;
+        var _this8 = this;
         var response, resourceList, normalizedList;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
@@ -581,7 +600,7 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
               response = _context5.sent;
               resourceList = Array.isArray(response === null || response === void 0 ? void 0 : response.list) ? response.list : [];
               normalizedList = resourceList.map(function (item) {
-                return _this10.normalizeResource(item);
+                return _this8.normalizeResource(item);
               });
               _context5.next = 10;
               return this.saveResourcesToSQLite(normalizedList);
@@ -646,7 +665,7 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
     key: "saveResourcesToSQLite",
     value: function () {
       var _saveResourcesToSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(resourceList) {
-        var _this11 = this;
+        var _this9 = this;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -677,7 +696,7 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
             case 11:
               _context7.next = 13;
               return Promise.all(resourceList.map(function (r) {
-                return _this11.dbManager.add(RESOURCE_STORE_NAME, r);
+                return _this9.dbManager.add(RESOURCE_STORE_NAME, r);
               }));
             case 13:
               _context7.next = 19;
@@ -738,7 +757,7 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
     key: "setupResourceSync",
     value: function () {
       var _setupResourceSync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        var _this12 = this,
+        var _this10 = this,
           _result$data;
         var result, _result$data2;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
@@ -757,12 +776,12 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
                     var data = (res === null || res === void 0 ? void 0 : res.data) || res;
                     if (!data) return;
                     var channelKey = data.module || 'resource';
-                    _this12.pendingSyncMessages.push(_objectSpread(_objectSpread({}, data), {}, {
+                    _this10.pendingSyncMessages.push(_objectSpread(_objectSpread({}, data), {}, {
                       _channelKey: channelKey
                     }));
-                    if (_this12.syncTimer) clearTimeout(_this12.syncTimer);
-                    _this12.syncTimer = setTimeout(function () {
-                      _this12.processSyncMessages();
+                    if (_this10.syncTimer) clearTimeout(_this10.syncTimer);
+                    _this10.syncTimer = setTimeout(function () {
+                      _this10.processSyncMessages();
                     }, RESOURCE_SYNC_DEBOUNCE_MS);
                   }
                 }
@@ -771,13 +790,16 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 4:
               result = _context8.sent;
+              this.logInfo('setupResourceSync: 资源列表查询结果', {
+                result: result
+              });
               if (!(result !== null && result !== void 0 && (_result$data = result.data) !== null && _result$data !== void 0 && (_result$data = _result$data.list) !== null && _result$data !== void 0 && _result$data.length)) {
-                _context8.next = 8;
+                _context8.next = 9;
                 break;
               }
-              _context8.next = 8;
+              _context8.next = 9;
               return this.mergeResourcesToStore(result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.list);
-            case 8:
+            case 9:
             case "end":
               return _context8.stop();
           }
@@ -958,16 +980,16 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
     key: "removeResourcesByIds",
     value: function () {
       var _removeResourcesByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(ids) {
-        var _this13 = this;
+        var _this11 = this;
         var keySet, _iterator4, _step4, id;
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
               keySet = new Set(ids.map(function (id) {
-                return _this13.getIdKey(id);
+                return _this11.getIdKey(id);
               }));
               this.store.list = this.store.list.filter(function (r) {
-                return !keySet.has(_this13.getIdKey(r.id));
+                return !keySet.has(_this11.getIdKey(r.id));
               });
               this.syncResourcesMap();
               if (!this.dbManager) {
@@ -1024,7 +1046,7 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
     key: "mergeResourcesToStore",
     value: function () {
       var _mergeResourcesToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(freshResources) {
-        var _this14 = this;
+        var _this12 = this;
         var freshMap, _iterator5, _step5, r, updatedList, _iterator6, _step6, _r;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
@@ -1062,7 +1084,7 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
               return _context12.finish(16);
             case 19:
               updatedList = this.store.list.map(function (r) {
-                var key = _this14.getIdKey(r.id);
+                var key = _this12.getIdKey(r.id);
                 if (!freshMap.has(key)) return r;
                 var fresh = freshMap.get(key);
                 freshMap.delete(key);

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

@@ -1,7 +1,7 @@
 /**
  * Resource 模块主键类型
  */
-export type ResourceId = number | string;
+export declare type ResourceId = number | string;
 /**
  * Sales / ScheduleEventResource：预约条目内关联资源（仅 ID 与占用，详情由设备端基准数据解析）
  * @see 统一 Sales 数据协议 3.4.1 resources

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

@@ -12,6 +12,7 @@ export declare class ScheduleModuleEx extends BaseModule implements Module, Sche
     private store;
     private dbManager;
     private logger;
+    private hasLoadedScheduleList;
     constructor(name?: string, version?: string);
     /**
      * 记录信息日志
@@ -41,6 +42,7 @@ export declare class ScheduleModuleEx extends BaseModule implements Module, Sche
      * 获取所有日程列表
      */
     getScheduleList(): ScheduleItem[];
+    isScheduleListLoaded(): boolean;
     /**
      * 根据 schedule IDs 获取日程数据
      * 使用 Map 快速查询，时间复杂度 O(m)，m 为 ids 数量
@@ -64,15 +66,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;
     /**
      * 预加载模块数据（统一接口）
      * 在模块注册后自动调用