@univerjs-pro/collaboration-client-ui 1.1.0 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (94) hide show
  1. package/lib/cjs/facade.js +1 -1
  2. package/lib/cjs/index.js +1 -1
  3. package/lib/cjs/locale/ar-SA.js +1 -1
  4. package/lib/cjs/locale/ca-ES.js +1 -1
  5. package/lib/cjs/locale/de-DE.js +1 -1
  6. package/lib/cjs/locale/en-US.js +1 -1
  7. package/lib/cjs/locale/es-ES.js +1 -1
  8. package/lib/cjs/locale/fa-IR.js +1 -1
  9. package/lib/cjs/locale/fr-FR.js +1 -1
  10. package/lib/cjs/locale/id-ID.js +1 -1
  11. package/lib/cjs/locale/it-IT.js +1 -1
  12. package/lib/cjs/locale/ja-JP.js +1 -1
  13. package/lib/cjs/locale/ko-KR.js +1 -1
  14. package/lib/cjs/locale/pl-PL.js +1 -1
  15. package/lib/cjs/locale/pt-BR.js +1 -1
  16. package/lib/cjs/locale/ru-RU.js +1 -1
  17. package/lib/cjs/locale/sk-SK.js +1 -1
  18. package/lib/cjs/locale/vi-VN.js +1 -1
  19. package/lib/cjs/locale/zh-CN.js +1 -1
  20. package/lib/cjs/locale/zh-HK.js +1 -1
  21. package/lib/cjs/locale/zh-TW.js +1 -1
  22. package/lib/es/facade.js +1 -1
  23. package/lib/es/index.js +1 -1
  24. package/lib/es/locale/ar-SA.js +1 -1
  25. package/lib/es/locale/ca-ES.js +1 -1
  26. package/lib/es/locale/de-DE.js +1 -1
  27. package/lib/es/locale/en-US.js +1 -1
  28. package/lib/es/locale/es-ES.js +1 -1
  29. package/lib/es/locale/fa-IR.js +1 -1
  30. package/lib/es/locale/fr-FR.js +1 -1
  31. package/lib/es/locale/id-ID.js +1 -1
  32. package/lib/es/locale/it-IT.js +1 -1
  33. package/lib/es/locale/ja-JP.js +1 -1
  34. package/lib/es/locale/ko-KR.js +1 -1
  35. package/lib/es/locale/pl-PL.js +1 -1
  36. package/lib/es/locale/pt-BR.js +1 -1
  37. package/lib/es/locale/ru-RU.js +1 -1
  38. package/lib/es/locale/sk-SK.js +1 -1
  39. package/lib/es/locale/vi-VN.js +1 -1
  40. package/lib/es/locale/zh-CN.js +1 -1
  41. package/lib/es/locale/zh-HK.js +1 -1
  42. package/lib/es/locale/zh-TW.js +1 -1
  43. package/lib/facade.js +1 -1
  44. package/lib/index.css +4 -0
  45. package/lib/index.js +1 -1
  46. package/lib/locale/ar-SA.js +1 -1
  47. package/lib/locale/ca-ES.js +1 -1
  48. package/lib/locale/de-DE.js +1 -1
  49. package/lib/locale/en-US.js +1 -1
  50. package/lib/locale/es-ES.js +1 -1
  51. package/lib/locale/fa-IR.js +1 -1
  52. package/lib/locale/fr-FR.js +1 -1
  53. package/lib/locale/id-ID.js +1 -1
  54. package/lib/locale/it-IT.js +1 -1
  55. package/lib/locale/ja-JP.js +1 -1
  56. package/lib/locale/ko-KR.js +1 -1
  57. package/lib/locale/pl-PL.js +1 -1
  58. package/lib/locale/pt-BR.js +1 -1
  59. package/lib/locale/ru-RU.js +1 -1
  60. package/lib/locale/sk-SK.js +1 -1
  61. package/lib/locale/vi-VN.js +1 -1
  62. package/lib/locale/zh-CN.js +1 -1
  63. package/lib/locale/zh-HK.js +1 -1
  64. package/lib/locale/zh-TW.js +1 -1
  65. package/lib/types/config/config.d.ts +3 -3
  66. package/lib/types/controllers/collaboration-client-ui.controller.d.ts +24 -3
  67. package/lib/types/controllers/snapshot-loading/snapshot-loading.controller.d.ts +2 -6
  68. package/lib/types/index.d.ts +0 -1
  69. package/lib/types/locale/en-US.d.ts +4 -0
  70. package/lib/umd/facade.js +1 -1
  71. package/lib/umd/index.js +1 -1
  72. package/lib/umd/locale/ar-SA.js +1 -1
  73. package/lib/umd/locale/ca-ES.js +1 -1
  74. package/lib/umd/locale/de-DE.js +1 -1
  75. package/lib/umd/locale/en-US.js +1 -1
  76. package/lib/umd/locale/es-ES.js +1 -1
  77. package/lib/umd/locale/fa-IR.js +1 -1
  78. package/lib/umd/locale/fr-FR.js +1 -1
  79. package/lib/umd/locale/id-ID.js +1 -1
  80. package/lib/umd/locale/it-IT.js +1 -1
  81. package/lib/umd/locale/ja-JP.js +1 -1
  82. package/lib/umd/locale/ko-KR.js +1 -1
  83. package/lib/umd/locale/pl-PL.js +1 -1
  84. package/lib/umd/locale/pt-BR.js +1 -1
  85. package/lib/umd/locale/ru-RU.js +1 -1
  86. package/lib/umd/locale/sk-SK.js +1 -1
  87. package/lib/umd/locale/vi-VN.js +1 -1
  88. package/lib/umd/locale/zh-CN.js +1 -1
  89. package/lib/umd/locale/zh-HK.js +1 -1
  90. package/lib/umd/locale/zh-TW.js +1 -1
  91. package/package.json +17 -18
  92. package/lib/types/controllers/data-loader/data-loader.controller.d.ts +0 -17
  93. package/lib/types/services/url/url.service.d.ts +0 -12
  94. package/lib/types/services/url/web-url.service.d.ts +0 -10
@@ -1 +1 @@
1
- const _0x4de11d=_0x46d5;(function(_0x2a34ab,_0xad72d3){const _0x5ade0f=_0x46d5,_0x5490b8=_0x2a34ab();while(!![]){try{const _0x23facb=parseInt(_0x5ade0f(0x160))/0x1*(parseInt(_0x5ade0f(0x148))/0x2)+-parseInt(_0x5ade0f(0x15a))/0x3*(-parseInt(_0x5ade0f(0x156))/0x4)+parseInt(_0x5ade0f(0x149))/0x5+parseInt(_0x5ade0f(0x150))/0x6*(-parseInt(_0x5ade0f(0x14f))/0x7)+parseInt(_0x5ade0f(0x162))/0x8*(-parseInt(_0x5ade0f(0x15e))/0x9)+-parseInt(_0x5ade0f(0x164))/0xa*(parseInt(_0x5ade0f(0x153))/0xb)+parseInt(_0x5ade0f(0x15d))/0xc*(parseInt(_0x5ade0f(0x151))/0xd);if(_0x23facb===_0xad72d3)break;else _0x5490b8['push'](_0x5490b8['shift']());}catch(_0x1560dc){_0x5490b8['push'](_0x5490b8['shift']());}}}(_0x1161,0x49b86));const e={'collaboration-client-ui':{'collabClient':{'tooltip':{'reconnect':_0x4de11d(0x161)}},'collabStatus':{'fetchMiss':_0x4de11d(0x14e),'conflict':'編輯衝突','notCollab':'本機檔案','synced':_0x4de11d(0x14a),'syncing':_0x4de11d(0x14d),'offline':'已離線,編輯將儲存在本機'},'snapshotLoading':{'timeout':_0x4de11d(0x14b),'refresh':_0x4de11d(0x155)},'session':{'connection-failed':_0x4de11d(0x154),'will-retry':_0x4de11d(0x159),'room-full':_0x4de11d(0x14c),'collaboration-timeout':_0x4de11d(0x15c)},'conflict':{'processing':_0x4de11d(0x163),'clearFailed':_0x4de11d(0x15f),'retry':_0x4de11d(0x152),'title':'協作衝突','content':'您的本機文件與伺服器文件存在衝突。請將您的本機編輯儲存至其他地方,因為重新整理頁面後將會遺失。'},'permission':{'title':'認證錯誤','content':_0x4de11d(0x15b)},'collaboration':{'offline-data-not-saved':_0x4de11d(0x147),'single-unit':{'warning':_0x4de11d(0x157)},'closeRoom':_0x4de11d(0x158)},'auth':{'needGotoLoginAlert':_0x4de11d(0x165)}}};export{e as default};function _0x46d5(_0x63cc90,_0x51b058){_0x63cc90=_0x63cc90-0x147;const _0x1161d3=_0x1161();let _0x46d533=_0x1161d3[_0x63cc90];return _0x46d533;}function _0x1161(){const _0x5422a8=['伺服器未回應協作請求,您的編輯將儲存在本機。','16536iXrsPw','2394ivypsR','無法清除本機衝突資料。重新整理頁面可能再次還原異常資料,請重試。','7721jolmfS','點擊重新連線','11728XtKyPU','正在處理協同衝突…','4146620TFUoFP','您的登入已過期,點擊「確定」重新登入,點擊「取消」儲存您的本機編輯。','您有未儲存至伺服器的離線編輯,請檢查網絡後重試。','50kgXaqy','3012700PPxUSC','已同步','資料載入停留在\x20{0}/{1},請重新整理頁面後再試。','協作房間已滿,您的編輯將暫存於本機。','同步中...','正在擷取伺服器資料...','1148AbFULH','21234wmJXpl','4862KGAJPe','重試並重新整理','11bkfNMt','連線失敗,請檢查您的網絡。','重新整理頁面','12uqYQet','您在另一個分頁開啟了同一個檔案。為避免資料遺失,此分頁將無法進行編輯。','由於協作房間已關閉,編輯權限已被收回。','連線失敗,將在稍後重試連線。','376035YBTVQw','您的操作與伺服器權限存在衝突。請將您的本機編輯儲存至其他地方,重新整理頁面後將會被捨棄。'];_0x1161=function(){return _0x5422a8;};return _0x1161();}
1
+ const _0x1b641e=_0x20c5;(function(_0x4669e8,_0x568245){const _0x43d91d=_0x20c5,_0x50f8f5=_0x4669e8();while(!![]){try{const _0x2c4924=-parseInt(_0x43d91d(0x1db))/0x1*(parseInt(_0x43d91d(0x1dd))/0x2)+parseInt(_0x43d91d(0x1d6))/0x3*(-parseInt(_0x43d91d(0x1e7))/0x4)+parseInt(_0x43d91d(0x1de))/0x5*(-parseInt(_0x43d91d(0x1e2))/0x6)+-parseInt(_0x43d91d(0x1dc))/0x7+parseInt(_0x43d91d(0x1e6))/0x8+parseInt(_0x43d91d(0x1e4))/0x9+parseInt(_0x43d91d(0x1eb))/0xa;if(_0x2c4924===_0x568245)break;else _0x50f8f5['push'](_0x50f8f5['shift']());}catch(_0x1a66ed){_0x50f8f5['push'](_0x50f8f5['shift']());}}}(_0x3057,0x70b95));function _0x3057(){const _0x28c3d1=['40879KkFvKm','2517662stMAiQ','36XOLQvf','2305tFRuIA','您有未儲存至伺服器的離線編輯,請檢查網絡後重試。','已離線,編輯將儲存在本機','您在另一個分頁開啟了同一個檔案。為避免資料遺失,此分頁將無法進行編輯。','3126rwWSuj','已同步','996750aAPDfh','連線失敗,將在稍後重試連線。','4771120PHSQkm','7736QDDAFA','正在處理協同衝突…','其他協作者將文件還原至歷史版本。重新整理後將載入還原後的內容。','編輯衝突','17729480gSsPLd','同步中...','協作衝突','由於協作房間已關閉,編輯權限已被收回。','連線失敗,請檢查您的網絡。','重新整理頁面','您的登入已過期,點擊「確定」重新登入,點擊「取消」儲存您的本機編輯。','點擊重新連線','本機檔案','資料載入停留在\x20{0}/{1},請重新整理頁面後再試。','1059vKFrpL','正在擷取伺服器資料...','儲存逾時,正在重試','文件已還原至歷史版本','您的本機文件與伺服器文件存在衝突,無法繼續同步。重新整理後將載入伺服器上的最新內容,本機編輯將被捨棄。'];_0x3057=function(){return _0x28c3d1;};return _0x3057();}function _0x20c5(_0x26afaf,_0x18b851){_0x26afaf=_0x26afaf-0x1d1;const _0x305781=_0x3057();let _0x20c536=_0x305781[_0x26afaf];return _0x20c536;}const e={'collaboration-client-ui':{'collabClient':{'tooltip':{'reconnect':_0x1b641e(0x1d3)}},'collabStatus':{'fetchMiss':_0x1b641e(0x1d7),'conflict':_0x1b641e(0x1ea),'notCollab':_0x1b641e(0x1d4),'synced':_0x1b641e(0x1e3),'syncing':_0x1b641e(0x1ec),'offline':_0x1b641e(0x1e0)},'snapshotLoading':{'timeout':_0x1b641e(0x1d5),'refresh':_0x1b641e(0x1d1)},'session':{'connection-failed':_0x1b641e(0x1ef),'will-retry':_0x1b641e(0x1e5),'room-full':'協作房間已滿,您的編輯將暫存於本機。','collaboration-timeout':_0x1b641e(0x1d8)},'conflict':{'processing':_0x1b641e(0x1e8),'clearFailed':'無法清除本機衝突資料。重新整理頁面可能再次還原異常資料,請重試。','retry':'重試並重新整理','title':_0x1b641e(0x1ed),'content':_0x1b641e(0x1da)},'permission':{'title':'認證錯誤','content':'您的操作與伺服器權限存在衝突,無法繼續同步。重新整理後將載入伺服器上的最新內容,本機編輯將被捨棄。'},'remoteRevert':{'title':_0x1b641e(0x1d9),'content':_0x1b641e(0x1e9)},'collaboration':{'offline-data-not-saved':_0x1b641e(0x1df),'single-unit':{'warning':_0x1b641e(0x1e1)},'closeRoom':_0x1b641e(0x1ee)},'auth':{'needGotoLoginAlert':_0x1b641e(0x1d2)}}};export{e as default};
@@ -1 +1 @@
1
- const _0x4b6d28=_0x5c0a;function _0x5c0a(_0x1c9f71,_0x50b3b9){_0x1c9f71=_0x1c9f71-0x73;const _0x5d790c=_0x5d79();let _0x5c0a79=_0x5d790c[_0x1c9f71];return _0x5c0a79;}(function(_0x33eb30,_0xc57c4a){const _0x591cc0=_0x5c0a,_0x5db8a7=_0x33eb30();while(!![]){try{const _0x1d0376=parseInt(_0x591cc0(0x8e))/0x1+-parseInt(_0x591cc0(0x76))/0x2+parseInt(_0x591cc0(0x8f))/0x3+-parseInt(_0x591cc0(0x74))/0x4+parseInt(_0x591cc0(0x78))/0x5+-parseInt(_0x591cc0(0x7f))/0x6*(parseInt(_0x591cc0(0x8c))/0x7)+-parseInt(_0x591cc0(0x7b))/0x8*(parseInt(_0x591cc0(0x77))/0x9);if(_0x1d0376===_0xc57c4a)break;else _0x5db8a7['push'](_0x5db8a7['shift']());}catch(_0x54665f){_0x5db8a7['push'](_0x5db8a7['shift']());}}}(_0x5d79,0x35693));const e={'collaboration-client-ui':{'collabClient':{'tooltip':{'reconnect':_0x4b6d28(0x85)}},'collabStatus':{'fetchMiss':_0x4b6d28(0x80),'conflict':_0x4b6d28(0x81),'notCollab':_0x4b6d28(0x7a),'synced':_0x4b6d28(0x7e),'syncing':'同步中...','offline':_0x4b6d28(0x83)},'snapshotLoading':{'timeout':_0x4b6d28(0x8a),'refresh':_0x4b6d28(0x89)},'session':{'connection-failed':_0x4b6d28(0x7c),'will-retry':'連線失敗,將在稍後重試連線。','room-full':_0x4b6d28(0x8d),'collaboration-timeout':'伺服器未回應協作請求,您的編輯將儲存在本機。'},'conflict':{'processing':_0x4b6d28(0x8b),'clearFailed':_0x4b6d28(0x79),'retry':_0x4b6d28(0x82),'title':_0x4b6d28(0x75),'content':_0x4b6d28(0x88)},'permission':{'title':_0x4b6d28(0x73),'content':'您的操作與伺服器權限存在衝突。請將您的本機編輯儲存至其他地方,重新整理頁面後將會被捨棄。'},'collaboration':{'offline-data-not-saved':_0x4b6d28(0x87),'single-unit':{'warning':_0x4b6d28(0x84)},'closeRoom':_0x4b6d28(0x86)},'auth':{'needGotoLoginAlert':_0x4b6d28(0x7d)}}};export{e as default};function _0x5d79(){const _0x230f84=['協作衝突','26722jMAuEQ','45ifOEuT','988440GbvFkH','無法清除本機衝突資料。重新整理頁面可能再次還原異常資料,請重試。','本機檔案','479096KrSHYf','連線失敗,請檢查您的網路。','您的登入已過期,點擊「確定」重新登入,點擊「取消」儲存您的本機編輯。','已同步','54726vIXFuS','正在擷取伺服器資料...','編輯衝突','重試並重新整理','已離線,編輯將儲存在本機','您在另一個分頁開啟了同一個檔案。為避免資料遺失,此分頁將無法進行編輯。','點擊重新連線','由於協作房間已關閉,編輯權限已被收回。','您有未儲存至伺服器的離線編輯,請檢查網路後重試。','您的本機文件與伺服器文件存在衝突。請將您的本機編輯儲存至其他地方,因為重新整理頁面後將會遺失。','重新整理頁面','資料載入停留在\x20{0}/{1},請重新整理頁面後再試。','正在處理協同衝突…','35kXsETs','協作房間已滿,您的編輯將暫存於本機。','346469OqnolM','687969xJnzAd','認證錯誤','785232AuObSF'];_0x5d79=function(){return _0x230f84;};return _0x5d79();}
1
+ function _0x1690(){const _0x12cd02=['99UMCIjM','4148844yolNjN','您的登入已過期,點擊「確定」重新登入,點擊「取消」儲存您的本機編輯。','2405754hLSxog','6219LnuRpS','您在另一個分頁開啟了同一個檔案。為避免資料遺失,此分頁將無法進行編輯。','本機檔案','您的操作與伺服器權限存在衝突,無法繼續同步。重新整理後將載入伺服器上的最新內容,本機編輯將被捨棄。','其他協作者將文件還原至歷史版本。重新整理後將載入還原後的內容。','41815PrYZoF','協作衝突','21451290mbtcqj','連線失敗,將在稍後重試連線。','正在處理協同衝突…','點擊重新連線','儲存逾時,正在重試','編輯衝突','302331BDsemp','72wBPRsq','16134aaHKio','同步中...','您的本機文件與伺服器文件存在衝突,無法繼續同步。重新整理後將載入伺服器上的最新內容,本機編輯將被捨棄。','已離線,編輯將儲存在本機','連線失敗,請檢查您的網路。','重新整理頁面','10936TeYOBt','正在擷取伺服器資料...','由於協作房間已關閉,編輯權限已被收回。'];_0x1690=function(){return _0x12cd02;};return _0x1690();}const _0x1ce5f3=_0x1f9e;function _0x1f9e(_0x428497,_0x4ad956){_0x428497=_0x428497-0x13c;const _0x16904d=_0x1690();let _0x1f9ed3=_0x16904d[_0x428497];return _0x1f9ed3;}(function(_0x42b9b9,_0x3e1072){const _0x3204e8=_0x1f9e,_0x1f76e5=_0x42b9b9();while(!![]){try{const _0x32600d=parseInt(_0x3204e8(0x145))/0x1*(-parseInt(_0x3204e8(0x13c))/0x2)+parseInt(_0x3204e8(0x156))/0x3+-parseInt(_0x3204e8(0x157))/0x4*(parseInt(_0x3204e8(0x14e))/0x5)+-parseInt(_0x3204e8(0x148))/0x6+parseInt(_0x3204e8(0x146))/0x7+parseInt(_0x3204e8(0x142))/0x8*(-parseInt(_0x3204e8(0x149))/0x9)+parseInt(_0x3204e8(0x150))/0xa;if(_0x32600d===_0x3e1072)break;else _0x1f76e5['push'](_0x1f76e5['shift']());}catch(_0x4044d2){_0x1f76e5['push'](_0x1f76e5['shift']());}}}(_0x1690,0x84c83));const e={'collaboration-client-ui':{'collabClient':{'tooltip':{'reconnect':_0x1ce5f3(0x153)}},'collabStatus':{'fetchMiss':_0x1ce5f3(0x143),'conflict':_0x1ce5f3(0x155),'notCollab':_0x1ce5f3(0x14b),'synced':'已同步','syncing':_0x1ce5f3(0x13d),'offline':_0x1ce5f3(0x13f)},'snapshotLoading':{'timeout':'資料載入停留在\x20{0}/{1},請重新整理頁面後再試。','refresh':_0x1ce5f3(0x141)},'session':{'connection-failed':_0x1ce5f3(0x140),'will-retry':_0x1ce5f3(0x151),'room-full':'協作房間已滿,您的編輯將暫存於本機。','collaboration-timeout':_0x1ce5f3(0x154)},'conflict':{'processing':_0x1ce5f3(0x152),'clearFailed':'無法清除本機衝突資料。重新整理頁面可能再次還原異常資料,請重試。','retry':'重試並重新整理','title':_0x1ce5f3(0x14f),'content':_0x1ce5f3(0x13e)},'permission':{'title':'認證錯誤','content':_0x1ce5f3(0x14c)},'remoteRevert':{'title':'文件已還原至歷史版本','content':_0x1ce5f3(0x14d)},'collaboration':{'offline-data-not-saved':'您有未儲存至伺服器的離線編輯,請檢查網路後重試。','single-unit':{'warning':_0x1ce5f3(0x14a)},'closeRoom':_0x1ce5f3(0x144)},'auth':{'needGotoLoginAlert':_0x1ce5f3(0x147)}}};export{e as default};
@@ -20,11 +20,11 @@ export interface IUniverCollaborationClientUIConfig {
20
20
  */
21
21
  enableFrontendLog?: boolean;
22
22
  /**
23
- * Whether to load the unit named by the `unit` and `type` URL query parameters when the plugin starts.
24
- * Disable it when the host loads documents itself, e.g. with `univerAPI.getCollaboration().loadSheetAsync()`.
23
+ * Whether the plugin shows its conflict notification (a title and text per reason, with a "reload page" action).
24
+ * Set it to `false` to show nothing and handle the `CollaborationConflict` event in the host.
25
25
  *
26
26
  * @default true
27
27
  */
28
- enableUrlUnitLoader?: boolean;
28
+ enableDefaultConflictUI?: boolean;
29
29
  }
30
30
  export declare const defaultPluginConfig: IUniverCollaborationClientUIConfig;
@@ -1,5 +1,5 @@
1
- import { CollaborationUIEventService, ILocalCacheService } from '@univerjs-pro/collaboration-client';
2
- import { Disposable, LocaleService } from '@univerjs/core';
1
+ import { CollaborationController, CollaborationUIEventService, ILocalCacheService } from '@univerjs-pro/collaboration-client';
2
+ import { Disposable, IConfigService, LocaleService } from '@univerjs/core';
3
3
  import { IBeforeCloseService, IMessageService, INotificationService } from '@univerjs/ui';
4
4
  /**
5
5
  * This controller is responsible for the general UI of the collaboration client.
@@ -11,11 +11,32 @@ export declare class CollaborationClientUIController extends Disposable {
11
11
  protected readonly _messageService: IMessageService;
12
12
  private readonly _notificationService;
13
13
  protected readonly _localeService: LocaleService;
14
+ private readonly _collaborationController;
15
+ private readonly _configService;
14
16
  private _conflictNotification;
15
17
  private readonly _retryingConflictCacheUnitIDs;
16
- constructor(_beforeCloseService: IBeforeCloseService, _localCacheService: ILocalCacheService, _collaborationUIEventService: CollaborationUIEventService, _messageService: IMessageService, _notificationService: INotificationService, _localeService: LocaleService);
18
+ /** The "save timed out" message of each unit that is still waiting for an acknowledgement. */
19
+ private readonly _saveTimedOutMessages;
20
+ constructor(_beforeCloseService: IBeforeCloseService, _localCacheService: ILocalCacheService, _collaborationUIEventService: CollaborationUIEventService, _messageService: IMessageService, _notificationService: INotificationService, _localeService: LocaleService, _collaborationController: CollaborationController, _configService: IConfigService);
17
21
  dispose(): void;
