ts-glitter 21.7.7 → 21.7.8

package/lowcode/Entry.js

@@ -146,7 +146,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_21.7.7';
+            glitter.share.editerVersion = 'V_21.7.8';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {

package/lowcode/Entry.ts

@@ -150,7 +150,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_21.7.7';
+      glitter.share.editerVersion = 'V_21.7.8';
       glitter.share.start = new Date();
       const vm = { appConfig: [] };
       (window as any).saasConfig = {

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

@@ -1507,7 +1507,6 @@ function detail(gvc, cf, vm, cVm, page_tab) {
                                                                         containerId: Tool.randomString(6),
                                                                         loading: true,
                                                                     };
-                                                                    console.log(`d1---->`, d1);
                                                                     return gvc.bindView(() => {
                                                                         return {
                                                                             bind: subVM.id,
@@ -1554,10 +1553,7 @@ function detail(gvc, cf, vm, cVm, page_tab) {
                                                                                         },
                                                                                     })}
                                                         </div>
-                                                        <div
-                                                          class="${d1.select === 'all' ? `d-none` : ``}"
-                                                          style=""
-                                                        >
+                                                        <div class="${d1.select === 'all' ? `d-none` : ``}">
                                                           ${BgWidget.save(gvc.event(() => {
                                                                                         var _a, _b;
                                                                                         if (d1.select === 'product') {
@@ -2347,7 +2343,6 @@ function loopFindProducts(config) {
     function loop(array, container_cf) {
         array.map((dd) => {
             if (dd.type === 'component' && dd.data.tag === 'SY00-normal-products') {
-                console.log(`loopFindProducts`, dd.data);
                 product_select.push(dd.data.refer_form_data.product_select);
             }
             else if (dd.type === 'container') {

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

@@ -1699,7 +1699,6 @@ function detail(gvc: GVC, cf: any, vm: any, cVm: any, page_tab: 'page' | 'hidden
                                             containerId: Tool.randomString(6),
                                             loading: true,
                                           };
-                                          console.log(`d1---->`, d1);
                                           return gvc.bindView(() => {
                                             return {
                                               bind: subVM.id,
@@ -1707,7 +1706,6 @@ function detail(gvc: GVC, cf: any, vm: any, cVm: any, page_tab: 'page' | 'hidden
                                                 if (subVM.loading) {
                                                   return BgWidget.spinner();
                                                 }
-                                                // d1=d1.
                                                 return new Promise(async resolve => {
                                                   subVM.dataList = await (async () => {
                                                     try {
@@ -1747,10 +1745,7 @@ function detail(gvc: GVC, cf: any, vm: any, cVm: any, page_tab: 'page' | 'hidden
                                                             },
                                                           })}
                                                         </div>
-                                                        <div
-                                                          class="${d1.select === 'all' ? `d-none` : ``}"
-                                                          style=""
-                                                        >
+                                                        <div class="${d1.select === 'all' ? `d-none` : ``}">
                                                           ${BgWidget.save(
                                                             gvc.event(() => {
                                                               if (d1.select === 'product') {
@@ -2609,11 +2604,6 @@ function loopFindProducts(config: any) {
   function loop(array: any, container_cf: any) {
     array.map((dd: any) => {
       if (dd.type === 'component' && dd.data.tag === 'SY00-normal-products') {
-        // if (dd.data.refer_form_data.product_select.select !== 'product') {
-        //   dd.data.refer_form_data.product_select.select = 'product';
-        //   dd.data.refer_form_data.product_select.value = [];
-        // }
-        console.log(`loopFindProducts`, dd.data);
         product_select.push(dd.data.refer_form_data.product_select);
       } else if (dd.type === 'container') {
         loop(dd.data.setting, dd);

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

@@ -0,0 +1,176 @@
+import { Tool } from '../modules/tool.js';
+import { Animation } from '../glitterBundle/module/Animation.js';
+const html = String.raw;
+const css = String.raw;
+export class BgDialog {
+    constructor(gvc) {
+        this.gvc = gvc;
+        this.glitter = gvc.glitter;
+        this.isMobile = window.innerWidth <= 768;
+        this.prefix = Tool.randomString(6);
+        this.init();
+    }
+    init() {
+        this.gvc.addStyle(css `
+      .${this.prefix}_body {
+        border-radius: 10px;
+        background: #fff;
+        overflow-y: auto;
+        min-width: calc(100vw - 180px);
+        max-width: calc(100vw - 20px);
+      }
+
+      .${this.prefix}_header {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        background: #f2f2f2;
+        padding: 12px 20px;
+      }
+
+      .${this.prefix}_btn {
+        display: flex;
+        padding: 3.25px 18px;
+        align-items: center;
+        gap: 8px;
+        border-radius: 10px;
+      }
+
+      .${this.prefix}_save {
+        background: #393939;
+      }
+
+      .${this.prefix}_cancel {
+        background: #fff;
+        border: 1px solid #ddd;
+      }
+
+      .${this.prefix}_footer {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 8px 20px 20px 20px;
+      }
+
+      .${this.prefix}_footer_left {
+        display: flex;
+        align-items: center;
+        justify-content: start;
+      }
+
+      .${this.prefix}_footer_right {
+        display: flex;
+        align-items: center;
+        justify-content: end;
+        gap: 14px;
+      }
+    `);
+    }
+    static select(obj) {
+        return html ` <select
+      class="c_select c_select_w_100"
+      onchange="${obj.gvc.event(e => {
+            return obj.callback(e.value);
+        })}"
+    >
+      ${obj.options
+            .map(opt => {
+            return html ` <option class="c_select_option" value="${opt.key}" ${obj.default === opt.key ? 'selected' : ''}>
+            ${opt.value}
+          </option>`;
+        })
+            .join('')}
+      ${obj.options.find(opt => obj.default === opt.key)
+            ? ''
+            : html `<option class="d-none" selected>請選擇項目</option>`}
+    </select>`;
+    }
+    save(event, text = '完成') {
+        return html ` <button class="btn ${this.prefix}_btn ${this.prefix}_save" type="button" onclick="${event}">
+      <span class="tx_700_white">${text}</span>
+    </button>`;
+    }
+    cancal(event, text = '取消') {
+        return html ` <button class="btn ${this.prefix}_btn ${this.prefix}_cancel" type="button" onclick="${event}">
+      <span class="tx_700">${text}</span>
+    </button>`;
+    }
+    viewAllSelect(event, text = '檢視已選取項目') {
+        return html `<span
+      style="color: #4D86DB; font-size: 16px; font-weight: 400; cursor:pointer; overflow-wrap: break-word;"
+      onclick="${event}"
+      >${text}</span
+    >`;
+    }
+    clearAll(event, text = '清除全部') {
+        return html `<span style="margin-right: 8px; font-size: 16px; text-decoration: underline;" onclick="${event}"
+      >${text}</span
+    >`;
+    }
+    marketShop() {
+        const gvc = this.gvc;
+        const glitter = this.glitter;
+        const marketOptions = [
+            { key: 'hidden', value: '隱形賣場' },
+            { key: 'onepage', value: '一頁商店' },
+            { key: 'group', value: '拼團賣場' },
+            { key: 'recommend', value: '分銷連結' },
+        ];
+        return glitter.innerDialog((gvc) => {
+            const vm = {
+                id: gvc.glitter.getUUID(),
+                loading: false,
+            };
+            return html ` <div class="${this.prefix}_body">
+          ${gvc.bindView({
+                bind: vm.id,
+                view: () => {
+                    if (vm.loading) {
+                        return 'Loading';
+                    }
+                    return html ` <div class="${this.prefix}_header">
+                  <div class="tx_700">產品列表</div>
+                  <div class="flex-fill"></div>
+                </div>
+                <div class="c_dialog">
+                  <div class="c_dialog_body">
+                    <div class="c_dialog_main" style="height: auto; max-height: 500px; gap: 24px;">
+                      ${BgDialog.select({
+                        gvc,
+                        default: marketOptions[0].key,
+                        options: marketOptions,
+                        callback: value => {
+                            console.log(value);
+                        },
+                    })}
+                    </div>
+                    <div class="${this.prefix}_footer">
+                      <div class="${this.prefix}_footer_left">
+                        ${this.viewAllSelect(gvc.event(() => {
+                        console.log('viewAllSelect');
+                    }), '檢視已選商品(12)')}
+                      </div>
+                      <div class="${this.prefix}_footer_right">
+                        ${[
+                        this.clearAll(gvc.event(() => {
+                            console.log('clearAll');
+                        })),
+                        this.cancal(gvc.event(() => {
+                            console.log('cancal');
+                        })),
+                        this.save(gvc.event(() => {
+                            console.log('save');
+                        })),
+                    ].join('')}
+                      </div>
+                    </div>
+                  </div>
+                </div>`;
+                },
+            })}
+        </div>`;
+        }, gvc.glitter.getUUID(), {
+            animation: Animation.fade,
+        });
+    }
+}

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

@@ -0,0 +1,230 @@
+import { GVC } from '../glitterBundle/GVController.js';
+import { EditorElem } from '../glitterBundle/plugins/editor-elem.js';
+import { PageSplit } from './splitPage.js';
+import { Tool } from '../modules/tool.js';
+import { ApiShop } from '../glitter-base/route/shopping.js';
+import { Article } from '../glitter-base/route/article.js';
+import { ApiUser } from '../glitter-base/route/user.js';
+import { ApiStock } from '../glitter-base/route/stock.js';
+import { ShareDialog } from '../glitterBundle/dialog/ShareDialog.js';
+import { Language, LanguageLocation } from '../glitter-base/global/language.js';
+import { FormModule } from '../cms-plugin/module/form-module.js';
+import { FormCheck } from '../cms-plugin/module/form-check.js';
+import { TableStorage } from '../cms-plugin/module/table-storage.js';
+import { ProductAi } from '../cms-plugin/ai-generator/product-ai.js';
+import { imageLibrary } from '../modules/image-library.js';
+import { Animation } from '../glitterBundle/module/Animation.js';
+
+const html = String.raw;
+const css = String.raw;
+
+export interface Option {
+  key: string;
+  value: string;
+  note?: string;
+  image?: string;
+  icon?: string;
+}
+
+export class BgDialog {
+  gvc: GVC;
+  glitter: any;
+  isMobile: Boolean;
+  prefix: string;
+
+  constructor(gvc: GVC) {
+    this.gvc = gvc;
+    this.glitter = gvc.glitter;
+    this.isMobile = window.innerWidth <= 768;
+    this.prefix = Tool.randomString(6);
+
+    this.init();
+  }
+
+  private init() {
+    this.gvc.addStyle(css`
+      .${this.prefix}_body {
+        border-radius: 10px;
+        background: #fff;
+        overflow-y: auto;
+        min-width: calc(100vw - 180px);
+        max-width: calc(100vw - 20px);
+      }
+
+      .${this.prefix}_header {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        background: #f2f2f2;
+        padding: 12px 20px;
+      }
+
+      .${this.prefix}_btn {
+        display: flex;
+        padding: 3.25px 18px;
+        align-items: center;
+        gap: 8px;
+        border-radius: 10px;
+      }
+
+      .${this.prefix}_save {
+        background: #393939;
+      }
+
+      .${this.prefix}_cancel {
+        background: #fff;
+        border: 1px solid #ddd;
+      }
+
+      .${this.prefix}_footer {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 8px 20px 20px 20px;
+      }
+
+      .${this.prefix}_footer_left {
+        display: flex;
+        align-items: center;
+        justify-content: start;
+      }
+
+      .${this.prefix}_footer_right {
+        display: flex;
+        align-items: center;
+        justify-content: end;
+        gap: 14px;
+      }
+    `);
+  }
+
+  static select(obj: { gvc: GVC; default: string; options: Option[]; callback: (value: string) => void }) {
+    return html` <select
+      class="c_select c_select_w_100"
+      onchange="${obj.gvc.event(e => {
+        return obj.callback(e.value);
+      })}"
+    >
+      ${obj.options
+        .map(opt => {
+          return html` <option class="c_select_option" value="${opt.key}" ${obj.default === opt.key ? 'selected' : ''}>
+            ${opt.value}
+          </option>`;
+        })
+        .join('')}
+      ${obj.options.find(opt => obj.default === opt.key)
+        ? ''
+        : html`<option class="d-none" selected>請選擇項目</option>`}
+    </select>`;
+  }
+
+  save(event: string, text: string = '完成'): string {
+    return html` <button class="btn ${this.prefix}_btn ${this.prefix}_save" type="button" onclick="${event}">
+      <span class="tx_700_white">${text}</span>
+    </button>`;
+  }
+
+  cancal(event: string, text: string = '取消'): string {
+    return html` <button class="btn ${this.prefix}_btn ${this.prefix}_cancel" type="button" onclick="${event}">
+      <span class="tx_700">${text}</span>
+    </button>`;
+  }
+
+  viewAllSelect(event: string, text: string = '檢視已選取項目'): string {
+    return html`<span
+      style="color: #4D86DB; font-size: 16px; font-weight: 400; cursor:pointer; overflow-wrap: break-word;"
+      onclick="${event}"
+      >${text}</span
+    >`;
+  }
+
+  clearAll(event: string, text: string = '清除全部'): string {
+    return html`<span style="margin-right: 8px; font-size: 16px; text-decoration: underline;" onclick="${event}"
+      >${text}</span
+    >`;
+  }
+
+  marketShop() {
+    const gvc = this.gvc;
+    const glitter = this.glitter;
+
+    const marketOptions = [
+      { key: 'hidden', value: '隱形賣場' },
+      { key: 'onepage', value: '一頁商店' },
+      { key: 'group', value: '拼團賣場' },
+      { key: 'recommend', value: '分銷連結' },
+    ];
+
+    return glitter.innerDialog(
+      (gvc: GVC) => {
+        const vm = {
+          id: gvc.glitter.getUUID(),
+          loading: false,
+        };
+
+        return html` <div class="${this.prefix}_body">
+          ${gvc.bindView({
+            bind: vm.id,
+            view: () => {
+              if (vm.loading) {
+                return 'Loading';
+              }
+
+              return html` <div class="${this.prefix}_header">
+                  <div class="tx_700">產品列表</div>
+                  <div class="flex-fill"></div>
+                </div>
+                <div class="c_dialog">
+                  <div class="c_dialog_body">
+                    <div class="c_dialog_main" style="height: auto; max-height: 500px; gap: 24px;">
+                      ${BgDialog.select({
+                        gvc,
+                        default: marketOptions[0].key,
+                        options: marketOptions,
+                        callback: value => {
+                          console.log(value);
+                        },
+                      })}
+                    </div>
+                    <div class="${this.prefix}_footer">
+                      <div class="${this.prefix}_footer_left">
+                        ${this.viewAllSelect(
+                          gvc.event(() => {
+                            console.log('viewAllSelect');
+                          }),
+                          '檢視已選商品(12)'
+                        )}
+                      </div>
+                      <div class="${this.prefix}_footer_right">
+                        ${[
+                          this.clearAll(
+                            gvc.event(() => {
+                              console.log('clearAll');
+                            })
+                          ),
+                          this.cancal(
+                            gvc.event(() => {
+                              console.log('cancal');
+                            })
+                          ),
+                          this.save(
+                            gvc.event(() => {
+                              console.log('save');
+                            })
+                          ),
+                        ].join('')}
+                      </div>
+                    </div>
+                  </div>
+                </div>`;
+            },
+          })}
+        </div>`;
+      },
+      gvc.glitter.getUUID(),
+      {
+        animation: Animation.fade,
+      }
+    );
+  }
+}

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

@@ -304,9 +304,7 @@ export class BgProduct {
                         gvc.closeDialog();
                     }))}
                     ${BgWidget.save(gvc.event(() => {
-                        obj.callback(obj.default.filter(item => {
-                            return vm.options.find((opt) => opt.key === item);
-                        }));
+                        obj.callback(obj.default);
                         gvc.closeDialog();
                     }), '確認')}
                   </div>

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

@@ -380,11 +380,7 @@ export class BgProduct {
                     )}
                     ${BgWidget.save(
                       gvc.event(() => {
-                        obj.callback(
-                          obj.default.filter(item => {
-                            return vm.options.find((opt: OptionsItem) => opt.key === item);
-                          })
-                        );
+                        obj.callback(obj.default);
                         gvc.closeDialog();
                       }),
                       '確認'

package/lowcode/cms-plugin/module/delivery-html.js

@@ -1,8 +1,18 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { Tool } from '../../modules/tool.js';
 import { BgWidget } from '../../backend-manager/bg-widget.js';
 import { ApiUser } from '../../glitter-base/route/user.js';
 import { ShipmentConfig } from '../../glitter-base/global/shipment-config.js';
 import { PaymentConfig } from '../../glitter-base/global/payment-config.js';
+import { OrderExcel } from './order-excel.js';
 const html = String.raw;
 export class DeliveryHTML {
     static print(ogvc, dataArray, type) {
@@ -61,6 +71,26 @@ export class DeliveryHTML {
                     },
                     onCreate: () => {
                         if (loading) {
+                            function processInChunks(dataArray) {
+                                return __awaiter(this, void 0, void 0, function* () {
+                                    const chunkSize = 20;
+                                    for (let i = 0; i < dataArray.length; i += chunkSize) {
+                                        const chunk = dataArray.slice(i, i + chunkSize);
+                                        yield Promise.all(chunk.map((data) => __awaiter(this, void 0, void 0, function* () {
+                                            const d = yield OrderExcel.getCustomizeMap(data);
+                                            const temp = {};
+                                            const receiveKeys = [...d.keys()].filter(key => key.includes('收件人資訊'));
+                                            for (const key of receiveKeys) {
+                                                const value = d.get(key);
+                                                if (value && value !== '-') {
+                                                    temp[key.split('-')[1].trim()] = value;
+                                                }
+                                            }
+                                            data.custom_receive_info = temp;
+                                        })));
+                                    }
+                                });
+                            }
                             Promise.all([
                                 fetch(new URL('../../assets/json/twzipcode.json', import.meta.url).href)
                                     .then(response => response.text())
@@ -70,11 +100,12 @@ export class DeliveryHTML {
                                 }),
                                 ShipmentConfig.shipmentMethod({ type: 'all' }),
                                 PaymentConfig.getSupportPayment(true),
-                            ]).then(dataArray => {
-                                vm.twZipcode = dataArray[0];
-                                vm.store = dataArray[1];
-                                vm.shippingMethod = dataArray[2];
-                                vm.paymentMethod = dataArray[3];
+                                processInChunks(dataArray),
+                            ]).then(results => {
+                                vm.twZipcode = results[0];
+                                vm.store = results[1];
+                                vm.shippingMethod = results[2];
+                                vm.paymentMethod = results[3];
                                 loading = false;
                                 gvc.notifyDataChange(id);
                             });
@@ -322,6 +353,16 @@ export class DeliveryHTML {
         const shippingAddr = ['UNIMARTC2C', 'UNIMARTFREEZE', 'FAMIC2C', 'FAMIC2CFREEZE', 'OKMARTC2C', 'HILIFEC2C'].includes(orderData.user_info.shipment)
             ? `${orderData.user_info.CVSStoreName} (${orderData.user_info.CVSAddress})`
             : [orderData.user_info.city, orderData.user_info.area, orderData.user_info.address].filter(Boolean).join('');
+        const receive_temp = [];
+        const receive_keys = Object.keys(data.custom_receive_info);
+        for (let i = 0; i < receive_keys.length; i += 2) {
+            const key1 = receive_keys[i];
+            const key2 = receive_keys[i + 1];
+            receive_temp.push(key2 ? [key1, key2] : [key1]);
+        }
+        function printReceiveTd(key) {
+            return key && data.custom_receive_info[key] ? html `<td>${key}：${data.custom_receive_info[key]}</td>` : '';
+        }
         return html `<div class="details">
       <table>
         <tr>
@@ -344,6 +385,16 @@ export class DeliveryHTML {
           <td>付款狀態：${paymentStatus(data)}</td>
           <td>收件人信箱：${orderData.user_info.email}</td>
         </tr>
+        ${receive_temp
+            .map(keys => {
+            const appendTd = keys.map(key => printReceiveTd(key)).join('');
+            return appendTd
+                ? html `<tr>
+                  ${appendTd}
+                </tr>`
+                : '';
+        })
+            .join('')}
       </table>
     </div>`;
     }