ts-glitter 21.4.4 → 21.4.5

package/lowcode/backend-manager/bg-widget.ts

@@ -3291,58 +3291,58 @@ ${obj.default ?? ''}</textarea
     const closeHeight = 56;
 
     obj.gvc.addStyle(`
-            .box-container-${text} {
-                position: relative;
-                height: ${closeHeight}px;
-                border: 1px solid #ddd;
-                border-radius: 10px;
-                overflow-y: hidden;
-                transition: height 0.3s ease-out;
-            }
-            .box-container-${text}.open-box {
-                max-height: ${height}px;
-                height: ${height}px;
-                overflow-y: auto;
-            }
-            .box-navbar-${text} {
-                position: sticky;
-                top: 0;
-                min-height: 20px;
-                background-color: #fff;
-                z-index: 10;
-                display: flex;
-                padding: 15px 20px;
-                align-items: flex-start;
-                justify-content: space-between;
-                cursor: pointer;
-            }
-            .arrow-icon-${text} {
-                color: #393939 !important;
-                box-shadow: none !important;
-                background-color: #fff !important;
-                background-image: url(${BgWidget.arrowDownDataImage('#000')}) !important;
-                background-repeat: no-repeat;
-                cursor: pointer;
-                height: 1rem;
-                border: 0;
-                margin-top: 0.35rem;
-                transition: transform 0.3s;
-            }
-            .arrow-icon-${text}.open-box {
-                margin-top: 0.15rem;
-                transform: rotate(180deg);
-            }
-            .box-inside-${text} {
-                padding: 0 1.5rem 1.5rem;
-                overflow-y: auto;
-            }
+      .box-container-${text} {
+        position: relative;
+        height: ${closeHeight}px;
+        border: 1px solid #ddd;
+        border-radius: 10px;
+        overflow-y: hidden;
+        transition: height 0.3s ease-out;
+      }
+      .box-container-${text}.open-box {
+        max-height: ${height}px;
+        height: ${height}px;
+        overflow-y: auto;
+      }
+      .box-navbar-${text} {
+        position: sticky;
+        top: 0;
+        min-height: 20px;
+        background-color: #fff;
+        z-index: 10;
+        display: flex;
+        padding: 15px 20px;
+        align-items: flex-start;
+        justify-content: space-between;
+        cursor: pointer;
+      }
+      .arrow-icon-${text} {
+        color: #393939 !important;
+        box-shadow: none !important;
+        background-color: #fff !important;
+        background-image: url(${BgWidget.arrowDownDataImage('#000')}) !important;
+        background-repeat: no-repeat;
+        cursor: pointer;
+        height: 1rem;
+        border: 0;
+        margin-top: 0.35rem;
+        transition: transform 0.3s;
+      }
+      .arrow-icon-${text}.open-box {
+        margin-top: 0.15rem;
+        transform: rotate(180deg);
+      }
+      .box-inside-${text} {
+        padding: 0 1.5rem 1.5rem;
+        overflow-y: auto;
+      }
 
-            @media (max-width: 768px) {
-                .box-inside-${text} {
-                    padding: 1rem;
-                }
-            }
-        `);
+      @media (max-width: 768px) {
+        .box-inside-${text} {
+          padding: 1rem;
+        }
+      }
+    `);
 
     return obj.gvc.bindView({
       bind: bvid,
@@ -3551,6 +3551,22 @@ ${obj.default ?? ''}</textarea
     let search = '';
     let selectTags: string[] = def || [];
 
+    gvc.addStyle(`
+      .select-tag-dialog {
+        margin-top: 1px;
+        border: 8px solid #fff;
+        outline: 1px solid #aeaeae;
+        height: 300px;
+        width: 100%;
+        border-radius: 5px;
+        position: absolute;
+        top: 0;
+        background-color: #fff;
+        border-radius: 5px;
+        overflow: auto;
+      }
+    `);
+
     return gvc.bindView({
       bind: id,
       view: () => {
@@ -3558,74 +3574,7 @@ ${obj.default ?? ''}</textarea
           return '';
         }
 
-        if (show) {
-          return html`<div
-            style="margin-top: 1px;border: 8px solid #fff; outline: 1px solid #aeaeae; height: 300px; width: 100%; border-radius: 5px; position: absolute; top: 0; background-color: #fff; border-radius: 5px; overflow: auto;"
-          >
-            <div class="position-relative">
-              <div
-                class="w-100 d-flex align-items-center gap-1 position-sticky mb-1"
-                style="top: 0; background-color: #fff;"
-              >
-                <div class="w-100">
-                  <i
-                    class="fa-regular fa-magnifying-glass"
-                    style="font-size: 18px; color: #A0A0A0; position: absolute; left: 18px; top: 50%; transform: translateY(-50%);"
-                    aria-hidden="true"
-                  ></i>
-                  <input
-                    class="form-control h-100"
-                    style="border-radius: 10px; border: 1px solid #DDD; padding-left: 50px; height: 100%;"
-                    placeholder="${placeholder}"
-                    onchange="${gvc.event(e => {
-                      search = `${e.value}`.trim();
-                      gvc.notifyDataChange(id);
-                    })}"
-                    value="${search}"
-                  />
-                </div>
-                ${this.customButton({
-                  button: {
-                    color: 'black',
-                    size: 'md',
-                  },
-                  text: {
-                    name: '確認',
-                    style: 'font-size: 14px;',
-                  },
-                  event: gvc.event(() => {
-                    show = false;
-                    gvc.notifyDataChange(id);
-                    callback(selectTags);
-                  }),
-                })}
-              </div>
-              <div class="p-2">
-                ${this.multiCheckboxContainer(
-                  gvc,
-                  tagList.filter(tag => tag.name.toLowerCase().includes(search.toLowerCase())),
-                  selectTags,
-                  text => {
-                    if (search) {
-                      selectTags = [
-                        ...new Set(
-                          selectTags
-                            .filter(tag => {
-                              return !tag.toLowerCase().includes(search.toLowerCase());
-                            })
-                            .concat(text)
-                        ),
-                      ];
-                    } else {
-                      selectTags = text;
-                    }
-                  },
-                  { single: false }
-                )}
-              </div>
-            </div>
-          </div>`;
-        } else {
+        if (!show) {
           return html`<div
             class="h-100"
             onclick="${gvc.event(() => {