22
+ /**
23
+ * Tell the user when a changeset has been resent and is still unacknowledged `SAVE_TIMED_OUT_AFTER` after it
24
+ * was first sent, whatever caused the resend: what matters to the user is that the edits are not saved yet.
25
+ * The notice stays until the unit leaves the awaiting states, i.e. the edits were saved.
26
+ */
27
+ private _initSaveTimedOutMessage;
28
+ private _showSaveTimedOutMessage;
29
+ private _removeSaveTimedOutMessage;
18
30
  private _setupBeforeClosingHandler;
31
+ /**
32
+ * The default handling of conflicts: a notification that names the reason and offers to reload the page.
33
+ * `conflict$` emits once the local edits are backed up and the offline cache is cleared, so reloading is safe
34
+ * from then on; until then the "processing" notice is shown. Hosts handle conflicts themselves by setting
35
+ * `enableDefaultConflictUI` to `false` and listening to the `CollaborationConflict` facade event, the same signal.
36
+ */
37
+ private _initConflictHandling;
38
+ private _onConflict;
39
+ protected _reloadPage(): void;
19
40
  private _initEvent;
20
41
  private _showConflictProcessingNotification;
21
42
  private _showConflictCacheClearFailedNotification;
@@ -1,24 +1,20 @@
1
- import type { ISnapshotLoadingTimeoutState } from '../../views/components/SnapshotLoadingTimeout';
2
1
  import { SnapshotLoadingService } from '@univerjs-pro/collaboration';
