@univerjs-pro/collaboration-client-ui 1.0.0-rc.0 → 1.0.1

package/lib/locale/zh-HK.js

@@ -1 +1 @@
-const _0x17e2c9=_0x5c5d;(function(_0x2156a4,_0x9b6de4){const _0xb60737=_0x5c5d,_0x2e92d9=_0x2156a4();while(!![]){try{const _0x27d19b=parseInt(_0xb60737(0x1de))/0x1+parseInt(_0xb60737(0x1c8))/0x2+parseInt(_0xb60737(0x1e2))/0x3+-parseInt(_0xb60737(0x1d8))/0x4+-parseInt(_0xb60737(0x1ce))/0x5*(-parseInt(_0xb60737(0x1da))/0x6)+parseInt(_0xb60737(0x1dc))/0x7*(parseInt(_0xb60737(0x1d3))/0x8)+-parseInt(_0xb60737(0x1d7))/0x9;if(_0x27d19b===_0x9b6de4)break;else _0x2e92d9['push'](_0x2e92d9['shift']());}catch(_0x55391f){_0x2e92d9['push'](_0x2e92d9['shift']());}}}(_0x2022,0x2b1d2));function _0x2022(){const _0x207151=['由於協作房間已關閉，編輯權限已被收回。','同步中...','公式計算已開始。','773697Fpahfl','已離線，編輯將儲存在本機','327324patejl','本機檔案','伺服器未回應協作請求，您的編輯將儲存在本機。','連線失敗，請檢查您的網絡。','資料載入停留在\x20{0}/{1}，請重新整理頁面後再試。','您的本機文件與伺服器文件存在衝突。請將您的本機編輯儲存至其他地方，因為重新整理頁面後將會遺失。','5GEUfus','重新整理頁面','您的登入已過期，點擊「確定」重新登入，點擊「取消」儲存您的本機編輯。','正在擷取伺服器資料...','點擊重新連線','30944HAjczL','您的操作與伺服器權限存在衝突。請將您的本機編輯儲存至其他地方，重新整理頁面後將會被捨棄。','您在另一個分頁開啟了同一個檔案。為避免資料遺失，此分頁將無法進行編輯。','已同步','6343830gGqiiD','69544JGHMQU','協作房間已滿，您的編輯將暫存於本機。','2038266dcHBZT','目前無法執行公式計算，請稍後重試。','7qpSERT','公式計算佇列已滿，正在等待可用資源...','133710akJrXc'];_0x2022=function(){return _0x207151;};return _0x2022();}function _0x5c5d(_0x52c7de,_0xa4a0d9){_0x52c7de=_0x52c7de-0x1c7;const _0x2022ff=_0x2022();let _0x5c5da9=_0x2022ff[_0x52c7de];return _0x5c5da9;}const e={'collaboration-client-ui':{'collabClient':{'tooltip':{'reconnect':_0x17e2c9(0x1d2)}},'collabStatus':{'fetchMiss':_0x17e2c9(0x1d1),'conflict':'編輯衝突','notCollab':_0x17e2c9(0x1c9),'synced':_0x17e2c9(0x1d6),'syncing':_0x17e2c9(0x1e0),'offline':_0x17e2c9(0x1c7)},'snapshotLoading':{'timeout':_0x17e2c9(0x1cc),'refresh':_0x17e2c9(0x1cf)},'session':{'connection-failed':_0x17e2c9(0x1cb),'will-retry':'連線失敗，將在稍後重試連線。','room-full':_0x17e2c9(0x1d9),'collaboration-timeout':_0x17e2c9(0x1ca)},'conflict':{'title':'協作衝突','content':_0x17e2c9(0x1cd)},'permission':{'title':'認證錯誤','content':_0x17e2c9(0x1d4)},'collaboration':{'offline-data-not-saved':'您有未儲存至伺服器的離線編輯，請檢查網絡後重試。','single-unit':{'warning':_0x17e2c9(0x1d5)},'closeRoom':_0x17e2c9(0x1df)},'auth':{'needGotoLoginAlert':_0x17e2c9(0x1d0)},'formula':{'calculation':{'started':_0x17e2c9(0x1e1),'waiting':_0x17e2c9(0x1dd),'unable':_0x17e2c9(0x1db)}}}};export{e as default};
+const _0x5856d4=_0x295e;(function(_0x5a003e,_0x5703e0){const _0x334a3e=_0x295e,_0x1fd6e8=_0x5a003e();while(!![]){try{const _0x5a2d09=parseInt(_0x334a3e(0x19a))/0x1+parseInt(_0x334a3e(0x198))/0x2*(parseInt(_0x334a3e(0x194))/0x3)+-parseInt(_0x334a3e(0x19b))/0x4+parseInt(_0x334a3e(0x197))/0x5+-parseInt(_0x334a3e(0x19c))/0x6*(parseInt(_0x334a3e(0x196))/0x7)+-parseInt(_0x334a3e(0x18e))/0x8+parseInt(_0x334a3e(0x18d))/0x9;if(_0x5a2d09===_0x5703e0)break;else _0x1fd6e8['push'](_0x1fd6e8['shift']());}catch(_0x2af865){_0x1fd6e8['push'](_0x1fd6e8['shift']());}}}(_0x3807,0x296a6));const e={'collaboration-client-ui':{'collabClient':{'tooltip':{'reconnect':_0x5856d4(0x192)}},'collabStatus':{'fetchMiss':_0x5856d4(0x18c),'conflict':_0x5856d4(0x1a4),'notCollab':_0x5856d4(0x195),'synced':_0x5856d4(0x1a3),'syncing':'同步中...','offline':_0x5856d4(0x199)},'snapshotLoading':{'timeout':_0x5856d4(0x19e),'refresh':_0x5856d4(0x1a1)},'session':{'connection-failed':'連線失敗，請檢查您的網絡。','will-retry':_0x5856d4(0x19f),'room-full':_0x5856d4(0x193),'collaboration-timeout':'伺服器未回應協作請求，您的編輯將儲存在本機。'},'conflict':{'processing':_0x5856d4(0x190),'clearFailed':'無法清除本機衝突資料。重新整理頁面可能再次還原異常資料，請重試。','retry':'重試並重新整理','title':_0x5856d4(0x191),'content':_0x5856d4(0x1a2)},'permission':{'title':_0x5856d4(0x1a5),'content':_0x5856d4(0x19d)},'collaboration':{'offline-data-not-saved':'您有未儲存至伺服器的離線編輯，請檢查網絡後重試。','single-unit':{'warning':'您在另一個分頁開啟了同一個檔案。為避免資料遺失，此分頁將無法進行編輯。'},'closeRoom':_0x5856d4(0x1a0)},'auth':{'needGotoLoginAlert':_0x5856d4(0x18f)}}};export{e as default};function _0x295e(_0x23e14d,_0x4e2bec){_0x23e14d=_0x23e14d-0x18c;const _0x380799=_0x3807();let _0x295e0c=_0x380799[_0x23e14d];return _0x295e0c;}function _0x3807(){const _0xb6a4d9=['22458lfikzA','您的操作與伺服器權限存在衝突。請將您的本機編輯儲存至其他地方，重新整理頁面後將會被捨棄。','資料載入停留在\x20{0}/{1}，請重新整理頁面後再試。','連線失敗，將在稍後重試連線。','由於協作房間已關閉，編輯權限已被收回。','重新整理頁面','您的本機文件與伺服器文件存在衝突。請將您的本機編輯儲存至其他地方，因為重新整理頁面後將會遺失。','已同步','編輯衝突','認證錯誤','正在擷取伺服器資料...','3985218wNNDey','864536oTcYOk','您的登入已過期，點擊「確定」重新登入，點擊「取消」儲存您的本機編輯。','正在處理協同衝突…','協作衝突','點擊重新連線','協作房間已滿，您的編輯將暫存於本機。','165keHXVZ','本機檔案','511KiZiEV','801255axklYx','1552avLqlP','已離線，編輯將儲存在本機','109977QUHaKl','819064PslpNo'];_0x3807=function(){return _0xb6a4d9;};return _0x3807();}

