ts-glitter 20.3.2 → 20.3.4

package/lowcode/Entry.js

@@ -143,7 +143,7 @@ export class Entry {
             }
             window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
             console.log(`Entry-time:`, window.renderClock.stop());
-            glitter.share.editerVersion = 'V_20.3.2';
+            glitter.share.editerVersion = 'V_20.3.4';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {

package/lowcode/Entry.ts

@@ -144,7 +144,7 @@ export class Entry {
       }
       (window as any).renderClock = (window as any).renderClock ?? createClock();
       console.log(`Entry-time:`, (window as any).renderClock.stop());
-      glitter.share.editerVersion = 'V_20.3.2';
+      glitter.share.editerVersion = 'V_20.3.4';
       glitter.share.start = new Date();
       const vm = { appConfig: [] };
       (window as any).saasConfig = {

package/lowcode/backend-manager/bg-product.js

@@ -179,9 +179,13 @@ export class BgProduct {
                                         ? BgWidget.infoInsignia(ProductConfig.getName(opt.content))
                                         : ''}${opt.value}
                                               </div>
-                                              ${opt.sub_title ? `
-                                              <div class="fw-500" style="color:grey;font-size:13px;">${opt.sub_title}</div>
-                                              ` : ``}
+                                              ${opt.sub_title
+                                        ? html `
+                                                    <div class="fw-500" style="color:grey;font-size:13px;">
+                                                      ${opt.sub_title}
+                                                    </div>
+                                                  `
+                                        : ''}
                                             </div>
                                           </div>
                                           ${(() => {
@@ -255,28 +259,30 @@ export class BgProduct {
                             vm.options = [];
                             data.response.data.map((product) => {
                                 var _a;
+                                const image = (_a = product.content.preview_image[0]) !== null && _a !== void 0 ? _a : BgWidget.noImageURL;
+                                const value = [
+                                    product.content.visible === 'false' ? BgWidget.warningInsignia('隱形商品') : '',
+                                    product.content.title,
+                                ]
+                                    .filter(Boolean)
+                                    .join('');
                                 if (obj.with_variants) {
-                                    product.content.variants.map((dd) => {
-                                        var _a;
+                                    product.content.variants.map((variant) => {
                                         vm.options.push({
-                                            key: `${product.content.id}-${dd.spec.join('-')}`,
-                                            value: [(product.content.visible === 'false') ? BgWidget.warningInsignia('隱形商品') : ``, product.content.title].filter((dd) => {
-                                                return dd;
-                                            }).join(''),
+                                            key: `${product.content.id}-${variant.spec.join('-')}`,
+                                            sub_title: variant.spec.join('-') ? `規格:${variant.spec.join('-')}` : '',
+                                            value: value,
                                             content: product.content,
-                                            sub_title: dd.spec.join('-') ? `規格:${dd.spec.join('-')}` : ``,
-                                            image: (_a = product.content.preview_image[0]) !== null && _a !== void 0 ? _a : BgWidget.noImageURL,
+                                            image: image,
                                         });
                                     });
                                 }
                                 else {
                                     vm.options.push({
                                         key: product.content.id,
-                                        value: [(product.content.visible === 'false') ? BgWidget.warningInsignia('隱形商品') : ``, product.content.title].filter((dd) => {
-                                            return dd;
-                                        }).join(''),
+                                        value: value,
                                         content: product.content,
-                                        image: (_a = product.content.preview_image[0]) !== null && _a !== void 0 ? _a : BgWidget.noImageURL,
+                                        image: image,
                                     });
                                 }
                             });

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

@@ -13,7 +13,7 @@ export type OptionsItem = {
   value: string;
   image: string;
   note?: string;
-  sub_title?:string,
+  sub_title?: string;
   content?: any;
 };
 
@@ -74,7 +74,7 @@ export class BgProduct {
     productType?: string;
     single?: boolean;
     filter_visible?: string;
-    with_variants?:boolean
+    with_variants?: boolean;
     show_product_type?: boolean;
   }) {
     const glitter = (window.parent as any).glitter;
@@ -228,9 +228,13 @@ export class BgProduct {
                                                   ? BgWidget.infoInsignia(ProductConfig.getName(opt.content))
                                                   : ''}${opt.value}
                                               </div>
-                                              ${opt.sub_title ? `
-                                              <div class="fw-500" style="color:grey;font-size:13px;">${opt.sub_title}</div>
-                                              `:``}
+                                              ${opt.sub_title
+                                                ? html`
+                                                    <div class="fw-500" style="color:grey;font-size:13px;">
+                                                      ${opt.sub_title}
+                                                    </div>
+                                                  `
+                                                : ''}
                                             </div>
                                           </div>
                                           ${(() => {
@@ -321,31 +325,37 @@ export class BgProduct {
                 filter_visible: obj.filter_visible,
                 status: 'inRange',
               }).then(data => {
-                vm.options=[]
-                 data.response.data.map(
-                  (product: { content: { id: number; title: string; preview_image: string[] ;variants:any;visible:string} }) => {
-                    if(obj.with_variants){
-                    
-                      product.content.variants.map((dd:any)=>{
+                vm.options = [];
+                data.response.data.map(
+                  (product: {
+                    content: { id: number; title: string; preview_image: string[]; variants: any; visible: string };
+                  }) => {
+                    const image = product.content.preview_image[0] ?? BgWidget.noImageURL;
+                    const value = [
+                      product.content.visible === 'false' ? BgWidget.warningInsignia('隱形商品') : '',
+                      product.content.title,
+                    ]
+                      .filter(Boolean)
+                      .join('');
+
+                    if (obj.with_variants) {
+                      product.content.variants.map((variant: any) => {
                         vm.options.push({
-                          key: `${product.content.id}-${dd.spec.join('-')}`,
-                          value: [(product.content.visible==='false') ? BgWidget.warningInsignia('隱形商品'):``,product.content.title].filter((dd)=>{
-                            return dd}).join(''),
+                          key: `${product.content.id}-${variant.spec.join('-')}`,
+                          sub_title: variant.spec.join('-') ? `規格:${variant.spec.join('-')}` : '',
+                          value: value,
                           content: product.content,
-                          sub_title:dd.spec.join('-') ? `規格:${dd.spec.join('-')}`:``,
-                          image: product.content.preview_image[0] ?? BgWidget.noImageURL,
+                          image: image,
                         });
-                      })
-                    }else{
+                      });
+                    } else {
                       vm.options.push({
                         key: product.content.id,
-                        value: [(product.content.visible==='false') ? BgWidget.warningInsignia('隱形商品'):``,product.content.title].filter((dd)=>{
-                          return dd}).join(''),
+                        value: value,
                         content: product.content,
-                        image: product.content.preview_image[0] ?? BgWidget.noImageURL,
+                        image: image,
                       });
                     }
-                
                   }
                 );
                 vm.loading = false;

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

@@ -2630,8 +2630,8 @@ ${obj.default ?? ''}</textarea
   }
 
   static inlineCheckBox(obj: {
-    title: string;
     gvc: any;
+    title: string;
     def: string | string[];
     array: string[] | { title: string; value: string; innerHtml?: string }[];
     callback: (text: string | string[]) => void;

package/lowcode/cms-plugin/model/order.d.ts

@@ -193,6 +193,7 @@ interface LineItem {
   sale_price: number;
   origin_price: number;
   discount_price: number;
+  deduction_log: any;
 }
 
 interface OrderQuery {

package/lowcode/cms-plugin/module/order-setting.js

@@ -2,6 +2,7 @@ import { BgWidget } from '../../backend-manager/bg-widget.js';
 import { ApiUser } from '../../glitter-base/route/user.js';
 import { ApiShop } from '../../glitter-base/route/shopping.js';
 import { ShareDialog } from '../../glitterBundle/dialog/ShareDialog.js';
+import { EditorElem } from '../../glitterBundle/plugins/editor-elem.js';
 const html = String.raw;
 export class OrderSetting {
     static getPaymentMethodText(orderData) {
@@ -76,11 +77,12 @@ export class OrderSetting {
     }
     static getShippmentOpt() {
         return [
+            { title: '未出貨', value: 'wait' },
+            { title: '備貨中', value: 'in_stock' },
             { title: '已出貨', value: 'shipping' },
-            { title: '未出貨 / 備貨中', value: 'wait' },
+            { title: '已到貨', value: 'arrived' },
             { title: '已取貨', value: 'finish' },
             { title: '已退貨', value: 'returns' },
-            { title: '已到貨', value: 'arrived' },
         ].map(item => {
             return {
                 key: item.value,
@@ -1123,7 +1125,7 @@ export class OrderSetting {
                 topGVC.glitter.closeDiaLog();
             }
             function getDatalist() {
-                return vm.orders.map((dd) => {
+                return vm.orders.map((dd, index) => {
                     return [
                         {
                             key: '訂單編號',
@@ -1157,40 +1159,117 @@ export class OrderSetting {
                             value: `$ ${dd.orderData.total.toLocaleString()}`,
                         },
                         {
-                            key: '付款狀態',
-                            value: BgWidget.select({
-                                gvc,
-                                callback: (value) => {
-                                    dd.status = value;
-                                },
-                                default: `${dd.status || 0}`,
-                                options: OrderSetting.getPaymentStatusOpt(),
-                                style: 'min-width: 220px;',
-                            }),
+                            key: '出貨單號碼',
+                            value: html `<div style="width: 200px;">
+                ${BgWidget.grayNote(dd.orderData.user_info.shipment_number
+                                ? `#${dd.orderData.user_info.shipment_number}`
+                                : dd.orderData.orderSource === 'POS'
+                                    ? 'POS 訂單'
+                                    : '')}
+              </div>`,
                         },
                         {
-                            key: '出貨狀態',
+                            key: '訂單狀態',
                             value: BgWidget.select({
                                 gvc,
                                 callback: (value) => {
-                                    dd.orderData.progress = value;
+                                    dd.orderData.orderStatus = value;
                                 },
-                                default: dd.orderData.progress || 'wait',
-                                options: OrderSetting.getShippmentOpt(),
-                                style: 'min-width: 180px;',
+                                default: `${dd.orderData.orderStatus || 0}`,
+                                options: OrderSetting.getOrderStatusOpt(),
                             }),
                         },
                         {
-                            key: '訂單狀態',
+                            key: '付款狀態',
                             value: BgWidget.select({
                                 gvc,
                                 callback: (value) => {
-                                    dd.orderData.orderStatus = value;
+                                    dd.status = value;
                                 },
-                                default: `${dd.orderData.orderStatus || 0}`,
-                                options: OrderSetting.getOrderStatusOpt(),
+                                default: `${dd.status || 0}`,
+                                options: OrderSetting.getPaymentStatusOpt(),
+                                style: 'min-width: 220px;',
                             }),
                         },
+                        {
+                            key: '出貨狀態',
+                            value: gvc.bindView((() => {
+                                const divView = {
+                                    id: gvc.glitter.getUUID(),
+                                    checkbox: 'auto',
+                                    hasShipmentNumber: Boolean(dd.orderData.user_info.shipment_number),
+                                };
+                                if (divView.hasShipmentNumber) {
+                                    dd.orderData.progress = 'in_stock';
+                                }
+                                return {
+                                    bind: divView.id,
+                                    view: () => {
+                                        var _a;
+                                        const htmlArray = [
+                                            BgWidget.select({
+                                                gvc,
+                                                callback: (value) => {
+                                                    dd.orderData.progress = value;
+                                                    if (['wait', 'returns', undefined].includes(value)) {
+                                                        dd.orderData.user_info.shipment_number = '';
+                                                    }
+                                                    gvc.notifyDataChange(divView.id);
+                                                },
+                                                default: dd.orderData.progress || 'wait',
+                                                options: OrderSetting.getShippmentOpt(),
+                                                style: 'max-width: 180px;',
+                                            }),
+                                            (() => {
+                                                var _a;
+                                                if (!divView.hasShipmentNumber &&
+                                                    ['wait', 'returns', undefined].includes(cloneOrders[index].orderData.progress) &&
+                                                    ['arrived', 'finish', 'shipping', 'in_stock'].includes(dd.orderData.progress)) {
+                                                    (_a = dd.orderData.user_info).shipment_number || (_a.shipment_number = new Date().getTime());
+                                                    return EditorElem.radio({
+                                                        gvc: gvc,
+                                                        title: '',
+                                                        def: divView.checkbox,
+                                                        array: [
+                                                            {
+                                                                title: '自動選號',
+                                                                value: 'auto',
+                                                            },
+                                                            {
+                                                                title: '手動輸入',
+                                                                value: 'manual',
+                                                            },
+                                                        ],
+                                                        callback: text => {
+                                                            divView.checkbox = text;
+                                                            gvc.notifyDataChange(divView.id);
+                                                        },
+                                                        oneLine: true,
+                                                    });
+                                                }
+                                                return '';
+                                            })(),
+                                            divView.checkbox === 'manual'
+                                                ? BgWidget.editeInput({
+                                                    gvc,
+                                                    title: '',
+                                                    default: `${(_a = dd.orderData.user_info.shipment_number) !== null && _a !== void 0 ? _a : ''}`,
+                                                    placeHolder: '為空則為自動選號',
+                                                    callback: text => {
+                                                        dd.orderData.user_info.shipment_number = text;
+                                                        gvc.notifyDataChange(divView.id);
+                                                    },
+                                                })
+                                                : '',
+                                        ].filter(Boolean);
+                                        return html `<div class="d-flex align-items-center gap-2">${htmlArray.join('')}</div>`;
+                                    },
+                                    divCreate: {
+                                        style: 'min-width: 580px;',
+                                    },
+                                };
+                            })()),
+                        },
                     ];
                 });
             }
@@ -1331,6 +1410,23 @@ export class OrderSetting {
               <div class="w-100 d-flex justify-content-end" style="padding: 14px 16px; gap: 14px;">
                 ${BgWidget.cancel(gvc.event(() => closeEvent()))}
                 ${BgWidget.save(gvc.event(() => {
+                        for (let i = 0; i < vm.orders.length; i++) {
+                            const order = vm.orders[i];
+                            const cloneOrder = cloneOrders[i];
+                            if (['wait', 'returns', undefined].includes(cloneOrder.orderData.progress) &&
+                                ['arrived', 'finish', 'shipping', 'in_stock'].includes(order.orderData.progress) &&
+                                !order.orderData.user_info.shipment_number) {
+                                dialog.errorMessage({
+                                    text: `訂單編號 #${order.cart_token} 未輸入出貨單號碼`,
+                                });
+                                return;
+                            }
+                        }
+                        vm.orders.forEach((order) => {
+                            if (order.orderData.progress === 'in_stock') {
+                                order.orderData.progress = 'wait';
+                            }
+                        });
                         obj.callback(vm.orders);
                         topGVC.glitter.closeDiaLog();
                     }))}

package/lowcode/cms-plugin/module/order-setting.ts

@@ -3,6 +3,7 @@ import { BgWidget, OptionsItem } from '../../backend-manager/bg-widget.js';
 import { ApiUser } from '../../glitter-base/route/user.js';
 import { ApiShop } from '../../glitter-base/route/shopping.js';
 import { ShareDialog } from '../../glitterBundle/dialog/ShareDialog.js';
+import { EditorElem } from '../../glitterBundle/plugins/editor-elem.js';
 
 const html = String.raw;
 
@@ -111,11 +112,12 @@ export class OrderSetting {
   // 配送方式 Select Options
   static getShippmentOpt() {
     return [
+      { title: '未出貨', value: 'wait' },
+      { title: '備貨中', value: 'in_stock' },
       { title: '已出貨', value: 'shipping' },
-      { title: '未出貨 / 備貨中', value: 'wait' },
+      { title: '已到貨', value: 'arrived' },
       { title: '已取貨', value: 'finish' },
       { title: '已退貨', value: 'returns' },
-      { title: '已到貨', value: 'arrived' },
     ].map(item => {
       return {
         key: item.value,
@@ -1291,7 +1293,7 @@ export class OrderSetting {
       }
 
       function getDatalist() {
-        return vm.orders.map((dd: any) => {
+        return vm.orders.map((dd: any, index: number) => {
           return [
             {
               key: '訂單編號',
@@ -1325,40 +1327,124 @@ export class OrderSetting {
               value: `$ ${dd.orderData.total.toLocaleString()}`,
             },
             {
-              key: '付款狀態',
-              value: BgWidget.select({
-                gvc,
-                callback: (value: any) => {
-                  dd.status = value;
-                },
-                default: `${dd.status || 0}`,
-                options: OrderSetting.getPaymentStatusOpt(),
-                style: 'min-width: 220px;',
-              }),
+              key: '出貨單號碼',
+              value: html`<div style="width: 200px;">
+                ${BgWidget.grayNote(
+                  dd.orderData.user_info.shipment_number
+                    ? `#${dd.orderData.user_info.shipment_number}`
+                    : dd.orderData.orderSource === 'POS'
+                      ? 'POS 訂單'
+                      : ''
+                )}
+              </div>`,
             },
             {
-              key: '出貨狀態',
+              key: '訂單狀態',
               value: BgWidget.select({
                 gvc,
                 callback: (value: any) => {
-                  dd.orderData.progress = value;
+                  dd.orderData.orderStatus = value;
                 },
-                default: dd.orderData.progress || 'wait',
-                options: OrderSetting.getShippmentOpt(),
-                style: 'min-width: 180px;',
+                default: `${dd.orderData.orderStatus || 0}`,
+                options: OrderSetting.getOrderStatusOpt(),
               }),
             },
             {
-              key: '訂單狀態',
+              key: '付款狀態',
               value: BgWidget.select({
                 gvc,
                 callback: (value: any) => {
-                  dd.orderData.orderStatus = value;
+                  dd.status = value;
                 },
-                default: `${dd.orderData.orderStatus || 0}`,
-                options: OrderSetting.getOrderStatusOpt(),
+                default: `${dd.status || 0}`,
+                options: OrderSetting.getPaymentStatusOpt(),
+                style: 'min-width: 220px;',
               }),
             },
+            {
+              key: '出貨狀態',
+              value: gvc.bindView(
+                (() => {
+                  const divView = {
+                    id: gvc.glitter.getUUID(),
+                    checkbox: 'auto',
+                    hasShipmentNumber: Boolean(dd.orderData.user_info.shipment_number),
+                  };
+
+                  if (divView.hasShipmentNumber) {
+                    dd.orderData.progress = 'in_stock';
+                  }
+
+                  return {
+                    bind: divView.id,
+                    view: () => {
+                      const htmlArray = [
+                        BgWidget.select({
+                          gvc,
+                          callback: (value: any) => {
+                            dd.orderData.progress = value;
+                            if (['wait', 'returns', undefined].includes(value)) {
+                              dd.orderData.user_info.shipment_number = '';
+                            }
+                            gvc.notifyDataChange(divView.id);
+                          },
+                          default: dd.orderData.progress || 'wait',
+                          options: OrderSetting.getShippmentOpt(),
+                          style: 'max-width: 180px;',
+                        }),
+                        (() => {
+                          if (
+                            !divView.hasShipmentNumber &&
+                            ['wait', 'returns', undefined].includes(cloneOrders[index].orderData.progress) &&
+                            ['arrived', 'finish', 'shipping', 'in_stock'].includes(dd.orderData.progress)
+                          ) {
+                            dd.orderData.user_info.shipment_number ||= new Date().getTime();
+                            return EditorElem.radio({
+                              gvc: gvc,
+                              title: '',
+                              def: divView.checkbox,
+                              array: [
+                                {
+                                  title: '自動選號',
+                                  value: 'auto',
+                                },
+                                {
+                                  title: '手動輸入',
+                                  value: 'manual',
+                                },
+                              ],
+                              callback: text => {
+                                divView.checkbox = text;
+                                gvc.notifyDataChange(divView.id);
+                              },
+                              oneLine: true,
+                            });
+                          }
+                          return '';
+                        })(),
+                        divView.checkbox === 'manual'
+                          ? BgWidget.editeInput({
+                              gvc,
+                              title: '',
+                              default: `${dd.orderData.user_info.shipment_number ?? ''}`,
+                              placeHolder: '為空則為自動選號',
+                              callback: text => {
+                                dd.orderData.user_info.shipment_number = text;
+                                gvc.notifyDataChange(divView.id);
+                              },
+                            })
+                          : '',
+                      ].filter(Boolean);
+
+                      return html`<div class="d-flex align-items-center gap-2">${htmlArray.join('')}</div>`;
+                    },
+                    divCreate: {
+                      style: 'min-width: 580px;',
+                    },
+                  };
+                })()
+              ),
+            },
           ];
         });
       }
@@ -1511,6 +1597,31 @@ export class OrderSetting {
                 ${BgWidget.cancel(gvc.event(() => closeEvent()))}
                 ${BgWidget.save(
                   gvc.event(() => {
+                    // 與原訂單的資料做驗證
+                    for (let i = 0; i < vm.orders.length; i++) {
+                      const order = vm.orders[i];
+                      const cloneOrder = cloneOrders[i];
+
+                      if (
+                        ['wait', 'returns', undefined].includes(cloneOrder.orderData.progress) &&
+                        ['arrived', 'finish', 'shipping', 'in_stock'].includes(order.orderData.progress) &&
+                        !order.orderData.user_info.shipment_number
+                      ) {
+                        dialog.errorMessage({
+                          text: `訂單編號 #${order.cart_token} 未輸入出貨單號碼`,
+                        });
+                        return;
+                      }
+                    }
+
+                    // 「備貨中」重新賦值
+                    vm.orders.forEach((order: any) => {
+                      if (order.orderData.progress === 'in_stock') {
+                        order.orderData.progress = 'wait';
+                      }
+                    });
+
+                    // 觸發更新事件
                     obj.callback(vm.orders);
                     topGVC.glitter.closeDiaLog();
                   })