ts-glitter 13.5.6 → 13.5.8

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.
Files changed (10) hide show
  1. package/lowcode/Entry.js +8 -1
  2. package/lowcode/Entry.ts +16 -8
  3. package/lowcode/glitterBundle/GVController.js +5 -5
  4. package/lowcode/glitterBundle/GVController.ts +6 -5
  5. package/lowcode/glitterBundle/module/PageManager.js +3 -1
  6. package/lowcode/glitterBundle/module/PageManager.ts +3 -1
  7. package/lowcode/jspage/editor.js +131 -133
  8. package/lowcode/jspage/editor.ts +135 -137
  9. package/lowcode/jspage/main.ts +1 -5
  10. 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.6";
62
+ glitter.share.editerVersion = "V_13.5.8";
63
63
  glitter.share.start = (new Date());
64
64
  const vm = {
65
65
  appConfig: [],
@@ -246,6 +246,13 @@ 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 && (glitter.getUrlParameter('page') !== 'cms')) {
254
+ glitter.setUrlParameter('page', data.response.redirect);
255
+ }
249
256
  glitter.setHome('jspage/main.js', glitter.getUrlParameter('page'), {
250
257
  appName: config.appName,
251
258
  }, {
package/lowcode/Entry.ts CHANGED
@@ -9,6 +9,7 @@ import {ShareDialog} from "./glitterBundle/dialog/ShareDialog.js";
9
9
 
10
10
  export class Entry {
11
11
  public static onCreate(glitter: Glitter) {
12
+
12
13
  glitter.share.top_inset = 0
13
14
  glitter.share.bottom_inset = 0
14
15
  glitter.share.reload_code_hash = function () {
@@ -40,6 +41,7 @@ export class Entry {
40
41
  };
41
42
  glitter.page = (window as any).glitter_page;
42
43
  glitter.share.GlobalUser = GlobalUser;
44
+
43
45
  Entry.checkRedirectPage(glitter);
44
46
  glitter.share.logID = glitter.getUUID();
45
47
  glitter.addStyle(`
@@ -58,7 +60,7 @@ export class Entry {
58
60
  }
59
61
  (window as any).renderClock = (window as any).renderClock ?? clockF();
60
62
  console.log(`Entry-time:`, (window as any).renderClock.stop());
61
- glitter.share.editerVersion = "V_13.5.6";
63
+ glitter.share.editerVersion = "V_13.5.8";
62
64
  glitter.share.start = (new Date());
63
65
  const vm: {
64
66
  appConfig: any;
@@ -72,6 +74,7 @@ export class Entry {
72
74
  };
73
75
  // 設定SAAS管理員請求API
74
76
  config.token = GlobalUser.saas_token;
77
+
75
78
  // 資源初始化
76
79
  Entry.resourceInitial(glitter, vm, async (dd) => {
77
80
  glitter.addStyle(`
@@ -160,6 +163,7 @@ export class Entry {
160
163
 
161
164
  }
162
165
  `);
166
+
163
167
  // 載入全域資源
164
168
  await Entry.globalStyle(glitter, dd);
165
169
  if (glitter.getUrlParameter('type') === 'editor') {
@@ -209,6 +213,7 @@ export class Entry {
209
213
 
210
214
  // 跳轉至頁面編輯器
211
215
  public static toBackendEditor(glitter: Glitter, callback: () => void) {
216
+
212
217
  glitter.addStyle(`
213
218
  @import url('https://fonts.googleapis.com/css2?family=Noto+Sans+TC:wght@100..900&family=Noto+Sans:ital,wght@0,100..900;1,100..900&display=swap');
214
219
  @media (prefers-reduced-motion: no-preference) {
@@ -256,17 +261,20 @@ export class Entry {
256
261
  (window as any).root.classList.add('light-mode');
257
262
 
258
263
  function toNext() {
264
+
259
265
  console.log(`to-next-time:`, (window as any).renderClock.stop());
260
266
  running().then(async () => {
261
267
  {
262
268
  console.log(`to-page-time:`, (window as any).renderClock.stop());
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
- // }
269
+ let data = await ApiPageConfig.getPage({
270
+ appName: config.appName,
271
+ tag: glitter.getUrlParameter('page'),
272
+ });
273
+ // console.log(`data===>`,data)
274
+ if (data.response.result.length === 0 && (glitter.getUrlParameter('page')!=='cms')) {
275
+ glitter.setUrlParameter('page', data.response.redirect);
276
+ }
277
+
270
278
  glitter.setHome(
271
279
  'jspage/main.js',
272
280
  glitter.getUrlParameter('page'),
package/lowcode/glitterBundle/GVController.js CHANGED
@@ -455,12 +455,12 @@ 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);
463
458
  if (cf.pageConfig.type === GVCType.Page) {
459
+ PageManager.setHistory(cf.pageConfig.tag, cf.c_type);
460
+ cf.pageConfig.carry_search.map((dd) => {
461
+ gvc.glitter.setUrlParameter(dd.key, dd.value);
462
+ });
463
+ gvc.glitter.setUrlParameter('page', cf.pageConfig.tag);
464
464
  $('#glitterPage').append(`<div id="page${cf.pageConfig.id}" style="min-width: 100vw;min-height: 100vh;left: 0;top: 0;width:100vw;
465
465
  background: ${cf.pageConfig.backGroundColor};z-index: 9999;overflow: hidden;display:none;" class="page-box">
466
466
  ${lifeCycle.onCreateView()}
package/lowcode/glitterBundle/GVController.ts CHANGED
@@ -483,12 +483,13 @@ 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
487
  if (cf.pageConfig.type === GVCType.Page) {
488
+ PageManager.setHistory(cf.pageConfig.tag, cf.c_type)
489
+ cf.pageConfig.carry_search.map((dd)=>{
490
+ gvc.glitter.setUrlParameter(dd.key,dd.value)
491
+ })
492
+ gvc.glitter.setUrlParameter('page',cf.pageConfig.tag)
492
493
  $('#glitterPage').append(`<div id="page${cf.pageConfig.id}" style="min-width: 100vw;min-height: 100vh;left: 0;top: 0;width:100vw;
493
494
  background: ${cf.pageConfig!.backGroundColor};z-index: 9999;overflow: hidden;display:none;" class="page-box">
494
495
  ${lifeCycle.onCreateView()}
package/lowcode/glitterBundle/module/PageManager.js CHANGED
@@ -90,7 +90,9 @@ export class PageManager {
90
90
  (PageManager.hiddenElement[glitter.pageConfig[index].id] &&
91
91
  document.getElementById('glitterPage').appendChild(PageManager.hiddenElement[glitter.pageConfig[index].id]));
92
92
  glitter.pageConfig[index].createResource();
93
- window.history.replaceState({}, document.title, glitter.pageConfig[index].search);
93
+ if (glitter.pageConfig[index].type === GVCType.Page) {
94
+ window.history.replaceState({}, document.title, glitter.pageConfig[index].search);
95
+ }
94
96
  }
95
97
  catch (e) {
96
98
  }
package/lowcode/glitterBundle/module/PageManager.ts CHANGED
@@ -140,7 +140,9 @@ export class PageManager {
140
140
  (PageManager.hiddenElement[glitter.pageConfig[index].id] &&
141
141
  document.getElementById('glitterPage')!.appendChild(PageManager.hiddenElement[glitter.pageConfig[index].id]));
142
142
  glitter.pageConfig[index].createResource();
143
- window.history.replaceState({}, document.title, glitter.pageConfig[index].search);
143
+ if(glitter.pageConfig[index].type === GVCType.Page){
144
+ window.history.replaceState({}, document.title, glitter.pageConfig[index].search);
145
+ }
144
146
  } catch (e) {
145
147
  }
146
148
  }
package/lowcode/jspage/editor.js CHANGED
@@ -337,14 +337,10 @@ color: transparent;"
337
337
  <i class="fa-regular fa-gear"></i>
338
338
  </div>
339
339
  ${(() => {
340
- if (glitter.share.editor_vm) {
341
- return html `
342
- <div class="btn btn-outline-secondary rounded px-3">
343
- ${glitter.share.editor_vm.title}
344
- </div>`;
340
+ if (Storage.select_function === 'backend-manger') {
341
+ return ``;
345
342
  }
346
- else {
347
- return html `
343
+ return html `
348
344
  <div
349
345
  class="btn-group "
350
346
  style="${(document.body.clientWidth < 768) ? `` : `max-width:350px;min-width:200px;`}
@@ -352,41 +348,41 @@ color: transparent;"
352
348
  "
353
349
  >
354
350
  ${(document.body.clientWidth < 800) ? gvc.bindView(() => {
355
- return {
356
- bind: 'top_sm_bar',
357
- view: () => {
358
- return ` ${[
359
- {
360
- src: `fa-duotone fa-window guide-user-editor-1-icon`,
361
- index: 'layout',
362
- hint: '頁面編輯',
363
- },
364
- {
365
- src: `fa-sharp fa-regular fa-globe guide-user-editor-11-icon`,
366
- index: 'color',
367
- hint: '全站樣式'
368
- },
369
- {
370
- src: `fa-regular fa-grid-2 design-guide-1-icon`,
371
- index: 'widget',
372
- hint: '設計元件'
373
- },
374
- {
375
- src: `fa-regular fa-eye`,
376
- index: 'preview',
377
- hint: '預覽頁面'
378
- }
379
- ]
380
- .filter((dd) => {
381
- if (gvc.glitter.getUrlParameter('device') === 'mobile') {
382
- return dd.index !== 'widget';
383
- }
384
- else {
385
- return true;
386
- }
387
- })
388
- .map((da) => {
389
- return html `<i
351
+ return {
352
+ bind: 'top_sm_bar',
353
+ view: () => {
354
+ return ` ${[
355
+ {
356
+ src: `fa-duotone fa-window guide-user-editor-1-icon`,
357
+ index: 'layout',
358
+ hint: '頁面編輯',
359
+ },
360
+ {
361
+ src: `fa-sharp fa-regular fa-globe guide-user-editor-11-icon`,
362
+ index: 'color',
363
+ hint: '全站樣式'
364
+ },
365
+ {
366
+ src: `fa-regular fa-grid-2 design-guide-1-icon`,
367
+ index: 'widget',
368
+ hint: '設計元件'
369
+ },
370
+ {
371
+ src: `fa-regular fa-eye`,
372
+ index: 'preview',
373
+ hint: '預覽頁面'
374
+ }
375
+ ]
376
+ .filter((dd) => {
377
+ if (gvc.glitter.getUrlParameter('device') === 'mobile') {
378
+ return dd.index !== 'widget';
379
+ }
380
+ else {
381
+ return true;
382
+ }
383
+ })
384
+ .map((da) => {
385
+ return html `<i
390
386
  class=" ${da.src} fs-5 fw-bold p-2 rounded"
391
387
  data-bs-toggle="tooltip"
392
388
  data-bs-placement="top"
@@ -396,115 +392,117 @@ color: transparent;"
396
392
  ${Storage.page_setting_item === `${da.index}` ? `background:${EditorConfig.editor_layout.btn_background};color:white;` : ``}
397
393
  "
398
394
  onclick="${gvc.event(() => {
399
- if (da.index === 'preview') {
400
- preView();
401
- }
402
- else {
403
- gvc.glitter.share.editorViewModel.waitCopy = undefined;
404
- gvc.glitter.share.editorViewModel.selectItem = undefined;
405
- Storage.page_setting_item = da.index;
406
- if (document.body.clientWidth < 800) {
407
- glitter.openDrawer();
408
- }
409
- gvc.notifyDataChange(["MainEditorLeft", "top_sm_bar"]);
395
+ if (da.index === 'preview') {
396
+ preView();
397
+ }
398
+ else {
399
+ gvc.glitter.share.editorViewModel.waitCopy = undefined;
400
+ gvc.glitter.share.editorViewModel.selectItem = undefined;
401
+ Storage.page_setting_item = da.index;
402
+ if (document.body.clientWidth < 800) {
403
+ glitter.openDrawer();
410
404
  }
411
- })}"
405
+ gvc.notifyDataChange(["MainEditorLeft", "top_sm_bar"]);
406
+ }
407
+ })}"
412
408
  ></i>`;
413
- })
414
- .join('')}`;
415
- },
416
- divCreate: {
417
- style: `gap:5px;height:50px;`,
418
- class: `${Storage.select_function === 'user-editor' || Storage.select_function === 'page-editor' ? `` : `d-none`} d-flex align-items-center justify-content-center`,
419
- },
420
- onCreate: () => {
421
- $('.tooltip').remove();
422
- $('[data-bs-toggle="tooltip"]').tooltip();
423
- }
424
- };
425
- }) : ` <button
409
+ })
410
+ .join('')}`;
411
+ },
412
+ divCreate: {
413
+ style: `gap:5px;height:50px;`,
414
+ class: `${Storage.select_function === 'user-editor' || Storage.select_function === 'page-editor' ? `` : `d-none`} d-flex align-items-center justify-content-center`,
415
+ },
416
+ onCreate: () => {
417
+ $('.tooltip').remove();
418
+ $('[data-bs-toggle="tooltip"]').tooltip();
419
+ }
420
+ };
421
+ }) : ` <button
426
422
  type="button"
427
423
  class="btn btn-outline-secondary rounded px-2 "
428
424
  onclick="${gvc.event(() => {
429
- if (gvc.glitter.getUrlParameter('device') !== 'mobile') {
430
- $('#topd').toggle();
431
- }
432
- })}"
425
+ if (gvc.glitter.getUrlParameter('device') !== 'mobile') {
426
+ $('#topd').toggle();
427
+ }
428
+ })}"
433
429
  >
434
430
  <span style="max-width: 180px;overflow: hidden;text-overflow: ellipsis;">${data.data.name}</span>
435
431
  <i class="fa-sharp fa-solid fa-caret-down position-absolute translate-middle-y ${(gvc.glitter.getUrlParameter('device') === 'mobile') ? `d-none` : ``}"
436
432
  style="top: 50%;right: 20px;"></i>
437
433
  </button>`}
438
434
  ${gvc.bindView(() => {
439
- const id = gvc.glitter.getUUID();
440
- return {
441
- bind: id,
442
- view: () => {
443
- return html `
444
- <div class="px-2 ${Storage.select_function === 'user-editor' ? `d-none` : ``}">
435
+ const id = gvc.glitter.getUUID();
436
+ return {
437
+ bind: id,
438
+ view: () => {
439
+ if (Storage.select_function !== 'page-editor') {
440
+ return ``;
441
+ }
442
+ return html `
443
+ <div class="px-2">
445
444
  ${EditorElem.select({
446
- title: '',
447
- gvc: gvc,
448
- def: Storage.select_page_type || 'page',
449
- array: EditorConfig.page_type_list,
450
- callback: (text) => {
451
- Storage.select_page_type = text;
452
- gvc.notifyDataChange(id);
453
- setTimeout(() => {
454
- $('#topd').toggle();
455
- });
456
- },
457
- })}
445
+ title: '',
446
+ gvc: gvc,
447
+ def: Storage.select_page_type || 'page',
448
+ array: EditorConfig.page_type_list,
449
+ callback: (text) => {
450
+ Storage.select_page_type = text;
451
+ gvc.notifyDataChange(id);
452
+ setTimeout(() => {
453
+ $('#topd').toggle();
454
+ });
455
+ },
456
+ })}
458
457
  </div>
459
458
  <div class="w-100 border-bottom mt-2 ${Storage.select_function === 'user-editor' ? `d-none` : ``}"></div>
460
459
  <ul class="list-group list-group-flush mt-2">
461
460
  ${(() => {
462
- return gvc.bindView(() => {
463
- const id = glitter.getUUID();
464
- return {
465
- bind: id,
466
- view: () => {
467
- return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
468
- PageEditor.pageSelctor(gvc, (d3) => {
469
- glitter.share.clearSelectItem();
470
- data.data = d3;
471
- glitter.setUrlParameter('page', d3.tag);
472
- glitter.share.reloadEditor();
473
- }, {
474
- filter: (data) => {
475
- if (Storage.select_function === 'user-editor') {
476
- return data.page_config && data.page_config.support_editor === 'true';
477
- }
478
- else {
479
- return data.page_type == Storage.select_page_type;
480
- }
481
- },
482
- }).then((data) => {
483
- resolve(data.left);
484
- });
485
- }));
486
- },
487
- divCreate: {
488
- class: `ms-n2 mt-n2`,
489
- },
490
- };
491
- });
492
- })()}
461
+ return gvc.bindView(() => {
462
+ const id = glitter.getUUID();
463
+ return {
464
+ bind: id,
465
+ view: () => {
466
+ return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
467
+ PageEditor.pageSelctor(gvc, (d3) => {
468
+ glitter.share.clearSelectItem();
469
+ data.data = d3;
470
+ glitter.setUrlParameter('page', d3.tag);
471
+ glitter.share.reloadEditor();
472
+ }, {
473
+ filter: (data) => {
474
+ if (Storage.select_function === 'user-editor') {
475
+ return data.page_config && data.page_config.support_editor === 'true';
476
+ }
477
+ else {
478
+ return data.page_type == Storage.select_page_type;
479
+ }
480
+ },
481
+ }).then((data) => {
482
+ resolve(data.left);
483
+ });
484
+ }));
485
+ },
486
+ divCreate: {
487
+ class: `ms-n2 mt-n2`,
488
+ },
489
+ };
490
+ });
491
+ })()}
493
492
  </ul>`;
494
- },
495
- divCreate: {
496
- class: 'dropdown-menu',
497
- style: `margin-top: 50px;max-height: calc(100vh - 100px);width:${document.body.clientWidth < 768 ? 200 : 260}px;overflow-y: scroll;`,
498
- option: [{ key: 'id', value: 'topd' }],
499
- },
500
- onCreate: () => {
501
- $('.tooltip').remove();
502
- $('[data-bs-toggle="tooltip"]').tooltip();
503
- },
504
- };
505
- })}
493
+ },
494
+ divCreate: {
495
+ class: 'dropdown-menu',
496
+ style: `margin-top: 50px;max-height: calc(100vh - 100px);width:${document.body.clientWidth < 768 ? 200 : 260}px;overflow-y: scroll;`,
497
+ option: [{ key: 'id', value: 'topd' }],
498
+ },
499
+ onCreate: () => {
500
+ $('.tooltip').remove();
501
+ $('[data-bs-toggle="tooltip"]').tooltip();
502
+ },
503
+ };
504
+ })}
506
505
  </div>`;
507
- }
508
506
  })()}
