ts-glitter 17.3.7 → 17.3.8
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/backend-manager/bg-widget.js +2 -1
- package/lowcode/backend-manager/bg-widget.ts +2 -1
- package/lowcode/cms-plugin/shopping-order-manager.js +9 -0
- package/lowcode/cms-plugin/shopping-order-manager.ts +9 -0
- package/lowcode/cms-plugin/user-list.js +9 -0
- package/lowcode/cms-plugin/user-list.ts +9 -0
- package/package.json +1 -1
- package/src/api-public/services/shopping.js +7 -1
- package/src/api-public/services/shopping.js.map +1 -1
- package/src/api-public/services/shopping.ts +8 -2
- package/src/services/private_config.js +14 -0
- package/src/services/private_config.js.map +1 -1
- package/src/services/private_config.ts +17 -0
package/lowcode/Entry.js
CHANGED
|
@@ -89,7 +89,7 @@ export class Entry {
|
|
|
89
89
|
}
|
|
90
90
|
window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : clockF();
|
|
91
91
|
console.log(`Entry-time:`, window.renderClock.stop());
|
|
92
|
-
glitter.share.editerVersion = 'V_17.3.
|
|
92
|
+
glitter.share.editerVersion = 'V_17.3.8';
|
|
93
93
|
glitter.share.start = new Date();
|
|
94
94
|
const vm = {
|
|
95
95
|
appConfig: [],
|
package/lowcode/Entry.ts
CHANGED
|
@@ -90,7 +90,7 @@ export class Entry {
|
|
|
90
90
|
}
|
|
91
91
|
(window as any).renderClock = (window as any).renderClock ?? clockF();
|
|
92
92
|
console.log(`Entry-time:`, (window as any).renderClock.stop());
|
|
93
|
-
glitter.share.editerVersion = 'V_17.3.
|
|
93
|
+
glitter.share.editerVersion = 'V_17.3.8';
|
|
94
94
|
glitter.share.start = new Date();
|
|
95
95
|
const vm: {
|
|
96
96
|
appConfig: any;
|
|
@@ -1572,9 +1572,10 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
|
|
|
1572
1572
|
}
|
|
1573
1573
|
`);
|
|
1574
1574
|
return gvc.bindView(() => {
|
|
1575
|
+
var _a;
|
|
1575
1576
|
const vm = {
|
|
1576
1577
|
loading: true,
|
|
1577
|
-
page: 1,
|
|
1578
|
+
page: (_a = obj.def_page) !== null && _a !== void 0 ? _a : 1,
|
|
1578
1579
|
pageSize: 0,
|
|
1579
1580
|
tableData: [],
|
|
1580
1581
|
originalData: [],
|
|
@@ -1840,6 +1840,7 @@ ${obj.default ?? ''}</textarea
|
|
|
1840
1840
|
itemSelect?: () => void;
|
|
1841
1841
|
hiddenPageSplit?: boolean;
|
|
1842
1842
|
tab_click?:(vm: TableV3)=>void;
|
|
1843
|
+
def_page?:number
|
|
1843
1844
|
}) {
|
|
1844
1845
|
const gvc = obj.gvc;
|
|
1845
1846
|
const glitter = gvc.glitter;
|
|
@@ -1877,7 +1878,7 @@ ${obj.default ?? ''}</textarea
|
|
|
1877
1878
|
return gvc.bindView(() => {
|
|
1878
1879
|
const vm: TableV3 = {
|
|
1879
1880
|
loading: true,
|
|
1880
|
-
page: 1,
|
|
1881
|
+
page: obj.def_page ?? 1,
|
|
1881
1882
|
pageSize: 0,
|
|
1882
1883
|
tableData: [],
|
|
1883
1884
|
originalData: [],
|
|
@@ -365,8 +365,10 @@ export class ShoppingOrderManager {
|
|
|
365
365
|
})(),
|
|
366
366
|
BgWidget.tableV3({
|
|
367
367
|
gvc: gvc,
|
|
368
|
+
def_page: ShoppingOrderManager.vm.page,
|
|
368
369
|
getData: (vmi) => {
|
|
369
370
|
const limit = 20;
|
|
371
|
+
ShoppingOrderManager.vm.page = vmi.page;
|
|
370
372
|
ApiShop.getOrder({
|
|
371
373
|
page: vmi.page - 1,
|
|
372
374
|
limit: limit,
|
|
@@ -478,6 +480,10 @@ export class ShoppingOrderManager {
|
|
|
478
480
|
vmi.originalData = vm.dataList;
|
|
479
481
|
vmi.tableData = getDatalist();
|
|
480
482
|
vmi.loading = false;
|
|
483
|
+
if ((vmi.pageSize != 0) && (vmi.page > vmi.pageSize)) {
|
|
484
|
+
ShoppingOrderManager.vm.page = 1;
|
|
485
|
+
gvc.notifyDataChange(vm.id);
|
|
486
|
+
}
|
|
481
487
|
vmi.callback();
|
|
482
488
|
});
|
|
483
489
|
},
|
|
@@ -3747,4 +3753,7 @@ export class ShoppingOrderManager {
|
|
|
3747
3753
|
return;
|
|
3748
3754
|
}
|
|
3749
3755
|
}
|
|
3756
|
+
ShoppingOrderManager.vm = {
|
|
3757
|
+
page: 1
|
|
3758
|
+
};
|
|
3750
3759
|
window.glitter.setModule(import.meta.url, ShoppingOrderManager);
|
|
@@ -202,6 +202,9 @@ interface OrderData {
|
|
|
202
202
|
const html = String.raw;
|
|
203
203
|
|
|
204
204
|
export class ShoppingOrderManager {
|
|
205
|
+
public static vm={
|
|
206
|
+
page:1
|
|
207
|
+
}
|
|
205
208
|
public static main(
|
|
206
209
|
gvc: GVC,
|
|
207
210
|
query: {
|
|
@@ -589,8 +592,10 @@ export class ShoppingOrderManager {
|
|
|
589
592
|
})(),
|
|
590
593
|
BgWidget.tableV3({
|
|
591
594
|
gvc: gvc,
|
|
595
|
+
def_page:ShoppingOrderManager.vm.page,
|
|
592
596
|
getData: (vmi) => {
|
|
593
597
|
const limit = 20;
|
|
598
|
+
ShoppingOrderManager.vm.page=vmi.page;
|
|
594
599
|
ApiShop.getOrder({
|
|
595
600
|
page: vmi.page - 1,
|
|
596
601
|
limit: limit,
|
|
@@ -700,6 +705,10 @@ export class ShoppingOrderManager {
|
|
|
700
705
|
vmi.originalData = vm.dataList;
|
|
701
706
|
vmi.tableData = getDatalist();
|
|
702
707
|
vmi.loading = false;
|
|
708
|
+
if((vmi.pageSize != 0) && (vmi.page>vmi.pageSize)){
|
|
709
|
+
ShoppingOrderManager.vm.page=1
|
|
710
|
+
gvc.notifyDataChange(vm.id)
|
|
711
|
+
}
|
|
703
712
|
vmi.callback();
|
|
704
713
|
});
|
|
705
714
|
},
|
|
@@ -219,6 +219,7 @@ export class UserList {
|
|
|
219
219
|
gvc: gvc,
|
|
220
220
|
getData: (vd) => {
|
|
221
221
|
vmi = vd;
|
|
222
|
+
UserList.vm.page = vmi.page;
|
|
222
223
|
const limit = 20;
|
|
223
224
|
ApiUser.getUserListOrders({
|
|
224
225
|
page: vmi.page - 1,
|
|
@@ -235,6 +236,10 @@ export class UserList {
|
|
|
235
236
|
vmi.originalData = vm.dataList;
|
|
236
237
|
vmi.tableData = getDatalist();
|
|
237
238
|
vmi.loading = false;
|
|
239
|
+
if ((vmi.pageSize != 0) && (vmi.page > vmi.pageSize)) {
|
|
240
|
+
UserList.vm.page = 1;
|
|
241
|
+
gvc.notifyDataChange(vm.id);
|
|
242
|
+
}
|
|
238
243
|
vmi.callback();
|
|
239
244
|
});
|
|
240
245
|
},
|
|
@@ -274,6 +279,7 @@ export class UserList {
|
|
|
274
279
|
},
|
|
275
280
|
},
|
|
276
281
|
],
|
|
282
|
+
def_page: UserList.vm.page
|
|
277
283
|
});
|
|
278
284
|
},
|
|
279
285
|
}),
|
|
@@ -1636,4 +1642,7 @@ export class UserList {
|
|
|
1636
1642
|
});
|
|
1637
1643
|
}
|
|
1638
1644
|
}
|
|
1645
|
+
UserList.vm = {
|
|
1646
|
+
page: 1
|
|
1647
|
+
};
|
|
1639
1648
|
window.glitter.setModule(import.meta.url, UserList);
|
|
@@ -32,6 +32,9 @@ type ViewModel = {
|
|
|
32
32
|
};
|
|
33
33
|
|
|
34
34
|
export class UserList {
|
|
35
|
+
public static vm={
|
|
36
|
+
page:1
|
|
37
|
+
}
|
|
35
38
|
public static main(
|
|
36
39
|
gvc: GVC,
|
|
37
40
|
obj?: {
|
|
@@ -258,6 +261,7 @@ export class UserList {
|
|
|
258
261
|
gvc: gvc,
|
|
259
262
|
getData: (vd) => {
|
|
260
263
|
vmi = vd;
|
|
264
|
+
UserList.vm.page=vmi.page;
|
|
261
265
|
const limit = 20;
|
|
262
266
|
ApiUser.getUserListOrders({
|
|
263
267
|
page: vmi.page - 1,
|
|
@@ -274,6 +278,10 @@ export class UserList {
|
|
|
274
278
|
vmi.originalData = vm.dataList;
|
|
275
279
|
vmi.tableData = getDatalist();
|
|
276
280
|
vmi.loading = false;
|
|
281
|
+
if((vmi.pageSize != 0) && (vmi.page>vmi.pageSize)){
|
|
282
|
+
UserList.vm.page=1
|
|
283
|
+
gvc.notifyDataChange(vm.id)
|
|
284
|
+
}
|
|
277
285
|
vmi.callback();
|
|
278
286
|
});
|
|
279
287
|
},
|
|
@@ -312,6 +320,7 @@ export class UserList {
|
|
|
312
320
|
},
|
|
313
321
|
},
|
|
314
322
|
],
|
|
323
|
+
def_page:UserList.vm.page
|
|
315
324
|
});
|
|
316
325
|
},
|
|
317
326
|
}),
|
package/package.json
CHANGED
|
@@ -1759,6 +1759,7 @@ class Shopping {
|
|
|
1759
1759
|
}
|
|
1760
1760
|
const userClass = new user_js_1.User(this.app);
|
|
1761
1761
|
const userData = (_a = (await userClass.getUserData(cart.email, 'email_or_phone'))) !== null && _a !== void 0 ? _a : { userID: -1 };
|
|
1762
|
+
console.log(`userData===>`, userData);
|
|
1762
1763
|
const allVoucher = await this.getAllUseVoucher(userData.userID);
|
|
1763
1764
|
let overlay = false;
|
|
1764
1765
|
const voucherList = allVoucher
|
|
@@ -2023,6 +2024,12 @@ class Shopping {
|
|
|
2023
2024
|
}
|
|
2024
2025
|
migrateOrder(data.orderData.lineItems);
|
|
2025
2026
|
migrateOrder(origin[0].orderData.lineItems);
|
|
2027
|
+
if (data.orderData.orderStatus === '-1') {
|
|
2028
|
+
await this.releaseVoucherHistory(data.orderData.orderID, 0);
|
|
2029
|
+
}
|
|
2030
|
+
else {
|
|
2031
|
+
await this.releaseVoucherHistory(data.orderData.orderID, 1);
|
|
2032
|
+
}
|
|
2026
2033
|
if (origin[0].orderData.orderStatus !== '-1' && data.orderData.orderStatus === '-1') {
|
|
2027
2034
|
for (const lineItem of origin[0].orderData.lineItems) {
|
|
2028
2035
|
for (const b of Object.keys(lineItem.deduction_log)) {
|
|
@@ -2331,7 +2338,6 @@ OR JSON_UNQUOTE(JSON_EXTRACT(orderData, '$.orderStatus')) NOT IN (-99)) `);
|
|
|
2331
2338
|
await database_js_1.default.execute(`UPDATE \`${this.app}\`.t_checkout
|
|
2332
2339
|
SET status = ?
|
|
2333
2340
|
WHERE cart_token = ?`, [-1, order_id]);
|
|
2334
|
-
await this.releaseVoucherHistory(order_id, 0);
|
|
2335
2341
|
}
|
|
2336
2342
|
if (original_status === 1 && status !== 1) {
|
|
2337
2343
|
for (const b of order_data['orderData'].lineItems) {
|