package/lib/locale/zh-TW.js

@@ -1 +1 @@
-function _0x512c(_0x41f7e3,_0x38bbf2){_0x41f7e3=_0x41f7e3-0x1d1;const _0x30789c=_0x3078();let _0x512c2f=_0x30789c[_0x41f7e3];return _0x512c2f;}const _0x81596b=_0x512c;(function(_0xd87b4e,_0x7fafef){const _0xbbd607=_0x512c,_0x342d16=_0xd87b4e();while(!![]){try{const _0x1da420=parseInt(_0xbbd607(0x1e9))/0x1+-parseInt(_0xbbd607(0x1e7))/0x2*(parseInt(_0xbbd607(0x1e5))/0x3)+parseInt(_0xbbd607(0x1e0))/0x4+parseInt(_0xbbd607(0x1e3))/0x5*(-parseInt(_0xbbd607(0x1eb))/0x6)+parseInt(_0xbbd607(0x1e2))/0x7*(-parseInt(_0xbbd607(0x1d5))/0x8)+parseInt(_0xbbd607(0x1ed))/0x9*(parseInt(_0xbbd607(0x1d1))/0xa)+parseInt(_0xbbd607(0x1db))/0xb;if(_0x1da420===_0x7fafef)break;else _0x342d16['push'](_0x342d16['shift']());}catch(_0x59ef6e){_0x342d16['push'](_0x342d16['shift']());}}}(_0x3078,0xb6b5d));function _0x3078(){const _0x43f6a0=['點擊重新連線','7634792bTDPNJ','公式計算佇列已滿，正在等待可用資源...','連線失敗，請檢查您的網路。','目前無法執行公式計算，請稍後重試。','伺服器未回應協作請求，您的編輯將儲存在本機。','927352UnnJmz','您的本機文件與伺服器文件存在衝突。請將您的本機編輯儲存至其他地方，因為重新整理頁面後將會遺失。','7002366EnIUtp','12010hivdxB','同步中...','45249fbNdGm','連線失敗，將在稍後重試連線。','166FltkIV','本機檔案','1049349TNUOOB','由於協作房間已關閉，編輯權限已被收回。','588AEibpw','資料載入停留在\x20{0}/{1}，請重新整理頁面後再試。','98667huASgj','正在擷取伺服器資料...','1150LayTdy','協作房間已滿，您的編輯將暫存於本機。','您的操作與伺服器權限存在衝突。請將您的本機編輯儲存至其他地方，重新整理頁面後將會被捨棄。','您的登入已過期，點擊「確定」重新登入，點擊「取消」儲存您的本機編輯。','8EEoWAd','公式計算已開始。','已離線，編輯將儲存在本機','您有未儲存至伺服器的離線編輯，請檢查網路後重試。','協作衝突'];_0x3078=function(){return _0x43f6a0;};return _0x3078();}const e={'collaboration-client-ui':{'collabClient':{'tooltip':{'reconnect':_0x81596b(0x1da)}},'collabStatus':{'fetchMiss':_0x81596b(0x1ee),'conflict':'編輯衝突','notCollab':_0x81596b(0x1e8),'synced':'已同步','syncing':_0x81596b(0x1e4),'offline':_0x81596b(0x1d7)},'snapshotLoading':{'timeout':_0x81596b(0x1ec),'refresh':'重新整理頁面'},'session':{'connection-failed':_0x81596b(0x1dd),'will-retry':_0x81596b(0x1e6),'room-full':_0x81596b(0x1d2),'collaboration-timeout':_0x81596b(0x1df)},'conflict':{'title':_0x81596b(0x1d9),'content':_0x81596b(0x1e1)},'permission':{'title':'認證錯誤','content':_0x81596b(0x1d3)},'collaboration':{'offline-data-not-saved':_0x81596b(0x1d8),'single-unit':{'warning':'您在另一個分頁開啟了同一個檔案。為避免資料遺失，此分頁將無法進行編輯。'},'closeRoom':_0x81596b(0x1ea)},'auth':{'needGotoLoginAlert':_0x81596b(0x1d4)},'formula':{'calculation':{'started':_0x81596b(0x1d6),'waiting':_0x81596b(0x1dc),'unable':_0x81596b(0x1de)}}}};export{e as default};
+function _0x24ac(_0x3bec00,_0x4ff127){_0x3bec00=_0x3bec00-0x146;const _0x56e670=_0x56e6();let _0x24acc5=_0x56e670[_0x3bec00];return _0x24acc5;}const _0x343e74=_0x24ac;function _0x56e6(){const _0x35a6c0=['連線失敗，將在稍後重試連線。','連線失敗，請檢查您的網路。','4764780jgWlLb','由於協作房間已關閉，編輯權限已被收回。','4960530tXzuMq','正在擷取伺服器資料...','您的操作與伺服器權限存在衝突。請將您的本機編輯儲存至其他地方，重新整理頁面後將會被捨棄。','30aahzBP','重試並重新整理','資料載入停留在\x20{0}/{1}，請重新整理頁面後再試。','113770kxwioG','協作衝突','您的本機文件與伺服器文件存在衝突。請將您的本機編輯儲存至其他地方，因為重新整理頁面後將會遺失。','147780SLYWst','4UmAEQr','772800RVFxGF','1089FxwHEZ','協作房間已滿，您的編輯將暫存於本機。','點擊重新連線','970688faHlJk','編輯衝突','伺服器未回應協作請求，您的編輯將儲存在本機。','認證錯誤','52652BatCqg','無法清除本機衝突資料。重新整理頁面可能再次還原異常資料，請重試。','正在處理協同衝突…','本機檔案','您在另一個分頁開啟了同一個檔案。為避免資料遺失，此分頁將無法進行編輯。'];_0x56e6=function(){return _0x35a6c0;};return _0x56e6();}(function(_0x584adb,_0x1aa273){const _0x30a669=_0x24ac,_0x268dc5=_0x584adb();while(!![]){try{const _0x1f8651=parseInt(_0x30a669(0x15f))/0x1+parseInt(_0x30a669(0x14d))/0x2*(-parseInt(_0x30a669(0x159))/0x3)+parseInt(_0x30a669(0x160))/0x4*(parseInt(_0x30a669(0x156))/0x5)+parseInt(_0x30a669(0x154))/0x6+parseInt(_0x30a669(0x161))/0x7+parseInt(_0x30a669(0x149))/0x8+parseInt(_0x30a669(0x146))/0x9*(-parseInt(_0x30a669(0x15c))/0xa);if(_0x1f8651===_0x1aa273)break;else _0x268dc5['push'](_0x268dc5['shift']());}catch(_0x248e53){_0x268dc5['push'](_0x268dc5['shift']());}}}(_0x56e6,0x80633));const e={'collaboration-client-ui':{'collabClient':{'tooltip':{'reconnect':_0x343e74(0x148)}},'collabStatus':{'fetchMiss':_0x343e74(0x157),'conflict':_0x343e74(0x14a),'notCollab':_0x343e74(0x150),'synced':'已同步','syncing':'同步中...','offline':'已離線，編輯將儲存在本機'},'snapshotLoading':{'timeout':_0x343e74(0x15b),'refresh':'重新整理頁面'},'session':{'connection-failed':_0x343e74(0x153),'will-retry':_0x343e74(0x152),'room-full':_0x343e74(0x147),'collaboration-timeout':_0x343e74(0x14b)},'conflict':{'processing':_0x343e74(0x14f),'clearFailed':_0x343e74(0x14e),'retry':_0x343e74(0x15a),'title':_0x343e74(0x15d),'content':_0x343e74(0x15e)},'permission':{'title':_0x343e74(0x14c),'content':_0x343e74(0x158)},'collaboration':{'offline-data-not-saved':'您有未儲存至伺服器的離線編輯，請檢查網路後重試。','single-unit':{'warning':_0x343e74(0x151)},'closeRoom':_0x343e74(0x155)},'auth':{'needGotoLoginAlert':'您的登入已過期，點擊「確定」重新登入，點擊「取消」儲存您的本機編輯。'}}};export{e as default};

package/lib/types/controllers/collaboration-client-ui.controller.d.ts

@@ -11,7 +11,14 @@ export declare class CollaborationClientUIController extends Disposable {
     protected readonly _messageService: IMessageService;
     private readonly _notificationService;
     protected readonly _localeService: LocaleService;
+    private _conflictNotification;
+    private readonly _retryingConflictCacheUnitIDs;
     constructor(_beforeCloseService: IBeforeCloseService, _localCacheService: ILocalCacheService, _collaborationUIEventService: CollaborationUIEventService, _messageService: IMessageService, _notificationService: INotificationService, _localeService: LocaleService);
+    dispose(): void;
     private _setupBeforeClosingHandler;
     private _initEvent;
+    private _showConflictProcessingNotification;
+    private _showConflictCacheClearFailedNotification;
+    private _retryConflictCacheClear;
+    private _replaceConflictNotification;
 }

package/lib/types/locale/en-US.d.ts

@@ -24,6 +24,9 @@ declare const locale: {
             'collaboration-timeout': string;
         };
         conflict: {
+            processing: string;
+            clearFailed: string;
+            retry: string;
             title: string;
             content: string;
         };
@@ -41,13 +44,6 @@ declare const locale: {
         auth: {
             needGotoLoginAlert: string;
         };
-        formula: {
-            calculation: {
-                started: string;
-                waiting: string;
-                unable: string;
-            };
-        };
     };
 };
 export default locale;

