ts-glitter 20.7.4 → 20.7.5

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

@@ -238,7 +238,9 @@ export class StockHistory {
                             },
                             {
                                 key: '總金額',
-                                value: `<span class="fs-7">$ ${dd.content.product_list
+                                value: html `<span class="fs-7"
+                  >$
+                  ${dd.content.product_list
                                     .reduce((sum, item) => {
                                     var _a, _b;
                                     if (dd.type === 'restocking') {
@@ -248,7 +250,8 @@ export class StockHistory {
                                         return sum + item.cost * ((_b = item.recent_count) !== null && _b !== void 0 ? _b : 0);
                                     }
                                 }, 0)
-                                    .toLocaleString()}</span>`,
+                                    .toLocaleString()}</span
+                >`,
                             },
                             {
                                 key: '供應商',
@@ -1165,6 +1168,7 @@ export class StockHistory {
                                                     gvc.bindView({
                                                         bind: dvm.radioCompId,
                                                         view: () => {
+                                                            dvm.variantIds = [];
                                                             switch (vm.data.content.check_according) {
                                                                 case 'collection':
                                                                     return gvc.bindView(() => {
@@ -1824,8 +1828,10 @@ export class StockHistory {
                                         if (dd.result && dd.response.value) {
                                             dataList = dd.response.value.list;
                                         }
-                                        loading = false;
-                                        gvc.notifyDataChange(id);
+                                        setTimeout(() => {
+                                            loading = false;
+                                            gvc.notifyDataChange(id);
+                                        }, 100);
                                     });
                                 }
                             },
@@ -1912,8 +1918,10 @@ export class StockHistory {
                                         if (dd.result && dd.response.value) {
                                             dataList = dd.response.value.list;
                                         }
-                                        loading = false;
-                                        gvc.notifyDataChange(id);
+                                        setTimeout(() => {
+                                            loading = false;
+                                            gvc.notifyDataChange(id);
+                                        }, 100);
                                     });
                                 }
                             },
@@ -1975,8 +1983,10 @@ export class StockHistory {
                                         if (dd.result && dd.response.value) {
                                             dataList = dd.response.value.list;
                                         }
-                                        loading = false;
-                                        gvc.notifyDataChange(id);
+                                        setTimeout(() => {
+                                            loading = false;
+                                            gvc.notifyDataChange(id);
+                                        }, 100);
                                     });
                                 }
                             },
@@ -2031,8 +2041,10 @@ export class StockHistory {
                                         if (dd.result && dd.response.value) {
                                             dataList = dd.response.value.list;
                                         }
-                                        loading = false;
-                                        gvc.notifyDataChange(id);
+                                        setTimeout(() => {
+                                            loading = false;
+                                            gvc.notifyDataChange(id);
+                                        }, 100);
                                     });
                                 }
                             },
@@ -2096,8 +2108,10 @@ export class StockHistory {
                                         if (dd.result && dd.response.value) {
                                             dataList = dd.response.value.list;
                                         }
-                                        loading = false;
-                                        gvc.notifyDataChange(id);
+                                        setTimeout(() => {
+                                            loading = false;
+                                            gvc.notifyDataChange(id);
+                                        }, 100);
                                     });
                                 }
                             },
@@ -3154,11 +3168,13 @@ export class StockHistory {
                     product_list.push(Object.assign(Object.assign({ variant_id: item.id, cost: 0, note: '', transfer_count: 0, product_id: item.product_content.id, check_count: 0 }, (origin !== null && origin !== void 0 ? origin : {})), { title: title, spec: spec && spec.length > 0 ? spec.join('/') : '單一規格', sku: sku !== null && sku !== void 0 ? sku : '', barcode: barcode !== null && barcode !== void 0 ? barcode : '' }));
                 });
             }
