@opensumi/ide-overlay 3.4.6-next-1730442794.0 → 3.5.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.
- package/lib/browser/dialog.service.d.ts +4 -2
- package/lib/browser/dialog.service.d.ts.map +1 -1
- package/lib/browser/dialog.service.js +5 -1
- package/lib/browser/dialog.service.js.map +1 -1
- package/lib/browser/dialog.view.d.ts.map +1 -1
- package/lib/browser/dialog.view.js +2 -1
- package/lib/browser/dialog.view.js.map +1 -1
- package/lib/browser/message.service.d.ts +3 -4
- package/lib/browser/message.service.d.ts.map +1 -1
- package/lib/browser/message.service.js +1 -1
- package/lib/browser/message.service.js.map +1 -1
- package/lib/common/index.d.ts +13 -2
- package/lib/common/index.d.ts.map +1 -1
- package/lib/common/index.js +3 -3
- package/lib/common/index.js.map +1 -1
- package/package.json +7 -7
- package/src/browser/dialog.service.ts +15 -8
- package/src/browser/dialog.view.tsx +2 -0
- package/src/browser/message.service.tsx +9 -7
- package/src/common/index.ts +17 -19
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import { Deferred, MessageType } from '@opensumi/ide-core-common';
|
|
3
|
-
import { AbstractMessageService, IDialogService, Icon } from '../common';
|
|
3
|
+
import { AbstractMessageService, IDialogService, Icon, OpenMessageOptions } from '../common';
|
|
4
4
|
export declare class DialogService extends AbstractMessageService implements IDialogService {
|
|
5
5
|
protected type: MessageType | undefined;
|
|
6
6
|
protected deferred: Deferred<any>;
|
|
7
7
|
private readonly contextkeyService;
|
|
8
8
|
protected _visible: boolean;
|
|
9
9
|
protected message: string | React.ReactNode;
|
|
10
|
+
protected detail: string | undefined;
|
|
10
11
|
protected title: string;
|
|
11
12
|
closable: boolean;
|
|
12
13
|
protected buttons: string[] | undefined;
|
|
@@ -14,10 +15,11 @@ export declare class DialogService extends AbstractMessageService implements IDi
|
|
|
14
15
|
private onDidDialogVisibleChangeEmitter;
|
|
15
16
|
get onDidDialogVisibleChange(): import("@opensumi/ide-core-common").Event<boolean>;
|
|
16
17
|
get visible(): boolean;
|
|
17
|
-
open<T = string>(message
|
|
18
|
+
open<T = string>({ message, type, buttons, options, closable, props, }: OpenMessageOptions): Promise<T | undefined>;
|
|
18
19
|
hide<T = string>(value?: T): void;
|
|
19
20
|
reset(): void;
|
|
20
21
|
getMessage(): string | React.ReactNode;
|
|
22
|
+
getDetail(): string | undefined;
|
|
21
23
|
getType(): MessageType | undefined;
|
|
22
24
|
getIcon(): Icon | undefined;
|
|
23
25
|
getButtons(): string[] | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dialog.service.d.ts","sourceRoot":"","sources":["../../src/browser/dialog.service.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAW,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE3E,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"dialog.service.d.ts","sourceRoot":"","sources":["../../src/browser/dialog.service.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAW,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE3E,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAI7F,qBACa,aAAc,SAAQ,sBAAuB,YAAW,cAAc;IACjF,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;IAExC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAGlC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IAErD,SAAS,CAAC,QAAQ,UAAS;IAE3B,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,CAAM;IAEjD,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAErC,SAAS,CAAC,KAAK,SAAM;IAEd,QAAQ,UAAQ;IAEvB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAExC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAE1C,OAAO,CAAC,+BAA+B,CAA0B;IAEjE,IAAI,wBAAwB,uDAE3B;IAED,IAAI,OAAO,YAEV;IAED,IAAI,CAAC,CAAC,GAAG,MAAM,EAAE,EACf,OAAO,EACP,IAAI,EACJ,OAAO,EACP,OAAO,EACP,QAAe,EACf,KAAK,GACN,EAAE,kBAAkB,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAe9C,IAAI,CAAC,CAAC,GAAG,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI;IAOjC,KAAK,IAAI,IAAI;IAOb,UAAU,IAAI,MAAM,GAAG,KAAK,CAAC,SAAS;IAItC,SAAS,IAAI,MAAM,GAAG,SAAS;IAI/B,OAAO,IAAI,WAAW,GAAG,SAAS;IAIlC,OAAO,IAAI,IAAI,GAAG,SAAS;IAsB3B,UAAU;IAIV,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CAGhC"}
|
|
@@ -22,10 +22,11 @@ let DialogService = class DialogService extends common_1.AbstractMessageService
|
|
|
22
22
|
get visible() {
|
|
23
23
|
return this._visible;
|
|
24
24
|
}
|
|
25
|
-
open(message, type, buttons, closable = true,
|
|
25
|
+
open({ message, type, buttons, options, closable = true, props, }) {
|
|
26
26
|
this.deferred = new ide_core_common_1.Deferred();
|
|
27
27
|
this.type = type;
|
|
28
28
|
this.message = message;
|
|
29
|
+
this.detail = options === null || options === void 0 ? void 0 : options.detail;
|
|
29
30
|
this._visible = true;
|
|
30
31
|
this.closable = closable;
|
|
31
32
|
this.props = props !== null && props !== void 0 ? props : {};
|
|
@@ -49,6 +50,9 @@ let DialogService = class DialogService extends common_1.AbstractMessageService
|
|
|
49
50
|
getMessage() {
|
|
50
51
|
return this.message;
|
|
51
52
|
}
|
|
53
|
+
getDetail() {
|
|
54
|
+
return this.detail;
|
|
55
|
+
}
|
|
52
56
|
getType() {
|
|
53
57
|
return this.type;
|
|
54
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dialog.service.js","sourceRoot":"","sources":["../../src/browser/dialog.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,+DAA2E;AAE3E,
|
|
1
|
+
{"version":3,"file":"dialog.service.js","sourceRoot":"","sources":["../../src/browser/dialog.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dialog.view.d.ts","sourceRoot":"","sources":["../../src/browser/dialog.view.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAoC,MAAM,OAAO,CAAC;AAOpE,eAAO,MAAM,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"dialog.view.d.ts","sourceRoot":"","sources":["../../src/browser/dialog.view.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAoC,MAAM,OAAO,CAAC;AAOpE,eAAO,MAAM,MAAM,EAAE,EAsEpB,CAAC"}
|
|
@@ -11,6 +11,7 @@ const Dialog = () => {
|
|
|
11
11
|
const dialogService = (0, ide_core_browser_1.useInjectable)(common_1.IDialogService);
|
|
12
12
|
const icon = dialogService.getIcon();
|
|
13
13
|
const message = dialogService.getMessage();
|
|
14
|
+
const detail = dialogService.getDetail();
|
|
14
15
|
const buttons = dialogService.getButtons();
|
|
15
16
|
const type = dialogService.getType();
|
|
16
17
|
const [visible, setVisible] = (0, react_1.useState)(dialogService.visible);
|
|
@@ -33,7 +34,7 @@ const Dialog = () => {
|
|
|
33
34
|
dispose.dispose();
|
|
34
35
|
};
|
|
35
36
|
}, []);
|
|
36
|
-
return (react_1.default.createElement(ide_components_1.Dialog, Object.assign({ visible: visible, onClose: handleClose, closable: (_a = dialogService.closable) !== null && _a !== void 0 ? _a : true, afterClose: afterClose, message: message, type: 'confirm', messageType: type, icon: icon, keyboard: true, buttons: buttons ? (buttons.map((button, index) => (react_1.default.createElement(ide_components_1.Button, { size: 'large', onClick: () => handlerClickButton(button), key: button, type: index === buttons.length - 1 ? 'primary' : 'secondary' }, ide_core_browser_1.strings.mnemonicButtonLabel(button, true))))) : (react_1.default.createElement(ide_components_1.Button, { size: 'large', onClick: handleClose, type: 'primary' }, (0, ide_core_browser_1.localize)('dialog.confirm'))) }, customProps)));
|
|
37
|
+
return (react_1.default.createElement(ide_components_1.Dialog, Object.assign({ visible: visible, onClose: handleClose, closable: (_a = dialogService.closable) !== null && _a !== void 0 ? _a : true, afterClose: afterClose, message: message, detail: detail, type: 'confirm', messageType: type, icon: icon, keyboard: true, buttons: buttons ? (buttons.map((button, index) => (react_1.default.createElement(ide_components_1.Button, { size: 'large', onClick: () => handlerClickButton(button), key: button, type: index === buttons.length - 1 ? 'primary' : 'secondary' }, ide_core_browser_1.strings.mnemonicButtonLabel(button, true))))) : (react_1.default.createElement(ide_components_1.Button, { size: 'large', onClick: handleClose, type: 'primary' }, (0, ide_core_browser_1.localize)('dialog.confirm'))) }, customProps)));
|
|
37
38
|
};
|
|
38
39
|
exports.Dialog = Dialog;
|
|
39
40
|
//# sourceMappingURL=dialog.view.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dialog.view.js","sourceRoot":"","sources":["../../src/browser/dialog.view.tsx"],"names":[],"mappings":";;;;AAAA,uDAAoE;AAEpE,6DAAwE;AACxE,iEAA8E;AAE9E,sCAA2C;AAEpC,MAAM,MAAM,GAAO,GAAG,EAAE;;IAC7B,MAAM,aAAa,GAAG,IAAA,gCAAa,EAAiB,uBAAc,CAAC,CAAC;IACpE,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC;IACrC,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,EAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,EAAE,CAAC;IAC3C,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC;IAErC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,EAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAE9D,2CAA2C;IAC3C,MAAM,WAAW,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC;IAE7C,MAAM,UAAU,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QAClC,aAAa,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IAEpB,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACnC,aAAa,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IAEpB,MAAM,kBAAkB,GAAG,IAAA,mBAAW,EACpC,CAAC,KAAa,EAAE,EAAE;QAChB,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC,EACD,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,OAAO,GAAG,aAAa,CAAC,wBAAwB,CAAC,CAAC,OAAO,EAAE,EAAE;YACjE,UAAU,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,8BAAC,uBAAU,kBACT,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,MAAA,aAAa,CAAC,QAAQ,mCAAI,IAAI,EACxC,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAC,SAAS,EACd,WAAW,EAAE,IAAI,EACjB,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,IAAI,EACd,OAAO,EACL,OAAO,CAAC,CAAC,CAAC,CACR,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAC7B,8BAAC,uBAAM,IACL,IAAI,EAAC,OAAO,EACZ,OAAO,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,EACzC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,KAAK,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,IAE3D,0BAAO,CAAC,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CACnC,CACV,CAAC,CACH,CAAC,CAAC,CAAC,CACF,8BAAC,uBAAM,IAAC,IAAI,EAAC,OAAO,EAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAC,SAAS,IACtD,IAAA,2BAAQ,EAAC,gBAAgB,CAAC,CACpB,CACV,IAEC,WAAW,EACf,CACH,CAAC;AACJ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"dialog.view.js","sourceRoot":"","sources":["../../src/browser/dialog.view.tsx"],"names":[],"mappings":";;;;AAAA,uDAAoE;AAEpE,6DAAwE;AACxE,iEAA8E;AAE9E,sCAA2C;AAEpC,MAAM,MAAM,GAAO,GAAG,EAAE;;IAC7B,MAAM,aAAa,GAAG,IAAA,gCAAa,EAAiB,uBAAc,CAAC,CAAC;IACpE,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC;IACrC,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,EAAE,CAAC;IAC3C,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,EAAE,CAAC;IACzC,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,EAAE,CAAC;IAC3C,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC;IAErC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,EAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAE9D,2CAA2C;IAC3C,MAAM,WAAW,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC;IAE7C,MAAM,UAAU,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QAClC,aAAa,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IAEpB,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACnC,aAAa,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IAEpB,MAAM,kBAAkB,GAAG,IAAA,mBAAW,EACpC,CAAC,KAAa,EAAE,EAAE;QAChB,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC,EACD,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,OAAO,GAAG,aAAa,CAAC,wBAAwB,CAAC,CAAC,OAAO,EAAE,EAAE;YACjE,UAAU,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,8BAAC,uBAAU,kBACT,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,MAAA,aAAa,CAAC,QAAQ,mCAAI,IAAI,EACxC,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAC,SAAS,EACd,WAAW,EAAE,IAAI,EACjB,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,IAAI,EACd,OAAO,EACL,OAAO,CAAC,CAAC,CAAC,CACR,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAC7B,8BAAC,uBAAM,IACL,IAAI,EAAC,OAAO,EACZ,OAAO,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,EACzC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,KAAK,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,IAE3D,0BAAO,CAAC,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CACnC,CACV,CAAC,CACH,CAAC,CAAC,CAAC,CACF,8BAAC,uBAAM,IAAC,IAAI,EAAC,OAAO,EAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAC,SAAS,IACtD,IAAA,2BAAQ,EAAC,gBAAgB,CAAC,CACpB,CACV,IAEC,WAAW,EACf,CACH,CAAC;AACJ,CAAC,CAAC;AAtEW,QAAA,MAAM,UAsEjB"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
import { AbstractMessageService, IMessageService } from '../common';
|
|
1
|
+
import { MayCancelablePromise } from '@opensumi/ide-core-common';
|
|
2
|
+
import { AbstractMessageService, IMessageService, OpenMessageOptions } from '../common';
|
|
4
3
|
export declare class MessageService extends AbstractMessageService implements IMessageService {
|
|
5
4
|
private readonly openerService;
|
|
6
5
|
private preMessage;
|
|
@@ -17,7 +16,7 @@ export declare class MessageService extends AbstractMessageService implements IM
|
|
|
17
16
|
* @param closable true | false
|
|
18
17
|
* @param from from extension
|
|
19
18
|
*/
|
|
20
|
-
open<T = string>(
|
|
19
|
+
open<T = string>({ type, buttons, from, closable, message: rawMessage, }: OpenMessageOptions): MayCancelablePromise<T | undefined>;
|
|
21
20
|
hide(): void;
|
|
22
21
|
}
|
|
23
22
|
//# sourceMappingURL=message.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.service.d.ts","sourceRoot":"","sources":["../../src/browser/message.service.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"message.service.d.ts","sourceRoot":"","sources":["../../src/browser/message.service.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAA+B,MAAM,2BAA2B,CAAC;AAE9F,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAsB,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAI5G,qBACa,cAAe,SAAQ,sBAAuB,YAAW,eAAe;IAEnF,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAG/C,OAAO,CAAC,UAAU,CAA2B;IAG7C,OAAO,CAAC,QAAQ,CAAK;IAGrB,SAAS,CAAC,MAAM,CAAC,wBAAwB,SAAQ;IAGjD,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAInD;IAEF;;;;;;;OAOG;IACH,IAAI,CAAC,CAAC,GAAG,MAAM,EAAE,EACf,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,QAAe,EACf,OAAO,EAAE,UAAU,GACpB,EAAE,kBAAkB,GAAG,oBAAoB,CAAC,CAAC,GAAG,SAAS,CAAC;IAgC3D,IAAI,IAAI,IAAI;CAGb"}
|
|
@@ -23,7 +23,7 @@ let MessageService = MessageService_1 = class MessageService extends common_1.Ab
|
|
|
23
23
|
* @param closable true | false
|
|
24
24
|
* @param from from extension
|
|
25
25
|
*/
|
|
26
|
-
open(
|
|
26
|
+
open({ type, buttons, from, closable = true, message: rawMessage, }) {
|
|
27
27
|
if (!rawMessage) {
|
|
28
28
|
return Promise.resolve(undefined);
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.service.js","sourceRoot":"","sources":["../../src/browser/message.service.tsx"],"names":[],"mappings":";;;;;AAEA,qCAAqD;AACrD,6DAA8D;AAC9D,8DAAwE;AACxE,iEAAwE;AACxE,+DAA8F;AAE9F,
|
|
1
|
+
{"version":3,"file":"message.service.js","sourceRoot":"","sources":["../../src/browser/message.service.tsx"],"names":[],"mappings":";;;;;AAEA,qCAAqD;AACrD,6DAA8D;AAC9D,8DAAwE;AACxE,iEAAwE;AACxE,+DAA8F;AAE9F,sCAA4G;AAKrG,IAAM,cAAc,sBAApB,MAAM,cAAe,SAAQ,+BAAsB;IAAnD;;QAOL,YAAY;QACJ,aAAQ,GAAG,CAAC,CAAC;IA6DvB,CAAC;IAjDC;;;;;;;OAOG;IACH,IAAI,CAAa,EACf,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,QAAQ,GAAG,IAAI,EACf,OAAO,EAAE,UAAU,GACA;QACnB,IAAI,CAAC,UAAU,EAAE;YACf,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACnC;QACD,IAAI,OAAO,GAAG,UAAU,CAAC;QACzB,yBAAyB;QACzB,IACE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,GAAG,gBAAc,CAAC,wBAAwB;YACpE,OAAO,OAAO,KAAK,QAAQ;YAC3B,IAAI,CAAC,UAAU,KAAK,OAAO,EAC3B;YACA,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACnC;QACD,IAAI,CAAC,UAAU,GAAG,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC;QACzD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC3B,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,CAAC,MAAM,GAAG,2BAAkB,EAAE;YAC5E,OAAO,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,2BAAkB,CAAC,KAAK,CAAC;SAC5D;QACD,MAAM,WAAW,GAAG,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAA,0BAAQ,EAAC,0BAA0B,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/G,MAAM,GAAG,GAAG,IAAA,sBAAI,GAAE,CAAC;QACnB,MAAM,OAAO,GAAG,IAAA,qBAAI,EAClB,IAAA,6BAAU,EAAC,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,EAAE,UAAU,EAAE,0BAAkB,EAAE,CAAC,EAC3E,IAAI,EACJ,QAAQ,EACR,GAAG,EACH,OAAO,EACP,WAAW,EACX,gBAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAC9B,CAAC;QACF,OAAO,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI;QACF,6BAAY,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;;AA1DD,cAAc;AACG,uCAAwB,GAAG,IAAI,CAAC;AAEjD,gFAAgF;AAC/D,uBAAQ,GAA+B;IACtD,CAAC,6BAAW,CAAC,IAAI,CAAC,EAAE,EAAE;IACtB,CAAC,6BAAW,CAAC,OAAO,CAAC,EAAE,EAAE;IACzB,CAAC,6BAAW,CAAC,KAAK,CAAC,EAAE,EAAE;CACxB,CAAC;AAjBF;IAAC,IAAA,cAAS,EAAC,iCAAc,CAAC;;qDACqB;AAFpC,cAAc;IAD1B,IAAA,eAAU,GAAE;GACA,cAAc,CAqE1B;AArEY,wCAAc"}
|
package/lib/common/index.d.ts
CHANGED
|
@@ -1,11 +1,21 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { Event, MayCancelablePromise, MessageType, URI } from '@opensumi/ide-core-common';
|
|
3
|
+
import type vscode from 'vscode';
|
|
3
4
|
export declare const IMessageService: unique symbol;
|
|
5
|
+
export interface OpenMessageOptions {
|
|
6
|
+
message: string | React.ReactNode;
|
|
7
|
+
type: MessageType;
|
|
8
|
+
buttons?: any[];
|
|
9
|
+
options?: vscode.MessageOptions;
|
|
10
|
+
closable?: boolean;
|
|
11
|
+
from?: string;
|
|
12
|
+
props?: Record<string, any>;
|
|
13
|
+
}
|
|
4
14
|
export interface IMessageService {
|
|
5
15
|
info(message: string | React.ReactNode, buttons?: string[], closable?: boolean, props?: Record<string, any>): MayCancelablePromise<string | undefined>;
|
|
6
16
|
warning(message: string | React.ReactNode, buttons?: string[], closable?: boolean, props?: Record<string, any>): MayCancelablePromise<string | undefined>;
|
|
7
17
|
error(message: string | React.ReactNode, buttons?: string[], closable?: boolean, props?: Record<string, any>): MayCancelablePromise<string | undefined>;
|
|
8
|
-
open<T = string>(
|
|
18
|
+
open<T = string>(options: OpenMessageOptions): MayCancelablePromise<T | undefined>;
|
|
9
19
|
hide<T = string>(value?: T): void;
|
|
10
20
|
}
|
|
11
21
|
export interface Icon {
|
|
@@ -19,6 +29,7 @@ export interface IDialogService extends IMessageService {
|
|
|
19
29
|
visible: boolean;
|
|
20
30
|
onDidDialogVisibleChange: Event<boolean>;
|
|
21
31
|
getMessage(): string | React.ReactNode;
|
|
32
|
+
getDetail(): string | undefined;
|
|
22
33
|
getIcon(): Icon | undefined;
|
|
23
34
|
getButtons(): string[] | undefined;
|
|
24
35
|
getType(): MessageType | undefined;
|
|
@@ -29,7 +40,7 @@ export declare abstract class AbstractMessageService implements IMessageService
|
|
|
29
40
|
info(message: string | React.ReactNode, buttons?: string[], closable?: boolean, props?: Record<string, any>): Promise<string | undefined>;
|
|
30
41
|
warning(message: string | React.ReactNode, buttons?: string[], closable?: boolean, props?: Record<string, any>): Promise<string | undefined>;
|
|
31
42
|
error(message: string | React.ReactNode, buttons?: string[], closable?: boolean, props?: Record<string, any>): Promise<string | undefined>;
|
|
32
|
-
abstract open<T = string>(
|
|
43
|
+
abstract open<T = string>(options: OpenMessageOptions): Promise<T | undefined>;
|
|
33
44
|
abstract hide<T = string>(value?: T): void;
|
|
34
45
|
}
|
|
35
46
|
export interface IWindowDialogService {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAE1F,eAAO,MAAM,eAAe,eAA4B,CAAC;AAEzD,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAE1F,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,eAAO,MAAM,eAAe,eAA4B,CAAC;AAEzD,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC;IAClC,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC7B;AACD,MAAM,WAAW,eAAe;IAC9B,IAAI,CACF,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,EACjC,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,QAAQ,CAAC,EAAE,OAAO,EAClB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,oBAAoB,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC5C,OAAO,CACL,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,EACjC,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,QAAQ,CAAC,EAAE,OAAO,EAClB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,oBAAoB,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC5C,KAAK,CACH,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,EACjC,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,QAAQ,CAAC,EAAE,OAAO,EAClB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,oBAAoB,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC5C,IAAI,CAAC,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,oBAAoB,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IACnF,IAAI,CAAC,CAAC,GAAG,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;CACnC;AAED,MAAM,WAAW,IAAI;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,kBAAkB,OAAO,CAAC;AAEvC,eAAO,MAAM,cAAc,eAA2B,CAAC;AACvD,MAAM,WAAW,cAAe,SAAQ,eAAe;IACrD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,wBAAwB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACzC,UAAU,IAAI,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC;IACvC,SAAS,IAAI,MAAM,GAAG,SAAS,CAAC;IAChC,OAAO,IAAI,IAAI,GAAG,SAAS,CAAC;IAC5B,UAAU,IAAI,MAAM,EAAE,GAAG,SAAS,CAAC;IACnC,OAAO,IAAI,WAAW,GAAG,SAAS,CAAC;IACnC,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,KAAK,IAAI,IAAI,CAAC;CACf;AAED,8BAAsB,sBAAuB,YAAW,eAAe;IACrE,IAAI,CACF,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,EACjC,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,QAAQ,CAAC,EAAE,OAAO,EAClB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI9B,OAAO,CACL,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,EACjC,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,QAAQ,CAAC,EAAE,OAAO,EAClB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI9B,KAAK,CACH,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,EACjC,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,QAAQ,CAAC,EAAE,OAAO,EAClB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAG9B,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAC9E,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI;CAC3C;AAED,MAAM,WAAW,oBAAoB;IACnC,cAAc,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC;IACzE,cAAc,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC;CACxE;AAED,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,OAAO,CAAC,EAAE;QACR,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;KAC1B,CAAC;CACH;AAED,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACxD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACxD,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,yBAAiB,kBAAkB,CAAC;IAClC,SAAgB,EAAE,CAAC,MAAM,KAAA,WAExB;CACF;AAED,yBAAiB,kBAAkB,CAAC;IAClC,SAAgB,EAAE,CAAC,MAAM,KAAA,WAIxB;CACF"}
|
package/lib/common/index.js
CHANGED
|
@@ -7,13 +7,13 @@ exports.MAX_MESSAGE_LENGTH = 1000;
|
|
|
7
7
|
exports.IDialogService = Symbol('IDialogService');
|
|
8
8
|
class AbstractMessageService {
|
|
9
9
|
info(message, buttons, closable, props) {
|
|
10
|
-
return this.open(message, ide_core_common_1.MessageType.Info, buttons, closable,
|
|
10
|
+
return this.open({ message, type: ide_core_common_1.MessageType.Info, buttons, closable, props });
|
|
11
11
|
}
|
|
12
12
|
warning(message, buttons, closable, props) {
|
|
13
|
-
return this.open(message, ide_core_common_1.MessageType.Warning, buttons, closable,
|
|
13
|
+
return this.open({ message, type: ide_core_common_1.MessageType.Warning, buttons, closable, props });
|
|
14
14
|
}
|
|
15
15
|
error(message, buttons, closable, props) {
|
|
16
|
-
return this.open(message, ide_core_common_1.MessageType.Error, buttons, closable,
|
|
16
|
+
return this.open({ message, type: ide_core_common_1.MessageType.Error, buttons, closable, props });
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
exports.AbstractMessageService = AbstractMessageService;
|
package/lib/common/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";;;AAEA,+DAA0F;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";;;AAEA,+DAA0F;AAI7E,QAAA,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAuC5C,QAAA,kBAAkB,GAAG,IAAI,CAAC;AAE1B,QAAA,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAcvD,MAAsB,sBAAsB;IAC1C,IAAI,CACF,OAAiC,EACjC,OAAkB,EAClB,QAAkB,EAClB,KAA2B;QAE3B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,6BAAW,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAClF,CAAC;IAED,OAAO,CACL,OAAiC,EACjC,OAAkB,EAClB,QAAkB,EAClB,KAA2B;QAE3B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,6BAAW,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IACrF,CAAC;IAED,KAAK,CACH,OAAiC,EACjC,OAAkB,EAClB,QAAkB,EAClB,KAA2B;QAE3B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,6BAAW,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IACnF,CAAC;CAGF;AA7BD,wDA6BC;AAOY,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAuBnE,IAAiB,kBAAkB,CAIlC;AAJD,WAAiB,kBAAkB;IACjC,SAAgB,EAAE,CAAC,MAAM;QACvB,OAAO,WAAW,IAAI,MAAM,IAAI,eAAe,IAAI,MAAM,IAAI,iBAAiB,IAAI,MAAM,CAAC;IAC3F,CAAC;IAFe,qBAAE,KAEjB,CAAA;AACH,CAAC,EAJgB,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAIlC;AAED,IAAiB,kBAAkB,CAMlC;AAND,WAAiB,kBAAkB;IACjC,SAAgB,EAAE,CAAC,MAAM;QACvB,OAAO,CACL,gBAAgB,IAAI,MAAM,IAAI,kBAAkB,IAAI,MAAM,IAAI,eAAe,IAAI,MAAM,IAAI,WAAW,IAAI,MAAM,CACjH,CAAC;IACJ,CAAC;IAJe,qBAAE,KAIjB,CAAA;AACH,CAAC,EANgB,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAMlC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-overlay",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.5.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -17,14 +17,14 @@
|
|
|
17
17
|
"url": "git@github.com:opensumi/core.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@opensumi/ide-core-common": "3.
|
|
21
|
-
"@opensumi/ide-theme": "3.
|
|
20
|
+
"@opensumi/ide-core-common": "3.5.0",
|
|
21
|
+
"@opensumi/ide-theme": "3.5.0",
|
|
22
22
|
"react-ctxmenu-trigger": "^1.0.0"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
|
-
"@opensumi/ide-components": "3.
|
|
26
|
-
"@opensumi/ide-core-browser": "3.
|
|
27
|
-
"@opensumi/ide-dev-tool": "3.
|
|
25
|
+
"@opensumi/ide-components": "3.5.0",
|
|
26
|
+
"@opensumi/ide-core-browser": "3.5.0",
|
|
27
|
+
"@opensumi/ide-dev-tool": "3.5.0"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "967717cae1872aa8f572e05c3d57b0b5d879de5a"
|
|
30
30
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
2
|
import { Deferred, Emitter, MessageType } from '@opensumi/ide-core-common';
|
|
3
3
|
|
|
4
|
-
import { AbstractMessageService, IDialogService, Icon } from '../common';
|
|
4
|
+
import { AbstractMessageService, IDialogService, Icon, OpenMessageOptions } from '../common';
|
|
5
5
|
|
|
6
6
|
import { DialogContextKey } from './dialog.contextkey';
|
|
7
7
|
|
|
@@ -18,6 +18,8 @@ export class DialogService extends AbstractMessageService implements IDialogServ
|
|
|
18
18
|
|
|
19
19
|
protected message: string | React.ReactNode = '';
|
|
20
20
|
|
|
21
|
+
protected detail: string | undefined;
|
|
22
|
+
|
|
21
23
|
protected title = '';
|
|
22
24
|
|
|
23
25
|
public closable = true;
|
|
@@ -36,17 +38,18 @@ export class DialogService extends AbstractMessageService implements IDialogServ
|
|
|
36
38
|
return this._visible;
|
|
37
39
|
}
|
|
38
40
|
|
|
39
|
-
open<T = string>(
|
|
40
|
-
message
|
|
41
|
-
type
|
|
42
|
-
buttons
|
|
41
|
+
open<T = string>({
|
|
42
|
+
message,
|
|
43
|
+
type,
|
|
44
|
+
buttons,
|
|
45
|
+
options,
|
|
43
46
|
closable = true,
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
): Promise<T | undefined> {
|
|
47
|
+
props,
|
|
48
|
+
}: OpenMessageOptions): Promise<T | undefined> {
|
|
47
49
|
this.deferred = new Deferred<string>();
|
|
48
50
|
this.type = type;
|
|
49
51
|
this.message = message;
|
|
52
|
+
this.detail = options?.detail;
|
|
50
53
|
this._visible = true;
|
|
51
54
|
this.closable = closable;
|
|
52
55
|
this.props = props ?? {};
|
|
@@ -75,6 +78,10 @@ export class DialogService extends AbstractMessageService implements IDialogServ
|
|
|
75
78
|
return this.message;
|
|
76
79
|
}
|
|
77
80
|
|
|
81
|
+
getDetail(): string | undefined {
|
|
82
|
+
return this.detail;
|
|
83
|
+
}
|
|
84
|
+
|
|
78
85
|
getType(): MessageType | undefined {
|
|
79
86
|
return this.type;
|
|
80
87
|
}
|
|
@@ -9,6 +9,7 @@ export const Dialog: FC = () => {
|
|
|
9
9
|
const dialogService = useInjectable<IDialogService>(IDialogService);
|
|
10
10
|
const icon = dialogService.getIcon();
|
|
11
11
|
const message = dialogService.getMessage();
|
|
12
|
+
const detail = dialogService.getDetail();
|
|
12
13
|
const buttons = dialogService.getButtons();
|
|
13
14
|
const type = dialogService.getType();
|
|
14
15
|
|
|
@@ -48,6 +49,7 @@ export const Dialog: FC = () => {
|
|
|
48
49
|
closable={dialogService.closable ?? true}
|
|
49
50
|
afterClose={afterClose}
|
|
50
51
|
message={message}
|
|
52
|
+
detail={detail}
|
|
51
53
|
type='confirm'
|
|
52
54
|
messageType={type}
|
|
53
55
|
icon={icon}
|
|
@@ -6,7 +6,9 @@ import { parseWithoutEscape } from '@opensumi/ide-components/lib/utils';
|
|
|
6
6
|
import { IOpenerService, toMarkdown } from '@opensumi/ide-core-browser';
|
|
7
7
|
import { MayCancelablePromise, MessageType, localize, uuid } from '@opensumi/ide-core-common';
|
|
8
8
|
|
|
9
|
-
import { AbstractMessageService, IMessageService, MAX_MESSAGE_LENGTH } from '../common';
|
|
9
|
+
import { AbstractMessageService, IMessageService, MAX_MESSAGE_LENGTH, OpenMessageOptions } from '../common';
|
|
10
|
+
|
|
11
|
+
import type vscode from 'vscode';
|
|
10
12
|
|
|
11
13
|
@Injectable()
|
|
12
14
|
export class MessageService extends AbstractMessageService implements IMessageService {
|
|
@@ -37,13 +39,13 @@ export class MessageService extends AbstractMessageService implements IMessageSe
|
|
|
37
39
|
* @param closable true | false
|
|
38
40
|
* @param from from extension
|
|
39
41
|
*/
|
|
40
|
-
open<T = string>(
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
42
|
+
open<T = string>({
|
|
43
|
+
type,
|
|
44
|
+
buttons,
|
|
45
|
+
from,
|
|
44
46
|
closable = true,
|
|
45
|
-
|
|
46
|
-
): MayCancelablePromise<T | undefined> {
|
|
47
|
+
message: rawMessage,
|
|
48
|
+
}: OpenMessageOptions): MayCancelablePromise<T | undefined> {
|
|
47
49
|
if (!rawMessage) {
|
|
48
50
|
return Promise.resolve(undefined);
|
|
49
51
|
}
|
package/src/common/index.ts
CHANGED
|
@@ -2,8 +2,19 @@ import React from 'react';
|
|
|
2
2
|
|
|
3
3
|
import { Event, MayCancelablePromise, MessageType, URI } from '@opensumi/ide-core-common';
|
|
4
4
|
|
|
5
|
+
import type vscode from 'vscode';
|
|
6
|
+
|
|
5
7
|
export const IMessageService = Symbol('IMessageService');
|
|
6
8
|
|
|
9
|
+
export interface OpenMessageOptions {
|
|
10
|
+
message: string | React.ReactNode;
|
|
11
|
+
type: MessageType;
|
|
12
|
+
buttons?: any[];
|
|
13
|
+
options?: vscode.MessageOptions;
|
|
14
|
+
closable?: boolean;
|
|
15
|
+
from?: string;
|
|
16
|
+
props?: Record<string, any>;
|
|
17
|
+
}
|
|
7
18
|
export interface IMessageService {
|
|
8
19
|
info(
|
|
9
20
|
message: string | React.ReactNode,
|
|
@@ -23,14 +34,7 @@ export interface IMessageService {
|
|
|
23
34
|
closable?: boolean,
|
|
24
35
|
props?: Record<string, any>,
|
|
25
36
|
): MayCancelablePromise<string | undefined>;
|
|
26
|
-
open<T = string>(
|
|
27
|
-
message: string | React.ReactNode,
|
|
28
|
-
type: MessageType,
|
|
29
|
-
buttons?: string[],
|
|
30
|
-
closable?: boolean,
|
|
31
|
-
from?: string,
|
|
32
|
-
props?: Record<string, any>,
|
|
33
|
-
): MayCancelablePromise<T | undefined>;
|
|
37
|
+
open<T = string>(options: OpenMessageOptions): MayCancelablePromise<T | undefined>;
|
|
34
38
|
hide<T = string>(value?: T): void;
|
|
35
39
|
}
|
|
36
40
|
|
|
@@ -47,6 +51,7 @@ export interface IDialogService extends IMessageService {
|
|
|
47
51
|
visible: boolean;
|
|
48
52
|
onDidDialogVisibleChange: Event<boolean>;
|
|
49
53
|
getMessage(): string | React.ReactNode;
|
|
54
|
+
getDetail(): string | undefined;
|
|
50
55
|
getIcon(): Icon | undefined;
|
|
51
56
|
getButtons(): string[] | undefined;
|
|
52
57
|
getType(): MessageType | undefined;
|
|
@@ -61,7 +66,7 @@ export abstract class AbstractMessageService implements IMessageService {
|
|
|
61
66
|
closable?: boolean,
|
|
62
67
|
props?: Record<string, any>,
|
|
63
68
|
): Promise<string | undefined> {
|
|
64
|
-
return this.open(message, MessageType.Info, buttons, closable,
|
|
69
|
+
return this.open({ message, type: MessageType.Info, buttons, closable, props });
|
|
65
70
|
}
|
|
66
71
|
|
|
67
72
|
warning(
|
|
@@ -70,7 +75,7 @@ export abstract class AbstractMessageService implements IMessageService {
|
|
|
70
75
|
closable?: boolean,
|
|
71
76
|
props?: Record<string, any>,
|
|
72
77
|
): Promise<string | undefined> {
|
|
73
|
-
return this.open(message, MessageType.Warning, buttons, closable,
|
|
78
|
+
return this.open({ message, type: MessageType.Warning, buttons, closable, props });
|
|
74
79
|
}
|
|
75
80
|
|
|
76
81
|
error(
|
|
@@ -79,16 +84,9 @@ export abstract class AbstractMessageService implements IMessageService {
|
|
|
79
84
|
closable?: boolean,
|
|
80
85
|
props?: Record<string, any>,
|
|
81
86
|
): Promise<string | undefined> {
|
|
82
|
-
return this.open(message, MessageType.Error, buttons, closable,
|
|
87
|
+
return this.open({ message, type: MessageType.Error, buttons, closable, props });
|
|
83
88
|
}
|
|
84
|
-
abstract open<T = string>(
|
|
85
|
-
message: string | React.ReactNode,
|
|
86
|
-
type: MessageType,
|
|
87
|
-
buttons?: any[],
|
|
88
|
-
closable?: boolean,
|
|
89
|
-
from?: string,
|
|
90
|
-
props?: Record<string, any>,
|
|
91
|
-
): Promise<T | undefined>;
|
|
89
|
+
abstract open<T = string>(options: OpenMessageOptions): Promise<T | undefined>;
|
|
92
90
|
abstract hide<T = string>(value?: T): void;
|
|
93
91
|
}
|
|
94
92
|
|