ts-glitter 16.5.3 → 16.5.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.
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.4';
|
|
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.4';
|
|
82
82
|
glitter.share.start = new Date();
|
|
83
83
|
const vm: {
|
|
84
84
|
appConfig: any;
|
|
@@ -1250,7 +1250,9 @@ export class ShoppingOrderManager {
|
|
|
1250
1250
|
var _a;
|
|
1251
1251
|
if (['normal', 'black_cat', 'global_express'].includes(orderData.orderData.user_info.shipment)) {
|
|
1252
1252
|
let map = [];
|
|
1253
|
-
map.push(`國家 : ${(_a = CountryTw.find((dd) => {
|
|
1253
|
+
map.push(`國家 : ${(_a = CountryTw.find((dd) => {
|
|
1254
|
+
return dd.countryCode === orderData.orderData.user_info.country;
|
|
1255
|
+
})) === null || _a === void 0 ? void 0 : _a.countryName}`);
|
|
1254
1256
|
map.push(`城市 : ${orderData.orderData.user_info.city}`);
|
|
1255
1257
|
map.push(`州/省 : ${orderData.orderData.user_info.state}`);
|
|
1256
1258
|
map.push(`郵遞區號 : ${orderData.orderData.user_info.postal_code}`);
|
|
@@ -1428,6 +1430,56 @@ export class ShoppingOrderManager {
|
|
|
1428
1430
|
else {
|
|
1429
1431
|
return ``;
|
|
1430
1432
|
}
|
|
1433
|
+
})(),
|
|
1434
|
+
(() => {
|
|
1435
|
+
let map = [`<div class="tx_700">
|
|
1436
|
+
發票開立資訊
|
|
1437
|
+
</div>`];
|
|
1438
|
+
if (orderData.orderData.user_info.invoice_method) {
|
|
1439
|
+
map.push(`開立時機: ${(() => {
|
|
1440
|
+
switch (orderData.orderData.user_info.invoice_method) {
|
|
1441
|
+
case 'nouse':
|
|
1442
|
+
return '不開立發票';
|
|
1443
|
+
case 'off_line':
|
|
1444
|
+
return '線下自行開立';
|
|
1445
|
+
default:
|
|
1446
|
+
return `付款時開立`;
|
|
1447
|
+
}
|
|
1448
|
+
})()}`);
|
|
1449
|
+
}
|
|
1450
|
+
if (orderData.orderData.user_info.invoice_method !== 'nouse') {
|
|
1451
|
+
map.push(`開立對象: ${(() => {
|
|
1452
|
+
switch (orderData.orderData.user_info.invoice_type) {
|
|
1453
|
+
case 'donate':
|
|
1454
|
+
return '捐贈';
|
|
1455
|
+
case 'company':
|
|
1456
|
+
return '公司';
|
|
1457
|
+
default:
|
|
1458
|
+
return '個人';
|
|
1459
|
+
}
|
|
1460
|
+
})()}`);
|
|
1461
|
+
map.push(`${(() => {
|
|
1462
|
+
switch (orderData.orderData.user_info.invoice_type) {
|
|
1463
|
+
case 'donate':
|
|
1464
|
+
return '發票捐贈單位: ' + orderData.orderData.user_info.love_code;
|
|
1465
|
+
case 'company':
|
|
1466
|
+
return [`公司抬頭: ${orderData.orderData.user_info.company}`,
|
|
1467
|
+
`統編號碼: ${orderData.orderData.user_info.gui_number}`,
|
|
1468
|
+
`發票寄送信箱: ${orderData.orderData.user_info.email || '未填寫'}`].map((dd) => {
|
|
1469
|
+
return `<div>${dd}</div>`;
|
|
1470
|
+
}).join(BgWidget.mbContainer(8));
|
|
1471
|
+
default:
|
|
1472
|
+
return [
|
|
1473
|
+
`發票寄送信箱: ${orderData.orderData.user_info.email || '未填寫'}`
|
|
1474
|
+
].map((dd) => {
|
|
1475
|
+
return `<div>${dd}</div>`;
|
|
1476
|
+
}).join(BgWidget.mbContainer(8));
|
|
1477
|
+
}
|
|
1478
|
+
})()}`);
|
|
1479
|
+
}
|
|
1480
|
+
return map.map((dd) => {
|
|
1481
|
+
return `<div>${dd}</div>`;
|
|
1482
|
+
}).join(BgWidget.mbContainer(8));
|
|
1431
1483
|
})()
|
|
1432
1484
|
].filter((dd) => {
|
|
1433
1485
|
return dd;
|
|
@@ -1494,7 +1494,9 @@ export class ShoppingOrderManager {
|
|
|
1494
1494
|
${(() => {
|
|
1495
1495
|
if (['normal', 'black_cat', 'global_express'].includes(orderData.orderData.user_info.shipment)) {
|
|
1496
1496
|
let map: any = []
|
|
1497
|
-
map.push(`國家 : ${CountryTw.find((dd)=>{
|
|
1497
|
+
map.push(`國家 : ${CountryTw.find((dd) => {
|
|
1498
|
+
return dd.countryCode === (orderData.orderData.user_info as any).country
|
|
1499
|
+
})?.countryName}`)
|
|
1498
1500
|
map.push(`城市 : ${(orderData.orderData.user_info as any).city}`)
|
|
1499
1501
|
map.push(`州/省 : ${(orderData.orderData.user_info as any).state}`)
|
|
1500
1502
|
map.push(`郵遞區號 : ${(orderData.orderData.user_info as any).postal_code}`)
|
|
@@ -1676,6 +1678,57 @@ export class ShoppingOrderManager {
|
|
|
1676
1678
|
} else {
|
|
1677
1679
|
return ``;
|
|
1678
1680
|
}
|
|
1681
|
+
})(),
|
|
1682
|
+
(() => {
|
|
1683
|
+
let map = [`<div class="tx_700">
|
|
1684
|
+
發票開立資訊
|
|
1685
|
+
</div>`];
|
|
1686
|
+
|
|
1687
|
+
if ((orderData.orderData.user_info as any).invoice_method) {
|
|
1688
|
+
map.push(`開立時機: ${(() => {
|
|
1689
|
+
switch ((orderData.orderData.user_info as any).invoice_method) {
|
|
1690
|
+
case 'nouse':
|
|
1691
|
+
return '不開立發票'
|
|
1692
|
+
case 'off_line':
|
|
1693
|
+
return '線下自行開立'
|
|
1694
|
+
default:
|
|
1695
|
+
return `付款時開立`
|
|
1696
|
+
}
|
|
1697
|
+
})()}`)
|
|
1698
|
+
}
|
|
1699
|
+
|
|
1700
|
+
if ((orderData.orderData.user_info as any).invoice_method !== 'nouse') {
|
|
1701
|
+
map.push(`開立對象: ${(() => {
|
|
1702
|
+
switch ((orderData.orderData.user_info as any).invoice_type) {
|
|
1703
|
+
case 'donate':
|
|
1704
|
+
return '捐贈'
|
|
1705
|
+
case 'company':
|
|
1706
|
+
return '公司'
|
|
1707
|
+
default:
|
|
1708
|
+
return '個人'
|
|
1709
|
+
}
|
|
1710
|
+
})()}`)
|
|
1711
|
+
map.push(`${(() => {
|
|
1712
|
+
switch ((orderData.orderData.user_info as any).invoice_type) {
|
|
1713
|
+
case 'donate':
|
|
1714
|
+
return '發票捐贈單位: ' + (orderData.orderData.user_info as any).love_code
|
|
1715
|
+
case 'company':
|
|
1716
|
+
return [`公司抬頭: ${(orderData.orderData.user_info as any).company}`,
|
|
1717
|
+
`統編號碼: ${(orderData.orderData.user_info as any).gui_number}`,
|
|
1718
|
+
`發票寄送信箱: ${(orderData.orderData.user_info as any).email || '未填寫'}`].map((dd) => {
|
|
1719
|
+
return `<div>${dd}</div>`
|
|
1720
|
+
}).join(BgWidget.mbContainer(8))
|
|
1721
|
+
default:
|
|
1722
|
+
return [
|
|
1723
|
+
`發票寄送信箱: ${(orderData.orderData.user_info as any).email || '未填寫'}`].map((dd) => {
|
|
1724
|
+
return `<div>${dd}</div>`
|
|
1725
|
+
}).join(BgWidget.mbContainer(8))
|
|
1726
|
+
}
|
|
1727
|
+
})()}`)
|
|
1728
|
+
}
|
|
1729
|
+
return map.map((dd) => {
|
|
1730
|
+
return `<div>${dd}</div>`
|
|
1731
|
+
}).join(BgWidget.mbContainer(8))
|
|
1679
1732
|
})()
|
|
1680
1733
|
].filter((dd) => {
|
|
1681
1734
|
return dd
|
|
@@ -2205,28 +2258,6 @@ export class ShoppingOrderManager {
|
|
|
2205
2258
|
)}
|
|
2206
2259
|
${BgWidget.save(
|
|
2207
2260
|
gvc.event(() => {
|
|
2208
|
-
//如果有編輯紀錄的話 檢查裡頭是不是有訂單已取消的事件在做倉儲的回填
|
|
2209
|
-
|
|
2210
|
-
|
|
2211
|
-
// if (orderData.orderData.progress == "shipping" && (origData.orderData.progress == "wait" || !origData.orderData.progress)) {
|
|
2212
|
-
// glitter.innerDialog((gvc:GVC)=>{
|
|
2213
|
-
//
|
|
2214
|
-
// return html`
|
|
2215
|
-
// <div class="d-flex flex-column " style="background-color: white;width: 600px; min-height: 400px;padding:15px;">
|
|
2216
|
-
// <div class="w-100 d-flex justify-content-end">
|
|
2217
|
-
// <div class="fa-regular fa-circle-xmark fs-5 text-dark" onclick="${gvc.event(()=>{
|
|
2218
|
-
// gvc.closeDialog();
|
|
2219
|
-
// return
|
|
2220
|
-
// })}">
|
|
2221
|
-
//
|
|
2222
|
-
// </div>
|
|
2223
|
-
// </div>
|
|
2224
|
-
// </div>
|
|
2225
|
-
// `
|
|
2226
|
-
// },"select")
|
|
2227
|
-
// }
|
|
2228
|
-
//
|
|
2229
|
-
|
|
2230
2261
|
function writeEdit(origData: any, orderData: any) {
|
|
2231
2262
|
let editArray: any = [];
|
|
2232
2263
|
if (orderData.status != origData.status) {
|