-            callback(origins.filter((d1) => {
-                return !product_list.find((dd) => {
+            callback(origins
+                .filter(d1 => {
+                return !product_list.find(dd => {
                     return d1.variant_id === dd.variant_id;
                 });
-            }).concat(product_list));
+            })
+                .concat(product_list));
         });
     }
     static getVariantInfo(dataList, callback) {

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

@@ -269,15 +269,18 @@ export class StockHistory {
               },
               {
                 key: '總金額',
-                value: `<span class="fs-7">$ ${dd.content.product_list
-                  .reduce((sum, item) => {
-                    if (dd.type === 'restocking') {
-                      return sum + item.cost * (item.transfer_count ?? 0);
-                    } else {
-                      return sum + item.cost * (item.recent_count ?? 0);
-                    }
-                  }, 0)
-                  .toLocaleString()}</span>`,
+                value: html`<span class="fs-7"
+                  >$
+                  ${dd.content.product_list
+                    .reduce((sum, item) => {
+                      if (dd.type === 'restocking') {
+                        return sum + item.cost * (item.transfer_count ?? 0);
+                      } else {
+                        return sum + item.cost * (item.recent_count ?? 0);
+                      }
+                    }, 0)
+                    .toLocaleString()}</span
+                >`,
               },
               {
                 key: '供應商',
@@ -1264,6 +1267,7 @@ export class StockHistory {
                                     gvc.bindView({
                                       bind: dvm.radioCompId,
                                       view: () => {
+                                        dvm.variantIds = [];
                                         switch (vm.data.content.check_according) {
                                           case 'collection':
                                             return gvc.bindView(() => {
@@ -2008,8 +2012,10 @@ export class StockHistory {
                             if (dd.result && dd.response.value) {
                               dataList = dd.response.value.list;
                             }
-                            loading = false;
-                            gvc.notifyDataChange(id);
+                            setTimeout(() => {
+                              loading = false;
+                              gvc.notifyDataChange(id);
+                            }, 100);
                           });
                         }
                       },
@@ -2109,8 +2115,10 @@ export class StockHistory {
                             if (dd.result && dd.response.value) {
                               dataList = dd.response.value.list;
                             }
-                            loading = false;
-                            gvc.notifyDataChange(id);
+                            setTimeout(() => {
+                              loading = false;
+                              gvc.notifyDataChange(id);
+                            }, 100);
                           });
                         }
                       },
@@ -2175,8 +2183,10 @@ export class StockHistory {
                             if (dd.result && dd.response.value) {
                               dataList = dd.response.value.list;
                             }
-                            loading = false;
-                            gvc.notifyDataChange(id);
+                            setTimeout(() => {
+                              loading = false;
+                              gvc.notifyDataChange(id);
+                            }, 100);
                           });
                         }
                       },
@@ -2234,8 +2244,10 @@ export class StockHistory {
                             if (dd.result && dd.response.value) {
                               dataList = dd.response.value.list;
                             }
-                            loading = false;
-                            gvc.notifyDataChange(id);
+                            setTimeout(() => {
+                              loading = false;
+                              gvc.notifyDataChange(id);
+                            }, 100);
                           });
                         }
                       },
@@ -2302,8 +2314,10 @@ export class StockHistory {
                             if (dd.result && dd.response.value) {
                               dataList = dd.response.value.list;
                             }
-                            loading = false;
-                            gvc.notifyDataChange(id);
+                            setTimeout(() => {
+                              loading = false;
+                              gvc.notifyDataChange(id);
+                            }, 100);
                           });
                         }
                       },
@@ -3459,7 +3473,7 @@ export class StockHistory {
             cost: 0,
             note: '',
             transfer_count: 0,
-            product_id:item.product_content.id,
+            product_id: item.product_content.id,
             check_count: 0,
             ...(origin ?? {}),
             title: title,
@@ -3470,11 +3484,15 @@ export class StockHistory {
         });
       }
 
-      callback( origins.filter((d1)=>{
-        return !product_list.find((dd)=>{
-          return d1.variant_id === dd.variant_id;
-        })
-      }).concat(product_list));
+      callback(
+        origins
+          .filter(d1 => {
+            return !product_list.find(dd => {
+              return d1.variant_id === dd.variant_id;
+            });
+          })
+          .concat(product_list)
+      );
     });
   }
 

package/lowcode/cms-plugin/third-party-google.js

@@ -148,7 +148,7 @@ export class ThirdPartyGoggle {
                                     BgWidget.editeInput({
                                         gvc: gvc,
                                         title: html ` <div class="d-flex align-items-center" style="gap:10px;">
-                              APP客户端 ID『 IOS應用程式 』
+                              IOS客户端ID ${BgWidget.dangerNote('*有購買APP方案才需要填寫')}
                             </div>`,
                                         default: vm.data.app_id,
                                         placeHolder: '請前往Google Cloud後台取得客户端 ID',
@@ -159,7 +159,7 @@ export class ThirdPartyGoggle {
                                     BgWidget.editeInput({
                                         gvc: gvc,
                                         title: html ` <div class="d-flex align-items-center" style="gap:10px;">
-                              APP客户端 ID『 Android應用程式 』
+                              Android客户端ID  ${BgWidget.dangerNote('*有購買APP方案才需要填寫')}
                             </div>`,
                                         default: vm.data.android_app_id,
                                         placeHolder: '請前往Google Cloud後台取得客户端 ID',

package/lowcode/cms-plugin/third-party-google.ts

@@ -163,7 +163,7 @@ export class ThirdPartyGoggle {
                           BgWidget.editeInput({
                             gvc: gvc,
                             title: html` <div class="d-flex align-items-center" style="gap:10px;">
-                              APP客户端 ID『 IOS應用程式 』
+                              IOS客户端ID ${BgWidget.dangerNote('*有購買APP方案才需要填寫')}
                             </div>`,
                             default: vm.data.app_id,
                             placeHolder: '請前往Google Cloud後台取得客户端 ID',
@@ -174,7 +174,7 @@ export class ThirdPartyGoggle {
                           BgWidget.editeInput({
                             gvc: gvc,
                             title: html` <div class="d-flex align-items-center" style="gap:10px;">
-                              APP客户端 ID『 Android應用程式 』
+                              Android客户端ID  ${BgWidget.dangerNote('*有購買APP方案才需要填寫')}
                             </div>`,
                             default: vm.data.android_app_id,
                             placeHolder: '請前往Google Cloud後台取得客户端 ID',