ts-glitter 20.7.3 → 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

@@ -18,6 +18,7 @@ export class ThirdPartyGoggle {
             const vm = {
                 loading: true,
                 data: {
+                    android_app_id: '',
                     google_toggle: false,
                     id: '',
                     app_id: '',
@@ -29,12 +30,12 @@ export class ThirdPartyGoggle {
                     g_tag: [],
                 },
             };
-            ApiUser.getPublicConfig(key, 'manager').then((dd) => {
+            ApiUser.getPublicConfig(key, 'manager').then(dd => {
                 vm.loading = false;
                 if (Object.keys(dd.response.value).length) {
                     dd.response.value && (vm.data = dd.response.value);
                 }
-                ApiUser.getPublicConfig('ga4_config', 'manager').then((res) => {
+                ApiUser.getPublicConfig('ga4_config', 'manager').then(res => {
                     if (Object.keys(res.response.value).length) {
                         res.response.value && (vm.ga = res.response.value);
                     }
@@ -52,17 +53,17 @@ export class ThirdPartyGoggle {
                         return [
                             array
                                 .map((dd, index) => {
-                                return html `<div
-                                                class="col-12 col-sm-4  mb-2 ps-0"
-                                                style="align-self: stretch;
+                                return html ` <div
+                        class="col-12 col-sm-4  mb-2 ps-0"
+                        style="align-self: stretch;
     justify-content: flex-start;
     align-items: flex-start;
     gap: 0px;
     display: inline-flex;"
-                                            >
-                                                <input
-                                                    class="w-100"
-                                                    style="flex: 1 1 0;
+                      >
+                        <input
+                          class="w-100"
+                          style="flex: 1 1 0;
     height: 40px;
     padding: 9px 18px;
     overflow: hidden;
@@ -73,14 +74,14 @@ export class ThirdPartyGoggle {
     display: flex;
     border-right: 0px;
     border-radius: 10px 0px 0px 10px;"
-                                                    placeholder="請輸入編號"
-                                                    value="${dd.code}"
-                                                    onchange="${gvc.event((e, event) => {
+                          placeholder="請輸入編號"
+                          value="${dd.code}"
+                          onchange="${gvc.event((e, event) => {
                                     dd.code = e.value;
                                 })}"
-                                                />
-                                                <div
-                                                    style="height: 100%;
+                        />
+                        <div
+                          style="height: 100%;
     background: #f2f2f2;
     justify-content: center;
     align-items: center;
@@ -90,11 +91,11 @@ export class ThirdPartyGoggle {
     border-top-right-radius: 10px;
     border-bottom-right-radius: 10px;
     cursor: pointer;"
-                                                    onclick="${gvc.event(() => {
+                          onclick="${gvc.event(() => {
                                     const dialog = new ShareDialog(gvc.glitter);
                                     dialog.checkYesOrNot({
                                         text: '是否確認刪除此追蹤編號?',
-                                        callback: (response) => {
+                                        callback: response => {
                                             if (response) {
                                                 array.splice(index, 1);
                                                 gvc.notifyDataChange(id);
@@ -102,139 +103,160 @@ export class ThirdPartyGoggle {
                                         },
                                     });
                                 })}"
-                                                >
-                                                    <div class="" style=""><i class="fa-regular fa-trash-can" aria-hidden="true"></i></div>
-                                                </div>
-                                            </div>`;
+                        >
+                          <div class="" style=""><i class="fa-regular fa-trash-can" aria-hidden="true"></i></div>
+                        </div>
+                      </div>`;
                             })
                                 .join(''),
-                            html `<div
-                                        class="col-12 col-sm-4  mb-2 ps-0"
-                                        onclick="${gvc.event(() => {
+                            html ` <div
+                    class="col-12 col-sm-4  mb-2 ps-0"
+                    onclick="${gvc.event(() => {
                                 array.push({ code: '' });
                                 gvc.notifyDataChange(id);
                             })}"
-                                    >
-                                        <div class="bt_orange">新增編號</div>
-                                    </div>`,
+                  >
+                    <div class="bt_orange">新增編號</div>
+                  </div>`,
                         ].join(``);
                     }
                     return [
-                        html `<div class="title-container">
-                                    ${BgWidget.title('Google 串接設定')}
-                                    <div class="flex-fill"></div>
-                                </div>`,
+                        html ` <div class="title-container">
+                  ${BgWidget.title('Google 串接設定')}
+                  <div class="flex-fill"></div>
+                </div>`,
                         BgWidget.mbContainer(18),
                         BgWidget.container1x2({
                             html: [
                                 BgWidget.mainCard([
-                                    html `<div class="tx_700">串接綁定</div>`,
-                                    html `<div class="d-flex align-items-center" style="gap:10px;">
-                                                        啟用Google登入${BgWidget.switchButton(gvc, vm.data.google_toggle, () => {
+                                    html ` <div class="tx_700">串接綁定</div>`,
+                                    html ` <div class="d-flex align-items-center" style="gap:10px;">
+                            啟用Google登入${BgWidget.switchButton(gvc, vm.data.google_toggle, () => {
                                         vm.data.google_toggle = !vm.data.google_toggle;
                                         gvc.notifyDataChange(id);
                                     })}
-                                                    </div>`,
+                          </div>`,
                                     BgWidget.editeInput({
                                         gvc: gvc,
-                                        title: html `<div class="d-flex align-items-center" style="gap:10px;">客户端 ID</div>`,
+                                        title: html ` <div class="d-flex align-items-center" style="gap:10px;">客户端 ID</div>`,
                                         default: vm.data.id,
                                         placeHolder: '請前往GOOGLE開發者後台取得客户端 ID',
-                                        callback: (text) => {
+                                        callback: text => {
                                             vm.data.id = text;
                                         },
                                     }),
                                     BgWidget.editeInput({
                                         gvc: gvc,
-                                        title: html `<div class="d-flex align-items-center" style="gap:10px;">APP客户端 ID『 非必填 』</div>`,
+                                        title: html ` <div class="d-flex align-items-center" style="gap:10px;">
+                              IOS客户端ID ${BgWidget.dangerNote('*有購買APP方案才需要填寫')}
+                            </div>`,
                                         default: vm.data.app_id,
                                         placeHolder: '請前往Google Cloud後台取得客户端 ID',
-                                        callback: (text) => {
+                                        callback: text => {
                                             vm.data.app_id = text;
                                         },
                                     }),
                                     BgWidget.editeInput({
                                         gvc: gvc,
-                                        title: html `<div class="d-flex align-items-center" style="gap:10px;">應用程式密鑰</div>`,
+                                        title: html ` <div class="d-flex align-items-center" style="gap:10px;">
+                              Android客户端ID  ${BgWidget.dangerNote('*有購買APP方案才需要填寫')}
+                            </div>`,
+                                        default: vm.data.android_app_id,
+                                        placeHolder: '請前往Google Cloud後台取得客户端 ID',
+                                        callback: text => {
+                                            vm.data.android_app_id = text;
+                                        },
+                                    }),
+                                    BgWidget.editeInput({
+                                        gvc: gvc,
+                                        title: html ` <div class="d-flex align-items-center" style="gap:10px;">應用程式密鑰</div>`,
                                         default: vm.data.secret,
                                         placeHolder: '請前往GOOGLE開發者後台取得應用程式密鑰',
-                                        callback: (text) => {
+                                        callback: text => {
                                             vm.data.secret = text;
                                         },
                                     }),
-                                    html `<div
-                                                        onclick="${gvc.event(() => {
+                                    html ` <div
+                            onclick="${gvc.event(() => {
                                         const dialog = new ShareDialog(gvc.glitter);
                                         navigator.clipboard.writeText(`https://` + window.parent.glitter.share.editorViewModel.domain + '/login');
                                         dialog.successMessage({ text: '已複製至剪貼簿' });
                                     })}"
-                                                    >
-                                                        ${BgWidget.editeInput({
+                          >
+                            ${BgWidget.editeInput({
                                         readonly: true,
                                         gvc: gvc,
-                                        title: html `<div class="d-flex flex-column" style="gap:5px;">
-                                                                重新導向URI『 登入頁 』 ${BgWidget.grayNote('點擊複製此連結至Google Cloud後台的OAuth重定向URI')}
-                                                            </div>`,
+                                        title: html ` <div class="d-flex flex-column" style="gap:5px;">
+                                重新導向URI『 登入頁 』
+                                ${BgWidget.grayNote('點擊複製此連結至Google Cloud後台的OAuth重定向URI')}
+                              </div>`,
                                         default: `https://` + window.parent.glitter.share.editorViewModel.domain + '/login',
                                         placeHolder: '',
-                                        callback: (text) => { },
+                                        callback: text => { },
                                     })}
-                                                    </div>`,
-                                    html `<div
-                                                        onclick="${gvc.event(() => {
+                          </div>`,
+                                    html ` <div
+                            onclick="${gvc.event(() => {
                                         const dialog = new ShareDialog(gvc.glitter);
                                         navigator.clipboard.writeText(`https://` + window.parent.glitter.share.editorViewModel.domain + '/register');
                                         dialog.successMessage({ text: '已複製至剪貼簿' });
                                     })}"
-                                                    >
-                                                        ${BgWidget.editeInput({
+                          >
+                            ${BgWidget.editeInput({
                                         readonly: true,
                                         gvc: gvc,
-                                        title: html `<div class="d-flex flex-column" style="gap:5px;">
-                                                                重新導向URI『 註冊頁 』 ${BgWidget.grayNote('點擊複製此連結至Google Cloud後台的OAuth重定向URI')}
-                                                            </div>`,
+                                        title: html ` <div class="d-flex flex-column" style="gap:5px;">
+                                重新導向URI『 註冊頁 』
+                                ${BgWidget.grayNote('點擊複製此連結至Google Cloud後台的OAuth重定向URI')}
+                              </div>`,
                                         default: `https://` + window.parent.glitter.share.editorViewModel.domain + '/register',
                                         placeHolder: '',
-                                        callback: (text) => { },
+                                        callback: text => { },
                                     })}
-                                                    </div>`,
+                          </div>`,
                                 ].join(BgWidget.mbContainer(12))),
                                 BgWidget.mainCard([
-                                    html `<div class="tx_700 d-flex align-items-center" style="gap:10px;">
-                                                        <img style="width: 25px;height: 25px;" src="https://d3jnmi1tfjgtti.cloudfront.net/file/252530754/1718208842472-ic_analytics.svg" />
-                                                        資料分析 Google Analytics ( GA4 )
-                                                    </div>`,
-                                    html `<div class="tx_700">追蹤編號</div>`,
-                                    html `<div class="row m-0">${renderCodeSelect(vm.ga.ga4)}</div>`,
+                                    html ` <div class="tx_700 d-flex align-items-center" style="gap:10px;">
+                            <img
+                              style="width: 25px;height: 25px;"
+                              src="https://d3jnmi1tfjgtti.cloudfront.net/file/252530754/1718208842472-ic_analytics.svg"
+                            />
+                            資料分析 Google Analytics ( GA4 )
+                          </div>`,
+                                    html ` <div class="tx_700">追蹤編號</div>`,
+                                    html ` <div class="row m-0">${renderCodeSelect(vm.ga.ga4)}</div>`,
                                 ].join(BgWidget.mbContainer(12))),
                                 BgWidget.mainCard([
-                                    html `<div class="tx_700 d-flex align-items-center" style="gap:10px;">
-                                                        <img style="width: 25px;height: 25px;" src="https://d3jnmi1tfjgtti.cloudfront.net/file/252530754/1718210156723-ic_tag_manager.svg" />
-                                                        追蹤代碼管理工具 Google Tag Manager
-                                                    </div>`,
-                                    html `<div class="tx_700">追蹤編號含GTM</div>`,
-                                    html `<div class="row m-0">${renderCodeSelect(vm.ga.g_tag)}</div>`,
+                                    html ` <div class="tx_700 d-flex align-items-center" style="gap:10px;">
+                            <img
+                              style="width: 25px;height: 25px;"
+                              src="https://d3jnmi1tfjgtti.cloudfront.net/file/252530754/1718210156723-ic_tag_manager.svg"
+                            />
+                            追蹤代碼管理工具 Google Tag Manager
+                          </div>`,
+                                    html ` <div class="tx_700">追蹤編號含GTM</div>`,
+                                    html ` <div class="row m-0">${renderCodeSelect(vm.ga.g_tag)}</div>`,
                                 ].join(BgWidget.mbContainer(12))),
                             ].join(BgWidget.mbContainer(24)),
                             ratio: 70,
                         }, {
                             html: [
                                 BgWidget.summaryCard([
-                                    html `<div class="tx_700">操作說明</div>`,
-                                    html `<div class="tx_normal">設定Google串接，實現Google登入，與 GA4 用戶行為追蹤</div>`,
-                                    html `<div class="tx_normal">
-                                                        前往
-                                                        ${BgWidget.blueNote(`『 教學步驟 』`, gvc.event(() => {
+                                    html ` <div class="tx_700">操作說明</div>`,
+                                    html ` <div class="tx_normal">設定Google串接，實現Google登入，與 GA4 用戶行為追蹤</div>`,
+                                    html ` <div class="tx_normal">
+                            前往
+                            ${BgWidget.blueNote(`『 教學步驟 』`, gvc.event(() => {
                                         window.parent.glitter.openNewTab('https://shopnex.tw/blogs/googleapiconnect');
                                     }))}
-                                                        查看串接設定流程
-                                                    </div>`,
+                            查看串接設定流程
+                          </div>`,
                                 ].join(BgWidget.mbContainer(12))),
                             ].join(BgWidget.mbContainer(24)),
                             ratio: 30,
                         }),
-                        html `<div class="update-bar-container">
-                                    ${BgWidget.save(gvc.event(() => __awaiter(this, void 0, void 0, function* () {
+                        html ` <div class="update-bar-container">
+                  ${BgWidget.save(gvc.event(() => __awaiter(this, void 0, void 0, function* () {
                             const dialog = new ShareDialog(gvc.glitter);
                             dialog.dataLoading({ visible: true });
                             const cf = (yield ApiUser.getPublicConfig('login_config', 'manager')).response.value || {};
@@ -259,7 +281,7 @@ export class ThirdPartyGoggle {
                                 gvc.closeDialog();
                             });
                         })))}
-                                </div>`,
+                </div>`,
                     ].join('');
                 },
             };