ts-glitter 18.6.0 → 18.6.1
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
|
@@ -131,7 +131,7 @@ export class Entry {
|
|
|
131
131
|
}
|
|
132
132
|
window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
|
|
133
133
|
console.log(`Entry-time:`, window.renderClock.stop());
|
|
134
|
-
glitter.share.editerVersion = 'V_18.6.
|
|
134
|
+
glitter.share.editerVersion = 'V_18.6.1';
|
|
135
135
|
glitter.share.start = new Date();
|
|
136
136
|
const vm = { appConfig: [] };
|
|
137
137
|
window.saasConfig = {
|
package/lowcode/Entry.ts
CHANGED
|
@@ -131,7 +131,7 @@ export class Entry {
|
|
|
131
131
|
}
|
|
132
132
|
(window as any).renderClock = (window as any).renderClock ?? createClock();
|
|
133
133
|
console.log(`Entry-time:`, (window as any).renderClock.stop());
|
|
134
|
-
glitter.share.editerVersion = 'V_18.6.
|
|
134
|
+
glitter.share.editerVersion = 'V_18.6.1';
|
|
135
135
|
glitter.share.start = new Date();
|
|
136
136
|
const vm = { appConfig: [] };
|
|
137
137
|
(window as any).saasConfig = {
|
|
@@ -673,29 +673,76 @@ export class ShoppingOrderManager {
|
|
|
673
673
|
}
|
|
674
674
|
dialog.checkYesOrNot({
|
|
675
675
|
text: '系統將自動生成配號並產生出貨單',
|
|
676
|
-
callback: (response) =>
|
|
676
|
+
callback: (response) => {
|
|
677
677
|
if (response) {
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
orderData.orderData.user_info.shipment_number = `${new Date().getTime()}${index_number++}`;
|
|
685
|
-
ApiShop.putOrder({
|
|
686
|
-
id: `${orderData.id}`,
|
|
687
|
-
order_data: orderData.orderData,
|
|
688
|
-
}).then(response => {
|
|
689
|
-
resolve(true);
|
|
678
|
+
let shipment_date = gvc.glitter.ut.dateFormat(new Date(), 'yyyy-MM-dd');
|
|
679
|
+
let shipment_time = gvc.glitter.ut.dateFormat(new Date(), 'hh:mm');
|
|
680
|
+
function next() {
|
|
681
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
682
|
+
dialog.dataLoading({
|
|
683
|
+
visible: true,
|
|
690
684
|
});
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
|
|
685
|
+
let index_number = 0;
|
|
686
|
+
yield Promise.all(checkArray.map((orderData) => {
|
|
687
|
+
return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
|
|
688
|
+
orderData.orderData.user_info.shipment_number = `${new Date().getTime()}${index_number++}`;
|
|
689
|
+
orderData.orderData.user_info.shipment_date = new Date(`${shipment_date} ${shipment_time}:00`).toISOString();
|
|
690
|
+
ApiShop.putOrder({
|
|
691
|
+
id: `${orderData.id}`,
|
|
692
|
+
order_data: orderData.orderData,
|
|
693
|
+
}).then(response => {
|
|
694
|
+
resolve(true);
|
|
695
|
+
});
|
|
696
|
+
}));
|
|
697
|
+
}));
|
|
698
|
+
dialog.dataLoading({
|
|
699
|
+
visible: false,
|
|
700
|
+
});
|
|
701
|
+
gvc.notifyDataChange(vm.id);
|
|
702
|
+
});
|
|
703
|
+
}
|
|
704
|
+
BgWidget.settingDialog({
|
|
705
|
+
gvc: gvc,
|
|
706
|
+
title: '設定出貨日期',
|
|
707
|
+
innerHTML: (gvc) => {
|
|
708
|
+
return [
|
|
709
|
+
BgWidget.editeInput({
|
|
710
|
+
gvc: gvc,
|
|
711
|
+
title: '出貨日期',
|
|
712
|
+
default: shipment_date,
|
|
713
|
+
callback: text => {
|
|
714
|
+
shipment_date = text;
|
|
715
|
+
},
|
|
716
|
+
type: 'date',
|
|
717
|
+
placeHolder: '請輸入出貨日期',
|
|
718
|
+
}),
|
|
719
|
+
BgWidget.editeInput({
|
|
720
|
+
gvc: gvc,
|
|
721
|
+
title: '出貨時間',
|
|
722
|
+
default: shipment_time,
|
|
723
|
+
callback: text => {
|
|
724
|
+
shipment_time = text;
|
|
725
|
+
},
|
|
726
|
+
type: 'time',
|
|
727
|
+
placeHolder: '請輸入出貨時間',
|
|
728
|
+
}),
|
|
729
|
+
].join('');
|
|
730
|
+
},
|
|
731
|
+
footer_html: (gvc) => {
|
|
732
|
+
return [
|
|
733
|
+
BgWidget.cancel(gvc.event(() => {
|
|
734
|
+
gvc.closeDialog();
|
|
735
|
+
}), '取消'),
|
|
736
|
+
BgWidget.save(gvc.event(() => {
|
|
737
|
+
gvc.closeDialog();
|
|
738
|
+
next();
|
|
739
|
+
}), '儲存'),
|
|
740
|
+
].join('');
|
|
741
|
+
},
|
|
742
|
+
width: 350,
|
|
695
743
|
});
|
|
696
|
-
gvc.notifyDataChange(vm.id);
|
|
697
744
|
}
|
|
698
|
-
}
|
|
745
|
+
}
|
|
699
746
|
});
|
|
700
747
|
}),
|
|
701
748
|
},
|
|
@@ -941,31 +941,85 @@ export class ShoppingOrderManager {
|
|
|
941
941
|
dialog.errorMessage({ text: `未出貨的訂單才可以進行取號 !!` });
|
|
942
942
|
return;
|
|
943
943
|
}
|
|
944
|
+
|
|
944
945
|
dialog.checkYesOrNot({
|
|
945
946
|
text:'系統將自動生成配號並產生出貨單',
|
|
946
|
-
callback:
|
|
947
|
+
callback: (response)=>{
|
|
947
948
|
if (response){
|
|
948
|
-
|
|
949
|
-
|
|
950
|
-
|
|
951
|
-
|
|
952
|
-
|
|
953
|
-
|
|
954
|
-
|
|
955
|
-
|
|
956
|
-
|
|
957
|
-
|
|
958
|
-
|
|
959
|
-
|
|
960
|
-
|
|
949
|
+
let shipment_date = gvc.glitter.ut.dateFormat(new Date(), 'yyyy-MM-dd');
|
|
950
|
+
let shipment_time = gvc.glitter.ut.dateFormat(new Date(), 'hh:mm');
|
|
951
|
+
|
|
952
|
+
async function next(){
|
|
953
|
+
dialog.dataLoading({
|
|
954
|
+
visible: true,
|
|
955
|
+
});
|
|
956
|
+
let index_number=0
|
|
957
|
+
await Promise.all(
|
|
958
|
+
checkArray.map((orderData: any) => {
|
|
959
|
+
return new Promise(async (resolve, reject) => {
|
|
960
|
+
orderData.orderData.user_info.shipment_number = `${new Date().getTime()}${index_number++}`;
|
|
961
|
+
orderData.orderData.user_info.shipment_date = new Date(`${shipment_date} ${shipment_time}:00`).toISOString();
|
|
962
|
+
|
|
963
|
+
ApiShop.putOrder({
|
|
964
|
+
id: `${orderData.id}`,
|
|
965
|
+
order_data: orderData.orderData,
|
|
966
|
+
}).then(response => {
|
|
967
|
+
resolve(true);
|
|
968
|
+
});
|
|
961
969
|
});
|
|
962
|
-
})
|
|
963
|
-
|
|
964
|
-
|
|
965
|
-
|
|
966
|
-
|
|
970
|
+
})
|
|
971
|
+
);
|
|
972
|
+
dialog.dataLoading({
|
|
973
|
+
visible: false,
|
|
974
|
+
});
|
|
975
|
+
gvc.notifyDataChange(vm.id);
|
|
976
|
+
}
|
|
977
|
+
BgWidget.settingDialog({
|
|
978
|
+
gvc: gvc,
|
|
979
|
+
title: '設定出貨日期',
|
|
980
|
+
innerHTML: (gvc: GVC) => {
|
|
981
|
+
return [
|
|
982
|
+
BgWidget.editeInput({
|
|
983
|
+
gvc: gvc,
|
|
984
|
+
title: '出貨日期',
|
|
985
|
+
default: shipment_date,
|
|
986
|
+
callback: text => {
|
|
987
|
+
shipment_date = text;
|
|
988
|
+
},
|
|
989
|
+
type: 'date',
|
|
990
|
+
placeHolder: '請輸入出貨日期',
|
|
991
|
+
}),
|
|
992
|
+
BgWidget.editeInput({
|
|
993
|
+
gvc: gvc,
|
|
994
|
+
title: '出貨時間',
|
|
995
|
+
default: shipment_time,
|
|
996
|
+
callback: text => {
|
|
997
|
+
shipment_time = text;
|
|
998
|
+
},
|
|
999
|
+
type: 'time',
|
|
1000
|
+
placeHolder: '請輸入出貨時間',
|
|
1001
|
+
}),
|
|
1002
|
+
].join('');
|
|
1003
|
+
},
|
|
1004
|
+
footer_html: (gvc: GVC) => {
|
|
1005
|
+
return [
|
|
1006
|
+
BgWidget.cancel(
|
|
1007
|
+
gvc.event(() => {
|
|
1008
|
+
gvc.closeDialog();
|
|
1009
|
+
}),
|
|
1010
|
+
'取消'
|
|
1011
|
+
),
|
|
1012
|
+
BgWidget.save(
|
|
1013
|
+
gvc.event(() => {
|
|
1014
|
+
gvc.closeDialog();
|
|
1015
|
+
next();
|
|
1016
|
+
}),
|
|
1017
|
+
'儲存'
|
|
1018
|
+
),
|
|
1019
|
+
].join('');
|
|
1020
|
+
},
|
|
1021
|
+
width: 350,
|
|
967
1022
|
});
|
|
968
|
-
gvc.notifyDataChange(vm.id);
|
|
969
1023
|
}
|
|
970
1024
|
}
|
|
971
1025
|
})
|