ts-glitter 21.2.4 → 21.2.6

package/lowcode/cms-plugin/pos-pages/pos-function.ts

@@ -342,7 +342,6 @@ export class PosFunction {
           `;
         },
         divCreate: {
-          class: '',
           style: `width: 338px; max-height: 400px; overflow-y: auto; padding: 25px 20px; background: white; box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.15); border-radius: 20px; display: flex; flex-direction: column; align-items: center; gap: 10px;`,
         },
       }));
@@ -477,86 +476,129 @@ export class PosFunction {
   }
 
   // SetMoney
-  public static setMoney(gvc: GVC, callback: (money: number) => void, title?: string) {
+  public static setMoney(gvc: GVC, def: number, callback: (money: number) => void, title?: string) {
     gvc.glitter.innerDialog(gvc => {
       const c_vm = {
-        text: '',
         id: gvc.glitter.getUUID(),
+        addListener: false,
+        text: def ? `${def}` : '',
       };
 
       const numberButtons = [
-        [1, 2, 3],
-        [4, 5, 6],
         [7, 8, 9],
-        ['<i class="fa-regular fa-delete-left"></i>', 0, '確認'],
+        [4, 5, 6],
+        [1, 2, 3],
+        ['C', 0, '<i class="fa-regular fa-delete-left"></i>'],
       ];
 
       const handleButtonClick = (value: any) => {
-        if (value === '確認') {
-          callback(parseInt(c_vm.text, 10));
-          gvc.closeDialog();
+        if (value === '確認' || value === 'Enter') {
+          saveEvent();
         } else if (value === '取消') {
-          gvc.closeDialog();
-        } else if (typeof value === 'string' && value.includes('fa-regular')) {
+          closeEvent();
+        } else if (value === 'Backspace' || (typeof value === 'string' && value.includes('fa-regular'))) {
           c_vm.text = c_vm.text.slice(0, -1);
           gvc.notifyDataChange(c_vm.id);
+        } else if (value === 'c' || value === 'C') {
+          c_vm.text = '';
+          gvc.notifyDataChange(c_vm.id);
         } else {
           c_vm.text += value;
+          if (c_vm.text[0] === '0') {
+            c_vm.text = c_vm.text.slice(1, c_vm.text.length);
+          }
           gvc.notifyDataChange(c_vm.id);
         }
       };
 
+      const numberBoardClickEvent = (e: any) => {
+        const key = e.key;
+
+        if (/^[0-9]$/.test(key) || key === 'Backspace' || key === 'Enter' || key.toLowerCase() === 'c') {
+          handleButtonClick(key);
+        }
+      };
+
+      const closeEvent = () => {
+        document.removeEventListener('keydown', numberBoardClickEvent);
+        gvc.closeDialog();
+      };
+
+      const saveEvent = () => {
+        callback(parseInt(c_vm.text, 10));
+        closeEvent();
+      };
+
       return gvc.bindView(() => ({
         bind: c_vm.id,
-        view: () => html`
-          <div
-            style="flex-direction: column; justify-content: flex-start; align-items: flex-start; gap: 20px; display: inline-flex"
-          >
-            <div style="align-self: stretch; display: inline-flex; justify-content: center;">
-              <div class="fw-bold" style="text-align: center; color: #585858; font-size: 28px;">
-                ${title || '輸入收款金額'}
-              </div>
-            </div>
-            <div class="border w-100 p-3 rounded-3 d-flex align-items-center justify-content-end" style="gap: 20px;">
-              <span style="font-size: 28px;">${c_vm.text || 0}</span>
-            </div>
+        view: () => {
+          return html`
             <div
-              style="background: white; flex-direction: column; justify-content: flex-start; align-items: center; gap: 32px; display: flex"
+              style="flex-direction: column; justify-content: flex-start; align-items: flex-end; gap: 20px; display: inline-flex"
             >
+              <div style="align-self: stretch; display: inline-flex; justify-content: center;">
+                <div class="fw-bold" style="text-align: center; color: #585858; font-size: 28px;">
+                  ${title || '輸入收款金額'}
+                </div>
+              </div>
+              <div class="border w-100 p-3 rounded-3 d-flex align-items-center justify-content-end" style="gap: 20px;">
+                <span style="font-size: 28px;">${c_vm.text || 0}</span>
+              </div>
               <div
-                style="align-self: stretch; border-radius: 10px; border: 1px solid #DDD; display: flex; flex-direction: column;"
+                style="background: white; flex-direction: column; justify-content: flex-start; align-items: center; gap: 32px; display: flex"
               >
-                ${numberButtons
-                  .map(
-                    row => html`
-                      <div style="display: inline-flex; justify-content: flex-start; align-items: center;">
-                        ${row
-                          .map(
-                            value => html`
-                              <div
-                                style="height: 56px; width: 95px; display: inline-flex; flex-direction: column; justify-content: center; align-items: center; gap: 10px;"
-                                onclick="${gvc.event(() => handleButtonClick(value))}"
-                              >
+                <div
+                  style="align-self: stretch; border-radius: 10px; border: 1px solid #DDD; display: flex; flex-direction: column;"
+                >
+                  ${numberButtons
+                    .map(
+                      row => html`
+                        <div style="display: inline-flex; justify-content: flex-start; align-items: center;">
+                          ${row
+                            .map(
+                              value => html`
                                 <div
-                                  style="align-self: stretch; text-align: center; color: #393939; font-size: 20px; font-weight: 700; line-height: 28px;"
+                                  style="height: 56px; width: 95px; display: inline-flex; flex-direction: column; justify-content: center; align-items: center; gap: 10px;"
+                                  onclick="${gvc.event(() => handleButtonClick(value))}"
                                 >
-                                  ${value}
+                                  <div
+                                    style="align-self: stretch; text-align: center; color: #393939; font-size: 20px; font-weight: 700; line-height: 28px;"
+                                  >
+                                    ${value}
+                                  </div>
                                 </div>
-                              </div>
-                            `
-                          )
-                          .join('<div style="border-right: 1px #DDDDDD solid; height: 56px;"></div>')}
-                      </div>
-                    `
-                  )
-                  .join('<div style="border-top: 1px #DDDDDD solid; height: 1px; width: 100%;"></div>')}
+                              `
+                            )
+                            .join('<div style="border-right: 1px #DDDDDD solid; height: 56px;"></div>')}
+                        </div>
+                      `
+                    )
+                    .join('<div style="border-top: 1px #DDDDDD solid; height: 1px; width: 100%;"></div>')}
+                </div>
               </div>
+              <div>${BgWidget.save(gvc.event(saveEvent), '確認')}</div>
             </div>
-          </div>
-        `,
+          `;
+        },
         divCreate: {
-          class: '',
-          style: `width: 338px; padding: 25px 20px; background: white; box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.15); border-radius: 20px; overflow: hidden; display: flex; flex-direction: column; align-items: center; gap: 10px;`,
+          style: `
+            width: 338px;
+            padding: 25px 20px;
+            background: white;
+            box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.15);
+            border-radius: 20px;
+            overflow: hidden;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            gap: 10px;
+          `,
+        },
+        onCreate: () => {
+          if (!c_vm.addListener) {
+            c_vm.addListener = true;
+            document.addEventListener('keydown', numberBoardClickEvent);
+          }
         },
       }));
     }, 'setMoney');
@@ -615,11 +657,12 @@ export class PosFunction {
         };
 
         const handlePaymentAmountClick = (method: any, id: string, gvc: GVC, dialog: ShareDialog) => {
+          console.log(method);
           if (method.paied) {
             dialog.errorMessage({ text: '此付款金額已結清，無法進行調整' });
             return;
           }
-          PosFunction.setMoney(gvc, money => {
+          PosFunction.setMoney(gvc, method.total, money => {
             method.total = money || 0;
             gvc.notifyDataChange(id);
           });
@@ -735,16 +778,23 @@ export class PosFunction {
 
                     return btnArray
                       .map(btn => {
-                        return `
-                                                <div style="flex: 1; display: flex; flex-direction: column; justify-content: center; align-items: center; padding: 15px; border-radius: 10px; background: #F6F6F6; ${method.method === btn.value ? 'color: #393939; border: 3px solid #393939; box-shadow: 2px 2px 15px rgba(0, 0, 0, 0.20);' : 'color: #8D8D8D;'}"
-                                                    onclick="${gvc.event(() => {
-                                                      method = { method: btn.value, total: 0 };
-                                                      gvc.notifyDataChange(id);
-                                                    })}">
-                                                    <div style="width: 28px; height: 28px;">${drawIcon(method.method === btn.value, btn.value)}</div>
-                                                    <div style="font-size: 16px; font-weight: 500;">${btn.title}</div>
-                                                </div>
-                                            `;
+                        return html`
+                          <div
+                            style="flex: 1; display: flex; flex-direction: column; justify-content: center; align-items: center; padding: 15px; border-radius: 10px; background: #F6F6F6; ${method.method ===
+                            btn.value
+                              ? 'color: #393939; border: 3px solid #393939; box-shadow: 2px 2px 15px rgba(0, 0, 0, 0.20);'
+                              : 'color: #8D8D8D;'}"
+                            onclick="${gvc.event(() => {
+                              method = { method: btn.value, total: 0 };
+                              gvc.notifyDataChange(id);
+                            })}"
+                          >
+                            <div style="width: 28px; height: 28px;">
+                              ${drawIcon(method.method === btn.value, btn.value)}
+                            </div>
+                            <div style="font-size: 16px; font-weight: 500;">${btn.title}</div>
+                          </div>
+                        `;
                       })
                       .join('');
                   })()}

package/lowcode/cms-plugin/pos-pages/pos-summary.js

@@ -94,7 +94,7 @@ export class PosSummary {
                         style="width:100px;"
                         placeholder="0"
                         onclick="${gvc.event((e, event) => {
-                                PosFunction.setMoney(gvc, response => {
+                                PosFunction.setMoney(gvc, dd.real, response => {
                                     dd.real = response || 0;
                                     e.value = response || 0;
                                 }, '設定清點金額');
@@ -128,7 +128,7 @@ export class PosSummary {
             <input
               class="form-control mt-2"
               onclick="${gvc.event((e, event) => {
-                        PosFunction.setMoney(gvc, response => {
+                        PosFunction.setMoney(gvc, money, response => {
                             e.value = `${response}`;
                             money = response || 0;
                         }, '設定備用金額');
@@ -463,8 +463,8 @@ export class PosSummary {
                             text: html `${PosWidget.fontBold('要從錢箱匯出的金額')}
                       <input
                         class="form-control mt-2"
-                        onclick="${gvc.event((e, event) => {
-                                PosFunction.setMoney(gvc, response => {
+                        onclick="${gvc.event(e => {
+                                PosFunction.setMoney(gvc, money, response => {
                                     if (response > min_) {
                                         dialog.errorMessage({ text: '錢箱金額不足' });
                                     }

package/lowcode/cms-plugin/pos-pages/pos-summary.ts

@@ -91,6 +91,7 @@ export class PosSummary {
                         onclick="${gvc.event((e, event) => {
                           PosFunction.setMoney(
                             gvc,
+                            dd.real,
                             response => {
                               dd.real = response || 0;
                               e.value = response || 0;
@@ -133,6 +134,7 @@ export class PosSummary {
               onclick="${gvc.event((e, event) => {
                 PosFunction.setMoney(
                   gvc,
+                  money,
                   response => {
                     e.value = `${response}`;
                     money = response || 0;
@@ -483,9 +485,10 @@ export class PosSummary {
                     text: html`${PosWidget.fontBold('要從錢箱匯出的金額')}
                       <input
                         class="form-control mt-2"
-                        onclick="${gvc.event((e, event) => {
+                        onclick="${gvc.event(e => {
                           PosFunction.setMoney(
                             gvc,
+                            money,
                             response => {
                               if (response > min_) {
                                 dialog.errorMessage({ text: '錢箱金額不足' });

package/lowcode/cms-plugin/shopping-order-manager.js

@@ -1547,12 +1547,15 @@ export class ShoppingOrderManager {
                                                     return {
                                                         bind: gvc.glitter.getUUID(),
                                                         view: () => __awaiter(this, void 0, void 0, function* () {
-                                                            const needAddress = [
-                                                                'normal',
-                                                                'black_cat',
-                                                                'black_cat_freezing',
-                                                                'black_cat_ice',
-                                                                'global_express',
+                                                            const noNeedAddress = [
+                                                                'now',
+                                                                'shop',
+                                                                'UNIMARTC2C',
+                                                                'FAMIC2C',
+                                                                'HILIFEC2C',
+                                                                'OKMARTC2C',
+                                                                'UNIMARTFREEZE',
+                                                                'FAMIC2CFREEZE',
                                                             ].includes(orderData.orderData.user_info.shipment);
                                                             const viewModel = [
                                                                 ['姓名', 'name'],
@@ -1562,7 +1565,7 @@ export class ShoppingOrderManager {
                                                                 ['鄉鎮', 'area'],
                                                                 ['地址', 'address'],
                                                             ].filter(item => {
-                                                                return needAddress || !['city', 'area', 'address'].includes(item[1]);
+                                                                return !noNeedAddress || !['city', 'area', 'address'].includes(item[1]);
                                                             });
                                                             const receipt = (yield ApiUser.getPublicConfig('custom_form_checkout_recipient', 'manager')).response.value;
                                                             receipt.list.map((d1) => {

package/lowcode/cms-plugin/shopping-order-manager.ts

@@ -1745,12 +1745,15 @@ export class ShoppingOrderManager {
                             return {
                               bind: gvc.glitter.getUUID(),
                               view: async () => {
-                                const needAddress = [
-                                  'normal',
-                                  'black_cat',
-                                  'black_cat_freezing',
-                                  'black_cat_ice',
-                                  'global_express',
+                                const noNeedAddress = [
+                                  'now',
+                                  'shop',
+                                  'UNIMARTC2C',
+                                  'FAMIC2C',
+                                  'HILIFEC2C',
+                                  'OKMARTC2C',
+                                  'UNIMARTFREEZE',
+                                  'FAMIC2CFREEZE',
                                 ].includes(orderData.orderData.user_info.shipment);
 
                                 const viewModel = [
@@ -1761,7 +1764,7 @@ export class ShoppingOrderManager {
                                   ['鄉鎮', 'area'],
                                   ['地址', 'address'],
                                 ].filter(item => {
-                                  return needAddress || !['city', 'area', 'address'].includes(item[1]);
+                                  return !noNeedAddress || !['city', 'area', 'address'].includes(item[1]);
                                 });
 
                                 const receipt = (

package/lowcode/cms-plugin/shopping-product-setting.js

@@ -747,6 +747,9 @@ export class ShoppingProductSetting {
                     const vm = {
                         id: gvc.glitter.getUUID(),
                     };
+                    if (obj.vm.type === 'add') {
+                        variant.shipment_type = 'none';
+                    }
                     return {
                         bind: vm.id,
                         view: () => {
@@ -918,7 +921,7 @@ export class ShoppingProductSetting {
                                         />
                                       `;
                             })
-                                .join(``)}
+                                .join('')}
                                 </div>
                               </div>`;
                         }
@@ -930,7 +933,7 @@ export class ShoppingProductSetting {
                               <div class="flex-fill d-flex flex-column" style="gap: 8px">
                                 <div>庫存數量</div>
                                 <div
-                                  class="w-100 ${postMD.shopee_id ? `` : `d-none`}"
+                                  class="w-100 ${postMD.shopee_id ? '' : `d-none`}"
                                   style="font-size: 14px;font-weight: 400;color: #8D8D8D;"
                                 >
                                   此商品來源為蝦皮電商平台，將自動同步蝦皮庫存
@@ -1086,7 +1089,7 @@ export class ShoppingProductSetting {
         })()}
               ${document.body.clientWidth > 768 && obj.single === undefined ? BgWidget.mbContainer(120) : ''}
             </div>
-            <div class="${obj.single ? `d-none` : ``}" style="min-width:300px; max-width:100%;">
+            <div class="${obj.single ? `d-none` : ''}" style="min-width:300px; max-width:100%;">
               ${BgWidget.summaryCard(gvc.bindView({
             bind: 'right',
             view: () => {
@@ -1132,7 +1135,7 @@ export class ShoppingProductSetting {
                           `;
                     }
                     else {
-                        return ``;
+                        return '';
                     }
                 })
                     .join('');
@@ -1148,7 +1151,7 @@ export class ShoppingProductSetting {
         `, {
             style: obj.vm.type === 'editSpec' ? '' : 'margin-top: 0 !important;',
         })}
-      <div class="update-bar-container ${obj.single ? `d-none` : ``}">
+      <div class="update-bar-container ${obj.single ? `d-none` : ''}">
         ${BgWidget.cancel(obj.gvc.event(() => {
             checkStore(obj && obj.goBackEvent
                 ? obj.goBackEvent.cancel
@@ -1271,7 +1274,7 @@ export class ShoppingProductSetting {
                     view: () => {
                         var _b, _c, _d, _e, _f;
                         const languageData = postMD.language_data[vm.language] || {};
-                        languageData.title = ((_b = languageData.title) === null || _b === void 0 ? void 0 : _b.trim()) ? languageData.title : (postMD === null || postMD === void 0 ? void 0 : postMD.title) || 'Default Title';
+                        languageData.title = ((_b = languageData.title) === null || _b === void 0 ? void 0 : _b.trim()) ? languageData.title : (postMD === null || postMD === void 0 ? void 0 : postMD.title) || '';
                         languageData.content = (_c = languageData.content) !== null && _c !== void 0 ? _c : postMD.content;
                         languageData.content_array = (_d = languageData.content_array) !== null && _d !== void 0 ? _d : postMD.content_array;
                         languageData.content_json = (_e = languageData.content_json) !== null && _e !== void 0 ? _e : postMD.content_json;

package/lowcode/cms-plugin/shopping-product-setting.ts

@@ -303,6 +303,7 @@ export class ShoppingProductSetting {
                                         return undefined;
                                       })(),
                                     };
+
                                     ApiShop.getProduct(vm.apiJSON).then(data => {
                                       function getDatalist() {
                                         return data.response.data.map((dd: any) => {
@@ -858,12 +859,18 @@ export class ShoppingProductSetting {
                         const vm = {
                           id: gvc.glitter.getUUID(),
                         };
+
+                        if (obj.vm.type === 'add') {
+                          variant.shipment_type = 'none';
+                        }
+
                         return {
                           bind: vm.id,
                           view: () => {
                             if (postMD.product_category === 'weighing') {
                               variant.shipment_type = 'none';
                             }
+
                             return html` <div style="font-weight: 700;margin-bottom: 6px;">運費計算</div>
                               ${BgWidget.multiCheckboxContainer(
                                 gvc,
@@ -1044,7 +1051,7 @@ export class ShoppingProductSetting {
                                         />
                                       `;
                                     })
-                                    .join(``)}
+                                    .join('')}
                                 </div>
                               </div>`;
                             }
@@ -1057,7 +1064,7 @@ export class ShoppingProductSetting {
                               <div class="flex-fill d-flex flex-column" style="gap: 8px">
                                 <div>庫存數量</div>
                                 <div
-                                  class="w-100 ${(postMD as any).shopee_id ? `` : `d-none`}"
+                                  class="w-100 ${(postMD as any).shopee_id ? '' : `d-none`}"
                                   style="font-size: 14px;font-weight: 400;color: #8D8D8D;"
                                 >
                                   此商品來源為蝦皮電商平台，將自動同步蝦皮庫存
@@ -1261,7 +1268,7 @@ export class ShoppingProductSetting {
               })()}
               ${document.body.clientWidth > 768 && obj.single === undefined ? BgWidget.mbContainer(120) : ''}
             </div>
-            <div class="${obj.single ? `d-none` : ``}" style="min-width:300px; max-width:100%;">
+            <div class="${obj.single ? `d-none` : ''}" style="min-width:300px; max-width:100%;">
               ${BgWidget.summaryCard(
                 gvc.bindView({
                   bind: 'right',
@@ -1310,7 +1317,7 @@ export class ShoppingProductSetting {
                             </div>
                           `;
                         } else {
-                          return ``;
+                          return '';
                         }
                       })
                       .join('');
@@ -1330,7 +1337,7 @@ export class ShoppingProductSetting {
           style: obj.vm.type === 'editSpec' ? '' : 'margin-top: 0 !important;',
         }
       )}
-      <div class="update-bar-container ${obj.single ? `d-none` : ``}">
+      <div class="update-bar-container ${obj.single ? `d-none` : ''}">
         ${BgWidget.cancel(
           obj.gvc.event(() => {
             checkStore(
@@ -1522,7 +1529,7 @@ export class ShoppingProductSetting {
           const languageData = (postMD.language_data as any)[vm.language] || {};
 
           // 如果沒有塞入預設值，則使用預設值
-          languageData.title = languageData.title?.trim() ? languageData.title : postMD?.title || 'Default Title';
+          languageData.title = languageData.title?.trim() ? languageData.title : postMD?.title || '';
           languageData.content = languageData.content ?? postMD.content;
           languageData.content_array = languageData.content_array ?? postMD.content_array;
           languageData.content_json = languageData.content_json ?? postMD.content_json;