ts-glitter 19.3.7 → 19.3.9

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 (7) hide show
  1. package/lowcode/Entry.js +1 -1
  2. package/lowcode/Entry.ts +1 -1
  3. package/lowcode/cms-plugin/customer-message-user.js +8 -1
  4. package/lowcode/cms-plugin/customer-message-user.ts +7 -1
  5. package/lowcode/public-components/user-manager/um-info.js +18 -11
  6. package/lowcode/public-components/user-manager/um-info.ts +132 -125
  7. package/package.json +1 -1
package/lowcode/Entry.js CHANGED
@@ -141,7 +141,7 @@ export class Entry {
141
141
  }
142
142
  window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
143
143
  console.log(`Entry-time:`, window.renderClock.stop());
144
- glitter.share.editerVersion = 'V_19.3.7';
144
+ glitter.share.editerVersion = 'V_19.3.9';
145
145
  glitter.share.start = new Date();
146
146
  const vm = { appConfig: [] };
147
147
  window.saasConfig = {
package/lowcode/Entry.ts CHANGED
@@ -140,7 +140,7 @@ export class Entry {
140
140
  }
141
141
  (window as any).renderClock = (window as any).renderClock ?? createClock();
142
142
  console.log(`Entry-time:`, (window as any).renderClock.stop());
143
- glitter.share.editerVersion = 'V_19.3.7';
143
+ glitter.share.editerVersion = 'V_19.3.9';
144
144
  glitter.share.start = new Date();
145
145
  const vm = { appConfig: [] };
146
146
  (window as any).saasConfig = {
package/lowcode/cms-plugin/customer-message-user.js CHANGED
@@ -12,6 +12,7 @@ import { Chat } from '../glitter-base/route/chat.js';
12
12
  import { imageLibrary } from '../modules/image-library.js';
13
13
  import { ShareDialog } from '../glitterBundle/dialog/ShareDialog.js';
14
14
  import { Animation } from '../glitterBundle/module/Animation.js';
15
+ import { GlobalUser } from '../glitter-base/global/global-user.js';
15
16
  export class CustomerMessageUser {
16
17
  static showCustomerMessage(cf) {
17
18
  if (cf.gvc.glitter.getUrlParameter('page') === 'checkout') {
@@ -1319,7 +1320,13 @@ ${gvc.glitter.share.top_inset ? `padding-top:${gvc.glitter.share.top_inset}px !i
1319
1320
  class="btn w-100 rounded text-white"
1320
1321
  style=" background-color: rgba(0, 0, 0, 0.2);"
1321
1322
  onclick="${gvc.event(() => {
1322
- goToChat('');
1323
+ if (!GlobalUser.token) {
1324
+ GlobalUser.loginRedirect = location.href;
1325
+ gvc.glitter.href = '/login';
1326
+ }
1327
+ else {
1328
+ goToChat('');
1329
+ }
1323
1330
  })}"
1324
1331
  >
1325
1332
  返回聊天
package/lowcode/cms-plugin/customer-message-user.ts CHANGED
@@ -4,6 +4,7 @@ import { Chat } from '../glitter-base/route/chat.js';
4
4
  import { imageLibrary } from '../modules/image-library.js';
5
5
  import { ShareDialog } from '../glitterBundle/dialog/ShareDialog.js';
6
6
  import { Animation } from '../glitterBundle/module/Animation.js';
7
+ import { GlobalUser } from '../glitter-base/global/global-user.js';
7
8
 
8
9
  export class CustomerMessageUser {
9
10
  public static config: any = {};
@@ -1456,7 +1457,12 @@ ${gvc.glitter.share.top_inset ? `padding-top:${gvc.glitter.share.top_inset }px !
1456
1457
  class="btn w-100 rounded text-white"
1457
1458
  style=" background-color: rgba(0, 0, 0, 0.2);"
1458
1459
  onclick="${gvc.event(() => {
1459
- goToChat('');
1460
+ if(!GlobalUser.token){
1461
+ GlobalUser.loginRedirect = location.href;
1462
+ gvc.glitter.href='/login';
1463
+ }else{
1464
+ goToChat('');
1465
+ }
1460
1466
  })}"
1461
1467
  >
1462
1468
  返回聊天
package/lowcode/public-components/user-manager/um-info.js CHANGED
@@ -41,7 +41,8 @@ export class UMInfo {
41
41
  <div class="row">
42
42
  <div class="col-12 align-items-center d-none d-lg-flex" style="gap:10px;">
43
43
  <div style="background: #FF9705;width:4px;height: 20px;"></div>
44
- <div class="um-info-title fw-bold" style="font-size: 24px;">${Language.text('account_user_info')}</div>
44
+ <div class="um-info-title fw-bold" style="font-size: 24px;">${Language.text('account_user_info')}
45
+ </div>
45
46
  </div>
46
47
  <div style="margin-top:24px;" class="col-12">
47
48
  <div
@@ -72,7 +73,7 @@ export class UMInfo {
72
73
  </div>
73
74
  <div style="justify-content: flex-start; align-items: center; gap: 6px; display: inline-flex">
74
75
  <div
75
- style="width: 68px; height: 22px; padding-left: 6px; padding-right: 6px; padding-top: 4px; padding-bottom: 4px; background: #393939; border-radius: 7px; justify-content: center; align-items: center; gap: 10px; display: flex"
76
+ style="width: auto; height: 22px; padding: 4px 6px;background: #393939; border-radius: 7px; justify-content: center; align-items: center; gap: 10px; display: flex"
76
77
  >
77
78
  <div style="color: white; font-size: 14px; font-weight: 700; word-wrap: break-word">
78
79
  ${(() => {
@@ -96,7 +97,8 @@ export class UMInfo {
96
97
  return '';
97
98
  }
98
99
  const solidButtonBgr = `#FF9705`;
99
- return html ` <div class="um-title mb-1 mt-2">
100
+ return html `
101
+ <div class="um-title mb-1 mt-2">
100
102
  ${Language.text('current_accumulated_spending_amount')}
101
103
  </div>
102
104
  <div class="w-100 um-linebar-container">
@@ -104,7 +106,7 @@ export class UMInfo {
104
106
  <div class="um-content">NT. ${((_a = vm.memberNext.sum) !== null && _a !== void 0 ? _a : 0).toLocaleString()}</div>
105
107
  <div class="um-content um-text-danger">
106
108
  ${Language.text('distance_from_target_amount')}
107
- NT.${vm.memberNext.leak.toLocaleString()} ${Language.text('can_upgrade')}
109
+ NT.${vm.memberNext.leak.toLocaleString()} ${Language.text('can_upgrade')}
108
110
  </div>
109
111
  </div>
110
112
  <div class="w-100 um-linebar">
@@ -169,7 +171,8 @@ export class UMInfo {
169
171
  ]
170
172
  .map(str => {
171
173
  return str.length > 0
172
- ? html ` <div class="um-info-note" style="font-size: 14px;">${str}</div> `
174
+ ? html `
175
+ <div class="um-info-note" style="font-size: 14px;">${str}</div> `
173
176
  : '';
174
177
  })
175
178
  .join('')}
@@ -183,7 +186,8 @@ export class UMInfo {
183
186
  tag: 'level-of-detail',
184
187
  title: Language.text('rules_explanation'),
185
188
  innerHTML: (gvc) => {
186
- return html ` <div
189
+ return html `
190
+ <div
187
191
  class="mt-1 pb-2 ${vm.data.member.length > 0 ? 'border-bottom' : ''}"
188
192
  >
189
193
  <div class="um-title">${Language.text('membership_level_rules')}</div>
@@ -257,9 +261,10 @@ export class UMInfo {
257
261
  });
258
262
  }
259
263
  else {
260
- return html ` <div style="text-align: center; vertical-align: middle;">
261
- <img src="${img}" />
262
- </div>`;
264
+ return html `
265
+ <div style="text-align: center; vertical-align: middle;">
266
+ <img src="${img}" />
267
+ </div>`;
263
268
  }
264
269
  },
265
270
  divCreate: {},
@@ -288,7 +293,8 @@ export class UMInfo {
288
293
  clearInterval(si);
289
294
  }
290
295
  }, 300);
291
- }, () => { });
296
+ }, () => {
297
+ });
292
298
  }
293
299
  },
294
300
  };
@@ -326,7 +332,8 @@ export class UMInfo {
326
332
  height: 50,
327
333
  displayValue: true,
328
334
  });
329
- }, () => { });
335
+ }, () => {
336
+ });
330
337
  },
331
338
  };
332
339
  });
package/lowcode/public-components/user-manager/um-info.ts CHANGED
@@ -119,7 +119,8 @@ export class UMInfo {
119
119
  <div class="row">
120
120
  <div class="col-12 align-items-center d-none d-lg-flex" style="gap:10px;">
121
121
  <div style="background: #FF9705;width:4px;height: 20px;"></div>
122
- <div class="um-info-title fw-bold" style="font-size: 24px;">${Language.text('account_user_info')}</div>
122
+ <div class="um-info-title fw-bold" style="font-size: 24px;">${Language.text('account_user_info')}
123
+ </div>
123
124
  </div>
124
125
  <div style="margin-top:24px;" class="col-12">
125
126
  <div
@@ -150,7 +151,7 @@ export class UMInfo {
150
151
  </div>
151
152
  <div style="justify-content: flex-start; align-items: center; gap: 6px; display: inline-flex">
152
153
  <div
153
- style="width: 68px; height: 22px; padding-left: 6px; padding-right: 6px; padding-top: 4px; padding-bottom: 4px; background: #393939; border-radius: 7px; justify-content: center; align-items: center; gap: 10px; display: flex"
154
+ style="width: auto; height: 22px; padding: 4px 6px;background: #393939; border-radius: 7px; justify-content: center; align-items: center; gap: 10px; display: flex"
154
155
  >
155
156
  <div style="color: white; font-size: 14px; font-weight: 700; word-wrap: break-word">
156
157
  ${(() => {
@@ -173,7 +174,8 @@ export class UMInfo {
173
174
  return '';
174
175
  }
175
176
  const solidButtonBgr = `#FF9705`;
176
- return html` <div class="um-title mb-1 mt-2">
177
+ return html`
178
+ <div class="um-title mb-1 mt-2">
177
179
  ${Language.text('current_accumulated_spending_amount')}
178
180
  </div>
179
181
  <div class="w-100 um-linebar-container">
@@ -181,7 +183,7 @@ export class UMInfo {
181
183
  <div class="um-content">NT. ${(vm.memberNext.sum ?? 0).toLocaleString()}</div>
182
184
  <div class="um-content um-text-danger">
183
185
  ${Language.text('distance_from_target_amount')}
184
- NT.${vm.memberNext.leak.toLocaleString()} ${Language.text('can_upgrade')}
186
+ NT.${vm.memberNext.leak.toLocaleString()} ${Language.text('can_upgrade')}
185
187
  </div>
186
188
  </div>
187
189
  <div class="w-100 um-linebar">
@@ -251,7 +253,8 @@ export class UMInfo {
251
253
  ]
252
254
  .map(str => {
253
255
  return str.length > 0
254
- ? html` <div class="um-info-note" style="font-size: 14px;">${str}</div> `
256
+ ? html`
257
+ <div class="um-info-note" style="font-size: 14px;">${str}</div> `
255
258
  : '';
256
259
  })
257
260
  .join('')}
@@ -265,7 +268,8 @@ export class UMInfo {
265
268
  tag: 'level-of-detail',
266
269
  title: Language.text('rules_explanation'),
267
270
  innerHTML: (gvc: GVC) => {
268
- return html` <div
271
+ return html`
272
+ <div
269
273
  class="mt-1 pb-2 ${vm.data.member.length > 0 ? 'border-bottom' : ''}"
270
274
  >
271
275
  <div class="um-title">${Language.text('membership_level_rules')}</div>
@@ -344,9 +348,10 @@ export class UMInfo {
344
348
  },
345
349
  });
346
350
  } else {
347
- return html` <div style="text-align: center; vertical-align: middle;">
348
- <img src="${img}" />
349
- </div>`;
351
+ return html`
352
+ <div style="text-align: center; vertical-align: middle;">
353
+ <img src="${img}" />
354
+ </div>`;
350
355
  }
351
356
  },
352
357
  divCreate: {},
@@ -382,7 +387,8 @@ export class UMInfo {
382
387
  }
383
388
  }, 300);
384
389
  },
