ts-glitter 16.5.3 → 16.5.5
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 +1 -1
- package/lowcode/Entry.ts +1 -1
- package/lowcode/cms-plugin/POS-setting.js +60 -50
- package/lowcode/cms-plugin/POS-setting.ts +68 -60
- package/lowcode/cms-plugin/pos-pages/payment-page.js +1 -1
- package/lowcode/cms-plugin/pos-pages/payment-page.ts +1 -1
- package/lowcode/cms-plugin/pos-pages/products-page.js +131 -108
- package/lowcode/cms-plugin/pos-pages/products-page.ts +217 -195
- package/lowcode/cms-plugin/shopping-order-manager.js +66 -1
- package/lowcode/cms-plugin/shopping-order-manager.ts +67 -23
- package/lowcode/cms-plugin/shopping-product-text.js +41 -34
- package/lowcode/cms-plugin/shopping-product-text.ts +39 -34
- package/package.json +1 -1
- package/src/api-public/services/recommend.js +0 -1
- package/src/api-public/services/recommend.js.map +1 -1
- package/src/api-public/services/share-permission.d.ts +14 -0
- package/src/api-public/services/share-permission.js +19 -1
- package/src/api-public/services/share-permission.js.map +1 -1
- package/src/api-public/services/share-permission.ts +19 -1
- package/src/api-public/services/shopping.d.ts +1 -1
- package/src/index.js +0 -4
- package/src/index.js.map +1 -1
- package/src/index.ts +0 -4
package/lowcode/Entry.js
CHANGED
|
@@ -79,7 +79,7 @@ export class Entry {
|
|
|
79
79
|
}
|
|
80
80
|
window.renderClock = (_a = window.renderClock) !== null && _a !== void 0 ? _a : clockF();
|
|
81
81
|
console.log(`Entry-time:`, window.renderClock.stop());
|
|
82
|
-
glitter.share.editerVersion = 'V_16.5.
|
|
82
|
+
glitter.share.editerVersion = 'V_16.5.5';
|
|
83
83
|
glitter.share.start = new Date();
|
|
84
84
|
const vm = {
|
|
85
85
|
appConfig: [],
|
package/lowcode/Entry.ts
CHANGED
|
@@ -78,7 +78,7 @@ export class Entry {
|
|
|
78
78
|
}
|
|
79
79
|
(window as any).renderClock = (window as any).renderClock ?? clockF();
|
|
80
80
|
console.log(`Entry-time:`, (window as any).renderClock.stop());
|
|
81
|
-
glitter.share.editerVersion = 'V_16.5.
|
|
81
|
+
glitter.share.editerVersion = 'V_16.5.5';
|
|
82
82
|
glitter.share.start = new Date();
|
|
83
83
|
const vm: {
|
|
84
84
|
appConfig: any;
|
|
@@ -252,65 +252,75 @@ height: 51px;
|
|
|
252
252
|
return {
|
|
253
253
|
bind: id,
|
|
254
254
|
view: () => __awaiter(this, void 0, void 0, function* () {
|
|
255
|
-
let [initial, res, member_auth, store_list] = yield Promise.all([POSSetting.initial(gvc), ApiUser.checkAdminAuth({
|
|
256
|
-
app: gvc.glitter.getUrlParameter('app-id'),
|
|
257
|
-
token: GlobalUser.saas_token,
|
|
258
|
-
}), ApiUser.getPermission({
|
|
259
|
-
page: 0,
|
|
260
|
-
limit: 100
|
|
261
|
-
}), ApiUser.getPublicConfig('store_manager', 'manager')]);
|
|
262
|
-
member_auth = member_auth.response.data.filter((dd) => {
|
|
263
|
-
return dd.invited && dd.status;
|
|
264
|
-
});
|
|
265
|
-
store_list = store_list.response.value.list;
|
|
266
|
-
glitter.share.store_list = store_list;
|
|
267
|
-
glitter.share.member_auth_list = member_auth;
|
|
268
|
-
glitter.share.editorViewModel.app_config_original;
|
|
269
255
|
try {
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
256
|
+
let [initial, res, member_auth, store_list] = yield Promise.all([POSSetting.initial(gvc), ApiUser.checkAdminAuth({
|
|
257
|
+
app: gvc.glitter.getUrlParameter('app-id'),
|
|
258
|
+
token: GlobalUser.saas_token,
|
|
259
|
+
}), ApiUser.getPermission({
|
|
260
|
+
page: 0,
|
|
261
|
+
limit: 100
|
|
262
|
+
}), ApiUser.getPublicConfig('store_manager', 'manager')]);
|
|
263
|
+
member_auth = member_auth.response.data.filter((dd) => {
|
|
264
|
+
return dd.invited && dd.status;
|
|
273
265
|
});
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
266
|
+
store_list = store_list.response.value.list;
|
|
267
|
+
glitter.share.store_list = store_list;
|
|
268
|
+
glitter.share.member_auth_list = member_auth;
|
|
269
|
+
try {
|
|
270
|
+
const login_user = GlobalUser.parseJWT(GlobalUser.saas_token).payload.userID;
|
|
271
|
+
const find_ = member_auth.find((dd) => {
|
|
272
|
+
return `${dd.user}` === `${login_user}`;
|
|
273
|
+
});
|
|
274
|
+
POSSetting.config.who = find_.user;
|
|
275
|
+
}
|
|
276
|
+
catch (e) {
|
|
277
|
+
}
|
|
278
|
+
const member_auth_ = member_auth.find((dd) => {
|
|
279
|
+
return `${dd.user}` === `${POSSetting.config.who}`;
|
|
284
280
|
});
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
dialog.errorMessage({
|
|
290
|
-
text: `尚未設定任何門市,請前往『 門市設定 』與『 員工設定 』中設定相關參數`,
|
|
291
|
-
callback: () => {
|
|
292
|
-
const dialog = new ShareDialog(gvc.glitter);
|
|
293
|
-
dialog.dataLoading({ visible: true });
|
|
294
|
-
localStorage.removeItem('on-pos');
|
|
295
|
-
(window.parent).history.replaceState({}, document.title, `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`);
|
|
296
|
-
glitter.share.reload('cms', 'shopnex');
|
|
297
|
-
}
|
|
281
|
+
console.log(`member_auth_=>`, member_auth_);
|
|
282
|
+
member_auth_.config.support_shop = member_auth_.config.support_shop.filter((dd) => {
|
|
283
|
+
return store_list.find((d1) => {
|
|
284
|
+
return dd === d1.id;
|
|
298
285
|
});
|
|
299
|
-
|
|
286
|
+
});
|
|
287
|
+
if (res.response.result && (member_auth_ || POSSetting.config.who === 'manager')) {
|
|
288
|
+
if (!member_auth_.config.support_shop || member_auth_.config.support_shop.length === 0) {
|
|
289
|
+
const dialog = new ShareDialog(gvc.glitter);
|
|
290
|
+
dialog.errorMessage({
|
|
291
|
+
text: `尚未設定任何門市,請前往『 門市設定 』與『 員工設定 』中設定相關參數`,
|
|
292
|
+
callback: () => {
|
|
293
|
+
const dialog = new ShareDialog(gvc.glitter);
|
|
294
|
+
dialog.dataLoading({ visible: true });
|
|
295
|
+
localStorage.removeItem('on-pos');
|
|
296
|
+
(window.parent).history.replaceState({}, document.title, `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`);
|
|
297
|
+
glitter.share.reload('cms', 'shopnex');
|
|
298
|
+
}
|
|
299
|
+
});
|
|
300
|
+
return ``;
|
|
301
|
+
}
|
|
302
|
+
else {
|
|
303
|
+
glitter.share.member_auth_list = member_auth.filter((dd) => {
|
|
304
|
+
return dd.config.support_shop && dd.config.support_shop.length > 0;
|
|
305
|
+
});
|
|
306
|
+
if (!member_auth_.config.support_shop.includes(POSSetting.config.where_store)) {
|
|
307
|
+
POSSetting.config.where_store = member_auth_.config.support_shop[0];
|
|
308
|
+
}
|
|
309
|
+
return POSSetting.posView(gvc);
|
|
310
|
+
}
|
|
300
311
|
}
|
|
301
312
|
else {
|
|
302
|
-
|
|
303
|
-
return dd.config.support_shop && dd.config.support_shop.length > 0;
|
|
313
|
+
return POSSetting.loginManager(gvc, 'first', () => {
|
|
304
314
|
});
|
|
305
|
-
if (!member_auth_.config.support_shop.includes(POSSetting.config.where_store)) {
|
|
306
|
-
POSSetting.config.where_store = member_auth_.config.support_shop[0];
|
|
307
|
-
}
|
|
308
|
-
return POSSetting.posView(gvc);
|
|
309
315
|
}
|
|
310
316
|
}
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
});
|
|
317
|
+
catch (e) {
|
|
318
|
+
const dialog = new ShareDialog(gvc.glitter);
|
|
319
|
+
dialog.dataLoading({ visible: true });
|
|
320
|
+
localStorage.removeItem('on-pos');
|
|
321
|
+
(window.parent).history.replaceState({}, document.title, `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`);
|
|
322
|
+
glitter.share.reload('cms', 'shopnex');
|
|
323
|
+
return ``;
|
|
314
324
|
}
|
|
315
325
|
}),
|
|
316
326
|
divCreate: {},
|
|
@@ -306,66 +306,74 @@ height: 51px;
|
|
|
306
306
|
return {
|
|
307
307
|
bind: id,
|
|
308
308
|
view: async () => {
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
309
|
+
try {
|
|
310
|
+
let [initial, res, member_auth,store_list]: any = await Promise.all([POSSetting.initial(gvc), ApiUser.checkAdminAuth({
|
|
311
|
+
app: gvc.glitter.getUrlParameter('app-id'),
|
|
312
|
+
token: GlobalUser.saas_token,
|
|
313
|
+
}), ApiUser.getPermission({
|
|
314
|
+
page: 0,
|
|
315
|
+
limit: 100
|
|
316
|
+
}),ApiUser.getPublicConfig('store_manager', 'manager')]);
|
|
317
|
+
member_auth = member_auth.response.data.filter((dd: any) => {
|
|
318
|
+
return dd.invited && dd.status
|
|
319
|
+
});
|
|
320
|
+
store_list=store_list.response.value.list;
|
|
321
|
+
glitter.share.store_list=store_list;
|
|
322
|
+
glitter.share.member_auth_list = member_auth
|
|
323
|
+
try {
|
|
324
|
+
const login_user = GlobalUser.parseJWT(GlobalUser.saas_token).payload.userID
|
|
325
|
+
const find_ = member_auth.find((dd: any) => {
|
|
326
|
+
return `${dd.user}` === `${login_user}`
|
|
327
|
+
});
|
|
328
|
+
POSSetting.config.who = find_.user
|
|
329
|
+
} catch (e) {
|
|
330
|
+
}
|
|
331
|
+
const member_auth_ = member_auth.find((dd: any) => {
|
|
332
|
+
return `${dd.user}` === `${POSSetting.config.who}`
|
|
333
|
+
})
|
|
334
|
+
console.log(`member_auth_=>`,member_auth_)
|
|
335
|
+
member_auth_.config.support_shop=member_auth_.config.support_shop.filter((dd:string)=>{
|
|
336
|
+
return store_list.find((d1:any)=>{
|
|
337
|
+
return dd===d1.id
|
|
338
|
+
})
|
|
339
|
+
});
|
|
340
|
+
if (res.response.result && (
|
|
341
|
+
member_auth_ || POSSetting.config.who === 'manager'
|
|
342
|
+
)) {
|
|
343
|
+
if (!member_auth_.config.support_shop || member_auth_.config.support_shop.length === 0) {
|
|
344
|
+
const dialog = new ShareDialog(gvc.glitter)
|
|
345
|
+
dialog.errorMessage({
|
|
346
|
+
text: `尚未設定任何門市,請前往『 門市設定 』與『 員工設定 』中設定相關參數`,
|
|
347
|
+
callback: () => {
|
|
348
|
+
const dialog = new ShareDialog(gvc.glitter);
|
|
349
|
+
dialog.dataLoading({visible: true});
|
|
350
|
+
localStorage.removeItem('on-pos');
|
|
351
|
+
(window.parent).history.replaceState({}, document.title, `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`);
|
|
352
|
+
glitter.share.reload('cms', 'shopnex');
|
|
353
|
+
}
|
|
354
|
+
})
|
|
355
|
+
return ``;
|
|
356
|
+
} else {
|
|
357
|
+
glitter.share.member_auth_list = member_auth.filter((dd:any)=>{
|
|
358
|
+
return dd.config.support_shop && dd.config.support_shop.length > 0;
|
|
359
|
+
});
|
|
360
|
+
if(!member_auth_.config.support_shop.includes(POSSetting.config.where_store)){
|
|
361
|
+
POSSetting.config.where_store=member_auth_.config.support_shop[0]
|
|
362
|
+
}
|
|
363
|
+
return POSSetting.posView(gvc);
|
|
364
|
+
}
|
|
365
|
+
} else {
|
|
366
|
+
return POSSetting.loginManager(gvc, 'first', () => {
|
|
367
|
+
});
|
|
368
|
+
}
|
|
369
|
+
}catch (e) {
|
|
370
|
+
const dialog = new ShareDialog(gvc.glitter);
|
|
371
|
+
dialog.dataLoading({visible: true});
|
|
372
|
+
localStorage.removeItem('on-pos');
|
|
373
|
+
(window.parent).history.replaceState({}, document.title, `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`);
|
|
374
|
+
glitter.share.reload('cms', 'shopnex');
|
|
375
|
+
return ``
|
|
376
|
+
}
|
|
369
377
|
},
|
|
370
378
|
divCreate: {},
|
|
371
379
|
onCreate: () => {
|
|
@@ -138,7 +138,7 @@ export class PaymentPage {
|
|
|
138
138
|
return html `
|
|
139
139
|
<div class="d-flex" style="">
|
|
140
140
|
<div class="col-8 col-sm-6 d-flex align-items-center">
|
|
141
|
-
<div style="width: 54px;height: 54px;border-radius: 5px;background: 50%/cover url('${data.preview_image}')"></div>
|
|
141
|
+
<div style="width: 54px;height: 54px;border-radius: 5px;background: 50%/cover url('${data.preview_image || 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg'}')"></div>
|
|
142
142
|
<div class="d-flex flex-column"
|
|
143
143
|
style="font-size: 16px;font-style: normal;font-weight: 500;letter-spacing: 0.64px;margin-left: 12px;">
|
|
144
144
|
${data.title}
|
|
@@ -146,7 +146,7 @@ export class PaymentPage {
|
|
|
146
146
|
return html`
|
|
147
147
|
<div class="d-flex" style="">
|
|
148
148
|
<div class="col-8 col-sm-6 d-flex align-items-center">
|
|
149
|
-
<div style="width: 54px;height: 54px;border-radius: 5px;background: 50%/cover url('${data.preview_image}')"></div>
|
|
149
|
+
<div style="width: 54px;height: 54px;border-radius: 5px;background: 50%/cover url('${data.preview_image || 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg'}')"></div>
|
|
150
150
|
<div class="d-flex flex-column"
|
|
151
151
|
style="font-size: 16px;font-style: normal;font-weight: 500;letter-spacing: 0.64px;margin-left: 12px;">
|
|
152
152
|
${data.title}
|