package/lib/types/services/local-cache/web-local-cache.service.d.ts

@@ -12,6 +12,7 @@ export declare class WebLocalCacheService extends Disposable implements ILocalCa
     private readonly _revisionService;
     private _cachedData;
     private _saveTaskMap;
+    private _activeSaveTaskMap;
     private _disabled;
     constructor(_configService: IConfigService, _localStorageService: ILocalStorageService, _revisionService: RevisionService);
     disableLocalCache(): void;
@@ -21,9 +22,11 @@ export declare class WebLocalCacheService extends Disposable implements ILocalCa
     loadOfflineData(unitID: string): Promise<Nullable<IUnitCacheData>>;
     saveOfflineData(unitID: string, data: IUnitCacheData): Promise<boolean>;
     backupOfflineData(unitID: string, reason: string): Promise<void>;
+    clearOfflineData(unitID: string): Promise<void>;
     updateOfflineData(unitID: string, type: UniverInstanceType, awaitingChangeset: Nullable<IChangeset>, pendingMutations: IMutationInfo[]): void;
     private _scheduleSaving;
     private _getSaveTimeout;
     private _saveCache;
+    private _trackActiveSaveTask;
     exhaustSavingTask(): Promise<void>;
 }

package/lib/umd/facade.js

@@ -1 +1 @@
-function _0x4be8(_0x3d57e6,_0x4e0b16){_0x3d57e6=_0x3d57e6-0x154;var _0x1e00c7=_0x1e00();var _0x4be8d9=_0x1e00c7[_0x3d57e6];return _0x4be8d9;}(function(_0x4aeffe,_0x44ea4e){var _0x14fa03=_0x4be8,_0x39e6e5=_0x4aeffe();while(!![]){try{var _0x559296=-parseInt(_0x14fa03(0x164))/0x1*(parseInt(_0x14fa03(0x15c))/0x2)+parseInt(_0x14fa03(0x15b))/0x3+-parseInt(_0x14fa03(0x156))/0x4*(parseInt(_0x14fa03(0x154))/0x5)+-parseInt(_0x14fa03(0x166))/0x6*(-parseInt(_0x14fa03(0x167))/0x7)+-parseInt(_0x14fa03(0x15e))/0x8*(-parseInt(_0x14fa03(0x160))/0x9)+parseInt(_0x14fa03(0x159))/0xa*(parseInt(_0x14fa03(0x15d))/0xb)+-parseInt(_0x14fa03(0x155))/0xc;if(_0x559296===_0x44ea4e)break;else _0x39e6e5['push'](_0x39e6e5['shift']());}catch(_0x1d7c8b){_0x39e6e5['push'](_0x39e6e5['shift']());}}}(_0x1e00,0x79afe),function(_0x55f8b9,_0x2cbfd7){var _0x328c3c=_0x4be8;typeof exports==_0x328c3c(0x168)&&typeof module<'u'?_0x2cbfd7(require('@univerjs-pro/collaboration-client-ui'),require('@univerjs/core/facade')):typeof define==_0x328c3c(0x16c)&&define[_0x328c3c(0x165)]?define([_0x328c3c(0x161),_0x328c3c(0x16a)],_0x2cbfd7):(_0x55f8b9=typeof globalThis<'u'?globalThis:_0x55f8b9||self,_0x2cbfd7(_0x55f8b9[_0x328c3c(0x162)],_0x55f8b9[_0x328c3c(0x169)]));}(this,function(_0x44ef78,_0x465d16){var _0x4c3ab5=_0x4be8,_0x561894=class extends _0x465d16[_0x4c3ab5(0x157)]{[_0x4c3ab5(0x16b)](_0x198033,_0x5a3a6e,..._0x33c5d3){var _0x2ad4c0=_0x4c3ab5;return this[_0x2ad4c0(0x163)][_0x2ad4c0(0x158)](_0x44ef78[_0x2ad4c0(0x15f)])['runOnServer'](_0x198033,_0x5a3a6e,{},..._0x33c5d3);}};_0x465d16[_0x4c3ab5(0x157)][_0x4c3ab5(0x15a)](_0x561894);}));function _0x1e00(){var _0x4aa20c=['UniverProCollaborationClientUi','_injector','194UxKcsa','amd','5243382KTpBCb','7dBXPvH','object','UniverCoreFacade','@univerjs/core/facade','runOnServer','function','145FUjtCJ','9621312SNArEm','119764jvFuHH','FUniver','get','610gjiRnR','extend','1491882fbRoFn','5902PXzOQf','86603TqIGUa','744JAjZLY','RemoteUniscriptService','86085fjwJMx','@univerjs-pro/collaboration-client-ui'];_0x1e00=function(){return _0x4aa20c;};return _0x1e00();}
+function _0x16f9(){var _0x556a2e=['6751233OefQTc','function','amd','runOnServer','UniverCoreFacade','UniverProCollaborationClientUi','88176nTyjui','_injector','extend','@univerjs-pro/collaboration-client-ui','3971751IHApqV','5FgeDue','get','3298926hvXCha','1505190SGxqsI','24kjQlEs','965895eYMyHn','3350397gZYnKA','@univerjs/core/facade','RemoteUniscriptService','FUniver'];_0x16f9=function(){return _0x556a2e;};return _0x16f9();}function _0x15b8(_0x1edb34,_0x44c73e){_0x1edb34=_0x1edb34-0x13d;var _0x16f9f5=_0x16f9();var _0x15b871=_0x16f9f5[_0x1edb34];return _0x15b871;}(function(_0x20c599,_0x54a975){var _0x316bfd=_0x15b8,_0x46b114=_0x20c599();while(!![]){try{var _0x2170e5=parseInt(_0x316bfd(0x140))/0x1+parseInt(_0x316bfd(0x13e))/0x2+parseInt(_0x316bfd(0x141))/0x3+parseInt(_0x316bfd(0x14b))/0x4+parseInt(_0x316bfd(0x150))/0x5*(parseInt(_0x316bfd(0x13d))/0x6)+parseInt(_0x316bfd(0x14f))/0x7*(-parseInt(_0x316bfd(0x13f))/0x8)+-parseInt(_0x316bfd(0x145))/0x9;if(_0x2170e5===_0x54a975)break;else _0x46b114['push'](_0x46b114['shift']());}catch(_0x4b0327){_0x46b114['push'](_0x46b114['shift']());}}}(_0x16f9,0xe91d6),function(_0x1270aa,_0x5444bf){var _0x5973ba=_0x15b8;typeof exports=='object'&&typeof module<'u'?_0x5444bf(require('@univerjs-pro/collaboration-client-ui'),require('@univerjs/core/facade')):typeof define==_0x5973ba(0x146)&&define[_0x5973ba(0x147)]?define([_0x5973ba(0x14e),_0x5973ba(0x142)],_0x5444bf):(_0x1270aa=typeof globalThis<'u'?globalThis:_0x1270aa||self,_0x5444bf(_0x1270aa[_0x5973ba(0x14a)],_0x1270aa[_0x5973ba(0x149)]));}(this,function(_0x1614a4,_0x11fa80){var _0x62f088=_0x15b8,_0x32e5f3=class extends _0x11fa80['FUniver']{['runOnServer'](_0x24a1b8,_0x119d4a,..._0x4f65ab){var _0xd24a25=_0x15b8;return this[_0xd24a25(0x14c)][_0xd24a25(0x151)](_0x1614a4[_0xd24a25(0x143)])[_0xd24a25(0x148)](_0x24a1b8,_0x119d4a,{},..._0x4f65ab);}};_0x11fa80[_0x62f088(0x144)][_0x62f088(0x14d)](_0x32e5f3);}));