509
507
 
510
508
  <div
package/lowcode/jspage/editor.ts CHANGED
@@ -336,14 +336,10 @@ color: transparent;"
336
336
  <i class="fa-regular fa-gear"></i>
337
337
  </div>
338
338
  ${(() => {
339
- if (glitter.share.editor_vm) {
340
- return html`
341
- <div class="btn btn-outline-secondary rounded px-3">
342
- ${glitter.share.editor_vm.title}
343
- </div>`;
344
- } else {
345
-
346
- return html`
339
+ if(Storage.select_function === 'backend-manger'){
340
+ return ``
341
+ }
342
+ return html`
347
343
  <div
348
344
  class="btn-group "
349
345
  style="${(document.body.clientWidth < 768) ? ``:`max-width:350px;min-width:200px;`}
@@ -351,40 +347,40 @@ color: transparent;"
351
347
  "
352
348
  >
353
349
  ${(document.body.clientWidth<800) ? gvc.bindView(() => {
354
- return {
355
- bind: 'top_sm_bar',
356
- view: () => {
357
- return ` ${[
358
- {
359
- src: `fa-duotone fa-window guide-user-editor-1-icon`,
360
- index: 'layout',
361
- hint: '頁面編輯',
362
- },
363
- {
364
- src: `fa-sharp fa-regular fa-globe guide-user-editor-11-icon`,
365
- index: 'color',
366
- hint: '全站樣式'
367
- },
368
- {
369
- src: `fa-regular fa-grid-2 design-guide-1-icon`,
370
- index: 'widget',
371
- hint: '設計元件'
372
- },
373
- {
374
- src: `fa-regular fa-eye`,
375
- index: 'preview',
376
- hint: '預覽頁面'
377
- }
378
- ]
379
- .filter((dd) => {
380
- if (gvc.glitter.getUrlParameter('device') === 'mobile') {
381
- return dd.index !== 'widget'
382
- } else {
383
- return true
384
- }
385
- })
386
- .map((da: any) => {
387
- return html`<i
350
+ return {
351
+ bind: 'top_sm_bar',
352
+ view: () => {
353
+ return ` ${[
354
+ {
355
+ src: `fa-duotone fa-window guide-user-editor-1-icon`,
356
+ index: 'layout',
357
+ hint: '頁面編輯',
358
+ },
359
+ {
360
+ src: `fa-sharp fa-regular fa-globe guide-user-editor-11-icon`,
361
+ index: 'color',
362
+ hint: '全站樣式'
363
+ },
364
+ {
365
+ src: `fa-regular fa-grid-2 design-guide-1-icon`,
366
+ index: 'widget',
367
+ hint: '設計元件'
368
+ },
369
+ {
370
+ src: `fa-regular fa-eye`,
371
+ index: 'preview',
372
+ hint: '預覽頁面'
373
+ }
374
+ ]
375
+ .filter((dd) => {
376
+ if (gvc.glitter.getUrlParameter('device') === 'mobile') {
377
+ return dd.index !== 'widget'
378
+ } else {
379
+ return true
380
+ }
381
+ })
382
+ .map((da: any) => {
383
+ return html`<i
388
384
  class=" ${da.src} fs-5 fw-bold p-2 rounded"
389
385
  data-bs-toggle="tooltip"
390
386
  data-bs-placement="top"
@@ -394,119 +390,121 @@ color: transparent;"
394
390
  ${Storage.page_setting_item === `${da.index}` ? `background:${EditorConfig.editor_layout.btn_background};color:white;` : ``}
395
391
  "
396
392
  onclick="${gvc.event(() => {
397
- if(da.index==='preview'){
398
- preView()
399
- }else{
400
- gvc.glitter.share.editorViewModel.waitCopy = undefined;
401
- gvc.glitter.share.editorViewModel.selectItem = undefined;
402
- Storage.page_setting_item = da.index;
403
- if(document.body.clientWidth<800){
404
- glitter.openDrawer()
405
- }
406
- gvc.notifyDataChange(["MainEditorLeft", "top_sm_bar"]);
407
- }
408
- })}"
393
+ if(da.index==='preview'){
394
+ preView()
395
+ }else{
396
+ gvc.glitter.share.editorViewModel.waitCopy = undefined;
397
+ gvc.glitter.share.editorViewModel.selectItem = undefined;
398
+ Storage.page_setting_item = da.index;
399
+ if(document.body.clientWidth<800){
400
+ glitter.openDrawer()
401
+ }
402
+ gvc.notifyDataChange(["MainEditorLeft", "top_sm_bar"]);
403
+ }
404
+ })}"
409
405
  ></i>`;
410
- })
411
- .join('')}`;
412
- },
413
- divCreate: {
414
- style: `gap:5px;height:50px;`,
415
- class: `${
416
- Storage.select_function === 'user-editor' || Storage.select_function === 'page-editor' ? `` : `d-none`
417
- } d-flex align-items-center justify-content-center`,
418
- },
419
- onCreate: () => {
420
- $('.tooltip').remove();
421
- ($('[data-bs-toggle="tooltip"]') as any).tooltip();
422
- }
423
- };
424
- }):` <button
406
+ })
407
+ .join('')}`;
408
+ },
409
+ divCreate: {
410
+ style: `gap:5px;height:50px;`,
411
+ class: `${
412
+ Storage.select_function === 'user-editor' || Storage.select_function === 'page-editor' ? `` : `d-none`
413
+ } d-flex align-items-center justify-content-center`,
414
+ },
415
+ onCreate: () => {
416
+ $('.tooltip').remove();
417
+ ($('[data-bs-toggle="tooltip"]') as any).tooltip();
418
+ }
419
+ };
420
+ }):` <button
425
421
  type="button"
426
422
  class="btn btn-outline-secondary rounded px-2 "
427
423
  onclick="${gvc.event(() => {
428
- if (gvc.glitter.getUrlParameter('device') !== 'mobile') {
429
- $('#topd').toggle();
430
- }
431
- })}"
424
+ if (gvc.glitter.getUrlParameter('device') !== 'mobile') {
425
+ $('#topd').toggle();
426
+ }
427
+ })}"
432
428
  >
433
429
  <span style="max-width: 180px;overflow: hidden;text-overflow: ellipsis;">${data.data.name}</span>
434
430
  <i class="fa-sharp fa-solid fa-caret-down position-absolute translate-middle-y ${(gvc.glitter.getUrlParameter('device') === 'mobile') ? `d-none` : ``}"
435
431
  style="top: 50%;right: 20px;"></i>
436
432
  </button>`}
437
433
  ${gvc.bindView(() => {
438
- const id = gvc.glitter.getUUID();
439
- return {
440
- bind: id,
441
- view: () => {
442
- return html`
443
- <div class="px-2 ${Storage.select_function === 'user-editor' ? `d-none` : ``}">
434
+ const id = gvc.glitter.getUUID();
435
+ return {
436
+ bind: id,
437
+ view: () => {
438
+ if(Storage.select_function !== 'page-editor' ){
439
+ return ``
440
+ }
441
+ return html`
442
+ <div class="px-2">
444
443
  ${EditorElem.select({
445
- title: '',
446
- gvc: gvc,
447
- def: Storage.select_page_type || 'page',
448
- array: EditorConfig.page_type_list,
449
- callback: (text: string) => {
450
- Storage.select_page_type = text as any;
451
- gvc.notifyDataChange(id);
452
- setTimeout(() => {
453
- $('#topd').toggle();
454
- });
455
- },
456
- })}
444
+ title: '',
445
+ gvc: gvc,
446
+ def: Storage.select_page_type || 'page',
447
+ array: EditorConfig.page_type_list,
448
+ callback: (text: string) => {
449
+ Storage.select_page_type = text as any;
450
+ gvc.notifyDataChange(id);
451
+ setTimeout(() => {
452
+ $('#topd').toggle();
453
+ });
454
+ },
455
+ })}
457
456
  </div>
458
457
  <div class="w-100 border-bottom mt-2 ${Storage.select_function === 'user-editor' ? `d-none` : ``}"></div>
459
458
  <ul class="list-group list-group-flush mt-2">
460
459
  ${(() => {
461
- return gvc.bindView(() => {
462
- const id = glitter.getUUID();
463
- return {
464
- bind: id,
465
- view: () => {
466
- return new Promise(async (resolve, reject) => {
467
- PageEditor.pageSelctor(
468
- gvc,
469
- (d3: any) => {
470
- glitter.share.clearSelectItem();
471
- data.data = d3;
472
- glitter.setUrlParameter('page', d3.tag);
473
- glitter.share.reloadEditor();
474
- },
475
- {
476
- filter: (data) => {
477
- if (Storage.select_function === 'user-editor') {
478
- return data.page_config && data.page_config.support_editor === 'true';
479
- } else {
480
- return data.page_type == Storage.select_page_type;
481
- }
482
- },
483
- }
484
- ).then((data) => {
485
- resolve(data.left);
486
- });
487
- });
488
- },
489
- divCreate: {
490
- class: `ms-n2 mt-n2`,
460
+ return gvc.bindView(() => {
461
+ const id = glitter.getUUID();
462
+ return {
463
+ bind: id,
464
+ view: () => {
465
+ return new Promise(async (resolve, reject) => {
466
+ PageEditor.pageSelctor(
467
+ gvc,
468
+ (d3: any) => {
469
+ glitter.share.clearSelectItem();
470
+ data.data = d3;
471
+ glitter.setUrlParameter('page', d3.tag);
472
+ glitter.share.reloadEditor();
473
+ },
474
+ {
475
+ filter: (data) => {
476
+ if (Storage.select_function === 'user-editor') {
477
+ return data.page_config && data.page_config.support_editor === 'true';
478
+ } else {
479
+ return data.page_type == Storage.select_page_type;
480
+ }
491
481
  },
492
- };
493
- });
494
- })()}
482
+ }
483
+ ).then((data) => {
484
+ resolve(data.left);
485
+ });
486
+ });
487
+ },
488
+ divCreate: {
489
+ class: `ms-n2 mt-n2`,
490
+ },
491
+ };
492
+ });
493
+ })()}
495
494
  </ul>`;
496
- },
497
- divCreate: {
498
- class: 'dropdown-menu',
499
- style: `margin-top: 50px;max-height: calc(100vh - 100px);width:${document.body.clientWidth < 768 ? 200 : 260}px;overflow-y: scroll;`,
500
- option: [{key: 'id', value: 'topd'}],
501
- },
502
- onCreate: () => {
503
- $('.tooltip')!.remove();
504
- ($('[data-bs-toggle="tooltip"]') as any).tooltip();
505
- },
506
- };
507
- })}
495
+ },
496
+ divCreate: {
497
+ class: 'dropdown-menu',
498
+ style: `margin-top: 50px;max-height: calc(100vh - 100px);width:${document.body.clientWidth < 768 ? 200 : 260}px;overflow-y: scroll;`,
499
+ option: [{key: 'id', value: 'topd'}],
500
+ },
501
+ onCreate: () => {
502
+ $('.tooltip')!.remove();
503
+ ($('[data-bs-toggle="tooltip"]') as any).tooltip();
504
+ },
505
+ };
506
+ })}
508
507
  </div>`;
509
- }
510
508
  })()}
511
509
 
512
510
  <div
package/lowcode/jspage/main.ts CHANGED
@@ -17,20 +17,15 @@ import {SetGlobalValue} from '../editor/set-global-value.js';
17
17
  import {PageCodeSetting} from '../editor/page-code-setting.js';
18
18
  import {NormalPageEditor} from '../editor/normal-page-editor.js';
19
19
  import {EditorConfig} from '../editor-config.js';
20
- import {all} from 'underscore/index.js';
21
20
  import {BgCustomerMessage} from '../backend-manager/bg-customer-message.js';
22
21
  import {BgGuide} from "../backend-manager/bg-guide.js";
23
22
  import {ApiShop} from "../glitter-base/route/shopping.js";
24
- import {StepManager} from "../modules/step-manager.js";
25
23
  import {ShareDialog} from "../glitterBundle/dialog/ShareDialog.js";
26
- import {EditorElem} from "../glitterBundle/plugins/editor-elem.js";
27
24
  import {SearchIdea} from "../editor/search-idea.js";
28
25
  import {AiMessage} from "../cms-plugin/ai-message.js";
29
26
  import {GlobalWidget} from "../glitterBundle/html-component/global-widget.js";
30
27
  import {BgWidget} from "../backend-manager/bg-widget.js";
31
28
  import {ApiUser} from "../glitter-base/route/user.js";
32
- import {AiPointsApi} from "../glitter-base/route/ai-points-api.js";
33
- import {ApiCart} from "../glitter-base/route/api-cart.js";
34
29
  import {BaseApi} from "../glitterBundle/api/base.js";
35
30
  import {GlobalUser} from "../glitter-base/global/global-user.js";
36
31
  import {Article} from "../glitter-base/route/article.js";
@@ -39,6 +34,7 @@ const html = String.raw;
39
34
  //
40
35
  const editorContainerID = `HtmlEditorContainer`;
41
36
  init(import.meta.url, (gvc, glitter, gBundle) => {
37
+
42
38
  glitter.share.ai_message = AiMessage
43
39
  glitter.share.loading_dialog = (new ShareDialog(gvc.glitter))
44
40
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ts-glitter",
3
- "version": "13.5.6",
3
+ "version": "13.5.8",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {