@web-atoms/core 2.4.75 → 2.5.3
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/dist/App.d.ts +1 -1
- package/dist/App.d.ts.map +1 -1
- package/dist/App.js +3 -3
- package/dist/App.js.map +1 -1
- package/dist/core/AtomLoader.d.ts.map +1 -1
- package/dist/core/AtomLoader.js +42 -16
- package/dist/core/AtomLoader.js.map +1 -1
- package/dist/services/BusyIndicatorService.d.ts +1 -2
- package/dist/services/BusyIndicatorService.d.ts.map +1 -1
- package/dist/services/BusyIndicatorService.js +1 -1
- package/dist/services/BusyIndicatorService.js.map +1 -1
- package/dist/services/FetchBuilder.d.ts.map +1 -1
- package/dist/services/FetchBuilder.js +21 -12
- package/dist/services/FetchBuilder.js.map +1 -1
- package/dist/services/http/RestService.d.ts.map +1 -1
- package/dist/services/http/RestService.js +34 -26
- package/dist/services/http/RestService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/web/services/PopupService.d.ts.map +1 -1
- package/dist/web/services/PopupService.js +26 -7
- package/dist/web/services/PopupService.js.map +1 -1
- package/dist/web/services/PopupWindow.js +7 -5
- package/dist/web/services/PopupWindow.js.map +1 -1
- package/dist/web/services/WebBusyIndicatorService.d.ts +1 -2
- package/dist/web/services/WebBusyIndicatorService.d.ts.map +1 -1
- package/dist/web/services/WebBusyIndicatorService.js +5 -1
- package/dist/web/services/WebBusyIndicatorService.js.map +1 -1
- package/package.json +2 -2
- package/src/App.ts +4 -4
- package/src/core/AtomLoader.ts +139 -151
- package/src/services/BusyIndicatorService.ts +2 -2
- package/src/services/FetchBuilder.ts +44 -49
- package/src/services/http/RestService.ts +119 -125
- package/src/web/services/PopupService.tsx +18 -6
- package/src/web/services/PopupWindow.tsx +6 -6
- package/src/web/services/WebBusyIndicatorService.ts +6 -2
- package/tsconfig.json +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["PopupWindow","ConfirmPopup","popupService","loadPopupService","focus","_export","default","setters","_tslib","Bind","_coreBind","_coreBindableProperty","BindableProperty","_coreXNode","XNode","_coreSleep","sleep","_coreTypes","CancelToken","_controlsAtomControl","AtomControl","_coreAtomUI","ChildEnumerator","_PopupWindowGlobalCss","execute","__awaiter","_context","import","popup","element","host","_a","querySelector","setupDragging","anyAutofocus","cb","_c","_b","call","constructor","initialized","showWindow","window","options","arguments_1","length","PS","lastTarget","showModal","arguments_2","modal","onPropertyChanged","name","recreate","init","requestCancel","closeWarning","confirm","message","cancel","renderer","node","undefined","e","enumerate","getAttribute","dispose","remove","na","attributes","render","create","rendererChanged","content","where","r","preCreate","title","viewModelTitle","setAttribute","c","cancelToken","registerDisposable","handler","key","app","runAsync","preventDefault","bindEvent","setTimeout","p","parent","offsetParent","document","body","left","offsetWidth","top","offsetHeight","style","removeAttribute","creator","titleRenderer","class","text","oneWay","closeButtonRenderer","eventClick","event","_d","actionBarRenderer","a","_e","extracted","extractControlProperties","Object","assign","viewModel","runAfterInit","tp","startEvent","target","tagName","disposables","offset","x","offsetLeft","y","offsetTop","dataset","dragging","rect","clientX","clientY","cursor","push","moveEvent","dx","dy","finalX","finalY","endEvent","iterator","__decorate","prototype","yesLabel","noLabel","cancelLabel","footerRenderer","autofocus","close","Promise","resolve"],"sources":["../../../src/web/services/PopupWindow.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["PopupWindow","ConfirmPopup","popupService","loadPopupService","focus","_export","default","setters","_tslib","Bind","_coreBind","_coreBindableProperty","BindableProperty","_coreXNode","XNode","_coreSleep","sleep","_coreTypes","CancelToken","_controlsAtomControl","AtomControl","_coreAtomUI","ChildEnumerator","_PopupWindowGlobalCss","execute","__awaiter","_context","import","popup","element","host","_a","querySelector","setupDragging","anyAutofocus","cb","_c","_b","call","constructor","initialized","showWindow","window","options","arguments_1","length","PS","lastTarget","showModal","arguments_2","modal","onPropertyChanged","name","recreate","init","requestCancel","closeWarning","confirm","message","cancel","renderer","node","undefined","e","enumerate","getAttribute","dispose","remove","na","attributes","render","create","rendererChanged","content","where","r","preCreate","title","viewModelTitle","setAttribute","c","cancelToken","registerDisposable","handler","key","app","runAsync","preventDefault","bindEvent","p","defaultPrevented","parent","offsetParent","document","body","left","offsetWidth","top","offsetHeight","style","removeAttribute","creator","titleRenderer","class","text","oneWay","closeButtonRenderer","eventClick","event","_d","actionBarRenderer","a","_e","extracted","extractControlProperties","Object","assign","viewModel","runAfterInit","setTimeout","tp","startEvent","target","tagName","disposables","offset","x","offsetLeft","y","offsetTop","dataset","dragging","rect","clientX","clientY","cursor","push","moveEvent","dx","dy","finalX","finalY","endEvent","iterator","__decorate","prototype","yesLabel","noLabel","cancelLabel","footerRenderer","autofocus","close","Promise","resolve"],"sources":["../../../src/web/services/PopupWindow.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import { IDisposable } from "../../core/types";
|
|
2
1
|
import { BusyIndicatorService } from "../../services/BusyIndicatorService";
|
|
3
2
|
export declare class WebBusyIndicatorService extends BusyIndicatorService {
|
|
4
3
|
private navigationService;
|
|
5
4
|
private app;
|
|
6
5
|
private zIndex;
|
|
7
6
|
private indicators;
|
|
8
|
-
createIndicator():
|
|
7
|
+
createIndicator(): Disposable;
|
|
9
8
|
}
|
|
10
9
|
//# sourceMappingURL=WebBusyIndicatorService.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebBusyIndicatorService.d.ts","sourceRoot":"","sources":["../../../src/web/services/WebBusyIndicatorService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"WebBusyIndicatorService.d.ts","sourceRoot":"","sources":["../../../src/web/services/WebBusyIndicatorService.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAM3E,qBACa,uBAAwB,SAAQ,oBAAoB;IAG7D,OAAO,CAAC,iBAAiB,CAAoB;IAG7C,OAAO,CAAC,GAAG,CAAM;IAEjB,OAAO,CAAC,MAAM,CAAiB;IAE/B,OAAO,CAAC,UAAU,CAAa;IAExB,eAAe,IAAI,UAAU;CAuDvC"}
|
|
@@ -66,7 +66,11 @@ System.register(["tslib", "../../App", "../../di/Inject", "../../di/RegisterSing
|
|
|
66
66
|
host.remove();
|
|
67
67
|
}
|
|
68
68
|
});
|
|
69
|
-
return
|
|
69
|
+
return {
|
|
70
|
+
[Symbol.dispose]() {
|
|
71
|
+
popup.dispose();
|
|
72
|
+
}
|
|
73
|
+
};
|
|
70
74
|
}
|
|
71
75
|
});
|
|
72
76
|
__decorate([Inject, __metadata("design:type", NavigationService)], WebBusyIndicatorService.prototype, "navigationService", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["App","_App","_diInject","Inject","_diRegisterSingleton","RegisterSingleton","_servicesBusyIndicatorService","BusyIndicatorService","_servicesNavigationService","NavigationService","_controlsAtomControl","AtomControl","_stylesStyleBuilder","cssNumberToString","execute","_export","WebBusyIndicatorService","constructor","zIndex","indicators","createIndicator","host","document","createElement","popup","app","className","span","divStyle","style","position","overflow","left","right","bottom","top","spanStyle","margin","width","height","maxHeight","maxWidth","appendChild","ws","navigationService","e","getHostForElement","body","refreshScreen","bind","screen","registerDisposable","dispose","remove","__decorate"],"sources":["../../../src/web/services/WebBusyIndicatorService.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;MAASA,GAAG,GAAAC,IAAA,CAAHD,GAAG;IAAA,aAAAE,SAAA;MAEHC,MAAM,GAAAD,SAAA,CAANC,MAAM;IAAA,aAAAC,oBAAA;MACNC,iBAAiB,GAAAD,oBAAA,CAAjBC,iBAAiB;IAAA,aAAAC,6BAAA;MACjBC,oBAAoB,GAAAD,6BAAA,CAApBC,oBAAoB;IAAA,aAAAC,0BAAA;MACpBC,iBAAiB,GAAAD,0BAAA,CAAjBC,iBAAiB;IAAA,aAAAC,oBAAA;MACjBC,WAAW,GAAAD,oBAAA,CAAXC,WAAW;IAAA,aAAAC,mBAAA;MACXC,iBAAiB,GAAAD,mBAAA,CAAjBC,iBAAiB;IAAA;IAAAC,OAAA,WAAAA,CAAA;MAAAC,OAAA,4BAIbC,uBAAuB,GAA7B,MAAMA,uBAAwB,SAAQT,oBAAoB;QAA1DU,YAAA;;UAQK,KAAAC,MAAM,GAAW,KAAK;UAEtB,KAAAC,UAAU,GAAW,CAAC;
|
|
1
|
+
{"version":3,"names":["App","_App","_diInject","Inject","_diRegisterSingleton","RegisterSingleton","_servicesBusyIndicatorService","BusyIndicatorService","_servicesNavigationService","NavigationService","_controlsAtomControl","AtomControl","_stylesStyleBuilder","cssNumberToString","execute","_export","WebBusyIndicatorService","constructor","zIndex","indicators","createIndicator","host","document","createElement","popup","app","className","span","divStyle","style","position","overflow","left","right","bottom","top","spanStyle","margin","width","height","maxHeight","maxWidth","appendChild","ws","navigationService","e","getHostForElement","body","refreshScreen","bind","screen","registerDisposable","dispose","remove","Symbol","__decorate"],"sources":["../../../src/web/services/WebBusyIndicatorService.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@web-atoms/core",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.5.3",
|
|
4
4
|
"description": "Web Atoms Core",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"postcss-preset-env": "^10.1.5",
|
|
49
49
|
"remap-istanbul": "^0.11.1",
|
|
50
50
|
"test-dom": "^1.0.0",
|
|
51
|
-
"tslib": "^2.
|
|
51
|
+
"tslib": "^2.8.1",
|
|
52
52
|
"xmlhttprequest": "^1.8.0"
|
|
53
53
|
},
|
|
54
54
|
"dependencies": {
|
package/src/App.ts
CHANGED
|
@@ -166,7 +166,7 @@ export class App extends ServiceProvider {
|
|
|
166
166
|
}, 5);
|
|
167
167
|
}
|
|
168
168
|
|
|
169
|
-
public createBusyIndicator(taskInfo?: IBackgroundTaskInfo ):
|
|
169
|
+
public createBusyIndicator(taskInfo?: IBackgroundTaskInfo ): Disposable {
|
|
170
170
|
this.busyIndicatorService = this.busyIndicatorService
|
|
171
171
|
|| this.resolve(BusyIndicatorService);
|
|
172
172
|
return this.busyIndicatorService.createIndicator(taskInfo);
|
|
@@ -334,10 +334,10 @@ export class App extends ServiceProvider {
|
|
|
334
334
|
if (a && a.then && a.catch) {
|
|
335
335
|
a.then((r) => {
|
|
336
336
|
// do nothing
|
|
337
|
-
indicator.dispose();
|
|
337
|
+
indicator[Symbol.dispose]();
|
|
338
338
|
});
|
|
339
339
|
a.catch((e) => {
|
|
340
|
-
indicator.dispose();
|
|
340
|
+
indicator[Symbol.dispose]();
|
|
341
341
|
// tslint:disable-next-line:no-console
|
|
342
342
|
// console.error("XFApp.onReady");
|
|
343
343
|
// tslint:disable-next-line:no-console
|
|
@@ -345,7 +345,7 @@ export class App extends ServiceProvider {
|
|
|
345
345
|
});
|
|
346
346
|
return;
|
|
347
347
|
}
|
|
348
|
-
indicator.dispose();
|
|
348
|
+
indicator[Symbol.dispose]();
|
|
349
349
|
}
|
|
350
350
|
|
|
351
351
|
}
|
package/src/core/AtomLoader.ts
CHANGED
|
@@ -62,87 +62,83 @@ export class AtomLoader {
|
|
|
62
62
|
returnPromise?: Promise<any>,
|
|
63
63
|
id?: string}> {
|
|
64
64
|
|
|
65
|
-
|
|
65
|
+
using _busy = app.createBusyIndicator({
|
|
66
66
|
title: url.toString(),
|
|
67
67
|
description: `Loading View ${url}`
|
|
68
68
|
});
|
|
69
69
|
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
if (!
|
|
74
|
-
|
|
75
|
-
return { view };
|
|
76
|
-
}
|
|
77
|
-
vm = vmFactory();
|
|
78
|
-
view.viewModel = vm;
|
|
79
|
-
}
|
|
80
|
-
if ("parameters" in view) {
|
|
81
|
-
vm = (view as any).parameters;
|
|
70
|
+
const view = await AtomLoader.load<T>(url, app);
|
|
71
|
+
let vm = view.viewModel;
|
|
72
|
+
if (!vm) {
|
|
73
|
+
if (!vmFactory) {
|
|
74
|
+
return { view };
|
|
82
75
|
}
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
76
|
+
vm = vmFactory();
|
|
77
|
+
view.viewModel = vm;
|
|
78
|
+
}
|
|
79
|
+
if ("parameters" in view) {
|
|
80
|
+
vm = (view as any).parameters;
|
|
81
|
+
}
|
|
82
|
+
if (vm) {
|
|
83
|
+
const jsonService = app.get(JsonService);
|
|
84
|
+
for (const key in url.query) {
|
|
85
|
+
if (url.query.hasOwnProperty(key)) {
|
|
86
|
+
const element = url.query[key];
|
|
87
|
+
if (typeof element === "object") {
|
|
88
|
+
vm[key] = jsonService.parse(jsonService.stringify(element));
|
|
89
|
+
continue;
|
|
90
|
+
}
|
|
91
|
+
if (/^json\:/.test(key)) {
|
|
92
|
+
const k = key.split(":")[1];
|
|
93
|
+
vm[k] = jsonService.parse(element.toString());
|
|
94
|
+
continue;
|
|
95
|
+
}
|
|
96
|
+
if (/^ref\:/.test(key)) {
|
|
97
|
+
const rs = app.get(ReferenceService);
|
|
98
|
+
const v = rs.get(element as string);
|
|
99
|
+
vm[key.split(":", 2)[1]] = v.consume();
|
|
100
|
+
continue;
|
|
101
|
+
}
|
|
102
|
+
try {
|
|
103
|
+
vm[key] = element;
|
|
104
|
+
} catch (e) {
|
|
105
|
+
// tslint:disable-next-line: no-console
|
|
106
|
+
console.error(e);
|
|
109
107
|
}
|
|
110
108
|
}
|
|
111
109
|
}
|
|
110
|
+
}
|
|
112
111
|
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
const disposables = view.disposables;
|
|
112
|
+
// register hooks !! if it is a window !!
|
|
113
|
+
if (hookCloseEvents && vm) {
|
|
117
114
|
|
|
118
|
-
|
|
119
|
-
(view as any).id = id;
|
|
115
|
+
const disposables = view.disposables;
|
|
120
116
|
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
resolve(r);
|
|
124
|
-
view.dispose();
|
|
125
|
-
}));
|
|
126
|
-
disposables.add( app.subscribe(`atom-window-cancel:${id}`, () => {
|
|
127
|
-
reject("cancelled");
|
|
128
|
-
view.dispose();
|
|
129
|
-
}));
|
|
130
|
-
});
|
|
117
|
+
const id = (AtomLoader.id++).toString();
|
|
118
|
+
(view as any).id = id;
|
|
131
119
|
|
|
132
|
-
|
|
133
|
-
|
|
120
|
+
const returnPromise = new Promise((resolve, reject) => {
|
|
121
|
+
disposables.add( app.subscribe(`atom-window-close:${id}`, (m, r) => {
|
|
122
|
+
resolve(r);
|
|
123
|
+
view.dispose();
|
|
124
|
+
}));
|
|
125
|
+
disposables.add( app.subscribe(`atom-window-cancel:${id}`, () => {
|
|
126
|
+
reject("cancelled");
|
|
127
|
+
view.dispose();
|
|
128
|
+
}));
|
|
129
|
+
});
|
|
134
130
|
|
|
135
|
-
|
|
131
|
+
// it is responsibility of view holder to dispose the view
|
|
132
|
+
// disposables.add((view as any));
|
|
136
133
|
|
|
137
|
-
|
|
134
|
+
vm.windowName = id;
|
|
138
135
|
|
|
139
|
-
|
|
140
|
-
}
|
|
136
|
+
(view as any).returnPromise = returnPromise;
|
|
141
137
|
|
|
142
|
-
return { view };
|
|
143
|
-
} finally {
|
|
144
|
-
busyIndicator.dispose();
|
|
138
|
+
return { view, disposables, returnPromise, id };
|
|
145
139
|
}
|
|
140
|
+
|
|
141
|
+
return { view };
|
|
146
142
|
}
|
|
147
143
|
|
|
148
144
|
public static async loadClass<T extends AtomControl>(
|
|
@@ -150,115 +146,107 @@ export class AtomLoader {
|
|
|
150
146
|
{ title, [displayRouteSymbol]: route, ... parameters }: any = {},
|
|
151
147
|
app: App): Promise<T> {
|
|
152
148
|
|
|
153
|
-
|
|
149
|
+
using _busyIndicator = app.createBusyIndicator({
|
|
154
150
|
title: url?.toString(),
|
|
155
151
|
description: `Loading View ${url}`
|
|
156
152
|
});
|
|
157
153
|
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
console.error(e);
|
|
186
|
-
}
|
|
154
|
+
const view = await AtomLoader.load<T>(url, app);
|
|
155
|
+
const vm = getOwnInheritedProperty(view, "viewModel");
|
|
156
|
+
let params;
|
|
157
|
+
if ("parameters" in view) {
|
|
158
|
+
params = (view as any).parameters;
|
|
159
|
+
}
|
|
160
|
+
if (!vm) {
|
|
161
|
+
params = (view as any).parameters ??= {};
|
|
162
|
+
} else {
|
|
163
|
+
console.warn("ViewModel is deprecated");
|
|
164
|
+
}
|
|
165
|
+
if (title) {
|
|
166
|
+
(view as any).title = title;
|
|
167
|
+
}
|
|
168
|
+
if (params) {
|
|
169
|
+
params[displayRouteSymbol] = route;
|
|
170
|
+
}
|
|
171
|
+
if ((vm || params) && parameters) {
|
|
172
|
+
for (const key in parameters) {
|
|
173
|
+
if (parameters.hasOwnProperty(key)) {
|
|
174
|
+
const element = parameters[key];
|
|
175
|
+
try {
|
|
176
|
+
if (vm) { vm[key] = element; }
|
|
177
|
+
if (params) { params[key] = element; }
|
|
178
|
+
} catch (e) {
|
|
179
|
+
// tslint:disable-next-line: no-console
|
|
180
|
+
console.error(e);
|
|
187
181
|
}
|
|
188
182
|
}
|
|
189
183
|
}
|
|
190
|
-
(view as any).init?.()
|
|
191
|
-
?.catch((error) => {
|
|
192
|
-
if (!CancelToken.isCancelled(error)) {
|
|
193
|
-
// tslint:disable-next-line: no-console
|
|
194
|
-
console.error(error);
|
|
195
|
-
}
|
|
196
|
-
});
|
|
197
|
-
return view;
|
|
198
|
-
} finally {
|
|
199
|
-
busyIndicator.dispose();
|
|
200
184
|
}
|
|
185
|
+
(view as any).init?.()
|
|
186
|
+
?.catch((error) => {
|
|
187
|
+
if (!CancelToken.isCancelled(error)) {
|
|
188
|
+
// tslint:disable-next-line: no-console
|
|
189
|
+
console.error(error);
|
|
190
|
+
}
|
|
191
|
+
});
|
|
192
|
+
return view;
|
|
201
193
|
}
|
|
202
194
|
|
|
203
195
|
public static async loadControl<T extends AtomControl>(
|
|
204
196
|
url: AtomUri,
|
|
205
197
|
app: App): Promise<T> {
|
|
206
198
|
|
|
207
|
-
|
|
199
|
+
using _busyIndicator = app.createBusyIndicator({
|
|
208
200
|
title: url?.toString(),
|
|
209
201
|
description: `Loading View ${url}`
|
|
210
202
|
});
|
|
211
203
|
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
console.error(e);
|
|
248
|
-
}
|
|
204
|
+
const view = await AtomLoader.load<T>(url, app);
|
|
205
|
+
const vm = getOwnInheritedProperty(view, "viewModel");
|
|
206
|
+
let params;
|
|
207
|
+
if ("parameters" in view) {
|
|
208
|
+
params = (view as any).parameters;
|
|
209
|
+
}
|
|
210
|
+
if (!vm) {
|
|
211
|
+
params = (view as any).parameters ??= {};
|
|
212
|
+
}
|
|
213
|
+
if (vm || params) {
|
|
214
|
+
const jsonService = app.get(JsonService);
|
|
215
|
+
for (const key in url.query) {
|
|
216
|
+
if (url.query.hasOwnProperty(key)) {
|
|
217
|
+
const element = url.query[key];
|
|
218
|
+
if (/^json\:/.test(key)) {
|
|
219
|
+
const k = key.split(":")[1];
|
|
220
|
+
const v = jsonService.parse(element.toString());
|
|
221
|
+
if (vm) { vm[k] = v; }
|
|
222
|
+
if (params) { params[k] = v; }
|
|
223
|
+
continue;
|
|
224
|
+
}
|
|
225
|
+
if (/^ref\:/.test(key)) {
|
|
226
|
+
const rs = app.get(ReferenceService);
|
|
227
|
+
const v = rs.get(element as string).consume();
|
|
228
|
+
const keyName = key.split(":", 2)[1];
|
|
229
|
+
if (vm) { vm[keyName] = v; }
|
|
230
|
+
if (params) { params[keyName] = v; }
|
|
231
|
+
continue;
|
|
232
|
+
}
|
|
233
|
+
try {
|
|
234
|
+
if (vm) { vm[key] = element; }
|
|
235
|
+
if (params) { params[key] = element; }
|
|
236
|
+
} catch (e) {
|
|
237
|
+
// tslint:disable-next-line: no-console
|
|
238
|
+
console.error(e);
|
|
249
239
|
}
|
|
250
240
|
}
|
|
251
241
|
}
|
|
252
|
-
(view as any).init?.()
|
|
253
|
-
?.catch((error) => {
|
|
254
|
-
if (!CancelToken.isCancelled(error)) {
|
|
255
|
-
console.error(error);
|
|
256
|
-
}
|
|
257
|
-
});
|
|
258
|
-
return view;
|
|
259
|
-
} finally {
|
|
260
|
-
busyIndicator.dispose();
|
|
261
242
|
}
|
|
243
|
+
(view as any).init?.()
|
|
244
|
+
?.catch((error) => {
|
|
245
|
+
if (!CancelToken.isCancelled(error)) {
|
|
246
|
+
console.error(error);
|
|
247
|
+
}
|
|
248
|
+
});
|
|
249
|
+
return view;
|
|
262
250
|
}
|
|
263
251
|
|
|
264
252
|
}
|
|
@@ -10,9 +10,9 @@ export interface IBackgroundTaskInfo {
|
|
|
10
10
|
@RegisterSingleton
|
|
11
11
|
export class BusyIndicatorService {
|
|
12
12
|
|
|
13
|
-
public createIndicator(info?: IBackgroundTaskInfo):
|
|
13
|
+
public createIndicator(info?: IBackgroundTaskInfo): Disposable {
|
|
14
14
|
return {
|
|
15
|
-
dispose() {
|
|
15
|
+
[Symbol.dispose]() {
|
|
16
16
|
// do nothing.
|
|
17
17
|
}
|
|
18
18
|
};
|