ts-glitter 13.8.671 → 13.8.673
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/glitterBundle/module/html-generate.js +10 -0
- package/lowcode/glitterBundle/module/html-generate.ts +13 -0
- package/lowcode/official_event/page/change-page.ts +0 -1
- package/lowcode/view-model/saas-view-model.js +3 -1
- package/lowcode/view-model/saas-view-model.ts +3 -1
- package/package.json +2 -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.673';
|
|
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.673';
|
|
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: () => {
|
|
@@ -2383,6 +2383,11 @@ HtmlGenerate.renameWidgetID = (dd) => {
|
|
|
2383
2383
|
HtmlGenerate.setHome = (obj) => {
|
|
2384
2384
|
var _a, _b;
|
|
2385
2385
|
const glitter = Glitter.glitter;
|
|
2386
|
+
if (obj.tag === 'backend_manager') {
|
|
2387
|
+
glitter.setUrlParameter('page', 'backend_manager');
|
|
2388
|
+
location.reload();
|
|
2389
|
+
return;
|
|
2390
|
+
}
|
|
2386
2391
|
glitter.setHome('glitterBundle/plugins/html-render.js', obj.tag, {
|
|
2387
2392
|
app_config: obj.app_config,
|
|
2388
2393
|
page_config: (_a = obj.page_config) !== null && _a !== void 0 ? _a : {},
|
|
@@ -2394,6 +2399,11 @@ HtmlGenerate.setHome = (obj) => {
|
|
|
2394
2399
|
HtmlGenerate.changePage = (obj) => {
|
|
2395
2400
|
var _a, _b;
|
|
2396
2401
|
const glitter = Glitter.glitter;
|
|
2402
|
+
if (obj.tag === 'backend_manager') {
|
|
2403
|
+
glitter.setUrlParameter('page', 'backend_manager');
|
|
2404
|
+
location.reload();
|
|
2405
|
+
return;
|
|
2406
|
+
}
|
|
2397
2407
|
console.log(`changePage-time:`, window.renderClock.stop());
|
|
2398
2408
|
glitter.changePage('glitterBundle/plugins/html-render.js', obj.tag, obj.goBack, {
|
|
2399
2409
|
app_config: obj.app_config,
|
|
@@ -573,6 +573,12 @@ export class HtmlGenerate {
|
|
|
573
573
|
|
|
574
574
|
public static setHome = (obj: { page_config?: any; app_config?: any; config: any; editMode?: any; data: any; tag: string; option?: any }) => {
|
|
575
575
|
const glitter = Glitter.glitter;
|
|
576
|
+
//複寫back_manager的頁面，避免堆棧問題
|
|
577
|
+
if(obj.tag==='backend_manager'){
|
|
578
|
+
glitter.setUrlParameter('page','backend_manager')
|
|
579
|
+
location.reload()
|
|
580
|
+
return
|
|
581
|
+
}
|
|
576
582
|
|
|
577
583
|
glitter.setHome(
|
|
578
584
|
'glitterBundle/plugins/html-render.js',
|
|
@@ -589,6 +595,13 @@ export class HtmlGenerate {
|
|
|
589
595
|
};
|
|
590
596
|
public static changePage = (obj: { page_config?: any; config: any; editMode?: any; data: any; tag: string; goBack: boolean; option?: any; app_config?: any }) => {
|
|
591
597
|
const glitter = Glitter.glitter;
|
|
598
|
+
//複寫back_manager的頁面，避免堆棧問題
|
|
599
|
+
if(obj.tag==='backend_manager'){
|
|
600
|
+
glitter.setUrlParameter('page','backend_manager')
|
|
601
|
+
location.reload()
|
|
602
|
+
return
|
|
603
|
+
}
|
|
604
|
+
|
|
592
605
|
console.log(`changePage-time:`, (window as any).renderClock.stop());
|
|
593
606
|
glitter.changePage(
|
|
594
607
|
'glitterBundle/plugins/html-render.js',
|
|
@@ -6,7 +6,6 @@ import {GVC} from "../../glitterBundle/GVController.js";
|
|
|
6
6
|
const html = String.raw
|
|
7
7
|
class ChangePage {
|
|
8
8
|
public static changePage(link: string, type: 'home' | 'page', subData: any) {
|
|
9
|
-
|
|
10
9
|
$('.new_page_loading').removeClass('d-none')
|
|
11
10
|
const glitter=(window as any).glitter;
|
|
12
11
|
return new Promise(async (resolve, reject) => {
|
|
@@ -168,11 +168,13 @@ export class SaasViewModel {
|
|
|
168
168
|
<a
|
|
169
169
|
class="dropdown-item cursor_pointer"
|
|
170
170
|
onclick="${gvc.event(() => {
|
|
171
|
+
gvc.glitter.setUrlParameter();
|
|
171
172
|
dialog.checkYesOrNot({
|
|
172
173
|
callback: (bool) => {
|
|
173
174
|
if (bool) {
|
|
174
175
|
GlobalUser.saas_token = '';
|
|
175
|
-
|
|
176
|
+
gvc.glitter.setUrlParameter('page', 'login');
|
|
177
|
+
location.reload();
|
|
176
178
|
}
|
|
177
179
|
},
|
|
178
180
|
text: '確定要登出嗎？',
|
|
@@ -162,11 +162,13 @@ export class SaasViewModel {
|
|
|
162
162
|
<a
|
|
163
163
|
class="dropdown-item cursor_pointer"
|
|
164
164
|
onclick="${gvc.event(() => {
|
|
165
|
+
gvc.glitter.setUrlParameter()
|
|
165
166
|
dialog.checkYesOrNot({
|
|
166
167
|
callback: (bool) => {
|
|
167
168
|
if (bool) {
|
|
168
169
|
GlobalUser.saas_token = '';
|
|
169
|
-
|
|
170
|
+
gvc.glitter.setUrlParameter('page','login')
|
|
171
|
+
location.reload()
|
|
170
172
|
}
|
|
171
173
|
},
|
|
172
174
|
text: '確定要登出嗎？',
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ts-glitter",
|
|
3
|
-
"version": "13.8.
|
|
3
|
+
"version": "13.8.673",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"axios": "^1.6.2",
|
|
33
33
|
"bcrypt": "^5.1.0",
|
|
34
34
|
"body-parser": "^1.20.2",
|
|
35
|
-
"ts-glitter": "13.8.
|
|
35
|
+
"ts-glitter": "13.8.672",
|
|
36
36
|
"compression": "^1.7.4",
|
|
37
37
|
"cookie-parser": "^1.4.6",
|
|
38
38
|
"cors": "^2.8.5",
|