ts-glitter 20.5.7 → 20.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 (9) hide show
  1. package/lowcode/Entry.js +1 -1
  2. package/lowcode/Entry.ts +1 -1
  3. package/lowcode/cms-plugin/shopping-setting-basic.js +1 -1
  4. package/lowcode/cms-plugin/shopping-setting-basic.ts +1 -1
  5. package/lowcode/public-components/user-manager/um-login.js +6 -1
  6. package/lowcode/public-components/user-manager/um-login.ts +7 -1
  7. package/package.json +1 -1
  8. package/src/api-public/services/updated-table-checked.js +2 -2
  9. package/src/api-public/services/updated-table-checked.js.map +1 -1
package/lowcode/Entry.js CHANGED
@@ -144,7 +144,7 @@ export class Entry {
144
144
  }
145
145
  window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
146
146
  console.log(`Entry-time:`, window.renderClock.stop());
147
- glitter.share.editerVersion = 'V_20.5.7';
147
+ glitter.share.editerVersion = 'V_20.5.8';
148
148
  glitter.share.start = new Date();
149
149
  const vm = { appConfig: [] };
150
150
  window.saasConfig = {
package/lowcode/Entry.ts CHANGED
@@ -146,7 +146,7 @@ export class Entry {
146
146
  }
147
147
  (window as any).renderClock = (window as any).renderClock ?? createClock();
148
148
  console.log(`Entry-time:`, (window as any).renderClock.stop());
149
- glitter.share.editerVersion = 'V_20.5.7';
149
+ glitter.share.editerVersion = 'V_20.5.8';
150
150
  glitter.share.start = new Date();
151
151
  const vm = { appConfig: [] };
152
152
  (window as any).saasConfig = {
package/lowcode/cms-plugin/shopping-setting-basic.js CHANGED
@@ -2785,7 +2785,7 @@ export class ShoppingSettingBasic {
2785
2785
  value="${language_data.seo.domain || ''}"
2786
2786
  onchange="${gvc.event(e => {
2787
2787
  let text = e.value;
2788
- language_data.seo.domain = text;
2788
+ language_data.seo.domain = text.replace(/%/g, '');
2789
2789
  gvc.notifyDataChange('seo');
2790
2790
  })}"
2791
2791
  />
package/lowcode/cms-plugin/shopping-setting-basic.ts CHANGED
@@ -3056,7 +3056,7 @@ export class ShoppingSettingBasic {
3056
3056
  value="${language_data.seo.domain || ''}"
3057
3057
  onchange="${gvc.event(e => {
3058
3058
  let text = e.value;
3059
- language_data.seo.domain = text;
3059
+ language_data.seo.domain = text.replace(/%/g, '');
3060
3060
  gvc.notifyDataChange('seo');
3061
3061
  })}"
3062
3062
  />
package/lowcode/public-components/user-manager/um-login.js CHANGED
@@ -421,7 +421,12 @@ export class UMLogin {
421
421
  gvc.glitter.href = red;
422
422
  }
423
423
  else {
424
- gvc.glitter.href = '/account_userinfo';
424
+ if (window.appName === 'proshake_v2') {
425
+ gvc.glitter.href = '/user_info';
426
+ }
427
+ else {
428
+ gvc.glitter.href = '/account_userinfo';
429
+ }
425
430
  }
426
431
  }
427
432
  });
package/lowcode/public-components/user-manager/um-login.ts CHANGED
@@ -436,7 +436,13 @@ export class UMLogin {
436
436
  GlobalUser.loginRedirect='';
437
437
  gvc.glitter.href = red;
438
438
  }else {
439
- gvc.glitter.href = '/account_userinfo';
439
+ //蔡先生的Proshake頁面，沒時間先這樣改
440
+ if((window as any).appName==='proshake_v2'){
441
+ gvc.glitter.href = '/user_info';
442
+ }else{
443
+ gvc.glitter.href = '/account_userinfo';
444
+ }
445
+
440
446
  }
441
447
  }
442
448
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ts-glitter",
3
- "version": "20.5.7",
3
+ "version": "20.5.8",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/src/api-public/services/updated-table-checked.js CHANGED
@@ -214,8 +214,8 @@ class UpdatedTableChecked {
214
214
  await UpdatedTableChecked.update({
215
215
  app_name: app_name,
216
216
  table_name: 't_user',
217
- last_version: ['V1.3'],
218
- new_version: 'V1.4',
217
+ last_version: ['V1.3', 'V1.4'],
218
+ new_version: 'V1.5',
219
219
  event: `UPDATE \`${app_name}\`.t_user
220
220
  SET
221
221
  phone = JSON_UNQUOTE(JSON_EXTRACT(userData, '$.phone')),
package/src/api-public/services/updated-table-checked.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"updated-table-checked.js","sourceRoot":"","sources":["updated-table-checked.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAwC;AACxC,+CAAgD;AAChD,qDAA8C;AAE9C,MAAa,mBAAmB;IACvB,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,QAAgB;QAE7C,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,gBAAgB;YAC5B,YAAY,EAAE,CAAC,EAAE,CAAC;YAClB,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE;wBACW,QAAQ;;;OAGzB;SACF,CAAC,CAAC;QAEH,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,YAAY;YACxB,YAAY,EAAE,CAAC,EAAE,CAAC;YAClB,WAAW,EAAE,MAAM;YACnB,KAAK,EACH,iBAAiB,QAAQ,sBAAsB;gBAC/C,mEAAmE;gBACnE,0EAA0E;gBAC1E,mFAAmF;gBACnF,sFAAsF;gBACtF,kFAAkF;gBAClF,8EAA8E;gBAC9E,6CAA6C;gBAC7C,oDAAoD;gBACpD,sDAAsD;gBACtD,uDAAuD;gBACvD,qDAAqD;gBACrD,iDAAiD;gBACjD,KAAK;SACR,CAAC,CAAC;QAEH,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,YAAY;YACxB,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;YACtC,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE;wBACW,QAAQ;;;OAGzB;SACF,CAAC,CAAC;QAEH,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,8BAA8B;YAC1C,YAAY,EAAE,CAAC,EAAE,CAAC;YAClB,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE;wBACW,QAAQ;;OAEzB;SACF,CAAC,CAAC;QAEH,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,8BAA8B;YAC1C,YAAY,EAAE,CAAC,EAAE,CAAC;YAClB,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE;wBACW,QAAQ;;OAEzB;SACF,CAAC,CAAC;QAEH,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,8BAA8B;YAC1C,YAAY,EAAE,CAAC,MAAM,CAAC;YACtB,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE;wBACW,QAAQ;;;OAGzB;SACF,CAAC,CAAC;QAEH,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,YAAY;YACxB,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;YAC9B,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE;wBACW,QAAQ;;;;;;;;OAQzB;SACF,CAAC,CAAC;QAEH,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,YAAY;YACxB,YAAY,EAAE,CAAC,MAAM,CAAC;YACtB,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE;wBACW,QAAQ;;;OAGzB;SACF,CAAC,CAAC;QAEH,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,QAAQ;YACpB,YAAY,EAAE,CAAC,EAAE,CAAC;YAClB,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE;wBACW,QAAQ;;;OAGzB;SACF,CAAC,CAAC;QAEH,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,QAAQ;YACpB,YAAY,EAAE,CAAC,MAAM,CAAC;YACtB,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,IAAI,OAAO,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;oBACjC,KAAK,MAAM,CAAC,IAAI,MAAM,kBAAE,CAAC,KAAK,CAAC,mBAAmB,QAAQ,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC;wBAC3E,MAAM,2BAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;oBAC9C,CAAC;oBACD,OAAO,CAAC,IAAI,CAAC,CAAC;gBAChB,CAAC,CAAC,CAAC;YACL,CAAC;SACF,CAAC,CAAC;QAEH,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,QAAQ;YACpB,YAAY,EAAE,CAAC,MAAM,CAAC;YACtB,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE;wBACW,QAAQ;;OAEzB;SACF,CAAC,CAAC;QAEH,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,YAAY;YACxB,YAAY,EAAE,CAAC,MAAM,CAAC;YACtB,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE;wBACW,QAAQ;;;;;;;;;;;;;;;;;;;OAmBzB;SACF,CAAC,CAAC;QAEH,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,YAAY;YACxB,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;YAC9B,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,IAAI,OAAO,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;oBACjC,KAAK,MAAM,CAAC,IAAI,MAAM,kBAAE,CAAC,KAAK,CAAC,mBAAmB,QAAQ,eAAe,EAAE,EAAE,CAAC,EAAE,CAAC;wBAC/E,MAAM,6BAAe,CAAC,6BAA6B,CAAC;4BAClD,EAAE,EAAE,CAAC,CAAC,EAAE;4BACR,SAAS,EAAE,CAAC,CAAC,SAAS;4BACtB,QAAQ,EAAE,QAAQ;yBACnB,CAAC,CAAC;oBACL,CAAC;oBACD,OAAO,CAAC,IAAI,CAAC,CAAC;gBAChB,CAAC,CAAC,CAAC;YACL,CAAC;SACF,CAAC,CAAC;QAEH,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,yBAAyB;YACrC,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC;YAC1B,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE;wBACW,QAAQ;;OAEzB;SACF,CAAC,CAAC;QAGH,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,QAAQ;YACpB,YAAY,EAAE,CAAC,MAAM,CAAC;YACtB,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE,iBAAiB,QAAQ;;;;;QAK9B;SACH,CAAC,CAAC;QAGH,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,QAAQ;YACpB,YAAY,EAAE,CAAC,MAAM,CAAC;YACtB,WAAW,EAAE,MAAM;YACnB,KAAK,EAAC,YAAY,QAAQ;;;0EAG0C;SACrE,CAAC,CAAC;IAGL,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAM1B;;QACC,MAAM,KAAK,GAAG,MAAM,kBAAE,CAAC,KAAK,CAC1B;;kDAE4C,EAC5C,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,UAAU,CAAC,CAC/B,CAAC;QAEF,IAAI,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAA,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,mCAAI,EAAE,CAAC,EAAE,CAAC;YAC/D,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,YAAY,OAAO,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;YAClF,IAAI,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAClC,MAAM,kBAAE,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAA,CAAC;YACjC,CAAC;YACD,MAAM,kBAAE,CAAC,KAAK,CAAC,iBAAiB,GAAG,CAAC,QAAQ,QAAQ,GAAG,CAAC,UAAU,iBAAiB,GAAG,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC,CAAC;YAC5G,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,YAAY,OAAO,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;CACF;AAtQD,kDAsQC"}
1
+ {"version":3,"file":"updated-table-checked.js","sourceRoot":"","sources":["updated-table-checked.ts"],"names":[],"mappings":"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"}