ts-glitter 13.8.672 → 13.8.674
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 -1
- package/lowcode/Entry.ts +1 -1
- package/lowcode/cms-plugin/POS-setting.js +2 -1
- package/lowcode/cms-plugin/POS-setting.ts +3 -2
- package/lowcode/glitterBundle/GVController.js +3 -1
- package/lowcode/glitterBundle/GVController.ts +3 -1
- package/lowcode/glitterBundle/module/PageManager.js +4 -0
- package/lowcode/glitterBundle/module/PageManager.ts +7 -0
- package/lowcode/view-model/saas-view-model.js +2 -1
- package/lowcode/view-model/saas-view-model.ts +2 -1
- package/package.json +1 -2
package/lowcode/Entry.js
CHANGED
|
@@ -64,7 +64,7 @@ export class Entry {
|
|
|
64
64
|
}
|
|
65
65
|
window.renderClock = (_a = window.renderClock) !== null && _a !== void 0 ? _a : clockF();
|
|
66
66
|
console.log(`Entry-time:`, window.renderClock.stop());
|
|
67
|
-
glitter.share.editerVersion = 'V_13.8.
|
|
67
|
+
glitter.share.editerVersion = 'V_13.8.674';
|
|
68
68
|
glitter.share.start = new Date();
|
|
69
69
|
const vm = {
|
|
70
70
|
appConfig: [],
|
package/lowcode/Entry.ts
CHANGED
|
@@ -66,7 +66,7 @@ export class Entry {
|
|
|
66
66
|
}
|
|
67
67
|
(window as any).renderClock = (window as any).renderClock ?? clockF();
|
|
68
68
|
console.log(`Entry-time:`, (window as any).renderClock.stop());
|
|
69
|
-
glitter.share.editerVersion = 'V_13.8.
|
|
69
|
+
glitter.share.editerVersion = 'V_13.8.674';
|
|
70
70
|
glitter.share.start = new Date();
|
|
71
71
|
const vm: {
|
|
72
72
|
appConfig: any;
|
|
@@ -560,7 +560,8 @@ cursor: pointer;
|
|
|
560
560
|
const dialog = new ShareDialog(gvc.glitter);
|
|
561
561
|
dialog.dataLoading({ visible: true });
|
|
562
562
|
localStorage.removeItem('on-pos');
|
|
563
|
-
|
|
563
|
+
(window.parent).history.replaceState({}, document.title, `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`);
|
|
564
|
+
location.reload();
|
|
564
565
|
})}">返回全通路後臺</a>
|
|
565
566
|
` : ``}
|
|
566
567
|
</div>
|
|
@@ -605,8 +605,9 @@ cursor: pointer;
|
|
|
605
605
|
<a class="dropdown-item cursor_pointer d-flex flex-column" onclick="${gvc.event(() => {
|
|
606
606
|
const dialog = new ShareDialog(gvc.glitter)
|
|
607
607
|
dialog.dataLoading({visible: true})
|
|
608
|
-
localStorage.removeItem('on-pos')
|
|
609
|
-
|
|
608
|
+
localStorage.removeItem('on-pos');
|
|
609
|
+
(window.parent).history.replaceState({}, document.title, `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`);
|
|
610
|
+
location.reload()
|
|
610
611
|
})}">返回全通路後臺</a>
|
|
611
612
|
` : ``}
|
|
612
613
|
</div>
|
|
@@ -456,7 +456,9 @@ export function init(metaURL, fun) {
|
|
|
456
456
|
}
|
|
457
457
|
};
|
|
458
458
|
if (cf.pageConfig.type === GVCType.Page) {
|
|
459
|
-
|
|
459
|
+
if (cf.pageConfig.push_stack) {
|
|
460
|
+
PageManager.setHistory(cf.pageConfig.tag, cf.c_type);
|
|
461
|
+
}
|
|
460
462
|
cf.pageConfig.carry_search.map((dd) => {
|
|
461
463
|
gvc.glitter.setUrlParameter(dd.key, dd.value);
|
|
462
464
|
});
|
|
@@ -485,7 +485,9 @@ export function init(metaURL: string, fun: (gvc: GVC, glitter: Glitter, gBundle:
|
|
|
485
485
|
}
|
|
486
486
|
|
|
487
487
|
if (cf.pageConfig.type === GVCType.Page) {
|
|
488
|
-
|
|
488
|
+
if(cf.pageConfig.push_stack){
|
|
489
|
+
PageManager.setHistory(cf.pageConfig.tag, cf.c_type)
|
|
490
|
+
}
|
|
489
491
|
cf.pageConfig.carry_search.map((dd)=>{
|
|
490
492
|
gvc.glitter.setUrlParameter(dd.key,dd.value)
|
|
491
493
|
})
|
|
@@ -21,6 +21,7 @@ export var GVCType;
|
|
|
21
21
|
export class PageConfig {
|
|
22
22
|
constructor(par) {
|
|
23
23
|
this.scrollTop = 0;
|
|
24
|
+
this.push_stack = par.push_stack;
|
|
24
25
|
this.carry_search = par.carry_search || [];
|
|
25
26
|
this.initial = false;
|
|
26
27
|
this.search = par.search || '';
|
|
@@ -133,6 +134,7 @@ export class PageManager {
|
|
|
133
134
|
id: glitter.getUUID(),
|
|
134
135
|
obj: obj,
|
|
135
136
|
goBack: true,
|
|
137
|
+
push_stack: false,
|
|
136
138
|
src: url,
|
|
137
139
|
tag: tag,
|
|
138
140
|
carry_search: option.carry_search,
|
|
@@ -262,6 +264,7 @@ export class PageManager {
|
|
|
262
264
|
goBack: goBack,
|
|
263
265
|
src: url,
|
|
264
266
|
tag: tag,
|
|
267
|
+
push_stack: true,
|
|
265
268
|
deleteResource: () => {
|
|
266
269
|
},
|
|
267
270
|
createResource: () => {
|
|
@@ -320,6 +323,7 @@ export class PageManager {
|
|
|
320
323
|
goBack: true,
|
|
321
324
|
src: url,
|
|
322
325
|
tag: tag,
|
|
326
|
+
push_stack: false,
|
|
323
327
|
deleteResource: () => {
|
|
324
328
|
},
|
|
325
329
|
createResource: () => {
|
|
@@ -40,6 +40,7 @@ export class PageConfig {
|
|
|
40
40
|
public goBack: boolean;
|
|
41
41
|
public src: string;
|
|
42
42
|
public tag: string;
|
|
43
|
+
public push_stack:boolean;
|
|
43
44
|
public createResource: () => void;
|
|
44
45
|
public deleteResource: (destroy: boolean) => void;
|
|
45
46
|
public type: GVCType;
|
|
@@ -63,6 +64,7 @@ export class PageConfig {
|
|
|
63
64
|
goBack: boolean,
|
|
64
65
|
src: string,
|
|
65
66
|
tag: string,
|
|
67
|
+
push_stack:boolean,
|
|
66
68
|
createResource: () => void,
|
|
67
69
|
deleteResource: (destroy: boolean) => void,
|
|
68
70
|
type: GVCType,
|
|
@@ -73,6 +75,7 @@ export class PageConfig {
|
|
|
73
75
|
search?: string,
|
|
74
76
|
carry_search?: {key:string,value:string}[]
|
|
75
77
|
}) {
|
|
78
|
+
this.push_stack=par.push_stack;
|
|
76
79
|
this.carry_search=par.carry_search || []
|
|
77
80
|
this.initial = false
|
|
78
81
|
this.search = par.search || '';
|
|
@@ -190,8 +193,10 @@ export class PageManager {
|
|
|
190
193
|
id: glitter.getUUID(),
|
|
191
194
|
obj: obj,
|
|
192
195
|
goBack: true,
|
|
196
|
+
push_stack:false,
|
|
193
197
|
src: url,
|
|
194
198
|
tag: tag,
|
|
199
|
+
|
|
195
200
|
carry_search: option.carry_search,
|
|
196
201
|
deleteResource: () => {
|
|
197
202
|
},
|
|
@@ -345,6 +350,7 @@ export class PageManager {
|
|
|
345
350
|
goBack: goBack,
|
|
346
351
|
src: url,
|
|
347
352
|
tag: tag,
|
|
353
|
+
push_stack:true,
|
|
348
354
|
deleteResource: () => {
|
|
349
355
|
},
|
|
350
356
|
createResource: () => {
|
|
@@ -421,6 +427,7 @@ export class PageManager {
|
|
|
421
427
|
goBack: true,
|
|
422
428
|
src: url,
|
|
423
429
|
tag: tag,
|
|
430
|
+
push_stack:false,
|
|
424
431
|
deleteResource: () => {
|
|
425
432
|
},
|
|
426
433
|
createResource: () => {
|
|
@@ -172,7 +172,8 @@ export class SaasViewModel {
|
|
|
172
172
|
callback: (bool) => {
|
|
173
173
|
if (bool) {
|
|
174
174
|
GlobalUser.saas_token = '';
|
|
175
|
-
|
|
175
|
+
gvc.glitter.setUrlParameter('page', 'login');
|
|
176
|
+
location.reload();
|
|
176
177
|
}
|
|
177
178
|
},
|
|
178
179
|
text: '確定要登出嗎？',
|
|
@@ -166,7 +166,8 @@ export class SaasViewModel {
|
|
|
166
166
|
callback: (bool) => {
|
|
167
167
|
if (bool) {
|
|
168
168
|
GlobalUser.saas_token = '';
|
|
169
|
-
|
|
169
|
+
gvc.glitter.setUrlParameter('page','login')
|
|
170
|
+
location.reload()
|
|
170
171
|
}
|
|
171
172
|
},
|
|
172
173
|
text: '確定要登出嗎？',
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ts-glitter",
|
|
3
|
-
"version": "13.8.
|
|
3
|
+
"version": "13.8.674",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -32,7 +32,6 @@
|
|
|
32
32
|
"axios": "^1.6.2",
|
|
33
33
|
"bcrypt": "^5.1.0",
|
|
34
34
|
"body-parser": "^1.20.2",
|
|
35
|
-
"ts-glitter": "13.8.672",
|
|
36
35
|
"compression": "^1.7.4",
|
|
37
36
|
"cookie-parser": "^1.4.6",
|
|
38
37
|
"cors": "^2.8.5",
|