ts-glitter 13.5.4 → 13.5.6
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/lowcode/Entry.js +1 -8
- package/lowcode/Entry.ts +8 -8
- package/lowcode/glitterBundle/GVController.js +5 -1
- package/lowcode/glitterBundle/GVController.ts +5 -1
- package/lowcode/glitterBundle/GlitterInitial.js +1 -0
- package/lowcode/glitterBundle/GlitterInitial.ts +1 -0
- package/lowcode/glitterBundle/module/PageManager.js +22 -8
- package/lowcode/glitterBundle/module/PageManager.ts +133 -85
- package/lowcode/jspage/main.js +17 -15
- package/lowcode/jspage/main.ts +19 -15
- package/lowcode/official_view_component/official/form.js +0 -2
- package/lowcode/official_view_component/official/form.ts +0 -2
- package/package.json +1 -1
package/lowcode/Entry.js
CHANGED
|
@@ -59,7 +59,7 @@ export class Entry {
|
|
|
59
59
|
}
|
|
60
60
|
window.renderClock = (_a = window.renderClock) !== null && _a !== void 0 ? _a : clockF();
|
|
61
61
|
console.log(`Entry-time:`, window.renderClock.stop());
|
|
62
|
-
glitter.share.editerVersion = "V_13.5.
|
|
62
|
+
glitter.share.editerVersion = "V_13.5.6";
|
|
63
63
|
glitter.share.start = (new Date());
|
|
64
64
|
const vm = {
|
|
65
65
|
appConfig: [],
|
|
@@ -246,13 +246,6 @@ export class Entry {
|
|
|
246
246
|
running().then(() => __awaiter(this, void 0, void 0, function* () {
|
|
247
247
|
{
|
|
248
248
|
console.log(`to-page-time:`, window.renderClock.stop());
|
|
249
|
-
let data = yield ApiPageConfig.getPage({
|
|
250
|
-
appName: config.appName,
|
|
251
|
-
tag: glitter.getUrlParameter('page'),
|
|
252
|
-
});
|
|
253
|
-
if (data.response.result.length === 0) {
|
|
254
|
-
glitter.setUrlParameter('page', data.response.redirect);
|
|
255
|
-
}
|
|
256
249
|
glitter.setHome('jspage/main.js', glitter.getUrlParameter('page'), {
|
|
257
250
|
appName: config.appName,
|
|
258
251
|
}, {
|
package/lowcode/Entry.ts
CHANGED
|
@@ -58,7 +58,7 @@ export class Entry {
|
|
|
58
58
|
}
|
|
59
59
|
(window as any).renderClock = (window as any).renderClock ?? clockF();
|
|
60
60
|
console.log(`Entry-time:`, (window as any).renderClock.stop());
|
|
61
|
-
glitter.share.editerVersion = "V_13.5.
|
|
61
|
+
glitter.share.editerVersion = "V_13.5.6";
|
|
62
62
|
glitter.share.start = (new Date());
|
|
63
63
|
const vm: {
|
|
64
64
|
appConfig: any;
|
|
@@ -260,13 +260,13 @@ export class Entry {
|
|
|
260
260
|
running().then(async () => {
|
|
261
261
|
{
|
|
262
262
|
console.log(`to-page-time:`, (window as any).renderClock.stop());
|
|
263
|
-
let data = await ApiPageConfig.getPage({
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
});
|
|
267
|
-
if (data.response.result.length === 0) {
|
|
268
|
-
|
|
269
|
-
}
|
|
263
|
+
// let data = await ApiPageConfig.getPage({
|
|
264
|
+
// appName: config.appName,
|
|
265
|
+
// tag: glitter.getUrlParameter('page'),
|
|
266
|
+
// });
|
|
267
|
+
// if (data.response.result.length === 0) {
|
|
268
|
+
// glitter.setUrlParameter('page', data.response.redirect);
|
|
269
|
+
// }
|
|
270
270
|
glitter.setHome(
|
|
271
271
|
'jspage/main.js',
|
|
272
272
|
glitter.getUrlParameter('page'),
|
|
@@ -455,6 +455,11 @@ export function init(metaURL, fun) {
|
|
|
455
455
|
lifeCycle.onDestroy();
|
|
456
456
|
}
|
|
457
457
|
};
|
|
458
|
+
PageManager.setHistory(cf.pageConfig.tag, cf.c_type);
|
|
459
|
+
cf.pageConfig.carry_search.map((dd) => {
|
|
460
|
+
gvc.glitter.setUrlParameter(dd.key, dd.value);
|
|
461
|
+
});
|
|
462
|
+
gvc.glitter.setUrlParameter('page', cf.pageConfig.tag);
|
|
458
463
|
if (cf.pageConfig.type === GVCType.Page) {
|
|
459
464
|
$('#glitterPage').append(`<div id="page${cf.pageConfig.id}" style="min-width: 100vw;min-height: 100vh;left: 0;top: 0;width:100vw;
|
|
460
465
|
background: ${cf.pageConfig.backGroundColor};z-index: 9999;overflow: hidden;display:none;" class="page-box">
|
|
@@ -470,6 +475,5 @@ ${lifeCycle.onCreateView()}
|
|
|
470
475
|
gvc.glitter.setAnimation(cf.pageConfig);
|
|
471
476
|
lifeCycle.onCreate();
|
|
472
477
|
gvc.glitter.defaultSetting.pageLoadingFinish();
|
|
473
|
-
PageManager.setHistory(cf.pageConfig.tag, cf.c_type);
|
|
474
478
|
};
|
|
475
479
|
}
|
|
@@ -483,6 +483,11 @@ export function init(metaURL: string, fun: (gvc: GVC, glitter: Glitter, gBundle:
|
|
|
483
483
|
lifeCycle.onDestroy()
|
|
484
484
|
}
|
|
485
485
|
}
|
|
486
|
+
PageManager.setHistory(cf.pageConfig.tag, cf.c_type)
|
|
487
|
+
cf.pageConfig.carry_search.map((dd)=>{
|
|
488
|
+
gvc.glitter.setUrlParameter(dd.key,dd.value)
|
|
489
|
+
})
|
|
490
|
+
gvc.glitter.setUrlParameter('page',cf.pageConfig.tag)
|
|
486
491
|
if (cf.pageConfig.type === GVCType.Page) {
|
|
487
492
|
$('#glitterPage').append(`<div id="page${cf.pageConfig.id}" style="min-width: 100vw;min-height: 100vh;left: 0;top: 0;width:100vw;
|
|
488
493
|
background: ${cf.pageConfig!.backGroundColor};z-index: 9999;overflow: hidden;display:none;" class="page-box">
|
|
@@ -498,6 +503,5 @@ ${lifeCycle.onCreateView()}
|
|
|
498
503
|
gvc.glitter.setAnimation(cf.pageConfig)
|
|
499
504
|
lifeCycle.onCreate()
|
|
500
505
|
gvc.glitter.defaultSetting.pageLoadingFinish()
|
|
501
|
-
PageManager.setHistory(cf.pageConfig.tag, cf.c_type)
|
|
502
506
|
}
|
|
503
507
|
}
|
|
@@ -21,6 +21,7 @@ export var GVCType;
|
|
|
21
21
|
export class PageConfig {
|
|
22
22
|
constructor(par) {
|
|
23
23
|
this.scrollTop = 0;
|
|
24
|
+
this.carry_search = par.carry_search || [];
|
|
24
25
|
this.initial = false;
|
|
25
26
|
this.search = par.search || '';
|
|
26
27
|
this.tag = par.tag;
|
|
@@ -89,7 +90,7 @@ export class PageManager {
|
|
|
89
90
|
(PageManager.hiddenElement[glitter.pageConfig[index].id] &&
|
|
90
91
|
document.getElementById('glitterPage').appendChild(PageManager.hiddenElement[glitter.pageConfig[index].id]));
|
|
91
92
|
glitter.pageConfig[index].createResource();
|
|
92
|
-
|
|
93
|
+
window.history.replaceState({}, document.title, glitter.pageConfig[index].search);
|
|
93
94
|
}
|
|
94
95
|
catch (e) {
|
|
95
96
|
}
|
|
@@ -110,7 +111,9 @@ export class PageManager {
|
|
|
110
111
|
}
|
|
111
112
|
static setHome(url, tag, obj, option = {}) {
|
|
112
113
|
const glitter = Glitter.glitter;
|
|
113
|
-
const now_page = glitter.pageConfig.filter((dd) => {
|
|
114
|
+
const now_page = glitter.pageConfig.filter((dd) => {
|
|
115
|
+
return dd.type === GVCType.Page;
|
|
116
|
+
}).reverse()[1];
|
|
114
117
|
glitter.htmlGenerate.loadScript(glitter, [
|
|
115
118
|
{
|
|
116
119
|
src: PageManager.getRelativeUrl(url),
|
|
@@ -130,6 +133,7 @@ export class PageManager {
|
|
|
130
133
|
goBack: true,
|
|
131
134
|
src: url,
|
|
132
135
|
tag: tag,
|
|
136
|
+
carry_search: option.carry_search,
|
|
133
137
|
deleteResource: () => {
|
|
134
138
|
},
|
|
135
139
|
createResource: () => {
|
|
@@ -152,7 +156,10 @@ export class PageManager {
|
|
|
152
156
|
glitter.pageConfig.push(pageConfig);
|
|
153
157
|
glitter.defaultSetting.pageLoading();
|
|
154
158
|
if (window.gtag && GVC.initial) {
|
|
155
|
-
window.gtag('event', 'page_view', {
|
|
159
|
+
window.gtag('event', 'page_view', {
|
|
160
|
+
'page_title': document.title,
|
|
161
|
+
page_location: document.location.href
|
|
162
|
+
});
|
|
156
163
|
}
|
|
157
164
|
GVC.initial = true;
|
|
158
165
|
gvFunction({
|
|
@@ -239,7 +246,10 @@ export class PageManager {
|
|
|
239
246
|
static changePage(url, tag, goBack, obj, option = {}) {
|
|
240
247
|
const glitter = Glitter.glitter;
|
|
241
248
|
console.log(`changePage-time:`, window.renderClock.stop());
|
|
242
|
-
const now_page = glitter.pageConfig.filter((dd) => {
|
|
249
|
+
const now_page = glitter.pageConfig.filter((dd) => {
|
|
250
|
+
return dd.type === GVCType.Page;
|
|
251
|
+
}).reverse()[0];
|
|
252
|
+
now_page.search = location.href;
|
|
243
253
|
now_page && (now_page.scrollTop = window.scrollY);
|
|
244
254
|
glitter.window.history.replaceState({}, glitter.document.title, location.href);
|
|
245
255
|
setTimeout(() => {
|
|
@@ -260,7 +270,8 @@ export class PageManager {
|
|
|
260
270
|
dismiss: (_b = option.dismiss) !== null && _b !== void 0 ? _b : (() => {
|
|
261
271
|
}),
|
|
262
272
|
renderFinish: () => {
|
|
263
|
-
}
|
|
273
|
+
},
|
|
274
|
+
carry_search: option.carry_search
|
|
264
275
|
});
|
|
265
276
|
glitter.pageConfig.push(pageConfig);
|
|
266
277
|
glitter.defaultSetting.pageLoading();
|
|
@@ -268,7 +279,6 @@ export class PageManager {
|
|
|
268
279
|
{
|
|
269
280
|
src: PageManager.getRelativeUrl(url),
|
|
270
281
|
callback: (gvFunction) => {
|
|
271
|
-
glitter.setUrlParameter('page', tag);
|
|
272
282
|
if (glitter.pageConfig.find((dd) => {
|
|
273
283
|
return dd === pageConfig;
|
|
274
284
|
})) {
|
|
@@ -279,7 +289,10 @@ export class PageManager {
|
|
|
279
289
|
});
|
|
280
290
|
}
|
|
281
291
|
if (window.gtag) {
|
|
282
|
-
window.gtag('event', 'page_view', {
|
|
292
|
+
window.gtag('event', 'page_view', {
|
|
293
|
+
'page_title': document.title,
|
|
294
|
+
page_location: document.location.href
|
|
295
|
+
});
|
|
283
296
|
}
|
|
284
297
|
}
|
|
285
298
|
}
|
|
@@ -314,7 +327,8 @@ export class PageManager {
|
|
|
314
327
|
animation: (_b = option.animation) !== null && _b !== void 0 ? _b : glitter.defaultSetting.dialogAnimation,
|
|
315
328
|
dismiss: (_c = option.dismiss) !== null && _c !== void 0 ? _c : (() => {
|
|
316
329
|
}),
|
|
317
|
-
renderFinish: () => {
|
|
330
|
+
renderFinish: () => {
|
|
331
|
+
}
|
|
318
332
|
});
|
|
319
333
|
glitter.pageConfig.push(pageConfig);
|
|
320
334
|
glitter.defaultSetting.pageLoading();
|
|
@@ -33,8 +33,8 @@ export enum GVCType {
|
|
|
33
33
|
}
|
|
34
34
|
|
|
35
35
|
export class PageConfig {
|
|
36
|
-
public initial:boolean;
|
|
37
|
-
public search:string;
|
|
36
|
+
public initial: boolean;
|
|
37
|
+
public search: string;
|
|
38
38
|
public id: string;
|
|
39
39
|
public obj: any;
|
|
40
40
|
public goBack: boolean;
|
|
@@ -47,21 +47,35 @@ export class PageConfig {
|
|
|
47
47
|
public backGroundColor: string;
|
|
48
48
|
public scrollTop: number = 0;
|
|
49
49
|
public dismiss: () => void;
|
|
50
|
-
public renderFinish:()=> void
|
|
51
|
-
public static rootPath=''
|
|
50
|
+
public renderFinish: () => void
|
|
51
|
+
public static rootPath = ''
|
|
52
|
+
public carry_search: {key:string,value:string}[];
|
|
52
53
|
|
|
53
54
|
public getElement(): any {
|
|
54
55
|
return Glitter.glitter.$(`#page${this.id}`);
|
|
55
56
|
}
|
|
56
57
|
|
|
57
|
-
public gvc?:GVC
|
|
58
|
+
public gvc?: GVC
|
|
59
|
+
|
|
58
60
|
constructor(par: {
|
|
59
|
-
id: string,
|
|
60
|
-
|
|
61
|
-
|
|
61
|
+
id: string,
|
|
62
|
+
obj: any,
|
|
63
|
+
goBack: boolean,
|
|
64
|
+
src: string,
|
|
65
|
+
tag: string,
|
|
66
|
+
createResource: () => void,
|
|
67
|
+
deleteResource: (destroy: boolean) => void,
|
|
68
|
+
type: GVCType,
|
|
69
|
+
animation: AnimationConfig,
|
|
70
|
+
backGroundColor: string,
|
|
71
|
+
dismiss: () => void,
|
|
72
|
+
renderFinish: () => void,
|
|
73
|
+
search?: string,
|
|
74
|
+
carry_search?: {key:string,value:string}[]
|
|
62
75
|
}) {
|
|
63
|
-
this.
|
|
64
|
-
this.
|
|
76
|
+
this.carry_search=par.carry_search || []
|
|
77
|
+
this.initial = false
|
|
78
|
+
this.search = par.search || '';
|
|
65
79
|
this.tag = par.tag;
|
|
66
80
|
this.id = par.id;
|
|
67
81
|
this.obj = par.obj;
|
|
@@ -73,7 +87,7 @@ export class PageConfig {
|
|
|
73
87
|
this.animation = par.animation;
|
|
74
88
|
this.backGroundColor = par.backGroundColor;
|
|
75
89
|
this.dismiss = par.dismiss
|
|
76
|
-
this.renderFinish= par.renderFinish
|
|
90
|
+
this.renderFinish = par.renderFinish
|
|
77
91
|
}
|
|
78
92
|
}
|
|
79
93
|
|
|
@@ -83,21 +97,21 @@ export class PageManager {
|
|
|
83
97
|
public static hidePageView(id: string, del: boolean = false) {
|
|
84
98
|
const glitter = Glitter.glitter;
|
|
85
99
|
try {
|
|
86
|
-
const pageConfig=glitter.pageConfig.find((dd)=>{
|
|
87
|
-
return dd.id===id
|
|
100
|
+
const pageConfig = glitter.pageConfig.find((dd) => {
|
|
101
|
+
return dd.id === id
|
|
88
102
|
})
|
|
89
|
-
if(pageConfig){
|
|
90
|
-
if(del){
|
|
103
|
+
if (pageConfig) {
|
|
104
|
+
if (del) {
|
|
91
105
|
pageConfig.dismiss()
|
|
92
106
|
pageConfig.deleteResource(true)
|
|
93
107
|
glitter.$(`#page` + pageConfig.id).remove();
|
|
94
108
|
glitter.$(`#` + pageConfig.id).remove();
|
|
95
109
|
PageManager.hiddenElement[`page${pageConfig.id}`] = undefined
|
|
96
110
|
PageManager.hiddenElement[`${pageConfig.id}`] = undefined
|
|
97
|
-
glitter.pageConfig=glitter.pageConfig.filter((dd)=>{
|
|
98
|
-
return dd.id!==pageConfig.id
|
|
111
|
+
glitter.pageConfig = glitter.pageConfig.filter((dd) => {
|
|
112
|
+
return dd.id !== pageConfig.id
|
|
99
113
|
})
|
|
100
|
-
}else{
|
|
114
|
+
} else {
|
|
101
115
|
const pageElement = document.getElementById(`page${pageConfig.id}`)
|
|
102
116
|
const dialogElement = document.getElementById(`${pageConfig.id}`)
|
|
103
117
|
if (pageElement) {
|
|
@@ -122,12 +136,11 @@ export class PageManager {
|
|
|
122
136
|
return data.id;
|
|
123
137
|
}).indexOf(id);
|
|
124
138
|
(PageManager.hiddenElement[`page` + glitter.pageConfig[index].id] &&
|
|
125
|
-
|
|
139
|
+
document.getElementById('glitterPage')!.appendChild(PageManager.hiddenElement[`page` + glitter.pageConfig[index].id]));
|
|
126
140
|
(PageManager.hiddenElement[glitter.pageConfig[index].id] &&
|
|
127
141
|
document.getElementById('glitterPage')!.appendChild(PageManager.hiddenElement[glitter.pageConfig[index].id]));
|
|
128
|
-
|
|
129
142
|
glitter.pageConfig[index].createResource();
|
|
130
|
-
|
|
143
|
+
window.history.replaceState({}, document.title, glitter.pageConfig[index].search);
|
|
131
144
|
} catch (e) {
|
|
132
145
|
}
|
|
133
146
|
}
|
|
@@ -147,28 +160,37 @@ export class PageManager {
|
|
|
147
160
|
}
|
|
148
161
|
}
|
|
149
162
|
|
|
150
|
-
public static setHome(url: string, tag: string, obj: any, option: {
|
|
163
|
+
public static setHome(url: string, tag: string, obj: any, option: {
|
|
164
|
+
animation?: AnimationConfig,
|
|
165
|
+
backGroundColor?: string,
|
|
166
|
+
dismiss?: () => void,
|
|
167
|
+
carry_search?: {key:string,value:string}[]
|
|
168
|
+
} = {}) {
|
|
151
169
|
const glitter = Glitter.glitter;
|
|
152
170
|
//當頁面有第二頁時則先返回首頁在做跳轉。
|
|
153
|
-
const now_page=glitter.pageConfig.filter((dd)=>{
|
|
154
|
-
|
|
171
|
+
const now_page = glitter.pageConfig.filter((dd) => {
|
|
172
|
+
return dd.type === GVCType.Page
|
|
173
|
+
}).reverse()[1];
|
|
174
|
+
glitter.htmlGenerate.loadScript(glitter, [
|
|
155
175
|
{
|
|
156
|
-
src:PageManager.getRelativeUrl(url),
|
|
157
|
-
callback:(gvFunction)=>{
|
|
176
|
+
src: PageManager.getRelativeUrl(url),
|
|
177
|
+
callback: (gvFunction) => {
|
|
158
178
|
const original = new URL(glitter.root_path + tag + window.location.search)
|
|
159
|
-
|
|
160
|
-
|
|
179
|
+
|
|
180
|
+
function switchFunction() {
|
|
181
|
+
glitter.page = tag
|
|
161
182
|
try {
|
|
162
183
|
window.history.replaceState({}, document.title, original.href);
|
|
163
|
-
}catch (e) {
|
|
184
|
+
} catch (e) {
|
|
164
185
|
|
|
165
186
|
}
|
|
166
|
-
const pageConfig=new PageConfig({
|
|
187
|
+
const pageConfig = new PageConfig({
|
|
167
188
|
id: glitter.getUUID(),
|
|
168
189
|
obj: obj,
|
|
169
190
|
goBack: true,
|
|
170
191
|
src: url,
|
|
171
192
|
tag: tag,
|
|
193
|
+
carry_search: option.carry_search,
|
|
172
194
|
deleteResource: () => {
|
|
173
195
|
},
|
|
174
196
|
createResource: () => {
|
|
@@ -178,40 +200,44 @@ export class PageManager {
|
|
|
178
200
|
animation: option.animation ?? glitter.animation.none,
|
|
179
201
|
dismiss: option.dismiss ?? (() => {
|
|
180
202
|
}),
|
|
181
|
-
renderFinish:()=>{
|
|
203
|
+
renderFinish: () => {
|
|
182
204
|
//僅保留首頁和彈跳視窗。
|
|
183
|
-
glitter.pageConfig=glitter.pageConfig.filter((dd)=>{
|
|
184
|
-
const isHome=(dd.id===pageConfig.id)
|
|
185
|
-
if(!isHome){
|
|
205
|
+
glitter.pageConfig = glitter.pageConfig.filter((dd) => {
|
|
206
|
+
const isHome = (dd.id === pageConfig.id)
|
|
207
|
+
if (!isHome) {
|
|
186
208
|
glitter.hidePageView(dd.id, true);
|
|
187
209
|
}
|
|
188
|
-
return isHome || (dd.type===GVCType.Dialog)
|
|
210
|
+
return isHome || (dd.type === GVCType.Dialog)
|
|
189
211
|
})
|
|
190
212
|
}
|
|
191
213
|
})
|
|
192
214
|
glitter.pageConfig.push(pageConfig)
|
|
193
215
|
glitter.defaultSetting.pageLoading();
|
|
194
|
-
if((window as any).gtag && GVC.initial){
|
|
195
|
-
(window as any).gtag('event', 'page_view', {
|
|
216
|
+
if ((window as any).gtag && GVC.initial) {
|
|
217
|
+
(window as any).gtag('event', 'page_view', {
|
|
218
|
+
'page_title': document.title,
|
|
219
|
+
page_location: document.location.href
|
|
220
|
+
});
|
|
196
221
|
}
|
|
197
|
-
GVC.initial=true
|
|
222
|
+
GVC.initial = true
|
|
198
223
|
gvFunction({
|
|
199
|
-
pageConfig:pageConfig,
|
|
200
|
-
c_type:'home'
|
|
224
|
+
pageConfig: pageConfig,
|
|
225
|
+
c_type: 'home'
|
|
201
226
|
})
|
|
202
227
|
}
|
|
203
|
-
|
|
228
|
+
|
|
229
|
+
if (now_page) {
|
|
204
230
|
glitter.goMenu()
|
|
205
|
-
glitter.share.menu_switch=setTimeout(()=>{
|
|
231
|
+
glitter.share.menu_switch = setTimeout(() => {
|
|
206
232
|
switchFunction()
|
|
207
|
-
},100)
|
|
208
|
-
}else{
|
|
233
|
+
}, 100)
|
|
234
|
+
} else {
|
|
209
235
|
switchFunction()
|
|
210
236
|
}
|
|
211
237
|
|
|
212
238
|
}
|
|
213
239
|
}
|
|
214
|
-
],'GVControllerList')
|
|
240
|
+
], 'GVControllerList')
|
|
215
241
|
|
|
216
242
|
};
|
|
217
243
|
|
|
@@ -240,6 +266,7 @@ export class PageManager {
|
|
|
240
266
|
|
|
241
267
|
public static setAnimation(page: PageConfig) {
|
|
242
268
|
const glitter = Glitter.glitter;
|
|
269
|
+
|
|
243
270
|
function closePreviousPage() {
|
|
244
271
|
console.log(`closePreviousPage`)
|
|
245
272
|
//Only hidden page view
|
|
@@ -280,29 +307,37 @@ export class PageManager {
|
|
|
280
307
|
}
|
|
281
308
|
};
|
|
282
309
|
|
|
283
|
-
public static setHistory(tag:string,type:string){
|
|
310
|
+
public static setHistory(tag: string, type: string) {
|
|
284
311
|
const glitter = Glitter.glitter;
|
|
285
|
-
const search = glitter.root_path+tag+glitter.window.location.search;
|
|
312
|
+
const search = glitter.root_path + tag + glitter.window.location.search;
|
|
286
313
|
try {
|
|
287
314
|
|
|
288
|
-
if(['home','page'].find((dd)=>{
|
|
289
|
-
return dd===type
|
|
290
|
-
})){
|
|
315
|
+
if (['home', 'page'].find((dd) => {
|
|
316
|
+
return dd === type
|
|
317
|
+
})) {
|
|
291
318
|
window.history.pushState({}, glitter.document.title, search);
|
|
292
|
-
glitter.pageConfig[glitter.pageConfig.length-1].search=search
|
|
319
|
+
glitter.pageConfig[glitter.pageConfig.length - 1].search = search
|
|
293
320
|
}
|
|
294
321
|
} catch (e) {
|
|
295
322
|
}
|
|
296
323
|
}
|
|
297
|
-
|
|
324
|
+
|
|
325
|
+
public static changePage(url: string, tag: string, goBack: boolean, obj: any, option: {
|
|
326
|
+
animation?: AnimationConfig,
|
|
327
|
+
backGroundColor?: string,
|
|
328
|
+
dismiss?: () => void,
|
|
329
|
+
carry_search?: {key:string,value:string}[]
|
|
330
|
+
} = {}) {
|
|
298
331
|
const glitter = Glitter.glitter;
|
|
299
332
|
console.log(`changePage-time:`, (window as any).renderClock.stop());
|
|
300
|
-
const now_page=glitter.pageConfig.filter((dd)=>{
|
|
301
|
-
|
|
333
|
+
const now_page = glitter.pageConfig.filter((dd) => {
|
|
334
|
+
return dd.type === GVCType.Page
|
|
335
|
+
}).reverse()[0];
|
|
336
|
+
now_page.search=location.href
|
|
337
|
+
now_page && (now_page.scrollTop = window.scrollY);
|
|
302
338
|
glitter.window.history.replaceState({}, glitter.document.title, location.href);
|
|
303
|
-
setTimeout(()=>{
|
|
304
|
-
|
|
305
|
-
const pageConfig=new PageConfig({
|
|
339
|
+
setTimeout(() => {
|
|
340
|
+
const pageConfig = new PageConfig({
|
|
306
341
|
id: glitter.getUUID(),
|
|
307
342
|
obj: obj,
|
|
308
343
|
goBack: goBack,
|
|
@@ -317,33 +352,36 @@ export class PageManager {
|
|
|
317
352
|
animation: option.animation || glitter.defaultSetting.pageAnimation || glitter.animation.none,
|
|
318
353
|
dismiss: option.dismiss ?? (() => {
|
|
319
354
|
}),
|
|
320
|
-
renderFinish:()=>{
|
|
355
|
+
renderFinish: () => {
|
|
321
356
|
|
|
322
|
-
}
|
|
357
|
+
},
|
|
358
|
+
carry_search: option.carry_search
|
|
323
359
|
})
|
|
324
360
|
glitter.pageConfig.push(pageConfig);
|
|
325
361
|
glitter.defaultSetting.pageLoading();
|
|
326
|
-
glitter.htmlGenerate.loadScript(glitter,[
|
|
362
|
+
glitter.htmlGenerate.loadScript(glitter, [
|
|
327
363
|
{
|
|
328
|
-
src:PageManager.getRelativeUrl(url),
|
|
329
|
-
callback:(gvFunction)=>{
|
|
330
|
-
glitter.
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
glitter.page=tag
|
|
364
|
+
src: PageManager.getRelativeUrl(url),
|
|
365
|
+
callback: (gvFunction) => {
|
|
366
|
+
if (glitter.pageConfig.find((dd) => {
|
|
367
|
+
return dd === pageConfig
|
|
368
|
+
})) {
|
|
369
|
+
glitter.page = tag
|
|
335
370
|
gvFunction({
|
|
336
|
-
pageConfig:pageConfig,
|
|
337
|
-
c_type:'page'
|
|
371
|
+
pageConfig: pageConfig,
|
|
372
|
+
c_type: 'page'
|
|
338
373
|
})
|
|
339
374
|
}
|
|
340
|
-
if((window as any).gtag){
|
|
341
|
-
(window as any).gtag('event', 'page_view', {
|
|
375
|
+
if ((window as any).gtag) {
|
|
376
|
+
(window as any).gtag('event', 'page_view', {
|
|
377
|
+
'page_title': document.title,
|
|
378
|
+
page_location: document.location.href
|
|
379
|
+
});
|
|
342
380
|
}
|
|
343
381
|
|
|
344
382
|
}
|
|
345
383
|
}
|
|
346
|
-
],'GVControllerList')
|
|
384
|
+
], 'GVControllerList')
|
|
347
385
|
})
|
|
348
386
|
|
|
349
387
|
}
|
|
@@ -356,17 +394,26 @@ export class PageManager {
|
|
|
356
394
|
this.hidePageView(pg.id, true);
|
|
357
395
|
}
|
|
358
396
|
};
|
|
359
|
-
|
|
397
|
+
|
|
398
|
+
public static innerDialog = (html: (gvc: GVC) => string | Promise<string>, tag: string, option: {
|
|
399
|
+
animation?: AnimationConfig,
|
|
400
|
+
backGroundColor?: string,
|
|
401
|
+
dismiss?: () => void
|
|
402
|
+
} = {}) => {
|
|
360
403
|
const glitter = Glitter.glitter;
|
|
361
404
|
glitter.openDiaLog(new URL('../dialog/dialog_inner.js', import.meta.url).href, tag, {
|
|
362
405
|
getView: html
|
|
363
406
|
}, option)
|
|
364
407
|
}
|
|
365
408
|
|
|
366
|
-
public static openDiaLog(url: string, tag: string, obj: any, option: {
|
|
409
|
+
public static openDiaLog(url: string, tag: string, obj: any, option: {
|
|
410
|
+
animation?: AnimationConfig,
|
|
411
|
+
backGroundColor?: string,
|
|
412
|
+
dismiss?: () => void
|
|
413
|
+
} = {}) {
|
|
367
414
|
const glitter = Glitter.glitter;
|
|
368
415
|
console.log(`openDiaLog-time:`, (window as any).renderClock.stop());
|
|
369
|
-
const pageConfig=new PageConfig({
|
|
416
|
+
const pageConfig = new PageConfig({
|
|
370
417
|
id: glitter.getUUID(),
|
|
371
418
|
obj: obj,
|
|
372
419
|
goBack: true,
|
|
@@ -381,24 +428,25 @@ export class PageManager {
|
|
|
381
428
|
animation: option.animation ?? glitter.defaultSetting.dialogAnimation,
|
|
382
429
|
dismiss: option.dismiss ?? (() => {
|
|
383
430
|
}),
|
|
384
|
-
renderFinish:()=>{
|
|
431
|
+
renderFinish: () => {
|
|
432
|
+
}
|
|
385
433
|
})
|
|
386
434
|
glitter.pageConfig.push(pageConfig);
|
|
387
435
|
glitter.defaultSetting.pageLoading();
|
|
388
|
-
glitter.htmlGenerate.loadScript(glitter,[
|
|
436
|
+
glitter.htmlGenerate.loadScript(glitter, [
|
|
389
437
|
{
|
|
390
|
-
src:PageManager.getRelativeUrl(url),
|
|
391
|
-
callback:(gvFunction)=>{
|
|
392
|
-
if(glitter.pageConfig.find((dd)=>{
|
|
393
|
-
return dd===pageConfig
|
|
394
|
-
})){
|
|
438
|
+
src: PageManager.getRelativeUrl(url),
|
|
439
|
+
callback: (gvFunction) => {
|
|
440
|
+
if (glitter.pageConfig.find((dd) => {
|
|
441
|
+
return dd === pageConfig
|
|
442
|
+
})) {
|
|
395
443
|
gvFunction({
|
|
396
|
-
pageConfig:pageConfig
|
|
444
|
+
pageConfig: pageConfig
|
|
397
445
|
})
|
|
398
446
|
}
|
|
399
447
|
}
|
|
400
448
|
}
|
|
401
|
-
],'GVControllerList')
|
|
449
|
+
], 'GVControllerList')
|
|
402
450
|
};
|
|
403
451
|
|
|
404
452
|
public static closeDiaLog(tag?: string) {
|
|
@@ -453,7 +501,7 @@ export class PageManager {
|
|
|
453
501
|
};
|
|
454
502
|
|
|
455
503
|
public static goMenu() {
|
|
456
|
-
(window as any).glitter.share.to_menu=true;
|
|
504
|
+
(window as any).glitter.share.to_menu = true;
|
|
457
505
|
window.history.back()
|
|
458
506
|
|
|
459
507
|
// const glitter = Glitter.glitter;
|
package/lowcode/jspage/main.js
CHANGED
|
@@ -727,34 +727,36 @@ ${Storage.page_setting_item === `${da.index}` ? `background:${EditorConfig.edito
|
|
|
727
727
|
},
|
|
728
728
|
onResume: () => {
|
|
729
729
|
setTimeout(() => {
|
|
730
|
-
glitter.setUrlParameter('function', EditorConfig.backend_page());
|
|
731
|
-
setTimeout(() => {
|
|
732
|
-
if (EditorConfig.backend_page() === 'backend-manger' && (glitter.getUrlParameter('page') !== 'cms')) {
|
|
733
|
-
glitter.setUrlParameter('page', 'cms');
|
|
734
|
-
}
|
|
735
|
-
}, 100);
|
|
736
730
|
gvc.notifyDataChange('MainEditorLeft');
|
|
737
|
-
},
|
|
731
|
+
}, 100);
|
|
738
732
|
}
|
|
739
733
|
};
|
|
740
734
|
});
|
|
741
735
|
function initialEditor(gvc, viewModel) {
|
|
742
736
|
var _a;
|
|
743
737
|
const glitter = gvc.glitter;
|
|
744
|
-
|
|
745
|
-
|
|
746
|
-
|
|
747
|
-
|
|
748
|
-
|
|
749
|
-
|
|
738
|
+
setTimeout(() => {
|
|
739
|
+
if (EditorConfig.backend_page() === 'backend-manger' && (glitter.getUrlParameter('page') !== 'cms')) {
|
|
740
|
+
setTimeout(() => {
|
|
741
|
+
glitter.setUrlParameter('page', 'cms');
|
|
742
|
+
}, 100);
|
|
743
|
+
}
|
|
744
|
+
glitter.setUrlParameter('function', EditorConfig.backend_page());
|
|
745
|
+
}, 50);
|
|
750
746
|
glitter.share.switch_to_web_builder = (page, device) => {
|
|
751
747
|
glitter.closeDrawer();
|
|
752
|
-
glitter.setUrlParameter('device', device);
|
|
753
|
-
glitter.setUrlParameter('function', 'user-editor');
|
|
754
748
|
glitter.changePage('jspage/main.js', page, true, {
|
|
755
749
|
appName: window.parent.glitter.getUrlParameter('appName'),
|
|
756
750
|
}, {
|
|
757
751
|
backGroundColor: `transparent;`,
|
|
752
|
+
carry_search: [
|
|
753
|
+
{
|
|
754
|
+
key: 'device', value: device
|
|
755
|
+
},
|
|
756
|
+
{
|
|
757
|
+
key: 'function', value: 'user-editor'
|
|
758
|
+
}
|
|
759
|
+
]
|
|
758
760
|
});
|
|
759
761
|
};
|
|
760
762
|
glitter.share.subscription = (title) => __awaiter(this, void 0, void 0, function* () {
|
package/lowcode/jspage/main.ts
CHANGED
|
@@ -804,31 +804,27 @@ ${Storage.page_setting_item === `${da.index}` ? `background:${EditorConfig.edito
|
|
|
804
804
|
},
|
|
805
805
|
onResume: () => {
|
|
806
806
|
setTimeout(() => {
|
|
807
|
-
glitter.setUrlParameter('function', EditorConfig.backend_page())
|
|
808
|
-
setTimeout(() => {
|
|
809
|
-
if (EditorConfig.backend_page() === 'backend-manger' && (glitter.getUrlParameter('page') !== 'cms')) {
|
|
810
|
-
glitter.setUrlParameter('page', 'cms')
|
|
811
|
-
}
|
|
812
|
-
}, 100)
|
|
813
807
|
gvc.notifyDataChange('MainEditorLeft')
|
|
814
|
-
},
|
|
808
|
+
}, 100)
|
|
815
809
|
}
|
|
816
810
|
};
|
|
817
811
|
});
|
|
818
812
|
|
|
819
813
|
function initialEditor(gvc: GVC, viewModel: any) {
|
|
820
814
|
const glitter = gvc.glitter;
|
|
821
|
-
|
|
822
|
-
|
|
823
|
-
|
|
824
|
-
|
|
825
|
-
|
|
826
|
-
|
|
815
|
+
setTimeout(()=>{
|
|
816
|
+
if (EditorConfig.backend_page() === 'backend-manger' && (glitter.getUrlParameter('page') !== 'cms')) {
|
|
817
|
+
setTimeout(() => {
|
|
818
|
+
glitter.setUrlParameter('page', 'cms')
|
|
819
|
+
}, 100)
|
|
820
|
+
}
|
|
821
|
+
glitter.setUrlParameter('function', EditorConfig.backend_page())
|
|
822
|
+
},50)
|
|
823
|
+
|
|
824
|
+
|
|
827
825
|
//跳轉至編輯器頁面功能
|
|
828
826
|
glitter.share.switch_to_web_builder = (page: string,device:string) => {
|
|
829
827
|
glitter.closeDrawer()
|
|
830
|
-
glitter.setUrlParameter('device', device);
|
|
831
|
-
glitter.setUrlParameter('function', 'user-editor');
|
|
832
828
|
glitter.changePage(
|
|
833
829
|
'jspage/main.js',
|
|
834
830
|
page,
|
|
@@ -838,6 +834,14 @@ function initialEditor(gvc: GVC, viewModel: any) {
|
|
|
838
834
|
},
|
|
839
835
|
{
|
|
840
836
|
backGroundColor: `transparent;`,
|
|
837
|
+
carry_search:[
|
|
838
|
+
{
|
|
839
|
+
key:'device',value:device
|
|
840
|
+
},
|
|
841
|
+
{
|
|
842
|
+
key:'function',value:'user-editor'
|
|
843
|
+
}
|
|
844
|
+
]
|
|
841
845
|
}
|
|
842
846
|
)
|
|
843
847
|
}
|
|
@@ -625,8 +625,6 @@ export class FormWidget {
|
|
|
625
625
|
});
|
|
626
626
|
}
|
|
627
627
|
loop(viewConfig);
|
|
628
|
-
console.log(`formPage==>`, dd.page);
|
|
629
|
-
console.log(`viewConfig===>`, viewConfig);
|
|
630
628
|
return new glitter.htmlGenerate(viewConfig, [], {
|
|
631
629
|
root_form_data: obj.widget && obj.widget.formData,
|
|
632
630
|
root_widget: obj.widget,
|
|
@@ -705,8 +705,6 @@ export class FormWidget {
|
|
|
705
705
|
});
|
|
706
706
|
}
|
|
707
707
|
loop(viewConfig);
|
|
708
|
-
console.log(`formPage==>`,(dd as any).page)
|
|
709
|
-
console.log(`viewConfig===>`,viewConfig)
|
|
710
708
|
return new glitter.htmlGenerate(viewConfig, [], {
|
|
711
709
|
root_form_data: obj.widget && obj.widget.formData,
|
|
712
710
|
root_widget: obj.widget,
|