@@ -3640,20 +3589,77 @@ ${obj.default ?? ''}</textarea
             ></i>
             <div
               class="form-control h-100"
-              style="border-radius: 10px; border: 1px solid #DDD; padding-left: 50px; height: 100%; color: #aeaeae; ${selectTags.length >
-                0 && false
-                ? 'padding: 0.3rem 3rem;'
-                : ''}"
+              style="border-radius: 10px; border: 1px solid #DDD; padding-left: 50px; height: 100%; color: #aeaeae;"
             >
               ${placeholder}
-              <!-- ${selectTags.length > 0
-                ? html`<div class="d-flex flex-wrap gap-2">
-                    ${selectTags.map(item => this.normalInsignia(`#${item}`)).join('')}
-                  </div>`
-                : placeholder} -->
             </div>
           </div>`;
         }
+
+        return html`<div class="select-tag-dialog">
+          <div class="position-relative">
+            <div
+              class="w-100 d-flex align-items-center gap-1 position-sticky mb-1 top-0"
+              style="background-color: #fff;"
+            >
+              <div class="w-100">
+                <i
+                  class="fa-regular fa-magnifying-glass"
+                  style="font-size: 18px; color: #A0A0A0; position: absolute; left: 18px; top: 50%; transform: translateY(-50%);"
+                  aria-hidden="true"
+                ></i>
+                <input
+                  class="form-control h-100"
+                  style="border-radius: 10px; border: 1px solid #DDD; padding-left: 50px; height: 100%;"
+                  placeholder="${placeholder}"
+                  onchange="${gvc.event(e => {
+                    search = `${e.value}`.trim();
+                    gvc.notifyDataChange(id);
+                  })}"
+                  value="${search}"
+                />
+              </div>
+              ${this.customButton({
+                button: {
+                  color: 'black',
+                  size: 'md',
+                },
+                text: {
+                  name: '確認',
+                  style: 'font-size: 14px;',
+                },
+                event: gvc.event(() => {
+                  show = false;
+                  gvc.notifyDataChange(id);
+                  callback(selectTags);
+                }),
+              })}
+            </div>
+            <div class="p-2">
+              ${this.multiCheckboxContainer(
+                gvc,
+                tagList.filter(tag => tag.name.toLowerCase().includes(search.toLowerCase())),
+                selectTags,
+                text => {
+                  if (search) {
+                    selectTags = [
+                      ...new Set(
+                        selectTags
+                          .filter(tag => {
+                            return !tag.toLowerCase().includes(search.toLowerCase());
+                          })
+                          .concat(text)
+                      ),
+                    ];
+                  } else {
+                    selectTags = text;
+                  }
+                },
+                { single: false }
+              )}
+            </div>
+          </div>
+        </div>`;
       },
       divCreate: {
         class: 'w-100 position-relative search-tags-filter',
@@ -3664,10 +3670,7 @@ ${obj.default ?? ''}</textarea
           tagList = await ApiUser.getPublicConfig('product_manager_tags', 'manager').then((dd: any) => {
             if (dd.result && dd.response?.value?.list) {
               return dd.response.value.list.map((item: string) => {
-                return {
-                  key: item,
-                  name: `#${item}`,
-                };
+                return { key: item, name: `#${item}` };
               });
             }
             return [];
@@ -3988,16 +3991,16 @@ ${obj.default ?? ''}</textarea
     };
 
     obj.gvc.addStyle(`
-            .${vm.random}-opt {
-                background-color: white;
-                gap: 24px;
-                padding: 6px;
-            }
-            .${vm.random}-opt:hover {
-                border-radius: 5px;
-                background-color: #e8e8e8;
-            }
-        `);
+      .${vm.random}-opt {
+        background-color: white;
+        gap: 24px;
+        padding: 6px;
+      }
+      .${vm.random}-opt:hover {
+        border-radius: 5px;
+        background-color: #e8e8e8;
+      }
+    `);
 
     return obj.gvc.bindView({
       bind: vm.id,
@@ -5121,31 +5124,31 @@ ${obj.default ?? ''}</textarea
     const transX = obj.align === 'center' ? '-50%' : '0';
 
     obj.gvc.addStyle(`
-            .bounce-effect-${className} {
-                animation: bounce 0.5s alternate;
-                animation-iteration-count: 2;
-                position: fixed;
-                ${fixedStyle}
-                background-color: #393939;
-                opacity: 0.85;
-                color: white;
-                padding: 10px;
-                border-radius: 8px;
-                width: ${obj.width ?? 120}px;
-                text-align: center;
-                z-index: 11;
-                transform: translateX(${transX});
-            }
+      .bounce-effect-${className} {
+        animation: bounce 0.5s alternate;
+        animation-iteration-count: 2;
+        position: fixed;
+        ${fixedStyle}
+        background-color: #393939;
+        opacity: 0.85;
+        color: white;
+        padding: 10px;
+        border-radius: 8px;
+        width: ${obj.width ?? 120}px;
+        text-align: center;
+        z-index: 11;
+        transform: translateX(${transX});
+      }
 
-            @keyframes bounce {
-                0% {
-                    transform: translate(${transX}, 0);
-                }
-                100% {
-                    transform: translate(${transX}, -6px);
-                }
-            }
-        `);
+      @keyframes bounce {
+        0% {
+          transform: translate(${transX}, 0);
+        }
+        100% {
+          transform: translate(${transX}, -6px);
+        }
+      }
+    `);
     const htmlString = html` <div class="bounce-effect-${className}">${obj.text}</div>`;
     obj.gvc.glitter.document.body.insertAdjacentHTML('beforeend', htmlString);
     setTimeout(() => {

package/lowcode/cms-plugin/POS-setting.js

@@ -30,6 +30,7 @@ import { PosWidget } from './pos-widget.js';
 import { SaasOffer } from '../saas-offer.js';
 import { Language } from '../glitter-base/global/language.js';
 import { CreditCard } from './pos-pages/credit-card.js';
+import { BgWidget } from '../backend-manager/bg-widget.js';
 const html = String.raw;
 export class POSSetting {
     static loginManager(gvc, mode, result) {
@@ -342,7 +343,6 @@ export class POSSetting {
         function changeSelectVariant(product) {
             let emptyArray = [];
             product.content.specs.forEach((spec) => {
-                console.log(spec.option);
                 emptyArray.push(spec.option.find((opt) => opt.select == true).title);
             });
             return product.content.variants.find((variant) => arraysEqual(variant.spec, emptyArray));
@@ -492,9 +492,9 @@ export class POSSetting {
                                   </svg>
                                 </div>
                               </div>
-                              <div class="d-flex mt-2 align-items-center justify-content-end ">
-                                <span
-                                  >${(() => {
+                              <div class="d-flex flex-column gap-1 mt-2 align-items-end justify-content-center">
+                                <div>
+                                  ${(() => {
                                         if (selectVariant.show_understocking === 'false') {
                                             return '此商品未追蹤庫存數量';
                                         }
@@ -503,8 +503,67 @@ export class POSSetting {
                                             return `庫存數量: ${selectVariant.exhibition_active_stock}`;
                                         }
                                         return `庫存數量: ${selectVariant.stock}`;
-                                    })()}</span
-                                >
+                                    })()}
+                                </div>
+                                ${selectVariant.show_understocking === 'false'
+                                        ? ''
+                                        : BgWidget.blueNote('查看其他庫存點', gvc.event(() => {
+                                            BgWidget.settingDialog({
+                                                gvc,
+                                                title: '其他庫存點',
+                                                innerHTML: () => {
+                                                    return BgWidget.tableV3({
+                                                        gvc,
+                                                        filter: [],
+                                                        getData: vmi => {
+                                                            const dataList = [];
+                                                            function callback() {
+                                                                vmi.pageSize = 1;
+                                                                vmi.originalData = dataList;
+                                                                vmi.tableData = getDatalist();
+                                                                vmi.loading = false;
+                                                                vmi.callback();
+                                                            }
+                                                            function getDatalist() {
+                                                                return dataList.map((dd) => {
+                                                                    return [
+                                                                        {
+                                                                            key: '門市名稱',
+                                                                            value: `<span class="fs-7">${dd.name}</span>`,
+                                                                        },
+                                                                        {
+                                                                            key: '數量',
+                                                                            value: `<span class="fs-7">${dd.count || 0}</span>`,
+                                                                        },
+                                                                    ];
+                                                                });
+                                                            }
+                                                            ApiUser.getPublicConfig('store_manager', 'manager').then((dd) => {
+                                                                var _a;
+                                                                if (dd.result && Array.isArray((_a = dd.response.value) === null || _a === void 0 ? void 0 : _a.list)) {
+                                                                    dd.response.value.list.map((store) => {
+                                                                        var _a, _b, _c;
+                                                                        const n = (_c = (_b = (_a = selectVariant.stockList) === null || _a === void 0 ? void 0 : _a[store.id]) === null || _b === void 0 ? void 0 : _b.count) !== null && _c !== void 0 ? _c : 0;
+                                                                        dataList.push({
+                                                                            name: store.name,
+                                                                            count: n > 0 ? n : 0,
+                                                                        });
+                                                                    });
+                                                                }
+                                                                callback();
+                                                            });
+                                                        },
+                                                        rowClick: () => { },
+                                                        hiddenPageSplit: true,
+                                                    });
+                                                },
+                                                footer_html: (fGVC) => {
+                                                    return [
+                                                        BgWidget.save(fGVC.event(() => gvc.closeDialog()), '確認'),
+                                                    ].join();
+                                                },
+                                            });
+                                        }))}
                               </div>
                             `;
                                 },
@@ -766,13 +825,7 @@ export class POSSetting {
             query: '',
             productSearch: [],
             categorySearch: true,
-            categories: [
-                {
-                    key: 'all',
-                    value: '全部商品',
-                    select: true,
-                },
-            ],
+            categories: [],
         };
         let orderDetail = JSON.parse(JSON.stringify(new OrderDetail(0, 0)));
         glitter.share.reloadPosPage = () => gvc.notifyDataChange(vm.id);
@@ -870,7 +923,6 @@ export class POSSetting {
             PayConfig.pos_config = res.response.value;
             vm.loading = false;
             gvc.notifyDataChange(vm.id);
-            console.log(`PayConfig.pos_config=>`, PayConfig.pos_config);
         });
         if (vm.type === 'home') {
             vm.type = 'menu';
@@ -1277,17 +1329,17 @@ export class POSSetting {
                                         ...(PayConfig.deviceType === 'pos'
                                             ? [
                                                 html `<a
-                                        class="dropdown-item cursor_pointer d-flex align-items-center"
-                                        style="gap:10px;"
-                                        onclick="${gvc.event(() => {
+                                          class="dropdown-item cursor_pointer d-flex align-items-center"
+                                          style="gap:10px;"
+                                          onclick="${gvc.event(() => {
                                                     CreditCard.refundView(gvc);
                                                 })}"
-                                      ><i
-                                        class="fa-regular fa-credit-card d-flex align-items-center justify-content-center"
-                                        style="width:20px;"
-                                      ></i
-                                      >信用卡刷退</a
-                                      >`,
+                                          ><i
+                                            class="fa-regular fa-credit-card d-flex align-items-center justify-content-center"
+                                            style="width:20px;"
+                                          ></i
+                                          >信用卡刷退</a
+                                        >`,
                                                 html ` <a
                                           class="dropdown-item cursor_pointer d-flex align-items-center"
                                           style="gap:10px;"