ts-glitter 20.4.1 → 20.4.2

package/lowcode/Entry.js

@@ -144,7 +144,7 @@ export class Entry {
             }
             window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
             console.log(`Entry-time:`, window.renderClock.stop());
-            glitter.share.editerVersion = 'V_20.4.1';
+            glitter.share.editerVersion = 'V_20.4.2';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {

package/lowcode/Entry.ts

@@ -145,7 +145,7 @@ export class Entry {
       }
       (window as any).renderClock = (window as any).renderClock ?? createClock();
       console.log(`Entry-time:`, (window as any).renderClock.stop());
-      glitter.share.editerVersion = 'V_20.4.1';
+      glitter.share.editerVersion = 'V_20.4.2';
       glitter.share.start = new Date();
       const vm = { appConfig: [] };
       (window as any).saasConfig = {

package/lowcode/cms-plugin/filter-options.js

@@ -543,6 +543,7 @@ FilterOptions.stockFilterFrame = {
 FilterOptions.stockSelect = [
     { key: 'title', value: '商品名稱' },
     { key: 'sku', value: '庫存單位（SKU）' },
+    { key: 'barcode', value: '商品條碼' },
 ];
 FilterOptions.stockFunnel = [
     {

package/lowcode/cms-plugin/filter-options.ts

@@ -575,6 +575,7 @@ export class FilterOptions {
   static stockSelect = [
     { key: 'title', value: '商品名稱' },
     { key: 'sku', value: '庫存單位（SKU）' },
+    { key: 'barcode', value: '商品條碼' },
   ];
 
   static stockFunnel = [

package/lowcode/cms-plugin/stock-history.js

@@ -238,7 +238,10 @@ export class StockHistory {
                             },
                             {
                                 key: '總金額',
-                                value: `<span class="fs-7">$ ${(dd.content.total_price || 0).toLocaleString()}</span>`,
+                                value: `<span class="fs-7">$ ${dd.content.product_list.reduce((sum, item) => {
+                                    var _a;
+                                    return sum + item.cost * ((_a = item.recent_count) !== null && _a !== void 0 ? _a : 0);
+                                }, 0).toLocaleString()}</span>`,
                             },
                             {
                                 key: '供應商',

package/lowcode/cms-plugin/stock-history.ts

@@ -269,7 +269,9 @@ export class StockHistory {
               },
               {
                 key: '總金額',
-                value: `<span class="fs-7">$ ${(dd.content.total_price || 0).toLocaleString()}</span>`,
+                value: `<span class="fs-7">$ ${  dd.content.product_list.reduce((sum, item) => {
+                return sum + item.cost * (item.recent_count ?? 0);
+                }, 0).toLocaleString()}</span>`,
               },
               {
                 key: '供應商',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-glitter",
-  "version": "20.4.1",
+  "version": "20.4.2",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/api-public/services/shopping.js

@@ -4585,6 +4585,9 @@ class Shopping {
                     case 'sku':
                         querySql.push(`(UPPER(JSON_EXTRACT(v.content, '$.sku')) LIKE UPPER('%${query.search}%'))`);
                         break;
+                    case 'barcode':
+                        querySql.push(`(UPPER(JSON_EXTRACT(v.content, '$.barcode')) LIKE UPPER('%${query.search}%'))`);
+                        break;
                 }
             }
             query.id && querySql.push(`(v.id = ${query.id})`);