3
2
  import { Disposable, Injector, LocaleService } from '@univerjs/core';
4
3
  import { IMessageService, IUIPartsService } from '@univerjs/ui';
5
- import { IURLService } from '../../services/url/url.service';
4
+ import type { ISnapshotLoadingTimeoutState } from '../../views/components/SnapshotLoadingTimeout';
6
5
  export declare class SnapshotLoadingController extends Disposable {
7
6
  private readonly _snapshotLoadingService;
8
7
  private readonly _messageService;
9
8
  private readonly _localeService;
10
9
  private readonly _injector;
11
- private readonly _urlService;
12
10
  private readonly _timeoutState$;
13
11
  private readonly _messageIds;
14
12
  private readonly _blockProgressWatches;
15
- private _latestStates;
16
13
  readonly timeoutState$: import("rxjs").Observable<ISnapshotLoadingTimeoutState | null>;
17
- constructor(_snapshotLoadingService: SnapshotLoadingService, _messageService: IMessageService, _localeService: LocaleService, _injector: Injector, uiPartsService: IUIPartsService, _urlService: IURLService);
14
+ constructor(_snapshotLoadingService: SnapshotLoadingService, _messageService: IMessageService, _localeService: LocaleService, _injector: Injector, uiPartsService: IUIPartsService);
18
15
  dispose(): void;
19
16
  private _updateMessage;
20
17
  private _watchBlockProgress;
21
18
  private _clearBlockProgressWatch;
22
19
  private _clearTimeoutState;
23
- private _isVisibleUnit;
24
20
  }
