ts-glitter 20.8.7 → 20.9.1

package/lowcode/Entry.js

@@ -144,7 +144,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.8.7';
+            glitter.share.editerVersion = 'V_20.9.1';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {

package/lowcode/Entry.ts

@@ -146,7 +146,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.8.7';
+      glitter.share.editerVersion = 'V_20.9.1';
       glitter.share.start = new Date();
       const vm = { appConfig: [] };
       (window as any).saasConfig = {

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

@@ -814,7 +814,7 @@ export class BgProduct {
                     });
                 }
                 catch (error) {
-                    console.log(error);
+                    console.error(error);
                 }
             });
         });

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

@@ -1028,7 +1028,7 @@ export class BgProduct {
           );
         });
       } catch (error) {
-        console.log(error);
+        console.error(error);
       }
     });
   }

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

@@ -1009,7 +1009,7 @@ export class BgRecommend {
                                                                                                 value: 'collection',
                                                                                             },
                                                                                             {
-                                                                                                title: '單一商品',
+                                                                                                title: '特定商品',
                                                                                                 value: 'product',
                                                                                             },
                                                                                         ],

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

@@ -725,7 +725,7 @@ export class BgRecommend {
                                     gvc.notifyDataChange(vm.previewId);
                                   },
                                   filter: {
-                                    page: ['一頁商店', '隱形賣場','所有商品'],
+                                    page: ['一頁商店', '隱形賣場', '所有商品'],
                                   },
                                 })}`,
                               gvc.bindView({
@@ -1153,7 +1153,7 @@ export class BgRecommend {
                                                               value: 'collection',
                                                             },
                                                             {
-                                                              title: '單一商品',
+                                                              title: '特定商品',
                                                               value: 'product',
                                                             },
                                                           ],

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

@@ -1084,11 +1084,8 @@ export class BgShopping {
                                 title: '',
                                 def: voucherData.for,
                                 array: [
-                                    {
-                                        title: '商品系列',
-                                        value: 'collection',
-                                    },
-                                    { title: '單一商品', value: 'product' },
+                                    { title: '商品系列', value: 'collection' },
+                                    { title: '特定商品', value: 'product' },
                                     { title: '所有商品', value: 'all' },
                                 ],
                                 callback: text => {

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

@@ -1204,11 +1204,8 @@ export class BgShopping {
                             title: '',
                             def: voucherData.for,
                             array: [
-                              {
-                                title: '商品系列',
-                                value: 'collection',
-                              },
-                              { title: '單一商品', value: 'product' },
+                              { title: '商品系列', value: 'collection' },
+                              { title: '特定商品', value: 'product' },
                               { title: '所有商品', value: 'all' },
                             ],
                             callback: text => {

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

@@ -28,6 +28,7 @@ import { PosSummary } from './pos-pages/pos-summary.js';
 import { ApiPos } from '../glitter-base/route/pos.js';
 import { PosWidget } from './pos-widget.js';
 import { SaasOffer } from '../saas-offer.js';
+import { Language } from '../glitter-base/global/language.js';
 const html = String.raw;
 export class POSSetting {
     static loginManager(gvc, mode, result) {
@@ -336,6 +337,7 @@ export class POSSetting {
         function changeSelectVariant(product) {
             let emptyArray = [];
             product.content.specs.forEach((spec) => {
+                console.log(spec.option);
                 emptyArray.push(spec.option.find((opt) => opt.select == true).title);
             });
             return product.content.variants.find((variant) => arraysEqual(variant.spec, emptyArray));
@@ -382,39 +384,37 @@ export class POSSetting {
                                 if (data.content.specs.length == 0) {
                                     return '';
                                 }
-                                return data.content.specs
-                                    .map((spec) => {
-                                    return html `
-                                <div style="font-size: 16px;font-style: normal;font-weight: 500;color: #8D8D8D;">
-                                  ${spec.title}
-                                </div>
-                                <select
-                                  class="w-100 form-select"
-                                  style="border-radius: 5px;border: 1px solid #DDD;padding: 10px 18px;font-size: 18px;"
-                                  onchange="${gvc.event(e => {
-                                        spec.option.forEach((option) => {
-                                            option.select = false;
-                                        });
-                                        spec.option[e.value].select = true;
-                                        selectVariant = changeSelectVariant(data);
-                                        obj.callback(selectVariant);
-                                        gvc.notifyDataChange('productDialog');
-                                    })}"
-                                >
-                                  ${spec.option
-                                        .map((option, index) => {
-                                        return html ` <option
-                                        class="d-flex align-items-center justify-content-center"
-                                        value="${index}"
-                                        ${option.select ? 'selected' : ''}
-                                        style="border-radius: 5px;padding: 10px 18px;color: #393939;font-size: 18px;font-weight: 500;letter-spacing: 0.72px;"
+                                const productSpecs = data.content.specs;
+                                return productSpecs
+                                    .map((spec, index1) => {
+                                    return html ` <div>
+                                <h5 class="mb-2" style="color: #393939; font-size: 14px;">
+                                  ${(spec.language_title && spec.language_title[Language.getLanguage()]) ||
+                                        spec.title}
+                                </h5>
+                                <div class="d-flex gap-2 flex-wrap">
+                                  ${gvc.map(spec.option.map((opt, optIndex) => {
+                                        return html ` <div
+                                        class="spec-option ${spec.option[optIndex].select ? 'selected-option' : ''}"
+                                        onclick="${gvc.event(() => {
+                                            spec.option.forEach((option) => {
+                                                option.select = false;
+                                            });
+                                            spec.option[optIndex].select = true;
+                                            selectVariant = changeSelectVariant(data);
+                                            obj.callback(selectVariant);
+                                            gvc.notifyDataChange('productDialog');
+                                        })}"
                                       >
-                                        ${option.title}
-                                      </option>`;
-                                    })
-                                        .join('')}
-                                </select>
-                              `;
+                                        <span style="font-size: 15px; font-weight: 500; letter-spacing: 1.76px;"
+                                          >${(opt.language_title &&
+                                            opt.language_title[Language.getLanguage()]) ||
+                                            opt.title}</span
+                                        >
+                                      </div>`;
+                                    }))}
+                                </div>
+                              </div>`;
                                 })
                                     .join('');
                             },
@@ -495,9 +495,9 @@ export class POSSetting {
                                         }
                                         if (POSSetting.config.where_store.includes('exhibition_') &&
                                             selectVariant.exhibition_type) {
-                                            return `庫存數量:${selectVariant.exhibition_active_stock}`;
+                                            return `庫存數量: ${selectVariant.exhibition_active_stock}`;
                                         }
-                                        return `庫存數量:${selectVariant.stock}`;
+                                        return `庫存數量: ${selectVariant.stock}`;
                                     })()}</span
                                 >
                               </div>
@@ -818,6 +818,30 @@ export class POSSetting {
         animation: slideOutFromLeft 0.3s ease-out forwards;
       }
 
+      .spec-option {
+        display: flex;
+        height: 38px;
+        padding-left: 10px;
+        padding-right: 10px;
+        justify-content: center;
+        align-items: center;
+        border-radius: 5px;
+        gap: 10px;
+        border: 1px solid #393939;
+        color: #393939;
+        cursor: pointer;
+        transition: 0.3s;
+      }
+
+      .spec-option.selected-option {
+        background: #393939;
+        color: #fff;
+      }
+
+      .spec-option:not(.selected-option):hover {
+        background: #8d8d8d;
+      }
+
       /* @keyframes 定義動畫 */
       @keyframes slideInFromLeft {
         0% {

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

@@ -20,6 +20,7 @@ import { PosSummary } from './pos-pages/pos-summary.js';
 import { ApiPos } from '../glitter-base/route/pos.js';
 import { PosWidget } from './pos-widget.js';
 import { SaasOffer } from '../saas-offer.js';
+import { Language } from '../glitter-base/global/language.js';
 
 const html = String.raw;
 
@@ -388,6 +389,7 @@ export class POSSetting {
     function changeSelectVariant(product: any) {
       let emptyArray: any[] = [];
       product.content.specs.forEach((spec: any) => {
+        console.log(spec.option);
         emptyArray.push(spec.option.find((opt: any) => opt.select == true).title);
       });
       return product.content.variants.find((variant: any) => arraysEqual(variant.spec, emptyArray));
@@ -436,39 +438,49 @@ export class POSSetting {
                           if (data.content.specs.length == 0) {
                             return '';
                           }
-                          return data.content.specs
-                            .map((spec: any) => {
-                              return html`
-                                <div style="font-size: 16px;font-style: normal;font-weight: 500;color: #8D8D8D;">
-                                  ${spec.title}
-                                </div>
-                                <select
-                                  class="w-100 form-select"
-                                  style="border-radius: 5px;border: 1px solid #DDD;padding: 10px 18px;font-size: 18px;"
-                                  onchange="${gvc.event(e => {
-                                    spec.option.forEach((option: any) => {
-                                      option.select = false;
-                                    });
-                                    spec.option[e.value].select = true;
-                                    selectVariant = changeSelectVariant(data);
-                                    obj.callback(selectVariant);
-                                    gvc.notifyDataChange('productDialog');
-                                  })}"
-                                >
-                                  ${spec.option
-                                    .map((option: any, index: number) => {
-                                      return html` <option
-                                        class="d-flex align-items-center justify-content-center"
-                                        value="${index}"
-                                        ${option.select ? 'selected' : ''}
-                                        style="border-radius: 5px;padding: 10px 18px;color: #393939;font-size: 18px;font-weight: 500;letter-spacing: 0.72px;"
+
+                          const productSpecs: {
+                            title: string;
+                            option: any;
+                            language_title?: {
+                              'en-US': string;
+                              'zh-CN': string;
+                              'zh-TW': string;
+                            };
+                          }[] = data.content.specs;
+
+                          return productSpecs
+                            .map((spec, index1) => {
+                              return html` <div>
+                                <h5 class="mb-2" style="color: #393939; font-size: 14px;">
+                                  ${(spec.language_title && (spec.language_title as any)[Language.getLanguage()]) ||
+                                  spec.title}
+                                </h5>
+                                <div class="d-flex gap-2 flex-wrap">
+                                  ${gvc.map(
+                                    spec.option.map((opt: any, optIndex: number) => {
+                                      return html` <div
+                                        class="spec-option ${spec.option[optIndex].select ? 'selected-option' : ''}"
+                                        onclick="${gvc.event(() => {
+                                          spec.option.forEach((option: any) => {
+                                            option.select = false;
+                                          });
+                                          spec.option[optIndex].select = true;
+                                          selectVariant = changeSelectVariant(data);
+                                          obj.callback(selectVariant);
+                                          gvc.notifyDataChange('productDialog');
+                                        })}"
                                       >
-                                        ${option.title}
-                                      </option>`;
+                                        <span style="font-size: 15px; font-weight: 500; letter-spacing: 1.76px;"
+                                          >${(opt.language_title &&
+                                            (opt.language_title as any)[Language.getLanguage()]) ||
+                                          opt.title}</span
+                                        >
+                                      </div>`;
                                     })
-                                    .join('')}
-                                </select>
-                              `;
+                                  )}
+                                </div>
+                              </div>`;
                             })
                             .join('');
                         },
@@ -552,9 +564,9 @@ export class POSSetting {
                                       POSSetting.config.where_store.includes('exhibition_') &&
                                       selectVariant.exhibition_type
                                     ) {
-                                      return `庫存數量:${selectVariant.exhibition_active_stock}`;
+                                      return `庫存數量: ${selectVariant.exhibition_active_stock}`;
                                     }
-                                    return `庫存數量:${selectVariant.stock}`;
+                                    return `庫存數量: ${selectVariant.stock}`;
                                   })()}</span
                                 >
                               </div>
@@ -913,6 +925,30 @@ export class POSSetting {
         animation: slideOutFromLeft 0.3s ease-out forwards;
       }
 
+      .spec-option {
+        display: flex;
+        height: 38px;
+        padding-left: 10px;
+        padding-right: 10px;
+        justify-content: center;
+        align-items: center;
+        border-radius: 5px;
+        gap: 10px;
+        border: 1px solid #393939;
+        color: #393939;
+        cursor: pointer;
+        transition: 0.3s;
+      }
+
+      .spec-option.selected-option {
+        background: #393939;
+        color: #fff;
+      }
+
+      .spec-option:not(.selected-option):hover {
+        background: #8d8d8d;
+      }
+
       /* @keyframes 定義動畫 */
       @keyframes slideInFromLeft {
         0% {

package/lowcode/cms-plugin/data-analyze-orders.js

@@ -35,7 +35,6 @@ export class DataAnalyze {
                             DataAnalyzeModule.salesAmount(gvc, vm),
                             DataAnalyzeModule.orderAmount(gvc, vm),
                             DataAnalyzeModule.orderAverage(gvc, vm),
-                            DataAnalyzeModule.viewPeople(gvc, vm),
                             DataAnalyzeModule.registerPeople(gvc, vm),
                             DataAnalyzeModule.transferRatio(gvc, vm),
                         ]

package/lowcode/cms-plugin/data-analyze-orders.ts

@@ -52,7 +52,7 @@ export class DataAnalyze {
                   DataAnalyzeModule.salesAmount(gvc, vm),
                   DataAnalyzeModule.orderAmount(gvc, vm),
                   DataAnalyzeModule.orderAverage(gvc, vm),
-                  DataAnalyzeModule.viewPeople(gvc, vm),
+                  // DataAnalyzeModule.viewPeople(gvc, vm),
                   DataAnalyzeModule.registerPeople(gvc, vm),
                   DataAnalyzeModule.transferRatio(gvc, vm),
                 ]

package/lowcode/cms-plugin/data-analyze.js

@@ -24,7 +24,7 @@ export class DataAnalyze {
                     src: 'https://d3jnmi1tfjgtti.cloudfront.net/file/252530754/1714105121170-apexcharts.min.js',
                 },
             ], () => { }, () => { });
-            ApiShop.ecDataAnalyze('active_recent_2week,active_recent_year,recent_register_today,order_today,sales_per_month_1_month'.split(',')).then((res) => __awaiter(this, void 0, void 0, function* () {
+            ApiShop.ecDataAnalyze('recent_register_today,order_today,sales_per_month_1_month'.split(',')).then((res) => __awaiter(this, void 0, void 0, function* () {
                 vm.loading = false;
                 vm.data = res.response;
                 gvc.notifyDataChange(id);
@@ -70,22 +70,6 @@ export class DataAnalyze {
                     </div>
                     <div class="row p-0" style="width: 896px; max-width: 100%; gap:15px 0px; ">
                       ${[
-                            {
-                                title: '今日瀏覽人數',
-                                value: html `${vm.data.active_recent_2week.count_array
-                                    .map((dd) => {
-                                    return dd;
-                                })
-                                    .reverse()[0]
-                                    .toLocaleString()}
-                          ${BgWidget.grayNote(`(本月: ${vm.data.active_recent_year.count_array
-                                    .map((dd) => {
-                                    return dd;
-                                })
-                                    .reverse()[0]
-                                    .toLocaleString()})`, 'font-weight: 500;')}`,
-                                icon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/users-duotone-solid.svg',
-                            },
                             {
                                 title: '今日會員註冊',
                                 value: html `${vm.data.recent_register_today['today'].toLocaleString()}
@@ -173,10 +157,6 @@ export class DataAnalyze {
                                 class: 'col-12 col-lg-4 col-md-6',
                                 event: DataAnalyzeModule.orderAverage(gvc),
                             },
-                            {
-                                class: 'col-12 col-lg-4 col-md-6',
-                                event: DataAnalyzeModule.viewPeople(gvc),
-                            },
                             {
                                 class: 'col-12 col-lg-4 col-md-6',
                                 event: DataAnalyzeModule.registerPeople(gvc),

package/lowcode/cms-plugin/data-analyze.ts

@@ -26,9 +26,9 @@ export class DataAnalyze {
         () => {},
         () => {}
       );
-
+//active_recent_2week,active_recent_year
       ApiShop.ecDataAnalyze(
-        'active_recent_2week,active_recent_year,recent_register_today,order_today,sales_per_month_1_month'.split(',')
+        'recent_register_today,order_today,sales_per_month_1_month'.split(',')
       ).then(async res => {
         vm.loading = false;
         vm.data = res.response;
@@ -76,25 +76,25 @@ export class DataAnalyze {
                     </div>
                     <div class="row p-0" style="width: 896px; max-width: 100%; gap:15px 0px; ">
                       ${[
-                        {
-                          title: '今日瀏覽人數',
-                          value: html`${vm.data.active_recent_2week.count_array
-                            .map((dd: any) => {
-                              return dd;
-                            })
-                            .reverse()[0]
-                            .toLocaleString()}
-                          ${BgWidget.grayNote(
-                            `(本月: ${vm.data.active_recent_year.count_array
-                              .map((dd: any) => {
-                                return dd;
-                              })
-                              .reverse()[0]
-                              .toLocaleString()})`,
-                            'font-weight: 500;'
-                          )}`,
-                          icon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/users-duotone-solid.svg',
-                        },
+                        // {
+                        //   title: '今日瀏覽人數',
+                        //   value: html`${vm.data.active_recent_2week.count_array
+                        //     .map((dd: any) => {
+                        //       return dd;
+                        //     })
+                        //     .reverse()[0]
+                        //     .toLocaleString()}
+                        //   ${BgWidget.grayNote(
+                        //     `(本月: ${vm.data.active_recent_year.count_array
+                        //       .map((dd: any) => {
+                        //         return dd;
+                        //       })
+                        //       .reverse()[0]
+                        //       .toLocaleString()})`,
+                        //     'font-weight: 500;'
+                        //   )}`,
+                        //   icon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/users-duotone-solid.svg',
+                        // },
                         {
                           title: '今日會員註冊',
                           value: html`${vm.data.recent_register_today['today'].toLocaleString()}
@@ -188,10 +188,10 @@ export class DataAnalyze {
                     class: 'col-12 col-lg-4 col-md-6',
                     event: DataAnalyzeModule.orderAverage(gvc),
                   },
-                  {
-                    class: 'col-12 col-lg-4 col-md-6',
-                    event: DataAnalyzeModule.viewPeople(gvc),
-                  },
+                  // {
+                  //   class: 'col-12 col-lg-4 col-md-6',
+                  //   event: DataAnalyzeModule.viewPeople(gvc),
+                  // },
                   {
                     class: 'col-12 col-lg-4 col-md-6',
                     event: DataAnalyzeModule.registerPeople(gvc),

package/lowcode/cms-plugin/filter-options.js

@@ -399,8 +399,8 @@ FilterOptions.progressOptions = [
     { key: 'arrived', name: '已到貨' },
     { key: 'shipping', name: '已出貨' },
     { key: 'pre_order', name: '待預購' },
-    { key: 'wait', name: '未出貨' },
     { key: 'in_stock', name: '備貨中' },
+    { key: 'wait', name: '未出貨' },
     { key: 'returns', name: '已退貨' },
 ];
 FilterOptions.returnOrderFunnel = [

package/lowcode/cms-plugin/filter-options.ts

@@ -236,8 +236,8 @@ export class FilterOptions {
     { key: 'arrived', name: '已到貨' },
     { key: 'shipping', name: '已出貨' },
     { key: 'pre_order', name: '待預購' },
-    { key: 'wait', name: '未出貨' },
     { key: 'in_stock', name: '備貨中' },
+    { key: 'wait', name: '未出貨' },
     { key: 'returns', name: '已退貨' },
   ];
 
@@ -684,7 +684,6 @@ export class FilterOptions {
     { key: 'title', value: '內容' },
   ];
 
-
   static emailOptions = [
     { key: 'def', value: '請選擇根據的條件' },
     { key: 'all', value: '所有會員' },