@univerjs/sheets-thread-comment 1.0.0-alpha.8 → 1.0.0-beta.1
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.
- package/lib/cjs/facade.js +18 -19
- package/lib/cjs/index.js +2 -3
- package/lib/es/facade.js +18 -19
- package/lib/es/index.js +2 -3
- package/lib/facade.js +18 -19
- package/lib/index.js +2 -3
- package/lib/umd/facade.js +1 -1
- package/lib/umd/index.js +1 -1
- package/package.json +6 -6
package/lib/cjs/facade.js
CHANGED
|
@@ -545,7 +545,7 @@ let FThreadComment = _FThreadComment = class FThreadComment {
|
|
|
545
545
|
unitId: this._thread.unitId,
|
|
546
546
|
subUnitId: this._thread.subUnitId,
|
|
547
547
|
commentId: this._thread.id,
|
|
548
|
-
resolved: resolved
|
|
548
|
+
resolved: resolved ?? !this._thread.resolved
|
|
549
549
|
});
|
|
550
550
|
}
|
|
551
551
|
/**
|
|
@@ -797,7 +797,7 @@ var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUnive
|
|
|
797
797
|
_initialize(injector) {
|
|
798
798
|
const commandService = injector.get(_univerjs_core.ICommandService);
|
|
799
799
|
this.disposeWithMe(this.registerEventHandler(this.Event.CommentAdded, () => commandService.onCommandExecuted((commandInfo) => {
|
|
800
|
-
var _threadComment$getRan, _threadComment$getRan2
|
|
800
|
+
var _threadComment$getRan, _threadComment$getRan2;
|
|
801
801
|
if (commandInfo.id !== _univerjs_thread_comment.AddCommentCommand.id) return;
|
|
802
802
|
const params = commandInfo.params;
|
|
803
803
|
const target = this.getSheetCommandTarget(params);
|
|
@@ -809,14 +809,14 @@ var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUnive
|
|
|
809
809
|
const eventParams = {
|
|
810
810
|
workbook,
|
|
811
811
|
worksheet,
|
|
812
|
-
row: (_threadComment$getRan =
|
|
813
|
-
col: (
|
|
812
|
+
row: ((_threadComment$getRan = threadComment.getRange()) === null || _threadComment$getRan === void 0 ? void 0 : _threadComment$getRan.getRow()) ?? 0,
|
|
813
|
+
col: ((_threadComment$getRan2 = threadComment.getRange()) === null || _threadComment$getRan2 === void 0 ? void 0 : _threadComment$getRan2.getColumn()) ?? 0,
|
|
814
814
|
comment: threadComment
|
|
815
815
|
};
|
|
816
816
|
this.fireEvent(this.Event.CommentAdded, eventParams);
|
|
817
817
|
})));
|
|
818
818
|
this.disposeWithMe(this.registerEventHandler(this.Event.CommentUpdated, () => commandService.onCommandExecuted((commandInfo) => {
|
|
819
|
-
var _threadComment$
|
|
819
|
+
var _threadComment$getRan3, _threadComment$getRan4;
|
|
820
820
|
if (commandInfo.id !== _univerjs_thread_comment.UpdateCommentCommand.id) return;
|
|
821
821
|
const params = commandInfo.params;
|
|
822
822
|
const target = this.getSheetCommandTarget(params);
|
|
@@ -828,8 +828,8 @@ var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUnive
|
|
|
828
828
|
const eventParams = {
|
|
829
829
|
workbook,
|
|
830
830
|
worksheet,
|
|
831
|
-
row: (
|
|
832
|
-
col: (
|
|
831
|
+
row: ((_threadComment$getRan3 = threadComment.getRange()) === null || _threadComment$getRan3 === void 0 ? void 0 : _threadComment$getRan3.getRow()) ?? 0,
|
|
832
|
+
col: ((_threadComment$getRan4 = threadComment.getRange()) === null || _threadComment$getRan4 === void 0 ? void 0 : _threadComment$getRan4.getColumn()) ?? 0,
|
|
833
833
|
comment: threadComment
|
|
834
834
|
};
|
|
835
835
|
this.fireEvent(this.Event.CommentUpdated, eventParams);
|
|
@@ -849,7 +849,7 @@ var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUnive
|
|
|
849
849
|
this.fireEvent(this.Event.CommentDeleted, eventParams);
|
|
850
850
|
})));
|
|
851
851
|
this.disposeWithMe(this.registerEventHandler(this.Event.CommentResolved, () => commandService.onCommandExecuted((commandInfo) => {
|
|
852
|
-
var _threadComment$
|
|
852
|
+
var _threadComment$getRan5, _threadComment$getRan6;
|
|
853
853
|
if (commandInfo.id !== _univerjs_thread_comment.ResolveCommentCommand.id) return;
|
|
854
854
|
const params = commandInfo.params;
|
|
855
855
|
const target = this.getSheetCommandTarget(params);
|
|
@@ -861,8 +861,8 @@ var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUnive
|
|
|
861
861
|
const eventParams = {
|
|
862
862
|
workbook,
|
|
863
863
|
worksheet,
|
|
864
|
-
row: (
|
|
865
|
-
col: (
|
|
864
|
+
row: ((_threadComment$getRan5 = threadComment.getRange()) === null || _threadComment$getRan5 === void 0 ? void 0 : _threadComment$getRan5.getRow()) ?? 0,
|
|
865
|
+
col: ((_threadComment$getRan6 = threadComment.getRange()) === null || _threadComment$getRan6 === void 0 ? void 0 : _threadComment$getRan6.getColumn()) ?? 0,
|
|
866
866
|
comment: threadComment,
|
|
867
867
|
resolved
|
|
868
868
|
};
|
|
@@ -887,7 +887,7 @@ var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUnive
|
|
|
887
887
|
if (eventParams.cancel) throw new _univerjs_core.CanceledError();
|
|
888
888
|
})));
|
|
889
889
|
this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentUpdate, () => commandService.beforeCommandExecuted((commandInfo) => {
|
|
890
|
-
var _threadComment$
|
|
890
|
+
var _threadComment$getRan7, _threadComment$getRan8;
|
|
891
891
|
if (commandInfo.id !== _univerjs_thread_comment.UpdateCommentCommand.id) return;
|
|
892
892
|
const params = commandInfo.params;
|
|
893
893
|
const target = this.getSheetCommandTarget(params);
|
|
@@ -899,8 +899,8 @@ var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUnive
|
|
|
899
899
|
const eventParams = {
|
|
900
900
|
workbook,
|
|
901
901
|
worksheet,
|
|
902
|
-
row: (
|
|
903
|
-
col: (
|
|
902
|
+
row: ((_threadComment$getRan7 = threadComment.getRange()) === null || _threadComment$getRan7 === void 0 ? void 0 : _threadComment$getRan7.getRow()) ?? 0,
|
|
903
|
+
col: ((_threadComment$getRan8 = threadComment.getRange()) === null || _threadComment$getRan8 === void 0 ? void 0 : _threadComment$getRan8.getColumn()) ?? 0,
|
|
904
904
|
comment: threadComment,
|
|
905
905
|
newContent: _univerjs_core.RichTextValue.createByBody(payload.text)
|
|
906
906
|
};
|
|
@@ -908,7 +908,7 @@ var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUnive
|
|
|
908
908
|
if (eventParams.cancel) throw new _univerjs_core.CanceledError();
|
|
909
909
|
})));
|
|
910
910
|
this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentDelete, () => commandService.beforeCommandExecuted((commandInfo) => {
|
|
911
|
-
var _threadComment$
|
|
911
|
+
var _threadComment$getRan9, _threadComment$getRan10;
|
|
912
912
|
if (commandInfo.id !== _univerjs_thread_comment.DeleteCommentCommand.id && commandInfo.id !== _univerjs_thread_comment.DeleteCommentTreeCommand.id) return;
|
|
913
913
|
const params = commandInfo.params;
|
|
914
914
|
const target = this.getSheetCommandTarget(params);
|
|
@@ -920,15 +920,14 @@ var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUnive
|
|
|
920
920
|
const eventParams = {
|
|
921
921
|
workbook,
|
|
922
922
|
worksheet,
|
|
923
|
-
row: (
|
|
924
|
-
col: (
|
|
923
|
+
row: ((_threadComment$getRan9 = threadComment.getRange()) === null || _threadComment$getRan9 === void 0 ? void 0 : _threadComment$getRan9.getRow()) ?? 0,
|
|
924
|
+
col: ((_threadComment$getRan10 = threadComment.getRange()) === null || _threadComment$getRan10 === void 0 ? void 0 : _threadComment$getRan10.getColumn()) ?? 0,
|
|
925
925
|
comment: threadComment
|
|
926
926
|
};
|
|
927
927
|
this.fireEvent(this.Event.BeforeCommentDelete, eventParams);
|
|
928
928
|
if (eventParams.cancel) throw new _univerjs_core.CanceledError();
|
|
929
929
|
})));
|
|
930
930
|
this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentResolve, () => commandService.beforeCommandExecuted((commandInfo) => {
|
|
931
|
-
var _getRow, _getColumn;
|
|
932
931
|
if (commandInfo.id !== _univerjs_thread_comment.ResolveCommentCommand.id) return;
|
|
933
932
|
const params = commandInfo.params;
|
|
934
933
|
const target = this.getSheetCommandTarget(params);
|
|
@@ -940,8 +939,8 @@ var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUnive
|
|
|
940
939
|
const eventParams = {
|
|
941
940
|
workbook,
|
|
942
941
|
worksheet,
|
|
943
|
-
row:
|
|
944
|
-
col:
|
|
942
|
+
row: threadComment.getRange().getRow() ?? 0,
|
|
943
|
+
col: threadComment.getRange().getColumn() ?? 0,
|
|
945
944
|
comment: threadComment,
|
|
946
945
|
resolved
|
|
947
946
|
};
|
package/lib/cjs/index.js
CHANGED
|
@@ -110,8 +110,7 @@ let SheetsThreadCommentModel = class SheetsThreadCommentModel extends _univerjs_
|
|
|
110
110
|
return subUnitMap;
|
|
111
111
|
}
|
|
112
112
|
_addCommentToMatrix(matrix, row, column, commentId) {
|
|
113
|
-
|
|
114
|
-
const current = (_matrix$getValue = matrix.getValue(row, column)) !== null && _matrix$getValue !== void 0 ? _matrix$getValue : /* @__PURE__ */ new Set();
|
|
113
|
+
const current = matrix.getValue(row, column) ?? /* @__PURE__ */ new Set();
|
|
115
114
|
current.add(commentId);
|
|
116
115
|
matrix.setValue(row, column, current);
|
|
117
116
|
}
|
|
@@ -450,7 +449,7 @@ SheetsThreadCommentRefRangeController = __decorate([
|
|
|
450
449
|
//#endregion
|
|
451
450
|
//#region package.json
|
|
452
451
|
var name = "@univerjs/sheets-thread-comment";
|
|
453
|
-
var version = "1.0.0-
|
|
452
|
+
var version = "1.0.0-beta.1";
|
|
454
453
|
|
|
455
454
|
//#endregion
|
|
456
455
|
//#region src/config/config.ts
|
package/lib/es/facade.js
CHANGED
|
@@ -544,7 +544,7 @@ let FThreadComment = _FThreadComment = class FThreadComment {
|
|
|
544
544
|
unitId: this._thread.unitId,
|
|
545
545
|
subUnitId: this._thread.subUnitId,
|
|
546
546
|
commentId: this._thread.id,
|
|
547
|
-
resolved: resolved
|
|
547
|
+
resolved: resolved ?? !this._thread.resolved
|
|
548
548
|
});
|
|
549
549
|
}
|
|
550
550
|
/**
|
|
@@ -796,7 +796,7 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
796
796
|
_initialize(injector) {
|
|
797
797
|
const commandService = injector.get(ICommandService);
|
|
798
798
|
this.disposeWithMe(this.registerEventHandler(this.Event.CommentAdded, () => commandService.onCommandExecuted((commandInfo) => {
|
|
799
|
-
var _threadComment$getRan, _threadComment$getRan2
|
|
799
|
+
var _threadComment$getRan, _threadComment$getRan2;
|
|
800
800
|
if (commandInfo.id !== AddCommentCommand.id) return;
|
|
801
801
|
const params = commandInfo.params;
|
|
802
802
|
const target = this.getSheetCommandTarget(params);
|
|
@@ -808,14 +808,14 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
808
808
|
const eventParams = {
|
|
809
809
|
workbook,
|
|
810
810
|
worksheet,
|
|
811
|
-
row: (_threadComment$getRan =
|
|
812
|
-
col: (
|
|
811
|
+
row: ((_threadComment$getRan = threadComment.getRange()) === null || _threadComment$getRan === void 0 ? void 0 : _threadComment$getRan.getRow()) ?? 0,
|
|
812
|
+
col: ((_threadComment$getRan2 = threadComment.getRange()) === null || _threadComment$getRan2 === void 0 ? void 0 : _threadComment$getRan2.getColumn()) ?? 0,
|
|
813
813
|
comment: threadComment
|
|
814
814
|
};
|
|
815
815
|
this.fireEvent(this.Event.CommentAdded, eventParams);
|
|
816
816
|
})));
|
|
817
817
|
this.disposeWithMe(this.registerEventHandler(this.Event.CommentUpdated, () => commandService.onCommandExecuted((commandInfo) => {
|
|
818
|
-
var _threadComment$
|
|
818
|
+
var _threadComment$getRan3, _threadComment$getRan4;
|
|
819
819
|
if (commandInfo.id !== UpdateCommentCommand.id) return;
|
|
820
820
|
const params = commandInfo.params;
|
|
821
821
|
const target = this.getSheetCommandTarget(params);
|
|
@@ -827,8 +827,8 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
827
827
|
const eventParams = {
|
|
828
828
|
workbook,
|
|
829
829
|
worksheet,
|
|
830
|
-
row: (
|
|
831
|
-
col: (
|
|
830
|
+
row: ((_threadComment$getRan3 = threadComment.getRange()) === null || _threadComment$getRan3 === void 0 ? void 0 : _threadComment$getRan3.getRow()) ?? 0,
|
|
831
|
+
col: ((_threadComment$getRan4 = threadComment.getRange()) === null || _threadComment$getRan4 === void 0 ? void 0 : _threadComment$getRan4.getColumn()) ?? 0,
|
|
832
832
|
comment: threadComment
|
|
833
833
|
};
|
|
834
834
|
this.fireEvent(this.Event.CommentUpdated, eventParams);
|
|
@@ -848,7 +848,7 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
848
848
|
this.fireEvent(this.Event.CommentDeleted, eventParams);
|
|
849
849
|
})));
|
|
850
850
|
this.disposeWithMe(this.registerEventHandler(this.Event.CommentResolved, () => commandService.onCommandExecuted((commandInfo) => {
|
|
851
|
-
var _threadComment$
|
|
851
|
+
var _threadComment$getRan5, _threadComment$getRan6;
|
|
852
852
|
if (commandInfo.id !== ResolveCommentCommand.id) return;
|
|
853
853
|
const params = commandInfo.params;
|
|
854
854
|
const target = this.getSheetCommandTarget(params);
|
|
@@ -860,8 +860,8 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
860
860
|
const eventParams = {
|
|
861
861
|
workbook,
|
|
862
862
|
worksheet,
|
|
863
|
-
row: (
|
|
864
|
-
col: (
|
|
863
|
+
row: ((_threadComment$getRan5 = threadComment.getRange()) === null || _threadComment$getRan5 === void 0 ? void 0 : _threadComment$getRan5.getRow()) ?? 0,
|
|
864
|
+
col: ((_threadComment$getRan6 = threadComment.getRange()) === null || _threadComment$getRan6 === void 0 ? void 0 : _threadComment$getRan6.getColumn()) ?? 0,
|
|
865
865
|
comment: threadComment,
|
|
866
866
|
resolved
|
|
867
867
|
};
|
|
@@ -886,7 +886,7 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
886
886
|
if (eventParams.cancel) throw new CanceledError();
|
|
887
887
|
})));
|
|
888
888
|
this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentUpdate, () => commandService.beforeCommandExecuted((commandInfo) => {
|
|
889
|
-
var _threadComment$
|
|
889
|
+
var _threadComment$getRan7, _threadComment$getRan8;
|
|
890
890
|
if (commandInfo.id !== UpdateCommentCommand.id) return;
|
|
891
891
|
const params = commandInfo.params;
|
|
892
892
|
const target = this.getSheetCommandTarget(params);
|
|
@@ -898,8 +898,8 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
898
898
|
const eventParams = {
|
|
899
899
|
workbook,
|
|
900
900
|
worksheet,
|
|
901
|
-
row: (
|
|
902
|
-
col: (
|
|
901
|
+
row: ((_threadComment$getRan7 = threadComment.getRange()) === null || _threadComment$getRan7 === void 0 ? void 0 : _threadComment$getRan7.getRow()) ?? 0,
|
|
902
|
+
col: ((_threadComment$getRan8 = threadComment.getRange()) === null || _threadComment$getRan8 === void 0 ? void 0 : _threadComment$getRan8.getColumn()) ?? 0,
|
|
903
903
|
comment: threadComment,
|
|
904
904
|
newContent: RichTextValue.createByBody(payload.text)
|
|
905
905
|
};
|
|
@@ -907,7 +907,7 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
907
907
|
if (eventParams.cancel) throw new CanceledError();
|
|
908
908
|
})));
|
|
909
909
|
this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentDelete, () => commandService.beforeCommandExecuted((commandInfo) => {
|
|
910
|
-
var _threadComment$
|
|
910
|
+
var _threadComment$getRan9, _threadComment$getRan10;
|
|
911
911
|
if (commandInfo.id !== DeleteCommentCommand.id && commandInfo.id !== DeleteCommentTreeCommand.id) return;
|
|
912
912
|
const params = commandInfo.params;
|
|
913
913
|
const target = this.getSheetCommandTarget(params);
|
|
@@ -919,15 +919,14 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
919
919
|
const eventParams = {
|
|
920
920
|
workbook,
|
|
921
921
|
worksheet,
|
|
922
|
-
row: (
|
|
923
|
-
col: (
|
|
922
|
+
row: ((_threadComment$getRan9 = threadComment.getRange()) === null || _threadComment$getRan9 === void 0 ? void 0 : _threadComment$getRan9.getRow()) ?? 0,
|
|
923
|
+
col: ((_threadComment$getRan10 = threadComment.getRange()) === null || _threadComment$getRan10 === void 0 ? void 0 : _threadComment$getRan10.getColumn()) ?? 0,
|
|
924
924
|
comment: threadComment
|
|
925
925
|
};
|
|
926
926
|
this.fireEvent(this.Event.BeforeCommentDelete, eventParams);
|
|
927
927
|
if (eventParams.cancel) throw new CanceledError();
|
|
928
928
|
})));
|
|
929
929
|
this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentResolve, () => commandService.beforeCommandExecuted((commandInfo) => {
|
|
930
|
-
var _getRow, _getColumn;
|
|
931
930
|
if (commandInfo.id !== ResolveCommentCommand.id) return;
|
|
932
931
|
const params = commandInfo.params;
|
|
933
932
|
const target = this.getSheetCommandTarget(params);
|
|
@@ -939,8 +938,8 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
939
938
|
const eventParams = {
|
|
940
939
|
workbook,
|
|
941
940
|
worksheet,
|
|
942
|
-
row:
|
|
943
|
-
col:
|
|
941
|
+
row: threadComment.getRange().getRow() ?? 0,
|
|
942
|
+
col: threadComment.getRange().getColumn() ?? 0,
|
|
944
943
|
comment: threadComment,
|
|
945
944
|
resolved
|
|
946
945
|
};
|
package/lib/es/index.js
CHANGED
|
@@ -109,8 +109,7 @@ let SheetsThreadCommentModel = class SheetsThreadCommentModel extends Disposable
|
|
|
109
109
|
return subUnitMap;
|
|
110
110
|
}
|
|
111
111
|
_addCommentToMatrix(matrix, row, column, commentId) {
|
|
112
|
-
|
|
113
|
-
const current = (_matrix$getValue = matrix.getValue(row, column)) !== null && _matrix$getValue !== void 0 ? _matrix$getValue : /* @__PURE__ */ new Set();
|
|
112
|
+
const current = matrix.getValue(row, column) ?? /* @__PURE__ */ new Set();
|
|
114
113
|
current.add(commentId);
|
|
115
114
|
matrix.setValue(row, column, current);
|
|
116
115
|
}
|
|
@@ -449,7 +448,7 @@ SheetsThreadCommentRefRangeController = __decorate([
|
|
|
449
448
|
//#endregion
|
|
450
449
|
//#region package.json
|
|
451
450
|
var name = "@univerjs/sheets-thread-comment";
|
|
452
|
-
var version = "1.0.0-
|
|
451
|
+
var version = "1.0.0-beta.1";
|
|
453
452
|
|
|
454
453
|
//#endregion
|
|
455
454
|
//#region src/config/config.ts
|
package/lib/facade.js
CHANGED
|
@@ -544,7 +544,7 @@ let FThreadComment = _FThreadComment = class FThreadComment {
|
|
|
544
544
|
unitId: this._thread.unitId,
|
|
545
545
|
subUnitId: this._thread.subUnitId,
|
|
546
546
|
commentId: this._thread.id,
|
|
547
|
-
resolved: resolved
|
|
547
|
+
resolved: resolved ?? !this._thread.resolved
|
|
548
548
|
});
|
|
549
549
|
}
|
|
550
550
|
/**
|
|
@@ -796,7 +796,7 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
796
796
|
_initialize(injector) {
|
|
797
797
|
const commandService = injector.get(ICommandService);
|
|
798
798
|
this.disposeWithMe(this.registerEventHandler(this.Event.CommentAdded, () => commandService.onCommandExecuted((commandInfo) => {
|
|
799
|
-
var _threadComment$getRan, _threadComment$getRan2
|
|
799
|
+
var _threadComment$getRan, _threadComment$getRan2;
|
|
800
800
|
if (commandInfo.id !== AddCommentCommand.id) return;
|
|
801
801
|
const params = commandInfo.params;
|
|
802
802
|
const target = this.getSheetCommandTarget(params);
|
|
@@ -808,14 +808,14 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
808
808
|
const eventParams = {
|
|
809
809
|
workbook,
|
|
810
810
|
worksheet,
|
|
811
|
-
row: (_threadComment$getRan =
|
|
812
|
-
col: (
|
|
811
|
+
row: ((_threadComment$getRan = threadComment.getRange()) === null || _threadComment$getRan === void 0 ? void 0 : _threadComment$getRan.getRow()) ?? 0,
|
|
812
|
+
col: ((_threadComment$getRan2 = threadComment.getRange()) === null || _threadComment$getRan2 === void 0 ? void 0 : _threadComment$getRan2.getColumn()) ?? 0,
|
|
813
813
|
comment: threadComment
|
|
814
814
|
};
|
|
815
815
|
this.fireEvent(this.Event.CommentAdded, eventParams);
|
|
816
816
|
})));
|
|
817
817
|
this.disposeWithMe(this.registerEventHandler(this.Event.CommentUpdated, () => commandService.onCommandExecuted((commandInfo) => {
|
|
818
|
-
var _threadComment$
|
|
818
|
+
var _threadComment$getRan3, _threadComment$getRan4;
|
|
819
819
|
if (commandInfo.id !== UpdateCommentCommand.id) return;
|
|
820
820
|
const params = commandInfo.params;
|
|
821
821
|
const target = this.getSheetCommandTarget(params);
|
|
@@ -827,8 +827,8 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
827
827
|
const eventParams = {
|
|
828
828
|
workbook,
|
|
829
829
|
worksheet,
|
|
830
|
-
row: (
|
|
831
|
-
col: (
|
|
830
|
+
row: ((_threadComment$getRan3 = threadComment.getRange()) === null || _threadComment$getRan3 === void 0 ? void 0 : _threadComment$getRan3.getRow()) ?? 0,
|
|
831
|
+
col: ((_threadComment$getRan4 = threadComment.getRange()) === null || _threadComment$getRan4 === void 0 ? void 0 : _threadComment$getRan4.getColumn()) ?? 0,
|
|
832
832
|
comment: threadComment
|
|
833
833
|
};
|
|
834
834
|
this.fireEvent(this.Event.CommentUpdated, eventParams);
|
|
@@ -848,7 +848,7 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
848
848
|
this.fireEvent(this.Event.CommentDeleted, eventParams);
|
|
849
849
|
})));
|
|
850
850
|
this.disposeWithMe(this.registerEventHandler(this.Event.CommentResolved, () => commandService.onCommandExecuted((commandInfo) => {
|
|
851
|
-
var _threadComment$
|
|
851
|
+
var _threadComment$getRan5, _threadComment$getRan6;
|
|
852
852
|
if (commandInfo.id !== ResolveCommentCommand.id) return;
|
|
853
853
|
const params = commandInfo.params;
|
|
854
854
|
const target = this.getSheetCommandTarget(params);
|
|
@@ -860,8 +860,8 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
860
860
|
const eventParams = {
|
|
861
861
|
workbook,
|
|
862
862
|
worksheet,
|
|
863
|
-
row: (
|
|
864
|
-
col: (
|
|
863
|
+
row: ((_threadComment$getRan5 = threadComment.getRange()) === null || _threadComment$getRan5 === void 0 ? void 0 : _threadComment$getRan5.getRow()) ?? 0,
|
|
864
|
+
col: ((_threadComment$getRan6 = threadComment.getRange()) === null || _threadComment$getRan6 === void 0 ? void 0 : _threadComment$getRan6.getColumn()) ?? 0,
|
|
865
865
|
comment: threadComment,
|
|
866
866
|
resolved
|
|
867
867
|
};
|
|
@@ -886,7 +886,7 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
886
886
|
if (eventParams.cancel) throw new CanceledError();
|
|
887
887
|
})));
|
|
888
888
|
this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentUpdate, () => commandService.beforeCommandExecuted((commandInfo) => {
|
|
889
|
-
var _threadComment$
|
|
889
|
+
var _threadComment$getRan7, _threadComment$getRan8;
|
|
890
890
|
if (commandInfo.id !== UpdateCommentCommand.id) return;
|
|
891
891
|
const params = commandInfo.params;
|
|
892
892
|
const target = this.getSheetCommandTarget(params);
|
|
@@ -898,8 +898,8 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
898
898
|
const eventParams = {
|
|
899
899
|
workbook,
|
|
900
900
|
worksheet,
|
|
901
|
-
row: (
|
|
902
|
-
col: (
|
|
901
|
+
row: ((_threadComment$getRan7 = threadComment.getRange()) === null || _threadComment$getRan7 === void 0 ? void 0 : _threadComment$getRan7.getRow()) ?? 0,
|
|
902
|
+
col: ((_threadComment$getRan8 = threadComment.getRange()) === null || _threadComment$getRan8 === void 0 ? void 0 : _threadComment$getRan8.getColumn()) ?? 0,
|
|
903
903
|
comment: threadComment,
|
|
904
904
|
newContent: RichTextValue.createByBody(payload.text)
|
|
905
905
|
};
|
|
@@ -907,7 +907,7 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
907
907
|
if (eventParams.cancel) throw new CanceledError();
|
|
908
908
|
})));
|
|
909
909
|
this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentDelete, () => commandService.beforeCommandExecuted((commandInfo) => {
|
|
910
|
-
var _threadComment$
|
|
910
|
+
var _threadComment$getRan9, _threadComment$getRan10;
|
|
911
911
|
if (commandInfo.id !== DeleteCommentCommand.id && commandInfo.id !== DeleteCommentTreeCommand.id) return;
|
|
912
912
|
const params = commandInfo.params;
|
|
913
913
|
const target = this.getSheetCommandTarget(params);
|
|
@@ -919,15 +919,14 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
919
919
|
const eventParams = {
|
|
920
920
|
workbook,
|
|
921
921
|
worksheet,
|
|
922
|
-
row: (
|
|
923
|
-
col: (
|
|
922
|
+
row: ((_threadComment$getRan9 = threadComment.getRange()) === null || _threadComment$getRan9 === void 0 ? void 0 : _threadComment$getRan9.getRow()) ?? 0,
|
|
923
|
+
col: ((_threadComment$getRan10 = threadComment.getRange()) === null || _threadComment$getRan10 === void 0 ? void 0 : _threadComment$getRan10.getColumn()) ?? 0,
|
|
924
924
|
comment: threadComment
|
|
925
925
|
};
|
|
926
926
|
this.fireEvent(this.Event.BeforeCommentDelete, eventParams);
|
|
927
927
|
if (eventParams.cancel) throw new CanceledError();
|
|
928
928
|
})));
|
|
929
929
|
this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentResolve, () => commandService.beforeCommandExecuted((commandInfo) => {
|
|
930
|
-
var _getRow, _getColumn;
|
|
931
930
|
if (commandInfo.id !== ResolveCommentCommand.id) return;
|
|
932
931
|
const params = commandInfo.params;
|
|
933
932
|
const target = this.getSheetCommandTarget(params);
|
|
@@ -939,8 +938,8 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
|
|
|
939
938
|
const eventParams = {
|
|
940
939
|
workbook,
|
|
941
940
|
worksheet,
|
|
942
|
-
row:
|
|
943
|
-
col:
|
|
941
|
+
row: threadComment.getRange().getRow() ?? 0,
|
|
942
|
+
col: threadComment.getRange().getColumn() ?? 0,
|
|
944
943
|
comment: threadComment,
|
|
945
944
|
resolved
|
|
946
945
|
};
|
package/lib/index.js
CHANGED
|
@@ -109,8 +109,7 @@ let SheetsThreadCommentModel = class SheetsThreadCommentModel extends Disposable
|
|
|
109
109
|
return subUnitMap;
|
|
110
110
|
}
|
|
111
111
|
_addCommentToMatrix(matrix, row, column, commentId) {
|
|
112
|
-
|
|
113
|
-
const current = (_matrix$getValue = matrix.getValue(row, column)) !== null && _matrix$getValue !== void 0 ? _matrix$getValue : /* @__PURE__ */ new Set();
|
|
112
|
+
const current = matrix.getValue(row, column) ?? /* @__PURE__ */ new Set();
|
|
114
113
|
current.add(commentId);
|
|
115
114
|
matrix.setValue(row, column, current);
|
|
116
115
|
}
|
|
@@ -449,7 +448,7 @@ SheetsThreadCommentRefRangeController = __decorate([
|
|
|
449
448
|
//#endregion
|
|
450
449
|
//#region package.json
|
|
451
450
|
var name = "@univerjs/sheets-thread-comment";
|
|
452
|
-
var version = "1.0.0-
|
|
451
|
+
var version = "1.0.0-beta.1";
|
|
453
452
|
|
|
454
453
|
//#endregion
|
|
455
454
|
//#region src/config/config.ts
|
package/lib/umd/facade.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
(function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require("@univerjs/core"),require("@univerjs/sheets-thread-comment"),require("@univerjs/sheets/facade"),require("@univerjs/thread-comment"),require("@univerjs/engine-formula"),require("@univerjs/core/facade")):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core`,`@univerjs/sheets-thread-comment`,`@univerjs/sheets/facade`,`@univerjs/thread-comment`,`@univerjs/engine-formula`,`@univerjs/core/facade`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverSheetsThreadCommentFacade={},e.UniverCore,e.UniverSheetsThreadComment,e.UniverSheetsFacade,e.UniverThreadComment,e.UniverEngineFormula,e.UniverCoreFacade))})(this,function(e,t,n,r,i,a,o){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});function s(e){"@babel/helpers - typeof";return s=typeof Symbol==`function`&&typeof Symbol.iterator==`symbol`?function(e){return typeof e}:function(e){return e&&typeof Symbol==`function`&&e.constructor===Symbol&&e!==Symbol.prototype?`symbol`:typeof e},s(e)}function c(e,t){if(s(e)!=`object`||!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var r=n.call(e,t||`default`);if(s(r)!=`object`)return r;throw TypeError(`@@toPrimitive must return a primitive value.`)}return(t===`string`?String:Number)(e)}function l(e){var t=c(e,`string`);return s(t)==`symbol`?t:t+``}function u(e,t,n){return(t=l(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function d(e,t){return function(n,r){t(n,r,e)}}function f(e,t,n,r){var i=arguments.length,a=i<3?t:r===null?r=Object.getOwnPropertyDescriptor(t,n):r,o;if(typeof Reflect==`object`&&typeof Reflect.decorate==`function`)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}var p,m=class e{static create(t){return new e(t)}constructor(e){u(this,`_comment`,{id:(0,t.generateRandomId)(),ref:``,threadId:``,dT:``,personId:``,text:t.RichTextBuilder.newEmptyData().body,attachments:[],unitId:``,subUnitId:``}),e&&(this._comment=e)}get personId(){return this._comment.personId}get dateTime(){return this._comment.dT}get content(){return t.RichTextValue.createByBody(this._comment.text)}get id(){return this._comment.id}get threadId(){return this._comment.threadId}copy(){return h.create(t.Tools.deepClone(this._comment))}},h=class e extends m{static create(t){return new e(t)}setContent(e){return e instanceof t.RichTextValue?this._comment.text=e.getData().body:this._comment.text=e,this}setPersonId(e){return this._comment.personId=e,this}setDateTime(e){return this._comment.dT=(0,i.getDT)(e),this}setId(e){return this._comment.id=e,this}setThreadId(e){return this._comment.threadId=e,this}build(){return this._comment}};let g=p=class{constructor(e,t,n,r,i,a,o){this._thread=e,this._parent=t,this._injector=n,this._commandService=r,this._univerInstanceService=i,this._threadCommentModel=a,this._userManagerService=o}_getRef(){var e;return(0,a.deserializeRangeWithSheet)(((e=this._parent)==null?void 0:e.ref)||this._thread.ref).range}getIsRoot(){return!this._parent}getCommentData(){let{children:e,...t}=this._thread;return t}getReplies(){var e;let t=this._getRef(),n=this._threadCommentModel.getCommentWithChildren(this._thread.unitId,this._thread.subUnitId,t.startRow,t.startColumn);return n==null||(e=n.children)==null?void 0:e.map(e=>this._injector.createInstance(p,e))}getRange(){let e=this._univerInstanceService.getUnit(this._thread.unitId,t.UniverInstanceType.UNIVER_SHEET);if(!e)return null;let n=e.getSheetBySheetId(this._thread.subUnitId);if(!n)return null;let i=this._getRef();return this._injector.createInstance(r.FRange,e,n,i)}getRichText(){let e=this._thread.text;return t.RichTextValue.create({body:e,documentStyle:{},id:`d`})}deleteAsync(){return this._commandService.executeCommand(this.getIsRoot()?i.DeleteCommentTreeCommand.id:i.DeleteCommentCommand.id,{commentId:this._thread.id,unitId:this._thread.unitId,subUnitId:this._thread.subUnitId})}async updateAsync(e){let n=e instanceof t.RichTextValue?e.getData().body:e,r=(0,i.getDT)();return await this._commandService.executeCommand(i.UpdateCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,payload:{commentId:this._thread.id,text:n,updated:!0,updateT:r}})}resolveAsync(e){return this._commandService.executeCommand(i.ResolveCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,commentId:this._thread.id,resolved:e==null?!this._thread.resolved:e})}replyAsync(e){var n;let r=e.build();return this._commandService.executeCommand(i.AddCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,comment:{id:(0,t.generateRandomId)(),parentId:this._thread.id,threadId:this._thread.threadId,ref:((n=this._parent)==null?void 0:n.ref)||this._thread.ref,unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,text:r.text,attachments:r.attachments,dT:r.dT||(0,i.getDT)(),personId:r.personId||this._userManagerService.getCurrentUser().userID}})}};g=p=f([d(2,(0,t.Inject)(t.Injector)),d(3,t.ICommandService),d(4,t.IUniverInstanceService),d(5,(0,t.Inject)(n.SheetsThreadCommentModel)),d(6,(0,t.Inject)(t.UserManagerService))],g);var _=class extends r.FRange{getComment(){let e=this._injector.get(n.SheetsThreadCommentModel),t=this._workbook.getUnitId(),r=this._worksheet.getSheetId(),i=e.getByLocation(t,r,this._range.startRow,this._range.startColumn);if(!i)return null;let a=e.getComment(t,r,i);return a?this._injector.createInstance(g,a):null}getComments(){let e=this._injector.get(n.SheetsThreadCommentModel),r=this._workbook.getUnitId(),i=this._worksheet.getSheetId(),a=[];return t.Range.foreach(this._range,(t,n)=>{let o=e.getByLocation(r,i,t,n);if(o){let t=e.getComment(r,i,o);t&&a.push(this._injector.createInstance(g,t))}}),a}addCommentAsync(e){var n;let r=this._injector,a=(n=this.getComment())==null?void 0:n.getCommentData(),o=r.get(t.ICommandService),s=r.get(t.UserManagerService),c=this._workbook.getUnitId(),l=this._worksheet.getSheetId(),u=`${t.Tools.chatAtABC(this._range.startColumn)}${this._range.startRow+1}`,d=s.getCurrentUser(),f=e instanceof h?e.build():{text:e};return o.executeCommand(i.AddCommentCommand.id,{unitId:c,subUnitId:l,comment:{text:f.text,dT:f.dT||(0,i.getDT)(),attachments:[],id:f.id||(0,t.generateRandomId)(),ref:u,personId:f.personId||d.userID,parentId:a==null?void 0:a.id,unitId:c,subUnitId:l,threadId:(a==null?void 0:a.threadId)||(0,t.generateRandomId)()}})}clearCommentAsync(){var e;let n=this._injector,r=(e=this.getComment())==null?void 0:e.getCommentData(),a=n.get(t.ICommandService),o=this._workbook.getUnitId(),s=this._worksheet.getSheetId();return r?a.executeCommand(i.DeleteCommentTreeCommand.id,{unitId:o,subUnitId:s,threadId:r.threadId,commentId:r.id}):Promise.resolve(!0)}clearCommentsAsync(){let e=this.getComments().map(e=>e.deleteAsync());return Promise.all(e).then(()=>!0)}};r.FRange.extend(_);var v=class extends r.FWorkbook{_initialize(){Object.defineProperty(this,"_threadCommentModel",{get(){return this._injector.get(i.ThreadCommentModel)}})}getComments(){return this._threadCommentModel.getUnit(this._workbook.getUnitId()).map(e=>this._injector.createInstance(g,e.root))}clearComments(){let e=this.getComments().map(e=>e.deleteAsync());return Promise.all(e).then(()=>!0)}};r.FWorkbook.extend(v);var y=class extends r.FWorksheet{getComments(){return this._injector.get(n.SheetsThreadCommentModel).getSubUnitAll(this._workbook.getUnitId(),this._worksheet.getSheetId()).map(e=>this._injector.createInstance(g,e))}clearComments(){let e=this.getComments().map(e=>e.deleteAsync());return Promise.all(e).then(()=>!0)}onCommented(e){return this._injector.get(t.ICommandService).onCommandExecuted(t=>{if(t.id===i.AddCommentCommand.id){let n=t.params;e(n)}})}getCommentById(e){let t=this._injector.get(n.SheetsThreadCommentModel).getComment(this._workbook.getUnitId(),this._worksheet.getSheetId(),e);if(t)return this._injector.createInstance(g,t)}};r.FWorksheet.extend(y);var b=class extends o.FEventName{get CommentAdded(){return`CommentAdded`}get BeforeCommentAdd(){return`BeforeCommentAdd`}get CommentUpdated(){return`CommentUpdated`}get BeforeCommentUpdate(){return`BeforeCommentUpdate`}get CommentDeleted(){return`CommentDeleted`}get BeforeCommentDelete(){return`BeforeCommentDelete`}get CommentResolved(){return`CommentResolved`}get BeforeCommentResolve(){return`BeforeCommentResolve`}};o.FEventName.extend(b);var x=class extends o.FUniver{_initialize(e){let n=e.get(t.ICommandService);this.disposeWithMe(this.registerEventHandler(this.Event.CommentAdded,()=>n.onCommandExecuted(e=>{var t,n,r,a;if(e.id!==i.AddCommentCommand.id)return;let o=e.params,s=this.getSheetCommandTarget(o);if(!s)return;let{workbook:c,worksheet:l}=s,{comment:u}=o,d=l.getCommentById(u.id);if(!d)return;let f={workbook:c,worksheet:l,row:(t=(n=d.getRange())==null?void 0:n.getRow())==null?0:t,col:(r=(a=d.getRange())==null?void 0:a.getColumn())==null?0:r,comment:d};this.fireEvent(this.Event.CommentAdded,f)}))),this.disposeWithMe(this.registerEventHandler(this.Event.CommentUpdated,()=>n.onCommandExecuted(e=>{var t,n,r,a;if(e.id!==i.UpdateCommentCommand.id)return;let o=e.params,s=this.getSheetCommandTarget(o);if(!s)return;let{workbook:c,worksheet:l}=s,{payload:u}=o,d=l.getCommentById(u.commentId);if(!d)return;let f={workbook:c,worksheet:l,row:(t=(n=d.getRange())==null?void 0:n.getRow())==null?0:t,col:(r=(a=d.getRange())==null?void 0:a.getColumn())==null?0:r,comment:d};this.fireEvent(this.Event.CommentUpdated,f)}))),this.disposeWithMe(this.registerEventHandler(this.Event.CommentDeleted,()=>n.onCommandExecuted(e=>{if(e.id!==i.DeleteCommentCommand.id&&e.id!==i.DeleteCommentTreeCommand.id)return;let t=e.params,n=this.getSheetCommandTarget(t);if(!n)return;let{workbook:r,worksheet:a}=n,{commentId:o}=t,s={workbook:r,worksheet:a,commentId:o};this.fireEvent(this.Event.CommentDeleted,s)}))),this.disposeWithMe(this.registerEventHandler(this.Event.CommentResolved,()=>n.onCommandExecuted(e=>{var t,n,r,a;if(e.id!==i.ResolveCommentCommand.id)return;let o=e.params,s=this.getSheetCommandTarget(o);if(!s)return;let{workbook:c,worksheet:l}=s,{commentId:u,resolved:d}=o,f=l.getCommentById(u);if(!f)return;let p={workbook:c,worksheet:l,row:(t=(n=f.getRange())==null?void 0:n.getRow())==null?0:t,col:(r=(a=f.getRange())==null?void 0:a.getColumn())==null?0:r,comment:f,resolved:d};this.fireEvent(this.Event.CommentResolved,p)}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentAdd,()=>n.beforeCommandExecuted(e=>{if(e.id!==i.AddCommentCommand.id)return;let n=e.params,r=this.getSheetCommandTarget(n);if(!r)return;let{workbook:o,worksheet:s}=r,{comment:c}=n,{range:l}=(0,a.deserializeRangeWithSheet)(c.ref),u={workbook:o,worksheet:s,row:l.startRow,col:l.startColumn,comment:m.create(c)};if(this.fireEvent(this.Event.BeforeCommentAdd,u),u.cancel)throw new t.CanceledError}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentUpdate,()=>n.beforeCommandExecuted(e=>{var n,r,a,o;if(e.id!==i.UpdateCommentCommand.id)return;let s=e.params,c=this.getSheetCommandTarget(s);if(!c)return;let{workbook:l,worksheet:u}=c,{payload:d}=s,f=u.getCommentById(d.commentId);if(!f)return;let p={workbook:l,worksheet:u,row:(n=(r=f.getRange())==null?void 0:r.getRow())==null?0:n,col:(a=(o=f.getRange())==null?void 0:o.getColumn())==null?0:a,comment:f,newContent:t.RichTextValue.createByBody(d.text)};if(this.fireEvent(this.Event.BeforeCommentUpdate,p),p.cancel)throw new t.CanceledError}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentDelete,()=>n.beforeCommandExecuted(e=>{var n,r,a,o;if(e.id!==i.DeleteCommentCommand.id&&e.id!==i.DeleteCommentTreeCommand.id)return;let s=e.params,c=this.getSheetCommandTarget(s);if(!c)return;let{workbook:l,worksheet:u}=c,{commentId:d}=s,f=u.getCommentById(d);if(!f)return;let p={workbook:l,worksheet:u,row:(n=(r=f.getRange())==null?void 0:r.getRow())==null?0:n,col:(a=(o=f.getRange())==null?void 0:o.getColumn())==null?0:a,comment:f};if(this.fireEvent(this.Event.BeforeCommentDelete,p),p.cancel)throw new t.CanceledError}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentResolve,()=>n.beforeCommandExecuted(e=>{var n,r;if(e.id!==i.ResolveCommentCommand.id)return;let a=e.params,o=this.getSheetCommandTarget(a);if(!o)return;let{workbook:s,worksheet:c}=o,{commentId:l,resolved:u}=a,d=c.getCommentById(l);if(!d)return;let f={workbook:s,worksheet:c,row:(n=d.getRange().getRow())==null?0:n,col:(r=d.getRange().getColumn())==null?0:r,comment:d,resolved:u};if(this.fireEvent(this.Event.BeforeCommentResolve,f),f.cancel)throw new t.CanceledError})))}newTheadComment(e){return new h(e)}};o.FUniver.extend(x),Object.defineProperty(e,"FThreadComment",{enumerable:!0,get:function(){return g}})});
|
|
1
|
+
(function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require("@univerjs/core"),require("@univerjs/sheets-thread-comment"),require("@univerjs/sheets/facade"),require("@univerjs/thread-comment"),require("@univerjs/engine-formula"),require("@univerjs/core/facade")):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core`,`@univerjs/sheets-thread-comment`,`@univerjs/sheets/facade`,`@univerjs/thread-comment`,`@univerjs/engine-formula`,`@univerjs/core/facade`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverSheetsThreadCommentFacade={},e.UniverCore,e.UniverSheetsThreadComment,e.UniverSheetsFacade,e.UniverThreadComment,e.UniverEngineFormula,e.UniverCoreFacade))})(this,function(e,t,n,r,i,a,o){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});function s(e){"@babel/helpers - typeof";return s=typeof Symbol==`function`&&typeof Symbol.iterator==`symbol`?function(e){return typeof e}:function(e){return e&&typeof Symbol==`function`&&e.constructor===Symbol&&e!==Symbol.prototype?`symbol`:typeof e},s(e)}function c(e,t){if(s(e)!=`object`||!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var r=n.call(e,t||`default`);if(s(r)!=`object`)return r;throw TypeError(`@@toPrimitive must return a primitive value.`)}return(t===`string`?String:Number)(e)}function l(e){var t=c(e,`string`);return s(t)==`symbol`?t:t+``}function u(e,t,n){return(t=l(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function d(e,t){return function(n,r){t(n,r,e)}}function f(e,t,n,r){var i=arguments.length,a=i<3?t:r===null?r=Object.getOwnPropertyDescriptor(t,n):r,o;if(typeof Reflect==`object`&&typeof Reflect.decorate==`function`)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}var p,m=class e{static create(t){return new e(t)}constructor(e){u(this,`_comment`,{id:(0,t.generateRandomId)(),ref:``,threadId:``,dT:``,personId:``,text:t.RichTextBuilder.newEmptyData().body,attachments:[],unitId:``,subUnitId:``}),e&&(this._comment=e)}get personId(){return this._comment.personId}get dateTime(){return this._comment.dT}get content(){return t.RichTextValue.createByBody(this._comment.text)}get id(){return this._comment.id}get threadId(){return this._comment.threadId}copy(){return h.create(t.Tools.deepClone(this._comment))}},h=class e extends m{static create(t){return new e(t)}setContent(e){return e instanceof t.RichTextValue?this._comment.text=e.getData().body:this._comment.text=e,this}setPersonId(e){return this._comment.personId=e,this}setDateTime(e){return this._comment.dT=(0,i.getDT)(e),this}setId(e){return this._comment.id=e,this}setThreadId(e){return this._comment.threadId=e,this}build(){return this._comment}};let g=p=class{constructor(e,t,n,r,i,a,o){this._thread=e,this._parent=t,this._injector=n,this._commandService=r,this._univerInstanceService=i,this._threadCommentModel=a,this._userManagerService=o}_getRef(){var e;return(0,a.deserializeRangeWithSheet)(((e=this._parent)==null?void 0:e.ref)||this._thread.ref).range}getIsRoot(){return!this._parent}getCommentData(){let{children:e,...t}=this._thread;return t}getReplies(){var e;let t=this._getRef(),n=this._threadCommentModel.getCommentWithChildren(this._thread.unitId,this._thread.subUnitId,t.startRow,t.startColumn);return n==null||(e=n.children)==null?void 0:e.map(e=>this._injector.createInstance(p,e))}getRange(){let e=this._univerInstanceService.getUnit(this._thread.unitId,t.UniverInstanceType.UNIVER_SHEET);if(!e)return null;let n=e.getSheetBySheetId(this._thread.subUnitId);if(!n)return null;let i=this._getRef();return this._injector.createInstance(r.FRange,e,n,i)}getRichText(){let e=this._thread.text;return t.RichTextValue.create({body:e,documentStyle:{},id:`d`})}deleteAsync(){return this._commandService.executeCommand(this.getIsRoot()?i.DeleteCommentTreeCommand.id:i.DeleteCommentCommand.id,{commentId:this._thread.id,unitId:this._thread.unitId,subUnitId:this._thread.subUnitId})}async updateAsync(e){let n=e instanceof t.RichTextValue?e.getData().body:e,r=(0,i.getDT)();return await this._commandService.executeCommand(i.UpdateCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,payload:{commentId:this._thread.id,text:n,updated:!0,updateT:r}})}resolveAsync(e){return this._commandService.executeCommand(i.ResolveCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,commentId:this._thread.id,resolved:e??!this._thread.resolved})}replyAsync(e){var n;let r=e.build();return this._commandService.executeCommand(i.AddCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,comment:{id:(0,t.generateRandomId)(),parentId:this._thread.id,threadId:this._thread.threadId,ref:((n=this._parent)==null?void 0:n.ref)||this._thread.ref,unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,text:r.text,attachments:r.attachments,dT:r.dT||(0,i.getDT)(),personId:r.personId||this._userManagerService.getCurrentUser().userID}})}};g=p=f([d(2,(0,t.Inject)(t.Injector)),d(3,t.ICommandService),d(4,t.IUniverInstanceService),d(5,(0,t.Inject)(n.SheetsThreadCommentModel)),d(6,(0,t.Inject)(t.UserManagerService))],g);var _=class extends r.FRange{getComment(){let e=this._injector.get(n.SheetsThreadCommentModel),t=this._workbook.getUnitId(),r=this._worksheet.getSheetId(),i=e.getByLocation(t,r,this._range.startRow,this._range.startColumn);if(!i)return null;let a=e.getComment(t,r,i);return a?this._injector.createInstance(g,a):null}getComments(){let e=this._injector.get(n.SheetsThreadCommentModel),r=this._workbook.getUnitId(),i=this._worksheet.getSheetId(),a=[];return t.Range.foreach(this._range,(t,n)=>{let o=e.getByLocation(r,i,t,n);if(o){let t=e.getComment(r,i,o);t&&a.push(this._injector.createInstance(g,t))}}),a}addCommentAsync(e){var n;let r=this._injector,a=(n=this.getComment())==null?void 0:n.getCommentData(),o=r.get(t.ICommandService),s=r.get(t.UserManagerService),c=this._workbook.getUnitId(),l=this._worksheet.getSheetId(),u=`${t.Tools.chatAtABC(this._range.startColumn)}${this._range.startRow+1}`,d=s.getCurrentUser(),f=e instanceof h?e.build():{text:e};return o.executeCommand(i.AddCommentCommand.id,{unitId:c,subUnitId:l,comment:{text:f.text,dT:f.dT||(0,i.getDT)(),attachments:[],id:f.id||(0,t.generateRandomId)(),ref:u,personId:f.personId||d.userID,parentId:a==null?void 0:a.id,unitId:c,subUnitId:l,threadId:(a==null?void 0:a.threadId)||(0,t.generateRandomId)()}})}clearCommentAsync(){var e;let n=this._injector,r=(e=this.getComment())==null?void 0:e.getCommentData(),a=n.get(t.ICommandService),o=this._workbook.getUnitId(),s=this._worksheet.getSheetId();return r?a.executeCommand(i.DeleteCommentTreeCommand.id,{unitId:o,subUnitId:s,threadId:r.threadId,commentId:r.id}):Promise.resolve(!0)}clearCommentsAsync(){let e=this.getComments().map(e=>e.deleteAsync());return Promise.all(e).then(()=>!0)}};r.FRange.extend(_);var v=class extends r.FWorkbook{_initialize(){Object.defineProperty(this,"_threadCommentModel",{get(){return this._injector.get(i.ThreadCommentModel)}})}getComments(){return this._threadCommentModel.getUnit(this._workbook.getUnitId()).map(e=>this._injector.createInstance(g,e.root))}clearComments(){let e=this.getComments().map(e=>e.deleteAsync());return Promise.all(e).then(()=>!0)}};r.FWorkbook.extend(v);var y=class extends r.FWorksheet{getComments(){return this._injector.get(n.SheetsThreadCommentModel).getSubUnitAll(this._workbook.getUnitId(),this._worksheet.getSheetId()).map(e=>this._injector.createInstance(g,e))}clearComments(){let e=this.getComments().map(e=>e.deleteAsync());return Promise.all(e).then(()=>!0)}onCommented(e){return this._injector.get(t.ICommandService).onCommandExecuted(t=>{if(t.id===i.AddCommentCommand.id){let n=t.params;e(n)}})}getCommentById(e){let t=this._injector.get(n.SheetsThreadCommentModel).getComment(this._workbook.getUnitId(),this._worksheet.getSheetId(),e);if(t)return this._injector.createInstance(g,t)}};r.FWorksheet.extend(y);var b=class extends o.FEventName{get CommentAdded(){return`CommentAdded`}get BeforeCommentAdd(){return`BeforeCommentAdd`}get CommentUpdated(){return`CommentUpdated`}get BeforeCommentUpdate(){return`BeforeCommentUpdate`}get CommentDeleted(){return`CommentDeleted`}get BeforeCommentDelete(){return`BeforeCommentDelete`}get CommentResolved(){return`CommentResolved`}get BeforeCommentResolve(){return`BeforeCommentResolve`}};o.FEventName.extend(b);var x=class extends o.FUniver{_initialize(e){let n=e.get(t.ICommandService);this.disposeWithMe(this.registerEventHandler(this.Event.CommentAdded,()=>n.onCommandExecuted(e=>{var t,n;if(e.id!==i.AddCommentCommand.id)return;let r=e.params,a=this.getSheetCommandTarget(r);if(!a)return;let{workbook:o,worksheet:s}=a,{comment:c}=r,l=s.getCommentById(c.id);if(!l)return;let u={workbook:o,worksheet:s,row:((t=l.getRange())==null?void 0:t.getRow())??0,col:((n=l.getRange())==null?void 0:n.getColumn())??0,comment:l};this.fireEvent(this.Event.CommentAdded,u)}))),this.disposeWithMe(this.registerEventHandler(this.Event.CommentUpdated,()=>n.onCommandExecuted(e=>{var t,n;if(e.id!==i.UpdateCommentCommand.id)return;let r=e.params,a=this.getSheetCommandTarget(r);if(!a)return;let{workbook:o,worksheet:s}=a,{payload:c}=r,l=s.getCommentById(c.commentId);if(!l)return;let u={workbook:o,worksheet:s,row:((t=l.getRange())==null?void 0:t.getRow())??0,col:((n=l.getRange())==null?void 0:n.getColumn())??0,comment:l};this.fireEvent(this.Event.CommentUpdated,u)}))),this.disposeWithMe(this.registerEventHandler(this.Event.CommentDeleted,()=>n.onCommandExecuted(e=>{if(e.id!==i.DeleteCommentCommand.id&&e.id!==i.DeleteCommentTreeCommand.id)return;let t=e.params,n=this.getSheetCommandTarget(t);if(!n)return;let{workbook:r,worksheet:a}=n,{commentId:o}=t,s={workbook:r,worksheet:a,commentId:o};this.fireEvent(this.Event.CommentDeleted,s)}))),this.disposeWithMe(this.registerEventHandler(this.Event.CommentResolved,()=>n.onCommandExecuted(e=>{var t,n;if(e.id!==i.ResolveCommentCommand.id)return;let r=e.params,a=this.getSheetCommandTarget(r);if(!a)return;let{workbook:o,worksheet:s}=a,{commentId:c,resolved:l}=r,u=s.getCommentById(c);if(!u)return;let d={workbook:o,worksheet:s,row:((t=u.getRange())==null?void 0:t.getRow())??0,col:((n=u.getRange())==null?void 0:n.getColumn())??0,comment:u,resolved:l};this.fireEvent(this.Event.CommentResolved,d)}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentAdd,()=>n.beforeCommandExecuted(e=>{if(e.id!==i.AddCommentCommand.id)return;let n=e.params,r=this.getSheetCommandTarget(n);if(!r)return;let{workbook:o,worksheet:s}=r,{comment:c}=n,{range:l}=(0,a.deserializeRangeWithSheet)(c.ref),u={workbook:o,worksheet:s,row:l.startRow,col:l.startColumn,comment:m.create(c)};if(this.fireEvent(this.Event.BeforeCommentAdd,u),u.cancel)throw new t.CanceledError}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentUpdate,()=>n.beforeCommandExecuted(e=>{var n,r;if(e.id!==i.UpdateCommentCommand.id)return;let a=e.params,o=this.getSheetCommandTarget(a);if(!o)return;let{workbook:s,worksheet:c}=o,{payload:l}=a,u=c.getCommentById(l.commentId);if(!u)return;let d={workbook:s,worksheet:c,row:((n=u.getRange())==null?void 0:n.getRow())??0,col:((r=u.getRange())==null?void 0:r.getColumn())??0,comment:u,newContent:t.RichTextValue.createByBody(l.text)};if(this.fireEvent(this.Event.BeforeCommentUpdate,d),d.cancel)throw new t.CanceledError}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentDelete,()=>n.beforeCommandExecuted(e=>{var n,r;if(e.id!==i.DeleteCommentCommand.id&&e.id!==i.DeleteCommentTreeCommand.id)return;let a=e.params,o=this.getSheetCommandTarget(a);if(!o)return;let{workbook:s,worksheet:c}=o,{commentId:l}=a,u=c.getCommentById(l);if(!u)return;let d={workbook:s,worksheet:c,row:((n=u.getRange())==null?void 0:n.getRow())??0,col:((r=u.getRange())==null?void 0:r.getColumn())??0,comment:u};if(this.fireEvent(this.Event.BeforeCommentDelete,d),d.cancel)throw new t.CanceledError}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentResolve,()=>n.beforeCommandExecuted(e=>{if(e.id!==i.ResolveCommentCommand.id)return;let n=e.params,r=this.getSheetCommandTarget(n);if(!r)return;let{workbook:a,worksheet:o}=r,{commentId:s,resolved:c}=n,l=o.getCommentById(s);if(!l)return;let u={workbook:a,worksheet:o,row:l.getRange().getRow()??0,col:l.getRange().getColumn()??0,comment:l,resolved:c};if(this.fireEvent(this.Event.BeforeCommentResolve,u),u.cancel)throw new t.CanceledError})))}newTheadComment(e){return new h(e)}};o.FUniver.extend(x),Object.defineProperty(e,"FThreadComment",{enumerable:!0,get:function(){return g}})});
|
package/lib/umd/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
(function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require("@univerjs/core"),require("@univerjs/engine-formula"),require("@univerjs/sheets"),require("@univerjs/thread-comment"),require("rxjs")):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core`,`@univerjs/engine-formula`,`@univerjs/sheets`,`@univerjs/thread-comment`,`rxjs`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverSheetsThreadComment={},e.UniverCore,e.UniverEngineFormula,e.UniverSheets,e.UniverThreadComment,e.rxjs))})(this,function(e,t,n,r,i,a){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});function o(e){"@babel/helpers - typeof";return o=typeof Symbol==`function`&&typeof Symbol.iterator==`symbol`?function(e){return typeof e}:function(e){return e&&typeof Symbol==`function`&&e.constructor===Symbol&&e!==Symbol.prototype?`symbol`:typeof e},o(e)}function s(e,t){if(o(e)!=`object`||!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var r=n.call(e,t||`default`);if(o(r)!=`object`)return r;throw TypeError(`@@toPrimitive must return a primitive value.`)}return(t===`string`?String:Number)(e)}function c(e){var t=s(e,`string`);return o(t)==`symbol`?t:t+``}function l(e,t,n){return(t=c(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function u(e,t){return function(n,r){t(n,r,e)}}function d(e,t,n,r){var i=arguments.length,a=i<3?t:r===null?r=Object.getOwnPropertyDescriptor(t,n):r,o;if(typeof Reflect==`object`&&typeof Reflect.decorate==`function`)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}let f=class extends t.Disposable{constructor(e,t){super(),this._threadCommentModel=e,this._univerInstanceService=t,l(this,`_matrixMap`,new Map),l(this,`_locationMap`,new Map),l(this,`_commentUpdate$`,new a.Subject),l(this,`commentUpdate$`,this._commentUpdate$.asObservable()),this._init(),this.disposeWithMe(()=>{this._commentUpdate$.complete()})}_init(){this._initData(),this._initUpdateTransform()}_ensureCommentMatrix(e,n){let r=this._matrixMap.get(e);r||(r=new Map,this._matrixMap.set(e,r));let i=r.get(n);return i||(i=new t.ObjectMatrix,r.set(n,i)),i}_ensureCommentLocationMap(e,t){let n=this._locationMap.get(e);n||(n=new Map,this._locationMap.set(e,n));let r=n.get(t);return r||(r=new Map,n.set(t,r)),r}_addCommentToMatrix(e,t,n,r){var i;let a=(i=e.getValue(t,n))==null?new Set:i;a.add(r),e.setValue(t,n,a)}_deleteCommentFromMatrix(e,t,n,r){if(t>=0&&n>=0){let i=e.getValue(t,n);i&&i.has(r)&&(i.delete(r),i.size===0&&e.realDeleteValue(t,n))}}_ensure(e,t){return{matrix:this._ensureCommentMatrix(e,t),locationMap:this._ensureCommentLocationMap(e,t)}}_initData(){let e=this._threadCommentModel.getAll();for(let t of e)for(let e of t.threads){let{unitId:t,subUnitId:n,root:r}=e;this._addComment(t,n,r)}}_addComment(e,t,r){let i=(0,n.singleReferenceToGrid)(r.ref),a=r.parentId,{row:o,column:s}=i,c=r.id,{matrix:l,locationMap:u}=this._ensure(e,t);!a&&o>=0&&s>=0&&(this._addCommentToMatrix(l,o,s,c),u.set(c,{row:o,column:s})),a||this._commentUpdate$.next({unitId:e,subUnitId:t,payload:r,type:`add`,isRoot:!a,...i})}_initUpdateTransform(){this.disposeWithMe(this._threadCommentModel.commentUpdate$.subscribe(e=>{let{unitId:r,subUnitId:i}=e;try{if(this._univerInstanceService.getUnitType(r)!==t.UniverInstanceType.UNIVER_SHEET)return}catch{}let{matrix:a,locationMap:o}=this._ensure(r,i);switch(e.type){case`add`:this._addComment(e.unitId,e.subUnitId,e.payload);break;case`delete`:{let{isRoot:t,comment:r}=e.payload;if(t){let t=(0,n.singleReferenceToGrid)(r.ref),{row:i,column:o}=t;this._deleteCommentFromMatrix(a,i,o,r.id),this._commentUpdate$.next({...e,...t})}break}case`update`:{let{commentId:t}=e.payload,a=this._threadCommentModel.getComment(r,i,t);if(!a)return;let o=(0,n.singleReferenceToGrid)(a.ref);this._commentUpdate$.next({...e,...o});break}case`updateRef`:{let t=(0,n.singleReferenceToGrid)(e.payload.ref),{commentId:r}=e.payload,i=o.get(r);if(!i)return;let{row:s,column:c}=i;this._deleteCommentFromMatrix(a,s,c,r),o.delete(r),t.row>=0&&t.column>=0&&(this._addCommentToMatrix(a,t.row,t.column,r),o.set(r,{row:t.row,column:t.column})),this._commentUpdate$.next({...e,...t});break}case`resolve`:{let{unitId:t,subUnitId:n,payload:r}=e,{locationMap:i}=this._ensure(t,n),a=i.get(r.commentId);a&&this._commentUpdate$.next({...e,...a});break}default:break}}))}getByLocation(e,t,n,r){var i;return(i=this.getAllByLocation(e,t,n,r).filter(e=>!e.resolved)[0])==null?void 0:i.id}getAllByLocation(e,t,n,r){let i=this._ensureCommentMatrix(e,t).getValue(n,r);if(!i)return[];let a=[];for(let n of i){let r=this.getComment(e,t,n);r&&a.push(r)}return a}getComment(e,t,n){return this._threadCommentModel.getComment(e,t,n)}getCommentWithChildren(e,t,n,r){let i=this.getByLocation(e,t,n,r);if(!i)return;let a=this.getComment(e,t,i);if(a)return this._threadCommentModel.getThread(e,t,a.threadId)}showCommentMarker(e,t,n,r){let i=this.getByLocation(e,t,n,r);if(!i)return!1;let a=this.getComment(e,t,i);return!!(a&&!a.resolved)}getSubUnitAll(e,t){return this._threadCommentModel.getUnit(e).filter(e=>e.subUnitId===t).map(e=>e.root)}};f=d([u(0,(0,t.Inject)(i.ThreadCommentModel)),u(1,t.IUniverInstanceService)],f);let p=class extends t.Disposable{constructor(e,t,r,a,o){super(),this._refRangeService=e,this._sheetsThreadCommentModel=t,this._threadCommentModel=r,this._selectionManagerService=a,this._commandService=o,l(this,`_disposableMap`,new Map),l(this,`_watcherMap`,new Map),l(this,`_handleRangeChange`,(e,t,r,a,o)=>{let s=r.id,c={startColumn:r.column,endColumn:r.column,startRow:r.row,endRow:r.row};return a?{redos:[{id:i.UpdateCommentRefMutation.id,params:{unitId:e,subUnitId:t,payload:{ref:(0,n.serializeRange)(a),commentId:s},silent:o}}],undos:[{id:i.UpdateCommentRefMutation.id,params:{unitId:e,subUnitId:t,payload:{ref:(0,n.serializeRange)(c),commentId:s},silent:o}}]}:{redos:[{id:i.DeleteCommentMutation.id,params:{unitId:e,subUnitId:t,commentId:s}}],undos:[{id:i.AddCommentMutation.id,params:{unitId:e,subUnitId:t,comment:r,sync:!0}}]}}),this._initData(),this._initRefRange()}_getIdWithUnitId(e,t,n){return`${e}-${t}-${n}`}_register(e,t,n){let i=n.id,a={startColumn:n.column,endColumn:n.column,startRow:n.row,endRow:n.row};this._disposableMap.set(this._getIdWithUnitId(e,t,i),this._refRangeService.registerRefRange(a,i=>{let o=(0,r.handleCommonRangeChangeWithEffectRefCommandsSkipNoInterests)(a,i,{selectionManagerService:this._selectionManagerService}),s=Array.isArray(o)?o[0]:o;return s&&s.startColumn===a.startColumn&&s.startRow===a.startRow?{undos:[],redos:[]}:this._handleRangeChange(e,t,n,s,!1)},e,t))}_watch(e,n,r){let i=r.id,a={startColumn:r.column,endColumn:r.column,startRow:r.row,endRow:r.row};this._watcherMap.set(this._getIdWithUnitId(e,n,i),this._refRangeService.watchRange(e,n,a,(i,a)=>{let{redos:o}=this._handleRangeChange(e,n,r,a,!0);(0,t.sequenceExecuteAsync)(o,this._commandService,{onlyLocal:!0})},!0))}_unwatch(e,t,n){var r;let i=this._getIdWithUnitId(e,t,n);(r=this._watcherMap.get(i))==null||r.dispose(),this._watcherMap.delete(i)}_unregister(e,t,n){var r;let i=this._getIdWithUnitId(e,t,n);(r=this._disposableMap.get(i))==null||r.dispose(),this._disposableMap.delete(i)}_initData(){let e=this._threadCommentModel.getAll();for(let t of e)for(let e of t.threads){let{unitId:t,subUnitId:r,root:i}=e,a=(0,n.singleReferenceToGrid)(i.ref),o={...i,...a};this._register(t,r,o),this._watch(t,r,o)}}_initRefRange(){this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.subscribe(e=>{let{unitId:t,subUnitId:n}=e;switch(e.type){case`add`:{if(e.payload.parentId)return;let t={...e.payload,row:e.row,column:e.column};this._register(e.unitId,e.subUnitId,t),this._watch(e.unitId,e.subUnitId,t);break}case`delete`:this._unregister(t,n,e.payload.commentId),this._unwatch(t,n,e.payload.commentId);break;case`updateRef`:{let r=this._sheetsThreadCommentModel.getComment(t,n,e.payload.commentId);if(!r)return;this._unregister(t,n,e.payload.commentId);let i={...r,row:e.row,column:e.column};e.silent||(this._unwatch(t,n,e.payload.commentId),this._watch(t,n,i)),this._register(e.unitId,e.subUnitId,i);break}}})),this.disposeWithMe((0,t.toDisposable)(()=>{this._disposableMap.forEach(e=>{e.dispose()}),this._disposableMap.clear()}))}};p=d([u(0,(0,t.Inject)(r.RefRangeService)),u(1,(0,t.Inject)(f)),u(2,(0,t.Inject)(i.ThreadCommentModel)),u(3,(0,t.Inject)(r.SheetsSelectionsService)),u(4,t.ICommandService)],p);var m=`@univerjs/sheets-thread-comment`,h=`1.0.0-alpha.8`;let g={},_=class extends t.Disposable{constructor(e,t,n,r){super(),this._univerInstanceService=e,this._sheetInterceptorService=t,this._threadCommentModel=n,this._threadCommentDataSourceService=r,this._initSheetChange()}_initSheetChange(){this.disposeWithMe(this._sheetInterceptorService.interceptCommand({getMutations:e=>{if(e.id===r.RemoveSheetCommand.id){var n;let r=e.params,a=r.unitId||this._univerInstanceService.getCurrentUnitOfType(t.UniverInstanceType.UNIVER_SHEET).getUnitId(),o=r.subUnitId||((n=this._univerInstanceService.getCurrentUnitOfType(t.UniverInstanceType.UNIVER_SHEET).getActiveSheet())==null?void 0:n.getSheetId());if(!a||!o)return{redos:[],undos:[]};let s=this._threadCommentModel.ensureMap(a,o),c=Array.from(s.values()).filter(e=>!e.parentId),l=this._threadCommentDataSourceService.syncUpdateMutationToColla,u=[],d=[];return c.forEach(({children:e,...t})=>{u.push({id:i.DeleteCommentMutation.id,params:{unitId:a,subUnitId:o,commentId:t.id}}),d.push({id:i.AddCommentMutation.id,params:{unitId:a,subUnitId:o,comment:{...t,children:l?e:void 0},sync:!l}})}),{redos:u,undos:d}}else if(e.id===r.CopySheetCommand.id){let{unitId:n,subUnitId:r,targetSubUnitId:a}=e.params;if(!n||!r||!a)return{redos:[],undos:[]};let o=this._threadCommentModel.ensureMap(n,r),s=Array.from(o.values()).map(e=>({...e,subUnitId:a,id:(0,t.generateRandomId)(),threadId:(0,t.generateRandomId)()})).filter(e=>!e.parentId),c=this._threadCommentDataSourceService.syncUpdateMutationToColla,l=[],u=[];return s.forEach(({children:e,...t})=>{l.push({id:i.AddCommentMutation.id,params:{unitId:n,subUnitId:a,comment:{...t,children:c?e:void 0},sync:!c}}),u.push({id:i.DeleteCommentMutation.id,params:{unitId:n,subUnitId:a,commentId:t.id}})}),{redos:l,undos:u}}return{redos:[],undos:[]}}}))}};_=d([u(0,t.IUniverInstanceService),u(1,(0,t.Inject)(r.SheetInterceptorService)),u(2,(0,t.Inject)(i.ThreadCommentModel)),u(3,i.IThreadCommentDataSourceService)],_);let v=class extends t.Plugin{constructor(e=g,n,r,i){super(),this._config=e,this._injector=n,this._commandService=r,this._configService=i;let{...a}=(0,t.merge)({},g,this._config);this._configService.setConfig(`sheets-thread-comment.config`,a)}onStarting(){[[f],[p],[_]].forEach(e=>{this._injector.add(e)}),(0,t.touchDependencies)(this._injector,[[p],[_]])}};l(v,`pluginName`,`SHEET_THREAD_COMMENT_BASE_PLUGIN`),l(v,`packageName`,m),l(v,`version`,h),l(v,`type`,t.UniverInstanceType.UNIVER_SHEET),v=d([(0,t.DependentOn)(i.UniverThreadCommentPlugin,r.UniverSheetsPlugin),u(1,(0,t.Inject)(t.Injector)),u(2,(0,t.Inject)(t.ICommandService)),u(3,t.IConfigService)],v),Object.defineProperty(e,"SheetsThreadCommentModel",{enumerable:!0,get:function(){return f}}),Object.defineProperty(e,"SheetsThreadCommentRefRangeController",{enumerable:!0,get:function(){return p}}),Object.defineProperty(e,"UniverSheetsThreadCommentPlugin",{enumerable:!0,get:function(){return v}})});
|
|
1
|
+
(function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require("@univerjs/core"),require("@univerjs/engine-formula"),require("@univerjs/sheets"),require("@univerjs/thread-comment"),require("rxjs")):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core`,`@univerjs/engine-formula`,`@univerjs/sheets`,`@univerjs/thread-comment`,`rxjs`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverSheetsThreadComment={},e.UniverCore,e.UniverEngineFormula,e.UniverSheets,e.UniverThreadComment,e.rxjs))})(this,function(e,t,n,r,i,a){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});function o(e){"@babel/helpers - typeof";return o=typeof Symbol==`function`&&typeof Symbol.iterator==`symbol`?function(e){return typeof e}:function(e){return e&&typeof Symbol==`function`&&e.constructor===Symbol&&e!==Symbol.prototype?`symbol`:typeof e},o(e)}function s(e,t){if(o(e)!=`object`||!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var r=n.call(e,t||`default`);if(o(r)!=`object`)return r;throw TypeError(`@@toPrimitive must return a primitive value.`)}return(t===`string`?String:Number)(e)}function c(e){var t=s(e,`string`);return o(t)==`symbol`?t:t+``}function l(e,t,n){return(t=c(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function u(e,t){return function(n,r){t(n,r,e)}}function d(e,t,n,r){var i=arguments.length,a=i<3?t:r===null?r=Object.getOwnPropertyDescriptor(t,n):r,o;if(typeof Reflect==`object`&&typeof Reflect.decorate==`function`)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}let f=class extends t.Disposable{constructor(e,t){super(),this._threadCommentModel=e,this._univerInstanceService=t,l(this,`_matrixMap`,new Map),l(this,`_locationMap`,new Map),l(this,`_commentUpdate$`,new a.Subject),l(this,`commentUpdate$`,this._commentUpdate$.asObservable()),this._init(),this.disposeWithMe(()=>{this._commentUpdate$.complete()})}_init(){this._initData(),this._initUpdateTransform()}_ensureCommentMatrix(e,n){let r=this._matrixMap.get(e);r||(r=new Map,this._matrixMap.set(e,r));let i=r.get(n);return i||(i=new t.ObjectMatrix,r.set(n,i)),i}_ensureCommentLocationMap(e,t){let n=this._locationMap.get(e);n||(n=new Map,this._locationMap.set(e,n));let r=n.get(t);return r||(r=new Map,n.set(t,r)),r}_addCommentToMatrix(e,t,n,r){let i=e.getValue(t,n)??new Set;i.add(r),e.setValue(t,n,i)}_deleteCommentFromMatrix(e,t,n,r){if(t>=0&&n>=0){let i=e.getValue(t,n);i&&i.has(r)&&(i.delete(r),i.size===0&&e.realDeleteValue(t,n))}}_ensure(e,t){return{matrix:this._ensureCommentMatrix(e,t),locationMap:this._ensureCommentLocationMap(e,t)}}_initData(){let e=this._threadCommentModel.getAll();for(let t of e)for(let e of t.threads){let{unitId:t,subUnitId:n,root:r}=e;this._addComment(t,n,r)}}_addComment(e,t,r){let i=(0,n.singleReferenceToGrid)(r.ref),a=r.parentId,{row:o,column:s}=i,c=r.id,{matrix:l,locationMap:u}=this._ensure(e,t);!a&&o>=0&&s>=0&&(this._addCommentToMatrix(l,o,s,c),u.set(c,{row:o,column:s})),a||this._commentUpdate$.next({unitId:e,subUnitId:t,payload:r,type:`add`,isRoot:!a,...i})}_initUpdateTransform(){this.disposeWithMe(this._threadCommentModel.commentUpdate$.subscribe(e=>{let{unitId:r,subUnitId:i}=e;try{if(this._univerInstanceService.getUnitType(r)!==t.UniverInstanceType.UNIVER_SHEET)return}catch{}let{matrix:a,locationMap:o}=this._ensure(r,i);switch(e.type){case`add`:this._addComment(e.unitId,e.subUnitId,e.payload);break;case`delete`:{let{isRoot:t,comment:r}=e.payload;if(t){let t=(0,n.singleReferenceToGrid)(r.ref),{row:i,column:o}=t;this._deleteCommentFromMatrix(a,i,o,r.id),this._commentUpdate$.next({...e,...t})}break}case`update`:{let{commentId:t}=e.payload,a=this._threadCommentModel.getComment(r,i,t);if(!a)return;let o=(0,n.singleReferenceToGrid)(a.ref);this._commentUpdate$.next({...e,...o});break}case`updateRef`:{let t=(0,n.singleReferenceToGrid)(e.payload.ref),{commentId:r}=e.payload,i=o.get(r);if(!i)return;let{row:s,column:c}=i;this._deleteCommentFromMatrix(a,s,c,r),o.delete(r),t.row>=0&&t.column>=0&&(this._addCommentToMatrix(a,t.row,t.column,r),o.set(r,{row:t.row,column:t.column})),this._commentUpdate$.next({...e,...t});break}case`resolve`:{let{unitId:t,subUnitId:n,payload:r}=e,{locationMap:i}=this._ensure(t,n),a=i.get(r.commentId);a&&this._commentUpdate$.next({...e,...a});break}default:break}}))}getByLocation(e,t,n,r){var i;return(i=this.getAllByLocation(e,t,n,r).filter(e=>!e.resolved)[0])==null?void 0:i.id}getAllByLocation(e,t,n,r){let i=this._ensureCommentMatrix(e,t).getValue(n,r);if(!i)return[];let a=[];for(let n of i){let r=this.getComment(e,t,n);r&&a.push(r)}return a}getComment(e,t,n){return this._threadCommentModel.getComment(e,t,n)}getCommentWithChildren(e,t,n,r){let i=this.getByLocation(e,t,n,r);if(!i)return;let a=this.getComment(e,t,i);if(a)return this._threadCommentModel.getThread(e,t,a.threadId)}showCommentMarker(e,t,n,r){let i=this.getByLocation(e,t,n,r);if(!i)return!1;let a=this.getComment(e,t,i);return!!(a&&!a.resolved)}getSubUnitAll(e,t){return this._threadCommentModel.getUnit(e).filter(e=>e.subUnitId===t).map(e=>e.root)}};f=d([u(0,(0,t.Inject)(i.ThreadCommentModel)),u(1,t.IUniverInstanceService)],f);let p=class extends t.Disposable{constructor(e,t,r,a,o){super(),this._refRangeService=e,this._sheetsThreadCommentModel=t,this._threadCommentModel=r,this._selectionManagerService=a,this._commandService=o,l(this,`_disposableMap`,new Map),l(this,`_watcherMap`,new Map),l(this,`_handleRangeChange`,(e,t,r,a,o)=>{let s=r.id,c={startColumn:r.column,endColumn:r.column,startRow:r.row,endRow:r.row};return a?{redos:[{id:i.UpdateCommentRefMutation.id,params:{unitId:e,subUnitId:t,payload:{ref:(0,n.serializeRange)(a),commentId:s},silent:o}}],undos:[{id:i.UpdateCommentRefMutation.id,params:{unitId:e,subUnitId:t,payload:{ref:(0,n.serializeRange)(c),commentId:s},silent:o}}]}:{redos:[{id:i.DeleteCommentMutation.id,params:{unitId:e,subUnitId:t,commentId:s}}],undos:[{id:i.AddCommentMutation.id,params:{unitId:e,subUnitId:t,comment:r,sync:!0}}]}}),this._initData(),this._initRefRange()}_getIdWithUnitId(e,t,n){return`${e}-${t}-${n}`}_register(e,t,n){let i=n.id,a={startColumn:n.column,endColumn:n.column,startRow:n.row,endRow:n.row};this._disposableMap.set(this._getIdWithUnitId(e,t,i),this._refRangeService.registerRefRange(a,i=>{let o=(0,r.handleCommonRangeChangeWithEffectRefCommandsSkipNoInterests)(a,i,{selectionManagerService:this._selectionManagerService}),s=Array.isArray(o)?o[0]:o;return s&&s.startColumn===a.startColumn&&s.startRow===a.startRow?{undos:[],redos:[]}:this._handleRangeChange(e,t,n,s,!1)},e,t))}_watch(e,n,r){let i=r.id,a={startColumn:r.column,endColumn:r.column,startRow:r.row,endRow:r.row};this._watcherMap.set(this._getIdWithUnitId(e,n,i),this._refRangeService.watchRange(e,n,a,(i,a)=>{let{redos:o}=this._handleRangeChange(e,n,r,a,!0);(0,t.sequenceExecuteAsync)(o,this._commandService,{onlyLocal:!0})},!0))}_unwatch(e,t,n){var r;let i=this._getIdWithUnitId(e,t,n);(r=this._watcherMap.get(i))==null||r.dispose(),this._watcherMap.delete(i)}_unregister(e,t,n){var r;let i=this._getIdWithUnitId(e,t,n);(r=this._disposableMap.get(i))==null||r.dispose(),this._disposableMap.delete(i)}_initData(){let e=this._threadCommentModel.getAll();for(let t of e)for(let e of t.threads){let{unitId:t,subUnitId:r,root:i}=e,a=(0,n.singleReferenceToGrid)(i.ref),o={...i,...a};this._register(t,r,o),this._watch(t,r,o)}}_initRefRange(){this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.subscribe(e=>{let{unitId:t,subUnitId:n}=e;switch(e.type){case`add`:{if(e.payload.parentId)return;let t={...e.payload,row:e.row,column:e.column};this._register(e.unitId,e.subUnitId,t),this._watch(e.unitId,e.subUnitId,t);break}case`delete`:this._unregister(t,n,e.payload.commentId),this._unwatch(t,n,e.payload.commentId);break;case`updateRef`:{let r=this._sheetsThreadCommentModel.getComment(t,n,e.payload.commentId);if(!r)return;this._unregister(t,n,e.payload.commentId);let i={...r,row:e.row,column:e.column};e.silent||(this._unwatch(t,n,e.payload.commentId),this._watch(t,n,i)),this._register(e.unitId,e.subUnitId,i);break}}})),this.disposeWithMe((0,t.toDisposable)(()=>{this._disposableMap.forEach(e=>{e.dispose()}),this._disposableMap.clear()}))}};p=d([u(0,(0,t.Inject)(r.RefRangeService)),u(1,(0,t.Inject)(f)),u(2,(0,t.Inject)(i.ThreadCommentModel)),u(3,(0,t.Inject)(r.SheetsSelectionsService)),u(4,t.ICommandService)],p);var m=`@univerjs/sheets-thread-comment`,h=`1.0.0-beta.1`;let g={},_=class extends t.Disposable{constructor(e,t,n,r){super(),this._univerInstanceService=e,this._sheetInterceptorService=t,this._threadCommentModel=n,this._threadCommentDataSourceService=r,this._initSheetChange()}_initSheetChange(){this.disposeWithMe(this._sheetInterceptorService.interceptCommand({getMutations:e=>{if(e.id===r.RemoveSheetCommand.id){var n;let r=e.params,a=r.unitId||this._univerInstanceService.getCurrentUnitOfType(t.UniverInstanceType.UNIVER_SHEET).getUnitId(),o=r.subUnitId||((n=this._univerInstanceService.getCurrentUnitOfType(t.UniverInstanceType.UNIVER_SHEET).getActiveSheet())==null?void 0:n.getSheetId());if(!a||!o)return{redos:[],undos:[]};let s=this._threadCommentModel.ensureMap(a,o),c=Array.from(s.values()).filter(e=>!e.parentId),l=this._threadCommentDataSourceService.syncUpdateMutationToColla,u=[],d=[];return c.forEach(({children:e,...t})=>{u.push({id:i.DeleteCommentMutation.id,params:{unitId:a,subUnitId:o,commentId:t.id}}),d.push({id:i.AddCommentMutation.id,params:{unitId:a,subUnitId:o,comment:{...t,children:l?e:void 0},sync:!l}})}),{redos:u,undos:d}}else if(e.id===r.CopySheetCommand.id){let{unitId:n,subUnitId:r,targetSubUnitId:a}=e.params;if(!n||!r||!a)return{redos:[],undos:[]};let o=this._threadCommentModel.ensureMap(n,r),s=Array.from(o.values()).map(e=>({...e,subUnitId:a,id:(0,t.generateRandomId)(),threadId:(0,t.generateRandomId)()})).filter(e=>!e.parentId),c=this._threadCommentDataSourceService.syncUpdateMutationToColla,l=[],u=[];return s.forEach(({children:e,...t})=>{l.push({id:i.AddCommentMutation.id,params:{unitId:n,subUnitId:a,comment:{...t,children:c?e:void 0},sync:!c}}),u.push({id:i.DeleteCommentMutation.id,params:{unitId:n,subUnitId:a,commentId:t.id}})}),{redos:l,undos:u}}return{redos:[],undos:[]}}}))}};_=d([u(0,t.IUniverInstanceService),u(1,(0,t.Inject)(r.SheetInterceptorService)),u(2,(0,t.Inject)(i.ThreadCommentModel)),u(3,i.IThreadCommentDataSourceService)],_);let v=class extends t.Plugin{constructor(e=g,n,r,i){super(),this._config=e,this._injector=n,this._commandService=r,this._configService=i;let{...a}=(0,t.merge)({},g,this._config);this._configService.setConfig(`sheets-thread-comment.config`,a)}onStarting(){[[f],[p],[_]].forEach(e=>{this._injector.add(e)}),(0,t.touchDependencies)(this._injector,[[p],[_]])}};l(v,`pluginName`,`SHEET_THREAD_COMMENT_BASE_PLUGIN`),l(v,`packageName`,m),l(v,`version`,h),l(v,`type`,t.UniverInstanceType.UNIVER_SHEET),v=d([(0,t.DependentOn)(i.UniverThreadCommentPlugin,r.UniverSheetsPlugin),u(1,(0,t.Inject)(t.Injector)),u(2,(0,t.Inject)(t.ICommandService)),u(3,t.IConfigService)],v),Object.defineProperty(e,"SheetsThreadCommentModel",{enumerable:!0,get:function(){return f}}),Object.defineProperty(e,"SheetsThreadCommentRefRangeController",{enumerable:!0,get:function(){return p}}),Object.defineProperty(e,"UniverSheetsThreadCommentPlugin",{enumerable:!0,get:function(){return v}})});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@univerjs/sheets-thread-comment",
|
|
3
|
-
"version": "1.0.0-
|
|
3
|
+
"version": "1.0.0-beta.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Thread comment integration for Univer Sheets.",
|
|
6
6
|
"author": "DreamNum Co., Ltd. <developer@univer.ai>",
|
|
@@ -62,16 +62,16 @@
|
|
|
62
62
|
"rxjs": ">=7.0.0"
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@univerjs/core": "1.0.0-
|
|
66
|
-
"@univerjs/engine-formula": "1.0.0-
|
|
67
|
-
"@univerjs/
|
|
68
|
-
"@univerjs/
|
|
65
|
+
"@univerjs/core": "1.0.0-beta.1",
|
|
66
|
+
"@univerjs/engine-formula": "1.0.0-beta.1",
|
|
67
|
+
"@univerjs/sheets": "1.0.0-beta.1",
|
|
68
|
+
"@univerjs/thread-comment": "1.0.0-beta.1"
|
|
69
69
|
},
|
|
70
70
|
"devDependencies": {
|
|
71
71
|
"rxjs": "^7.8.2",
|
|
72
72
|
"typescript": "^6.0.3",
|
|
73
73
|
"vitest": "^4.1.10",
|
|
74
|
-
"@univerjs-infra/shared": "1.0.0-
|
|
74
|
+
"@univerjs-infra/shared": "1.0.0-beta.1"
|
|
75
75
|
},
|
|
76
76
|
"scripts": {
|
|
77
77
|
"test": "vitest run",
|