@@ -5,6 +5,5 @@ export { UniverCollaborationClientUIPlugin } from './plugin';
5
5
  export { BrowserCollaborationSocketService } from './services/collaboration-socket/collaboration-socket.service';
6
6
  export { RemoteUniscriptService } from './services/remote-uniscript/remote-uniscript.service';
7
7
  export { WebBrowserSingleActiveUnitService } from './services/single-active-unit/single-active-unit.service';
8
- export { IURLService } from './services/url/url.service';
9
8
  export { SheetCollabCursorShape } from './views/shapes/sheet-collab-cursor.shape';
10
9
  export type { ISheetCollabCursorShapeProps } from './views/shapes/sheet-collab-cursor.shape';
@@ -34,6 +34,10 @@ declare const locale: {
34
34
  title: string;
35
35
  content: string;
36
36
  };
37
+ remoteRevert: {
38
+ title: string;
39
+ content: string;
40
+ };
37
41
  collaboration: {
38
42
  'offline-data-not-saved': string;
39
43
  'single-unit': {
package/lib/umd/facade.js CHANGED
@@ -1 +1 @@
1
- function _0x5f4f(_0x45289c,_0x4984ff){_0x45289c=_0x45289c-0x8d;var _0x54159c=_0x5415();var _0x5f4f6d=_0x54159c[_0x45289c];return _0x5f4f6d;}function _0x5415(){var _0x641f93=['4qDmqaV','1490580BnWfGL','21jNsbGx','extend','FUniver','808797BeagSz','UniverCoreFacade','485232kwHBkT','18854JeSfgc','runOnServer','384184IKeUtk','1966430akUoLn','3331410mJmUWp','@univerjs/core/facade','@univerjs-pro/collaboration-client-ui','8wMJDHV','UniverProCollaborationClientUi','function','get'];_0x5415=function(){return _0x641f93;};return _0x5415();}(function(_0x3a3e48,_0x42d2a1){var _0x2a9cc7=_0x5f4f,_0x2c6792=_0x3a3e48();while(!![]){try{var _0x1b000a=-parseInt(_0x2a9cc7(0x91))/0x1*(-parseInt(_0x2a9cc7(0x98))/0x2)+-parseInt(_0x2a9cc7(0x8e))/0x3*(parseInt(_0x2a9cc7(0x9c))/0x4)+parseInt(_0x2a9cc7(0x94))/0x5+parseInt(_0x2a9cc7(0x90))/0x6+-parseInt(_0x2a9cc7(0x9e))/0x7*(-parseInt(_0x2a9cc7(0x93))/0x8)+parseInt(_0x2a9cc7(0x9d))/0x9+-parseInt(_0x2a9cc7(0x95))/0xa;if(_0x1b000a===_0x42d2a1)break;else _0x2c6792['push'](_0x2c6792['shift']());}catch(_0x41c531){_0x2c6792['push'](_0x2c6792['shift']());}}}(_0x5415,0x3ea0b),function(_0xf34316,_0x5269bf){var _0x3b9bc1=_0x5f4f;typeof exports=='object'&&typeof module<'u'?_0x5269bf(require('@univerjs-pro/collaboration-client-ui'),require('@univerjs/core/facade')):typeof define==_0x3b9bc1(0x9a)&&define['amd']?define([_0x3b9bc1(0x97),_0x3b9bc1(0x96)],_0x5269bf):(_0xf34316=typeof globalThis<'u'?globalThis:_0xf34316||self,_0x5269bf(_0xf34316[_0x3b9bc1(0x99)],_0xf34316[_0x3b9bc1(0x8f)]));}(this,function(_0x5efbce,_0x3227ed){var _0x188f24=_0x5f4f,_0x3acc16=class extends _0x3227ed[_0x188f24(0x8d)]{[_0x188f24(0x92)](_0xc2b86,_0x37e605,..._0xa1a14a){var _0x56bf13=_0x188f24;return this['_injector'][_0x56bf13(0x9b)](_0x5efbce['RemoteUniscriptService'])[_0x56bf13(0x92)](_0xc2b86,_0x37e605,{},..._0xa1a14a);}};_0x3227ed['FUniver'][_0x188f24(0x9f)](_0x3acc16);}));
1
+ function _0x3f68(){var _0x4a6b2e=['UniverCoreFacade','get','204676hyWnUR','1196206iyEvbm','330079TWpikq','5482036PKehuD','4396080RXKLCn','@univerjs-pro/collaboration-client-ui','FUniver','object','15OrUHyj','extend','function','RemoteUniscriptService','amd','@univerjs/core/facade','11472368gggOSs','601755UzOUVq'];_0x3f68=function(){return _0x4a6b2e;};return _0x3f68();}function _0xd9c2(_0x55491b,_0x196f79){_0x55491b=_0x55491b-0x145;var _0x3f685c=_0x3f68();var _0xd9c2ca=_0x3f685c[_0x55491b];return _0xd9c2ca;}(function(_0x59edd6,_0xa226bf){var _0x2a3df0=_0xd9c2,_0x3955ce=_0x59edd6();while(!![]){try{var _0x38ec92=-parseInt(_0x2a3df0(0x155))/0x1+-parseInt(_0x2a3df0(0x154))/0x2+-parseInt(_0x2a3df0(0x150))/0x3+-parseInt(_0x2a3df0(0x153))/0x4*(-parseInt(_0x2a3df0(0x149))/0x5)+parseInt(_0x2a3df0(0x145))/0x6+-parseInt(_0x2a3df0(0x156))/0x7+parseInt(_0x2a3df0(0x14f))/0x8;if(_0x38ec92===_0xa226bf)break;else _0x3955ce['push'](_0x3955ce['shift']());}catch(_0x22f68c){_0x3955ce['push'](_0x3955ce['shift']());}}}(_0x3f68,0x63afe),function(_0x21f393,_0x20f0ad){var _0x520928=_0xd9c2;typeof exports==_0x520928(0x148)&&typeof module<'u'?_0x20f0ad(require('@univerjs-pro/collaboration-client-ui'),require('@univerjs/core/facade')):typeof define==_0x520928(0x14b)&&define[_0x520928(0x14d)]?define([_0x520928(0x146),_0x520928(0x14e)],_0x20f0ad):(_0x21f393=typeof globalThis<'u'?globalThis:_0x21f393||self,_0x20f0ad(_0x21f393['UniverProCollaborationClientUi'],_0x21f393[_0x520928(0x151)]));}(this,function(_0x4a82f6,_0x49fae2){var _0x1f48c4=_0xd9c2,_0x3c2500=class extends _0x49fae2[_0x1f48c4(0x147)]{['runOnServer'](_0x39ad62,_0x5808c8,..._0x516a40){var _0x295f33=_0x1f48c4;return this['_injector'][_0x295f33(0x152)](_0x4a82f6[_0x295f33(0x14c)])['runOnServer'](_0x39ad62,_0x5808c8,{},..._0x516a40);}};_0x49fae2[_0x1f48c4(0x147)][_0x1f48c4(0x14a)](_0x3c2500);}));