ts-glitter 20.4.3 → 20.4.4

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 (5) hide show
  1. package/lowcode/Entry.js +1 -1
  2. package/lowcode/Entry.ts +1 -1
  3. package/lowcode/cms-plugin/POS-setting.js +17 -12
  4. package/lowcode/cms-plugin/POS-setting.ts +16 -12
  5. package/package.json +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.4.3';
147
+ glitter.share.editerVersion = 'V_20.4.4';
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.4.3';
149
+ glitter.share.editerVersion = 'V_20.4.4';
150
150
  glitter.share.start = new Date();
151
151
  const vm = { appConfig: [] };
152
152
  (window as any).saasConfig = {
package/lowcode/cms-plugin/POS-setting.js CHANGED
@@ -106,7 +106,7 @@ export class POSSetting {
106
106
  onclick="${gvc.event(() => {
107
107
  dialog.dataLoading({ visible: true });
108
108
  ApiUser.login({
109
- app_name: 'shopnex',
109
+ app_name: window.glitterBase,
110
110
  account: vm.account,
111
111
  pwd: vm.pwd,
112
112
  }).then((r) => __awaiter(this, void 0, void 0, function* () {
@@ -206,7 +206,12 @@ export class POSSetting {
206
206
  POSSetting.initialStyle(gvc);
207
207
  gvc.glitter.share.NormalPageEditor = NormalPageEditor;
208
208
  gvc.glitter.addStyleLink('./css/editor.css');
209
- window.glitterBase = 'shopnex';
209
+ if (window.location.href.includes('smartshop')) {
210
+ window.glitterBase = 'hd_saas';
211
+ }
212
+ else {
213
+ window.glitterBase = 'shopnex';
214
+ }
210
215
  window.appName = gvc.glitter.getUrlParameter('app-id');
211
216
  window.saasConfig.config.token = GlobalUser.saas_token;
212
217
  localStorage.setItem('on-pos', 'true');
@@ -278,7 +283,7 @@ export class POSSetting {
278
283
  dialog.dataLoading({ visible: true });
279
284
  localStorage.removeItem('on-pos');
280
285
  window.parent.history.replaceState({}, document.title, `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`);
281
- glitter.share.reload('cms', 'shopnex');
286
+ glitter.share.reload('cms', window.glitterBase);
282
287
  },
283
288
  });
284
289
  return '';
@@ -303,7 +308,7 @@ export class POSSetting {
303
308
  dialog.dataLoading({ visible: true });
304
309
  localStorage.removeItem('on-pos');
305
310
  window.parent.history.replaceState({}, document.title, `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`);
306
- glitter.share.reload('cms', 'shopnex');
311
+ glitter.share.reload('cms', window.glitterBase);
307
312
  return '';
308
313
  }
309
314
  }),
@@ -977,8 +982,8 @@ export class POSSetting {
977
982
  >
978
983
  ${document.body.offsetWidth < 800
979
984
  ? ''
980
- : html `<div class="d-flex align-items-center h-100 border-end pe-4" style="gap:10px;">
981
- <img src="${SaasOffer.saas_logo}" style="max-width:150px;">
985
+ : html ` <div class="d-flex align-items-center h-100 border-end pe-4" style="gap:10px;">
986
+ <img src="${SaasOffer.saas_logo}" style="max-width:150px;" />
982
987
  <div
983
988
  style="text-align: center; color: #8D8D8D; font-size: 38px; font-family: Lilita One; font-weight: 400; word-wrap: break-word"
984
989
  >
@@ -1195,7 +1200,7 @@ export class POSSetting {
1195
1200
  class: `h-100`,
1196
1201
  },
1197
1202
  })}
1198
- ${document.body.clientWidth < 800 ? html `<div class="flex-fill"></div>` : ''}
1203
+ ${document.body.clientWidth < 800 ? html ` <div class="flex-fill"></div>` : ''}
1199
1204
  <div class="h-100 d-flex align-items-center border-start ps-1">
1200
1205
  <div
1201
1206
  style="width:50px;height: 100%;cursor: pointer;"
@@ -1218,7 +1223,7 @@ export class POSSetting {
1218
1223
  </div>
1219
1224
  ${document.body.clientWidth > 800 || vm.type !== 'menu'
1220
1225
  ? ''
1221
- : html `<div style="width:50px;" class="d-flex align-items-center justify-content-center">
1226
+ : html ` <div style="width:50px;" class="d-flex align-items-center justify-content-center">
1222
1227
  ${cartBtn}
1223
1228
  </div>`}
1224
1229
  ${gvc.bindView({
@@ -1306,7 +1311,7 @@ export class POSSetting {
1306
1311
  dialog.dataLoading({ visible: true });
1307
1312
  localStorage.removeItem('on-pos');
1308
1313
  window.parent.history.replaceState({}, document.title, `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`);
1309
- glitter.share.reload('cms', 'shopnex');
1314
+ glitter.share.reload('cms', window.glitterBase);
1310
1315
  })}"
1311
1316
  ><i
1312
1317
  class="fa-solid fa-angle-left d-flex align-items-center justify-content-center"
@@ -1346,12 +1351,12 @@ export class POSSetting {
1346
1351
  });
1347
1352
  }
1348
1353
  else if (vm.type === 'order') {
1349
- return html `<div class="vw-100 px-lg-3" style="overflow-y: scroll;">
1354
+ return html ` <div class="vw-100 px-lg-3" style="overflow-y: scroll;">
1350
1355
  ${ShoppingOrderManager.main(gvc, { isPOS: true })}
1351
1356
  </div>`;
1352
1357
  }
1353
1358
  else if (vm.type === 'member') {
1354
- return html `<div class="vw-100 px-lg-3" style="overflow-y: scroll;">
1359
+ return html ` <div class="vw-100 px-lg-3" style="overflow-y: scroll;">
1355
1360
  ${UserList.main(gvc)}
1356
1361
  </div>`;
1357
1362
  }
@@ -1371,7 +1376,7 @@ export class POSSetting {
1371
1376
  }
1372
1377
  })();
1373
1378
  if (document.body.clientWidth < 768) {
1374
- view += html `<div style="height: 100px;"></div>`;
1379
+ view += html ` <div style="height: 100px;"></div>`;
1375
1380
  }
1376
1381
  return view;
1377
1382
  }),
package/lowcode/cms-plugin/POS-setting.ts CHANGED
@@ -135,7 +135,7 @@ export class POSSetting {
135
135
  onclick="${gvc.event(() => {
136
136
  dialog.dataLoading({ visible: true });
137
137
  ApiUser.login({
138
- app_name: 'shopnex',
138
+ app_name: (window as any).glitterBase,
139
139
  account: vm.account,
140
140
  pwd: vm.pwd,
141
141
  }).then(async r => {
@@ -239,8 +239,12 @@ export class POSSetting {
239
239
 
240
240
  gvc.glitter.share.NormalPageEditor = NormalPageEditor; // 提供給編輯器使用
241
241
  gvc.glitter.addStyleLink('./css/editor.css');
242
+ if (window.location.href.includes('smartshop')) {
243
+ (window as any).glitterBase = 'hd_saas';
244
+ } else {
245
+ (window as any).glitterBase = 'shopnex';
246
+ }
242
247
 
243
- (window as any).glitterBase = 'shopnex';
244
248
  (window as any).appName = gvc.glitter.getUrlParameter('app-id');
245
249
  (window as any).saasConfig.config.token = GlobalUser.saas_token;
246
250
 
@@ -322,7 +326,7 @@ export class POSSetting {
322
326
  document.title,
323
327
  `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`
324
328
  );
325
- glitter.share.reload('cms', 'shopnex');
329
+ glitter.share.reload('cms', (window as any).glitterBase);
326
330
  },
327
331
  });
328
332
  return '';
@@ -348,7 +352,7 @@ export class POSSetting {
348
352
  document.title,
349
353
  `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`
350
354
  );
351
- glitter.share.reload('cms', 'shopnex');
355
+ glitter.share.reload('cms', (window as any).glitterBase);
352
356
  return '';
353
357
  }
354
358
  },
@@ -1080,8 +1084,8 @@ export class POSSetting {
1080
1084
  >
1081
1085
  ${document.body.offsetWidth < 800
1082
1086
  ? ''
1083
- : html`<div class="d-flex align-items-center h-100 border-end pe-4" style="gap:10px;">
1084
- <img src="${SaasOffer.saas_logo}" style="max-width:150px;">
1087
+ : html` <div class="d-flex align-items-center h-100 border-end pe-4" style="gap:10px;">
1088
+ <img src="${SaasOffer.saas_logo}" style="max-width:150px;" />
1085
1089
  <div
1086
1090
  style="text-align: center; color: #8D8D8D; font-size: 38px; font-family: Lilita One; font-weight: 400; word-wrap: break-word"
1087
1091
  >
@@ -1297,7 +1301,7 @@ export class POSSetting {
1297
1301
  class: `h-100`,
1298
1302
  },
1299
1303
  })}
1300
- ${document.body.clientWidth < 800 ? html`<div class="flex-fill"></div>` : ''}
1304
+ ${document.body.clientWidth < 800 ? html` <div class="flex-fill"></div>` : ''}
1301
1305
  <div class="h-100 d-flex align-items-center border-start ps-1">
1302
1306
  <div
1303
1307
  style="width:50px;height: 100%;cursor: pointer;"
@@ -1320,7 +1324,7 @@ export class POSSetting {
1320
1324
  </div>
1321
1325
  ${document.body.clientWidth > 800 || vm.type !== 'menu'
1322
1326
  ? ''
1323
- : html`<div style="width:50px;" class="d-flex align-items-center justify-content-center">
1327
+ : html` <div style="width:50px;" class="d-flex align-items-center justify-content-center">
1324
1328
  ${cartBtn}
1325
1329
  </div>`}
1326
1330
  ${gvc.bindView({
@@ -1414,7 +1418,7 @@ export class POSSetting {
1414
1418
  document.title,
1415
1419
  `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`
1416
1420
  );
1417
- glitter.share.reload('cms', 'shopnex');
1421
+ glitter.share.reload('cms', (window as any).glitterBase);
1418
1422
  })}"
1419
1423
  ><i
1420
1424
  class="fa-solid fa-angle-left d-flex align-items-center justify-content-center"
@@ -1453,11 +1457,11 @@ export class POSSetting {
1453
1457
  vm: vm,
1454
1458
  });
1455
1459
  } else if (vm.type === 'order') {
1456
- return html`<div class="vw-100 px-lg-3" style="overflow-y: scroll;">
1460
+ return html` <div class="vw-100 px-lg-3" style="overflow-y: scroll;">
1457
1461
  ${ShoppingOrderManager.main(gvc, { isPOS: true })}
1458
1462
  </div>`;
1459
1463
  } else if (vm.type === 'member') {
1460
- return html`<div class="vw-100 px-lg-3" style="overflow-y: scroll;">
1464
+ return html` <div class="vw-100 px-lg-3" style="overflow-y: scroll;">
1461
1465
  ${UserList.main(gvc)}
1462
1466
  </div>`;
1463
1467
  } else if (vm.type === 'setting') {
@@ -1474,7 +1478,7 @@ export class POSSetting {
1474
1478
  }
1475
1479
  })();
1476
1480
  if (document.body.clientWidth < 768) {
1477
- view += html`<div style="height: 100px;"></div>`;
1481
+ view += html` <div style="height: 100px;"></div>`;
1478
1482
  }
1479
1483
  return view;
1480
1484
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ts-glitter",
3
- "version": "20.4.3",
3
+ "version": "20.4.4",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {