ts-glitter 21.8.3 → 21.8.6

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.
Files changed (63) hide show
  1. package/lowcode/Entry.js +1 -1
  2. package/lowcode/Entry.ts +1 -1
  3. package/lowcode/backend-manager/bg-dialog.js +342 -100
  4. package/lowcode/backend-manager/bg-dialog.ts +432 -145
  5. package/lowcode/backend-manager/bg-widget.js +4 -4
  6. package/lowcode/backend-manager/bg-widget.ts +5 -5
  7. package/lowcode/cms-plugin/POS-setting.js +18 -6
  8. package/lowcode/cms-plugin/POS-setting.ts +22 -10
  9. package/lowcode/cms-plugin/pos-pages/payment-page.js +9 -2
  10. package/lowcode/cms-plugin/pos-pages/payment-page.ts +11 -3
  11. package/lowcode/cms-plugin/shopping-discount-setting.js +148 -92
  12. package/lowcode/cms-plugin/shopping-discount-setting.ts +162 -111
  13. package/lowcode/cms-plugin/shopping-product-stock.js +58 -45
  14. package/lowcode/cms-plugin/shopping-product-stock.ts +66 -49
  15. package/lowcode/cms-plugin/stock-stores.js +55 -0
  16. package/lowcode/cms-plugin/stock-stores.ts +59 -0
  17. package/lowcode/css/editor.css +8 -9
  18. package/lowcode/editor/basic-component.js +0 -10
  19. package/lowcode/editor/basic-component.ts +1 -11
  20. package/lowcode/glitter-base/route/article.js +50 -51
  21. package/lowcode/glitter-base/route/article.ts +102 -103
  22. package/lowcode/glitter-base/route/recommend.js +1 -0
  23. package/lowcode/glitter-base/route/recommend.ts +141 -123
  24. package/lowcode/glitterBundle/plugins/html-render.js +2 -0
  25. package/lowcode/glitterBundle/plugins/html-render.ts +1 -0
  26. package/lowcode/jspage/function-page/setting_editor.js +1 -1
  27. package/lowcode/jspage/function-page/setting_editor.ts +1 -1
  28. package/lowcode/jspage/function-page/tool-setting.js +0 -1
  29. package/lowcode/jspage/function-page/tool-setting.ts +0 -1
  30. package/lowcode/jspage/main.js +6 -1
  31. package/lowcode/jspage/main.ts +6 -1
  32. package/lowcode/modules/image-library-clone.ts +2 -0
  33. package/lowcode/modules/image-library.js +118 -155
  34. package/lowcode/modules/image-library.ts +134 -197
  35. package/lowcode/official_view_component/official/component.js +1 -1
  36. package/lowcode/official_view_component/official/component.ts +1 -1
  37. package/lowcode/public-components/banner/first-banner.js +85 -50
  38. package/lowcode/public-components/banner/first-banner.ts +96 -59
  39. package/lowcode/public-components/layout-plugin/social-links-01.js +19 -19
  40. package/lowcode/public-components/layout-plugin/social-links-01.ts +35 -35
  41. package/package.json +1 -1
  42. package/src/api-public/controllers/article.js +11 -0
  43. package/src/api-public/controllers/article.js.map +1 -1
  44. package/src/api-public/controllers/article.ts +13 -0
  45. package/src/api-public/controllers/recommend.js +1 -0
  46. package/src/api-public/controllers/recommend.js.map +1 -1
  47. package/src/api-public/controllers/recommend.ts +99 -89
  48. package/src/api-public/services/checkout-event.js +81 -43
  49. package/src/api-public/services/checkout-event.js.map +1 -1
  50. package/src/api-public/services/checkout-event.ts +93 -38
  51. package/src/api-public/services/post.js +7 -17
  52. package/src/api-public/services/post.js.map +1 -1
  53. package/src/api-public/services/recommend.d.ts +1 -0
  54. package/src/api-public/services/recommend.js +12 -2
  55. package/src/api-public/services/recommend.js.map +1 -1
  56. package/src/api-public/services/recommend.ts +375 -354
  57. package/src/api-public/services/shopping.d.ts +1 -0
  58. package/src/api-public/services/shopping.js +4 -2
  59. package/src/api-public/services/shopping.js.map +1 -1
  60. package/src/api-public/services/shopping.ts +7 -2
  61. package/src/services/saas-table-check.js +1 -1
  62. package/src/services/saas-table-check.js.map +1 -1
  63. package/src/services/saas-table-check.ts +1 -1
package/src/api-public/services/shopping.ts CHANGED
@@ -109,6 +109,7 @@ export interface VoucherData {
109
109
  type: SelectShipmentType;
110
110
  list: string[];
111
111
  };
112
+ distribution_shop: string[];
112
113
 
113
114
  // backend-value
114
115
  bind: BindItem[];
@@ -2830,12 +2831,16 @@ export class Shopping {
2830
2831
 
2831
2832
  // 計算優惠券的訂單折扣
2832
2833
  function compare(voucher: VoucherData) {
2833
- return voucher.bind
2834
+ const reduce_sum = voucher.bind
2834
2835
  .map(item => {
2835
2836
  const val = parseFloat(voucher.value);
2836
2837
  return voucher.method === 'percent' ? (item.sale_price * val) / 100 : val;
2837
2838
  })
2838
- .reduce((accumulator, currentValue) => accumulator + currentValue, 0);
2839
+ .reduce((sum, value) => sum + value, 0);
2840
+
2841
+ const use_rebate_count = voucher.includeDiscount === 'after' ? cart.use_rebate : 0;
2842
+
2843
+ return reduce_sum - use_rebate_count;
2839
2844
  }
2840
2845
 
2841
2846
  // 商家設定手動排序
package/src/services/saas-table-check.js CHANGED
@@ -276,7 +276,7 @@ function chunkArray(array, groupSize) {
276
276
  }
277
277
  async function compare_sql_table(scheme, table, sql) {
278
278
  try {
279
- await database_1.default.execute(`CREATE TABLE if not exists \`${scheme}\`.\`${table}\` ${sql}`, []);
279
+ await database_1.default.query(`CREATE TABLE if not exists \`${scheme}\`.\`${table}\` ${sql}`, []);
280
280
  return true;
281
281
  }
282
282
  catch (e) {
package/src/services/saas-table-check.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"saas-table-check.js","sourceRoot":"","sources":["saas-table-check.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"saas-table-check.js","sourceRoot":"","sources":["saas-table-check.ts"],"names":[],"mappings":"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"}
package/src/services/saas-table-check.ts CHANGED
@@ -276,7 +276,7 @@ function chunkArray(array: any, groupSize: number) {
276
276
 
277
277
  export async function compare_sql_table(scheme: string, table: string, sql: string): Promise<any> {
278
278
  try {
279
- await db.execute(`CREATE TABLE if not exists \`${scheme}\`.\`${table}\` ${sql}`, []);
279
+ await db.query(`CREATE TABLE if not exists \`${scheme}\`.\`${table}\` ${sql}`, []);
280
280
  // const tempKey = 'tempcompare' + table;
281
281
  // const trans = await db.Transaction.build();
282
282
  // await trans.execute(`DROP TABLE if exists \`${scheme}\`.\`${tempKey}\`;`, []);