ts-glitter 20.0.2 → 20.0.3

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 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_20.0.2';
144
+ glitter.share.editerVersion = 'V_20.0.3';
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_20.0.2';
143
+ glitter.share.editerVersion = 'V_20.0.3';
144
144
  glitter.share.start = new Date();
145
145
  const vm = { appConfig: [] };
146
146
  (window as any).saasConfig = {
@@ -630,14 +630,17 @@ export class UMLogin {
630
630
  localStorage.setItem('google_login', 'true');
631
631
  localStorage.setItem('google_redirect', redirect_url);
632
632
  if (glitter.deviceType === glitter.deviceTypeEnum.Ios) {
633
- gvc.glitter.runJsInterFace('google_login', {
634
- app_id: widget.share.google.app_id,
635
- }, (response) => {
636
- if (response.result) {
637
- gvc.glitter.setUrlParameter('state', 'google_login');
638
- gvc.glitter.setUrlParameter('code', response.code);
639
- gvc.recreateView();
640
- }
633
+ ApiUser.getPublicConfig('login_google_setting', 'manager').then((dd) => {
634
+ widget.share.google = dd.response.value || {};
635
+ gvc.glitter.runJsInterFace('google_login', {
636
+ app_id: widget.share.google.app_id,
637
+ }, (response) => {
638
+ if (response.result) {
639
+ gvc.glitter.setUrlParameter('state', 'google_login');
640
+ gvc.glitter.setUrlParameter('code', response.code);
641
+ gvc.recreateView();
642
+ }
643
+ });
641
644
  });
642
645
  }
643
646
  else {
@@ -656,19 +656,23 @@ export class UMLogin {
656
656
  localStorage.setItem('google_redirect', redirect_url);
657
657
 
658
658
  if (glitter.deviceType === glitter.deviceTypeEnum.Ios) {
659
- gvc.glitter.runJsInterFace(
660
- 'google_login',
661
- {
662
- app_id: widget.share.google.app_id,
663
- },
664
- (response) => {
665
- if (response.result) {
666
- gvc.glitter.setUrlParameter('state', 'google_login');
667
- gvc.glitter.setUrlParameter('code', response.code);
668
- gvc.recreateView();
669
- }
670
- }
671
- );
659
+ ApiUser.getPublicConfig('login_google_setting', 'manager').then((dd) => {
660
+ widget.share.google = dd.response.value || {};
661
+ gvc.glitter.runJsInterFace(
662
+ 'google_login',
663
+ {
664
+ app_id: widget.share.google.app_id,
665
+ },
666
+ (response) => {
667
+ if (response.result) {
668
+ gvc.glitter.setUrlParameter('state', 'google_login');
669
+ gvc.glitter.setUrlParameter('code', response.code);
670
+ gvc.recreateView();
671
+ }
672
+ }
673
+ );
674
+ });
675
+
672
676
  } else {
673
677
  gvc.glitter.href = `https://accounts.google.com/o/oauth2/v2/auth?client_id=${widget.share.google.id}&redirect_uri=${redirect_url}&state=google_login&response_type=code&scope=profile+email`;
674
678
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ts-glitter",
3
- "version": "20.0.2",
3
+ "version": "20.0.3",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {