ts-glitter 21.0.4 → 21.0.6

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

@@ -402,25 +402,32 @@ export class ShoppingOrderManager {
                     ),
                   ];
 
+                  function cartTokenComponent(cart_token: any, source_badge: string, is_watch_user: boolean) {
+                    return html`<div style="min-width:200px;">
+                      <div style="position: relative; height: 40px;">
+                        <div
+                          style="position: absolute; bottom: 9px; height: 9px; width: 127px; ${is_watch_user
+                            ? 'background-color: #ffe9b2'
+                            : ''}"
+                        ></div>
+                        <span style="position: absolute; bottom: 0;">${cart_token}${source_badge}</span>
+                      </div>
+                    </div>`;
+                  }
+
                   return data.response.data.map((dd: any) => {
                     const vt = OrderSetting.getAllStatusBadge(dd);
                     dd.orderData.total = dd.orderData.total || 0;
                     dd.orderData.customer_info = dd.orderData.customer_info ?? {};
 
                     const isWatchUser = watchUsers.includes(dd.orderData.email);
-                    const backgroundColor = isWatchUser ? `background-color: #ffe9b2` : '';
                     const tooltipText = isWatchUser ? '此份訂單的顧客為觀察名單' : '';
 
                     if (query.isShipment) {
                       return [
                         {
                           key: '訂單編號',
-                          value: html` <div
-                            class="d-flex align-items-center gap-2"
-                            style="min-width: 200px; ${backgroundColor}"
-                          >
-                            ${dd.cart_token}${vt.sourceBadge()}
-                          </div>`,
+                          value: cartTokenComponent(dd.cart_token, vt.sourceBadge(), isWatchUser),
                           tooltip: tooltipText,
                         },
                         {
@@ -449,12 +456,7 @@ export class ShoppingOrderManager {
                       return [
                         {
                           key: '訂單編號',
-                          value: html` <div
-                            class="d-flex align-items-center gap-2"
-                            style="min-width: 200px; ${backgroundColor}"
-                          >
-                            ${dd.cart_token}${vt.sourceBadge()}
-                          </div>`,
+                          value: cartTokenComponent(dd.cart_token, vt.sourceBadge(), isWatchUser),
                           tooltip: tooltipText,
                         },
                         {
@@ -1738,19 +1740,21 @@ export class ShoppingOrderManager {
                                   ['姓名', 'name'],
                                   ['電話', 'phone'],
                                   ['信箱', 'email'],
+                                  ['縣市', 'city'],
+                                  ['鄉鎮', 'area'],
+                                  ['地址', 'address'],
                                 ];
+
                                 const receipt = (
                                   await ApiUser.getPublicConfig('custom_form_checkout_recipient', 'manager')
                                 ).response.value;
+
                                 receipt.list.map((d1: any) => {
-                                  if (
-                                    !viewModel.find(dd => {
-                                      return dd[1] === d1.key;
-                                    })
-                                  ) {
+                                  if (!viewModel.find(dd => dd[1] === d1.key)) {
                                     viewModel.push([d1.title, d1.key]);
                                   }
                                 });
+
                                 if (vm.mode == 'read') {
                                   return viewModel
                                     .map(item => {
@@ -2865,7 +2869,7 @@ export class ShoppingOrderManager {
                                   html` <div class="d-flex flex-column" style="gap:8px;">
                                     <div
                                       class="d-flex align-items-center"
-                                      style="font-weight: 700; gap:8px;cursor:pointer;"
+                                      style="gap: 8px; cursor: pointer;"
                                       onclick="${gvc.event(() => {
                                         if (userData.userID) {
                                           child_vm.userID = userData.userID;
@@ -2873,30 +2877,43 @@ export class ShoppingOrderManager {
                                         }
                                       })}"
                                     >
-                                      ${(() => {
-                                        const name = userData?.userData?.name;
-                                        if (name) {
-                                          return html`<span style="color: #4D86DB;">${name}</span>`;
-                                        }
-                                        return html`<span style="color: #393939;">訪客</span>`;
-                                      })()}
-                                      ${(() => {
-                                        if (userDataLoading) {
-                                          return BgWidget.secondaryInsignia('讀取中');
-                                        }
-                                        if (userData.member == undefined) {
-                                          return BgWidget.secondaryInsignia('訪客');
-                                        }
-                                        if (userData?.member.length > 0) {
-                                          for (let i = 0; i < userData.member.length; i++) {
-                                            if (userData.member[i].trigger) {
-                                              return BgWidget.primaryInsignia(userData.member[i].tag_name);
+                                      ${[
+                                        (() => {
+                                          const name = userData?.userData?.name;
+                                          if (name) {
+                                            return html`<span style="font-weight: 500; color: #4D86DB;">${name}</span>`;
+                                          }
+                                          return html`<span style="font-weight: normal; color: #393939;">訪客</span>`;
+                                        })(),
+                                        (() => {
+                                          if (userData.status === 0) {
+                                            return '';
+                                          }
+                                          if (userDataLoading) {
+                                            return BgWidget.grayInsignia('讀取中');
+                                          }
+                                          if (userData.member === undefined) {
+                                            return BgWidget.grayInsignia('訪客');
+                                          }
+                                          if (userData?.member.length > 0) {
+                                            for (let i = 0; i < userData.member.length; i++) {
+                                              if (userData.member[i].trigger) {
+                                                return BgWidget.darkInsignia(userData.member[i].tag_name);
+                                              }
                                             }
                                           }
-                                          return BgWidget.primaryInsignia('一般會員');
-                                        }
-                                        return BgWidget.secondaryInsignia('訪客');
-                                      })()}
+                                          return BgWidget.darkInsignia('一般會員');
+                                        })(),
+                                        (() => {
+                                          if (userData.status === 0) {
+                                            return BgWidget.dangerInsignia('黑名單');
+                                          }
+                                          if (userData.status === 2) {
+                                            return BgWidget.watchingInsignia('觀察名單');
+                                          }
+                                          return '';
+                                        })(),
+                                      ].join('')}
                                     </div>
                                     <div style="color: #393939;font-weight: 400;">
                                       ${userData?.userData?.phone ??
@@ -2906,9 +2923,6 @@ export class ShoppingOrderManager {
                                     <div style="color: #393939;font-weight: 400;word-break:break-all;">
                                       ${userData?.userData?.email ?? orderData.orderData.user_info.email ?? ''}
                                     </div>
-                                    <div style="color: #393939;font-weight: 700;">
-                                      ${userData.status === 2 ? '* 此顧客列為觀察名單' : ''}
-                                    </div>
                                   </div>`,
                                   BgWidget.horizontalLine(),
                                   gvc.bindView({
@@ -3020,9 +3034,7 @@ export class ShoppingOrderManager {
                                                         orderData.orderData.user_info.area,
                                                         orderData.orderData.user_info.address,
                                                       ]
-                                                        .filter(dd => {
-                                                          return dd;
-                                                        })
+                                                        .filter(Boolean)
                                                         .join('')}
                                                     </div>`
                                                 );

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

@@ -297,12 +297,17 @@ export class ShoppingProductSetting {
                                                                                         }
                                                                                     });
                                                                                     if (countStock == 0) {
-                                                                                        return html ` 無追蹤庫存 `;
+                                                                                        return '無追蹤庫存';
                                                                                     }
-                                                                                    return html `${countStock}個子類
-                                                ${sum > 1
-                                                                                        ? `有${sum}件庫存`
-                                                                                        : html ` <span style="color:#8E0E2B">有${sum} 件庫存</span>`}`;
+                                                                                    const countStockText = countStock > 1 ? `${countStock} 個子類` : '';
+                                                                                    const stockText = html ` <span
+                                                  style="${sum > 1
+                                                                                        ? 'color: #393939'
+                                                                                        : 'color: #8E0E2B; font-weight: 500;'}"
+                                                >
+                                                  庫存 ${sum.toLocaleString()} 件</span
+                                                >`;
+                                                                                    return `${countStockText}${stockText}`;
                                                                                 })(),
                                                                             },
                                                                             {

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

@@ -345,20 +345,28 @@ export class ShoppingProductSetting {
                                               value: (() => {
                                                 let sum = 0;
                                                 let countStock = 0;
+
                                                 dd.content.variants.forEach((variant: any) => {
                                                   if (variant.show_understocking == 'true') {
                                                     countStock++;
                                                     sum += variant.stock;
                                                   }
                                                 });
-                                                // const sum = dd.content.variants.reduce((acc: any, curr: any) => acc + curr.stock, 0);
+
                                                 if (countStock == 0) {
-                                                  return html` 無追蹤庫存 `;
+                                                  return '無追蹤庫存';
                                                 }
-                                                return html`${countStock}個子類
-                                                ${sum > 1
-                                                  ? `有${sum}件庫存`
-                                                  : html` <span style="color:#8E0E2B">有${sum} 件庫存</span>`}`;
+
+                                                const countStockText = countStock > 1 ? `${countStock} 個子類` : '';
+                                                const stockText = html` <span
+                                                  style="${sum > 1
+                                                    ? 'color: #393939'
+                                                    : 'color: #8E0E2B; font-weight: 500;'}"
+                                                >
+                                                  庫存 ${sum.toLocaleString()} 件</span
+                                                >`;
+
+                                                return `${countStockText}${stockText}`;
                                               })(),
                                             },
                                             {

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

@@ -9,9 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { BgWidget } from '../backend-manager/bg-widget.js';
 import { BgProduct } from '../backend-manager/bg-product.js';
-import { ApiPageConfig } from '../api/pageConfig.js';
 import { ApiUser } from '../glitter-base/route/user.js';
-import { ShipmentConfig } from '../glitter-base/global/shipment-config.js';
 import { QuestionInfo } from './module/question-info.js';
 import { Tool } from '../modules/tool.js';
 const html = String.raw;
@@ -753,7 +751,7 @@ export class ShoppingSettingAdvance {
                                 var _a;
                                 let loading = true;
                                 let dataList = [];
-                                postMD.designated_logistics = (_a = postMD.designated_logistics) !== null && _a !== void 0 ? _a : { type: 'all', list: [] };
+                                postMD.designated_logistics = (_a = postMD.designated_logistics) !== null && _a !== void 0 ? _a : { group: '' };
                                 return {
                                     bind: 'designatedLogistics',
                                     view: () => {
@@ -785,79 +783,30 @@ export class ShoppingSettingAdvance {
                                                                 key: 'designated',
                                                                 value: '指定物流',
                                                             },
-                                                        ],
+                                                        ].filter(item => {
+                                                            return !(item.key === 'designated' && dataList.length === 0);
+                                                        }),
                                                         style: 'width: 100%;',
                                                     })}
                                       <div>
                                         ${(() => {
                                                         switch (postMD.designated_logistics.type) {
                                                             case 'designated':
-                                                                return (() => {
-                                                                    const designatedVM = {
-                                                                        id: gvc.glitter.getUUID(),
-                                                                        loading: true,
-                                                                        dataList: [],
-                                                                    };
-                                                                    return gvc.bindView({
-                                                                        bind: designatedVM.id,
-                                                                        view: () => {
-                                                                            var _a;
-                                                                            if (designatedVM.loading) {
-                                                                                return BgWidget.spinner({ text: { visible: false } });
-                                                                            }
-                                                                            else {
-                                                                                return BgWidget.selectDropList({
-                                                                                    gvc: gvc,
-                                                                                    callback: (value) => {
-                                                                                        postMD.designated_logistics.list = value;
-                                                                                        gvc.notifyDataChange(id);
-                                                                                    },
-                                                                                    default: (_a = postMD.designated_logistics.list) !== null && _a !== void 0 ? _a : [],
-                                                                                    options: designatedVM.dataList,
-                                                                                    style: 'width: 100%;',
-                                                                                });
-                                                                            }
-                                                                        },
-                                                                        divCreate: {
-                                                                            style: 'width: 100%;',
-                                                                        },
-                                                                        onCreate: () => {
-                                                                            if (designatedVM.loading) {
-                                                                                ApiPageConfig.getPrivateConfig(window.parent.appName, 'logistics_setting')
-                                                                                    .then((dd) => {
-                                                                                    var _a;
-                                                                                    if (!dd.result || !dd.response.result[0]) {
-                                                                                        throw new Error('Failed to fetch logistics setting or empty result.');
-                                                                                    }
-                                                                                    const shipment_setting = dd.response.result[0].value;
-                                                                                    const combinedList = [
-                                                                                        ...ShipmentConfig.list.map(dd => ({
-                                                                                            name: dd.title,
-                                                                                            value: dd.value,
-                                                                                        })),
-                                                                                        ...((_a = shipment_setting.custom_delivery) !== null && _a !== void 0 ? _a : []).map((dd) => ({
-                                                                                            form: dd.form,
-                                                                                            name: dd.name,
-                                                                                            value: dd.id,
-                                                                                        })),
-                                                                                    ];
-                                                                                    const supportedList = combinedList.filter(d1 => shipment_setting.support.some((d2) => d2 === d1.value));
-                                                                                    designatedVM.dataList = supportedList.map(item => ({
-                                                                                        key: item.value,
-                                                                                        value: item.name,
-                                                                                    }));
-                                                                                    designatedVM.loading = false;
-                                                                                    gvc.notifyDataChange(designatedVM.id);
-                                                                                })
-                                                                                    .catch(error => {
-                                                                                    console.error('Error fetching logistics setting:', error);
-                                                                                    designatedVM.loading = false;
-                                                                                    gvc.notifyDataChange(designatedVM.id);
-                                                                                });
-                                                                            }
-                                                                        },
-                                                                    });
-                                                                })();
+                                                                return BgWidget.selectDropList({
+                                                                    gvc: gvc,
+                                                                    callback: (value) => {
+                                                                        postMD.designated_logistics.group = value;
+                                                                        gvc.notifyDataChange(id);
+                                                                    },
+                                                                    default: postMD.designated_logistics.group || [],
+                                                                    options: dataList.map((data) => {
+                                                                        return {
+                                                                            key: data.key,
+                                                                            value: data.name,
+                                                                        };
+                                                                    }),
+                                                                    style: 'width: 100%;',
+                                                                });
                                                             default:
                                                                 return '';
                                                         }
@@ -871,10 +820,10 @@ export class ShoppingSettingAdvance {
                                     },
                                     onCreate: () => {
                                         if (loading) {
-                                            ApiPageConfig.getPrivateConfig(window.parent.appName, 'glitter_delivery').then(res => {
+                                            ApiUser.getPublicConfig('logistics_group', 'manager').then(r => {
                                                 dataList = (() => {
                                                     try {
-                                                        return res.response.result[0].value;
+                                                        return r.response.value;
                                                     }
                                                     catch (error) {
                                                         return dataList;

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

@@ -1,10 +1,8 @@
 import { GVC } from '../glitterBundle/GVController.js';
 import { BgWidget } from '../backend-manager/bg-widget.js';
 import { BgProduct, OptionsItem } from '../backend-manager/bg-product.js';
-import { ApiPageConfig } from '../api/pageConfig.js';
 import { ApiUser } from '../glitter-base/route/user.js';
 import { LanguageLocation } from '../glitter-base/global/language.js';
-import { ShipmentConfig } from '../glitter-base/global/shipment-config.js';
 import { QuestionInfo } from './module/question-info.js';
 import { Tool } from '../modules/tool.js';
 import { Product, MultiSaleType } from '../public-models/product.js';
@@ -828,7 +826,8 @@ export class ShoppingSettingAdvance {
                     obj.gvc.bindView(() => {
                       let loading = true;
                       let dataList: any = [];
-                      postMD.designated_logistics = postMD.designated_logistics ?? { type: 'all', list: [] };
+                      postMD.designated_logistics = postMD.designated_logistics ?? { group: '' };
+
                       return {
                         bind: 'designatedLogistics',
                         view: () => {
@@ -860,94 +859,30 @@ export class ShoppingSettingAdvance {
                                             key: 'designated',
                                             value: '指定物流',
                                           },
-                                        ],
+                                        ].filter(item => {
+                                          return !(item.key === 'designated' && dataList.length === 0);
+                                        }),
                                         style: 'width: 100%;',
                                       })}
                                       <div>
                                         ${(() => {
                                           switch (postMD.designated_logistics.type) {
                                             case 'designated':
-                                              return (() => {
-                                                const designatedVM = {
-                                                  id: gvc.glitter.getUUID(),
-                                                  loading: true,
-                                                  dataList: [] as any,
-                                                };
-                                                return gvc.bindView({
-                                                  bind: designatedVM.id,
-                                                  view: () => {
-                                                    if (designatedVM.loading) {
-                                                      return BgWidget.spinner({ text: { visible: false } });
-                                                    } else {
-                                                      return BgWidget.selectDropList({
-                                                        gvc: gvc,
-                                                        callback: (value: []) => {
-                                                          postMD.designated_logistics.list = value;
-                                                          gvc.notifyDataChange(id);
-                                                        },
-                                                        default: postMD.designated_logistics.list ?? [],
-                                                        options: designatedVM.dataList,
-                                                        style: 'width: 100%;',
-                                                      });
-                                                    }
-                                                  },
-                                                  divCreate: {
-                                                    style: 'width: 100%;',
-                                                  },
-                                                  onCreate: () => {
-                                                    if (designatedVM.loading) {
-                                                      ApiPageConfig.getPrivateConfig(
-                                                        (window.parent as any).appName,
-                                                        'logistics_setting'
-                                                      )
-                                                        .then((dd: any) => {
-                                                          if (!dd.result || !dd.response.result[0]) {
-                                                            throw new Error(
-                                                              'Failed to fetch logistics setting or empty result.'
-                                                            );
-                                                          }
-
-                                                          const shipment_setting = dd.response.result[0].value;
-
-                                                          // 合併 ShipmentConfig.list 和 shipment_setting.custom_delivery
-                                                          const combinedList = [
-                                                            ...ShipmentConfig.list.map(dd => ({
-                                                              name: dd.title,
-                                                              value: dd.value,
-                                                            })),
-                                                            ...(shipment_setting.custom_delivery ?? []).map(
-                                                              (dd: any) => ({
-                                                                form: dd.form,
-                                                                name: dd.name,
-                                                                value: dd.id,
-                                                              })
-                                                            ),
-                                                          ];
-
-                                                          // 過濾出 shipment_setting.support 中支援的項目
-                                                          const supportedList = combinedList.filter(d1 =>
-                                                            shipment_setting.support.some((d2: any) => d2 === d1.value)
-                                                          );
-
-                                                          // 轉換為 designatedVM.dataList 所需的格式
-                                                          designatedVM.dataList = supportedList.map(item => ({
-                                                            key: item.value,
-                                                            value: item.name,
-                                                          }));
-
-                                                          // 更新狀態並通知資料變更
-                                                          designatedVM.loading = false;
-                                                          gvc.notifyDataChange(designatedVM.id);
-                                                        })
-                                                        .catch(error => {
-                                                          console.error('Error fetching logistics setting:', error);
-                                                          designatedVM.loading = false;
-                                                          gvc.notifyDataChange(designatedVM.id);
-                                                        });
-                                                    }
-                                                  },
-                                                });
-                                              })();
+                                              return BgWidget.selectDropList({
+                                                gvc: gvc,
+                                                callback: (value: []) => {
+                                                  postMD.designated_logistics.group = value;
+                                                  gvc.notifyDataChange(id);
+                                                },
+                                                default: postMD.designated_logistics.group || [],
+                                                options: dataList.map((data: any) => {
+                                                  return {
+                                                    key: data.key,
+                                                    value: data.name,
+                                                  };
+                                                }),
+                                                style: 'width: 100%;',
+                                              });
                                             default:
                                               return '';
                                           }
@@ -961,19 +896,17 @@ export class ShoppingSettingAdvance {
                         },
                         onCreate: () => {
                           if (loading) {
-                            ApiPageConfig.getPrivateConfig((window.parent as any).appName, 'glitter_delivery').then(
-                              res => {
-                                dataList = (() => {
-                                  try {
-                                    return res.response.result[0].value;
-                                  } catch (error) {
-                                    return dataList;
-                                  }
-                                })();
-                                loading = false;
-                                gvc.notifyDataChange('designatedLogistics');
-                              }
-                            );
+                            ApiUser.getPublicConfig('logistics_group', 'manager').then(r => {
+                              dataList = (() => {
+                                try {
+                                  return r.response.value;
+                                } catch (error) {
+                                  return dataList;
+                                }
+                              })();
+                              loading = false;
+                              gvc.notifyDataChange('designatedLogistics');
+                            });
                           }
                         },
                       };