ts-glitter 18.2.3 → 18.2.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 +2 -2
- package/lowcode/api/pageConfig.js +11 -11
- package/lowcode/api/pageConfig.ts +24 -12
- package/lowcode/cms-plugin/shopping-finance-setting.js +2 -0
- package/lowcode/cms-plugin/shopping-finance-setting.ts +1 -0
- package/lowcode/cms-plugin/shopping-order-manager.js +1676 -1541
- package/lowcode/cms-plugin/shopping-order-manager.ts +1753 -1590
- package/lowcode/glitter-base/route/delivery.js +12 -0
- package/lowcode/glitter-base/route/delivery.ts +13 -0
- package/lowcode/glitterBundle/Glitter.js +9 -4
- package/lowcode/glitterBundle/Glitter.ts +12 -4
- package/lowcode/jspage/function-page/setting_editor.js +6 -0
- package/lowcode/jspage/function-page/setting_editor.ts +7 -0
- package/package.json +1 -1
- package/src/api-public/config/shipment-config.js +3 -3
- package/src/api-public/config/shipment-config.ts +3 -3
- package/src/api-public/controllers/delivery.js +9 -0
- package/src/api-public/controllers/delivery.js.map +1 -1
- package/src/api-public/controllers/delivery.ts +8 -0
- package/src/api-public/controllers/shop.ts +2 -1
- package/src/api-public/services/delivery.js +46 -1
- package/src/api-public/services/delivery.js.map +1 -1
- package/src/api-public/services/delivery.ts +48 -2
- package/src/api-public/services/financial-service.js +1 -1
- package/src/api-public/services/financial-service.js.map +1 -1
- package/src/api-public/services/financial-service.ts +1 -2
- package/src/api-public/services/paynow-logistics.d.ts +2 -0
- package/src/api-public/services/paynow-logistics.js +124 -27
- package/src/api-public/services/paynow-logistics.js.map +1 -1
- package/src/api-public/services/paynow-logistics.ts +144 -42
- package/src/api-public/services/shopping.js +5 -0
- package/src/api-public/services/shopping.js.map +1 -1
- package/src/api-public/services/shopping.ts +9 -0
- package/src/domain-check.js.map +1 -1
- package/src/domain-check.ts +0 -32
package/lowcode/Entry.js
CHANGED
|
@@ -112,7 +112,7 @@ export class Entry {
|
|
|
112
112
|
}
|
|
113
113
|
window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : clockF();
|
|
114
114
|
console.log(`Entry-time:`, window.renderClock.stop());
|
|
115
|
-
glitter.share.editerVersion = 'V_18.2.
|
|
115
|
+
glitter.share.editerVersion = 'V_18.2.5';
|
|
116
116
|
glitter.share.start = new Date();
|
|
117
117
|
const vm = {
|
|
118
118
|
appConfig: [],
|
package/lowcode/Entry.ts
CHANGED
|
@@ -33,7 +33,7 @@ export class Entry {
|
|
|
33
33
|
}
|
|
34
34
|
}, 100);
|
|
35
35
|
//預設為購物網站
|
|
36
|
-
(window as any).store_info.web_type = (window as any).store_info.web_type ?? ['shop']
|
|
36
|
+
(window as any).store_info.web_type = (window as any).store_info.web_type ?? ['shop'];
|
|
37
37
|
const shopp = localStorage.getItem('shopee')
|
|
38
38
|
if (shopp) {
|
|
39
39
|
localStorage.removeItem('shopee')
|
|
@@ -111,7 +111,7 @@ export class Entry {
|
|
|
111
111
|
}
|
|
112
112
|
(window as any).renderClock = (window as any).renderClock ?? clockF();
|
|
113
113
|
console.log(`Entry-time:`, (window as any).renderClock.stop());
|
|
114
|
-
glitter.share.editerVersion = 'V_18.2.
|
|
114
|
+
glitter.share.editerVersion = 'V_18.2.5';
|
|
115
115
|
glitter.share.start = new Date();
|
|
116
116
|
const vm: {
|
|
117
117
|
appConfig: any;
|
|
@@ -393,7 +393,7 @@ export class ApiPageConfig {
|
|
|
393
393
|
'Content-Type': s3res.type,
|
|
394
394
|
}
|
|
395
395
|
});
|
|
396
|
-
if (size ===
|
|
396
|
+
if (size === 1920) {
|
|
397
397
|
links.push(s3res.fullUrl);
|
|
398
398
|
}
|
|
399
399
|
resolve(res.result);
|
|
@@ -405,19 +405,19 @@ export class ApiPageConfig {
|
|
|
405
405
|
});
|
|
406
406
|
});
|
|
407
407
|
}
|
|
408
|
-
let chunk_size = [150, 600, 1200, 1440];
|
|
408
|
+
let chunk_size = [150, 600, 1200, 1440, 1920];
|
|
409
409
|
let chunk_count = 0;
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
}
|
|
418
|
-
});
|
|
410
|
+
const s3res = (yield ApiPageConfig.uploadFile(getFileName('original'))).response;
|
|
411
|
+
const res = yield BaseApi.create({
|
|
412
|
+
url: s3res.url,
|
|
413
|
+
type: 'put',
|
|
414
|
+
data: file,
|
|
415
|
+
headers: {
|
|
416
|
+
'Content-Type': s3res.type,
|
|
419
417
|
}
|
|
420
418
|
});
|
|
419
|
+
links.push(s3res.fullUrl);
|
|
420
|
+
result = true;
|
|
421
421
|
if (!result) {
|
|
422
422
|
return {
|
|
423
423
|
result: false
|
|
@@ -402,7 +402,7 @@ export class ApiPageConfig {
|
|
|
402
402
|
for (const file of files){
|
|
403
403
|
const file_id=(window as any).glitter.getUUID()
|
|
404
404
|
//取得檔案名稱
|
|
405
|
-
function getFileName(size?:
|
|
405
|
+
function getFileName(size?:any){
|
|
406
406
|
let file_name = (
|
|
407
407
|
file.name ||
|
|
408
408
|
`${file_id}.${(() => {
|
|
@@ -466,7 +466,7 @@ export class ApiPageConfig {
|
|
|
466
466
|
'Content-Type': s3res.type,
|
|
467
467
|
}
|
|
468
468
|
})
|
|
469
|
-
if(size===
|
|
469
|
+
if(size===1920){
|
|
470
470
|
links.push(s3res.fullUrl)
|
|
471
471
|
}
|
|
472
472
|
resolve(res.result)
|
|
@@ -476,19 +476,31 @@ export class ApiPageConfig {
|
|
|
476
476
|
reader.readAsDataURL(file);
|
|
477
477
|
})
|
|
478
478
|
}
|
|
479
|
-
let chunk_size=[150,600,1200,1440]
|
|
479
|
+
let chunk_size=[150,600,1200,1440,1920]
|
|
480
480
|
let chunk_count=0
|
|
481
|
-
await new Promise((resolve, reject)=>{
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
481
|
+
// await new Promise((resolve, reject)=>{
|
|
482
|
+
// // for (const size of chunk_size){
|
|
483
|
+
// // loopSize(size).then((res:boolean)=>{
|
|
484
|
+
// // chunk_count++
|
|
485
|
+
// // result=res && result
|
|
486
|
+
// // if(chunk_count===chunk_size.length){
|
|
487
|
+
// // resolve(true)
|
|
488
|
+
// // }
|
|
489
|
+
// // })
|
|
490
|
+
// // }
|
|
491
|
+
//
|
|
492
|
+
// })
|
|
493
|
+
const s3res= (await ApiPageConfig.uploadFile(getFileName('original'))).response;
|
|
494
|
+
const res= await BaseApi.create({
|
|
495
|
+
url: s3res.url,
|
|
496
|
+
type: 'put',
|
|
497
|
+
data: file,
|
|
498
|
+
headers: {
|
|
499
|
+
'Content-Type': s3res.type,
|
|
490
500
|
}
|
|
491
501
|
})
|
|
502
|
+
links.push(s3res.fullUrl)
|
|
503
|
+
result=true
|
|
492
504
|
if(!result){
|
|
493
505
|
return {
|
|
494
506
|
result:false
|
|
@@ -268,6 +268,8 @@ export class ShoppingFinanceSetting {
|
|
|
268
268
|
<div class="row">${onlinePayArray.filter((dd) => {
|
|
269
269
|
return dd.type !== 'pos';
|
|
270
270
|
}).map((dd) => {
|
|
271
|
+
var _a;
|
|
272
|
+
keyData[dd.key] = (_a = keyData[dd.key]) !== null && _a !== void 0 ? _a : {};
|
|
271
273
|
return ` <div class="col-12 col-md-4 p-0 p-md-2">
|
|
272
274
|
<div
|
|
273
275
|
class="w-100 position-relative main-card"
|
|
@@ -394,6 +394,7 @@ export class ShoppingFinanceSetting {
|
|
|
394
394
|
onlinePayArray.filter((dd) => {
|
|
395
395
|
return dd.type !== 'pos'
|
|
396
396
|
}).map((dd) => {
|
|
397
|
+
(keyData as any)[dd.key]=(keyData as any)[dd.key]?? {}
|
|
397
398
|
return ` <div class="col-12 col-md-4 p-0 p-md-2">
|
|
398
399
|
<div
|
|
399
400
|
class="w-100 position-relative main-card"
|