385
- () => {}
390
+ () => {
391
+ }
386
392
  );
387
393
  }
388
394
  },
@@ -404,7 +410,7 @@ export class UMInfo {
404
410
  return ``;
405
411
  },
406
412
  divCreate: {
407
- elem:'svg',
413
+ elem: 'svg',
408
414
  class: ``,
409
415
  option: [
410
416
  {
@@ -417,7 +423,7 @@ export class UMInfo {
417
423
  gvc.glitter.addMtScript(
418
424
  [`https://cdn.jsdelivr.net/npm/jsbarcode@3.11.5/dist/JsBarcode.all.min.js`],
419
425
  () => {
420
-
426
+
421
427
  //@ts-ignore
422
428
  JsBarcode(document.querySelector('#barcode'), `user-${vm.data.userID}`, {
423
429
  format: 'CODE128', // 條碼格式，可根據需求更換
@@ -427,7 +433,8 @@ export class UMInfo {
427
433
  displayValue: true, // 是否顯示條碼值
428
434
  });
429
435
  },
430
- () => {}
436
+ () => {
437
+ }
431
438
  );
432
439
  },
433
440
  };
@@ -439,109 +446,109 @@ export class UMInfo {
439
446
  style="align-self: stretch; justify-content: flex-start; align-items: center; gap: 12px; display: inline-flex"
440
447
  >
441
448
  ${
442
- [
443
- {
444
- title:glitter.share.rebateConfig.title || Language.text('shopping_credit'),
445
- value:gvc.bindView(() => {
446
- const id = glitter.getUUID();
447
- let sum: string = '-';
448
- ApiShop.getRebate({}).then(res => {
449
- sum = res.response.sum.toLocaleString();
450
- gvc.notifyDataChange(id);
451
- });
452
- return {
453
- bind: id,
454
- view: () => {
455
- return sum;
456
- },
457
- divCreate: {
458
- style: `align-self: stretch; text-align: center; color: #393939; font-size: 20px; font-weight: 700; line-height: 28px; word-wrap: break-word`,
459
- },
460
- };
461
- })
462
- },
463
- {
464
- title:Language.text('coupons'),
465
- value:gvc.bindView(() => {
466
- const id = glitter.getUUID();
467
- let sum: string = '-';
468
- ApiShop.getVoucher({
469
- page: 0,
470
- limit: 10000,
471
- data_from: 'user',
472
- }).then(res => {
473
- sum = res.response.data
474
- .filter((item: Voucher) => item.content.trigger === 'code')
475
- .length.toLocaleString();
476
- gvc.notifyDataChange(id);
477
- });
478
- return {
479
- bind: id,
480
- view: () => {
481
- return sum;
482
- },
483
- divCreate: {
484
- style: `align-self: stretch; text-align: center; color: #393939; font-size: 20px; font-weight: 700; line-height: 28px; word-wrap: break-word`,
485
- },
486
- };
487
- })
488
- },
489
- {
490
- title:Language.text('wait_ship'),
491
- value:gvc.bindView(() => {
492
- const id = glitter.getUUID();
493
- let sum: string = '-';
494
- ApiShop.getOrder({
495
- limit: 1,
496
- page: 0,
497
- filter: {
498
- progress: ['in_stock', 'wait'],
499
- },
500
- data_from: 'user',
501
- }).then((res: any) => {
502
- sum = res.response.total.toLocaleString();
503
- gvc.notifyDataChange(id);
504
- });
505
- return {
506
- bind: id,
507
- view: () => {
508
- return sum;
509
- },
510
- divCreate: {
511
- style: `align-self: stretch; text-align: center; color: #393939; font-size: 20px; font-weight: 700; line-height: 28px; word-wrap: break-word`,
512
- },
513
- };
514
- })
515
- },
516
- {
517
- title:Language.text('shipped'),
518
- value:gvc.bindView(() => {
519
- const id = glitter.getUUID();
520
- let sum: string = '-';
521
- ApiShop.getOrder({
522
- limit: 1,
523
- page: 0,
524
- filter: {
525
- progress: ['shipping'],
526
- },
527
- data_from: 'user',
528
- }).then((res: any) => {
529
- sum = res.response.total.toLocaleString();
530
- gvc.notifyDataChange(id);
531
- });
532
- return {
533
- bind: id,
534
- view: () => {
535
- return sum;
536
- },
537
- divCreate: {
538
- style: `align-self: stretch; text-align: center; color: #393939; font-size: 20px; font-weight: 700; line-height: 28px; word-wrap: break-word`,
539
- },
540
- };
541
- })
542
- }
543
- ].map((dd)=>{
544
- return `<div
449
+ [
450
+ {
451
+ title: glitter.share.rebateConfig.title || Language.text('shopping_credit'),
452
+ value: gvc.bindView(() => {
453
+ const id = glitter.getUUID();
454
+ let sum: string = '-';
455
+ ApiShop.getRebate({}).then(res => {
456
+ sum = res.response.sum.toLocaleString();
457
+ gvc.notifyDataChange(id);
458
+ });
459
+ return {
460
+ bind: id,
461
+ view: () => {
462
+ return sum;
463
+ },
464
+ divCreate: {
465
+ style: `align-self: stretch; text-align: center; color: #393939; font-size: 20px; font-weight: 700; line-height: 28px; word-wrap: break-word`,
466
+ },
467
+ };
468
+ })
469
+ },
470
+ {
471
+ title: Language.text('coupons'),
472
+ value: gvc.bindView(() => {
473
+ const id = glitter.getUUID();
474
+ let sum: string = '-';
475
+ ApiShop.getVoucher({
476
+ page: 0,
477
+ limit: 10000,
478
+ data_from: 'user',
479
+ }).then(res => {
480
+ sum = res.response.data
481
+ .filter((item: Voucher) => item.content.trigger === 'code')
482
+ .length.toLocaleString();
483
+ gvc.notifyDataChange(id);
484
+ });
485
+ return {
486
+ bind: id,
487
+ view: () => {
488
+ return sum;
489
+ },
490
+ divCreate: {
491
+ style: `align-self: stretch; text-align: center; color: #393939; font-size: 20px; font-weight: 700; line-height: 28px; word-wrap: break-word`,
492
+ },
493
+ };
494
+ })
495
+ },
496
+ {
497
+ title: Language.text('wait_ship'),
498
+ value: gvc.bindView(() => {
499
+ const id = glitter.getUUID();
500
+ let sum: string = '-';
501
+ ApiShop.getOrder({
502
+ limit: 1,
503
+ page: 0,
504
+ filter: {
505
+ progress: ['in_stock', 'wait'],
506
+ },
507
+ data_from: 'user',
508
+ }).then((res: any) => {
509
+ sum = res.response.total.toLocaleString();
510
+ gvc.notifyDataChange(id);
511
+ });
512
+ return {
513
+ bind: id,
514
+ view: () => {
515
+ return sum;
516
+ },
517
+ divCreate: {
518
+ style: `align-self: stretch; text-align: center; color: #393939; font-size: 20px; font-weight: 700; line-height: 28px; word-wrap: break-word`,
519
+ },
520
+ };
521
+ })
522
+ },
523
+ {
524
+ title: Language.text('shipped'),
525
+ value: gvc.bindView(() => {
526
+ const id = glitter.getUUID();
527
+ let sum: string = '-';
528
+ ApiShop.getOrder({
529
+ limit: 1,
530
+ page: 0,
531
+ filter: {
532
+ progress: ['shipping'],
533
+ },
534
+ data_from: 'user',
535
+ }).then((res: any) => {
536
+ sum = res.response.total.toLocaleString();
537
+ gvc.notifyDataChange(id);
538
+ });
539
+ return {
540
+ bind: id,
541
+ view: () => {
542
+ return sum;
543
+ },
544
+ divCreate: {
545
+ style: `align-self: stretch; text-align: center; color: #393939; font-size: 20px; font-weight: 700; line-height: 28px; word-wrap: break-word`,
546
+ },
547
+ };
548
+ })
549
+ }
550
+ ].map((dd) => {
551
+ return `<div
545
552
  style="flex: 1 1 0; flex-direction: column; justify-content: flex-start; align-items: center; display: inline-flex"
546
553
  >
547
554
  ${dd.value}
@@ -551,7 +558,7 @@ export class UMInfo {
551
558
  ${dd.title}
552
559
  </div>
553
560
  </div>`
554
- }).join(`<div class="border-end" style="width:1px;height: 30px;"></div>`)
561
+ }).join(`<div class="border-end" style="width:1px;height: 30px;"></div>`)
555
562
  }
556
563
  </div>
557
564
  </div>
@@ -565,8 +572,8 @@ export class UMInfo {
565
572
  {
566
573
  title: Language.text('member_info'),
567
574
  icon: '<i class="fa-solid fa-address-book fs-3"></i>',
568
- event:()=>{
569
- gvc.glitter.getModule(new URL(gvc.glitter.root_path+'official_event/page/change-page.js', import.meta.url).href, (cl) => {
575
+ event: () => {
576
+ gvc.glitter.getModule(new URL(gvc.glitter.root_path + 'official_event/page/change-page.js', import.meta.url).href, (cl) => {
570
577
  cl.changePage('account_edit', 'page', {})
571
578
  })
572
579
  }
@@ -574,8 +581,8 @@ export class UMInfo {
574
581
  {
575
582
  title: Language.text('order_history'),
576
583
  icon: `<i class="fa-solid fa-square-list fs-3"></i>`,
577
- event:()=>{
578
- gvc.glitter.getModule(new URL(gvc.glitter.root_path+'official_event/page/change-page.js', import.meta.url).href, (cl) => {
584
+ event: () => {
585
+ gvc.glitter.getModule(new URL(gvc.glitter.root_path + 'official_event/page/change-page.js', import.meta.url).href, (cl) => {
579
586
  cl.changePage('order_list', 'home', {})
580
587
  })
581
588
  }
@@ -583,19 +590,19 @@ export class UMInfo {
583
590
  {
584
591
  title: Language.text('wishlist'),
585
592
  icon: `<i class="fa-solid fa-heart fs-3"></i>`,
586
- event:()=>{
587
- gvc.glitter.getModule(new URL(gvc.glitter.root_path+'official_event/page/change-page.js', import.meta.url).href, (cl) => {
593
+ event: () => {
594
+ gvc.glitter.getModule(new URL(gvc.glitter.root_path + 'official_event/page/change-page.js', import.meta.url).href, (cl) => {
588
595
  cl.changePage('wishlist', 'home', {})
589
596
  })
590
597
  }
591
598
  },
592
599
  ]
593
- .map((dd:any) => {
600
+ .map((dd: any) => {
594
601
  return `
595
602
  <div
596
603
  style="flex: 1 1 0; flex-direction: column; justify-content: flex-start; align-items: center; gap: 8px; display: inline-flex;cursor:pointer;"
597
604
  onclick="${gvc.event(() => {
598
- dd.event()
605
+ dd.event()
599
606
  })}">
600
607
  ${dd.icon}
601
608
  <div
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ts-glitter",
3
- "version": "19.3.7",
3
+ "version": "19.3.9",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {