ts-glitter 21.0.4 → 21.0.6

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

package/lowcode/Entry.ts

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

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

@@ -539,8 +539,10 @@ export class BgBlog {
                 limit: 1,
                 id: window.parent.glitter.getUrlParameter('page-id'),
             }).then((data) => __awaiter(this, void 0, void 0, function* () {
-                vm.data = data.response.data[0];
-                vm.type = 'replace';
+                if (data.result) {
+                    vm.data = data.response.data[0];
+                    vm.type = 'replace';
+                }
             }));
         }
         return gvc.bindView(() => {
@@ -550,7 +552,8 @@ export class BgBlog {
                 dataList: [{ obj: vm, key: 'type' }],
                 view: () => {
                     if (window.parent.glitter.getUrlParameter('page-id') && vm.type !== 'replace') {
-                        return '';
+                        window.parent.glitter.setUrlParameter('page-id', '');
+                        gvc.notifyDataChange(id);
                     }
                     const pageTabMap = {
                         hidden: '隱形賣場',
@@ -681,15 +684,13 @@ export class BgBlog {
                             },
                         }));
                     }
-                    else {
-                        return editor({
-                            gvc: gvc,
-                            vm: vm,
-                            is_page: is_page,
-                            widget: widget,
-                            page_tab: page_tab,
-                        });
-                    }
+                    return editor({
+                        gvc: gvc,
+                        vm: vm,
+                        is_page: is_page,
+                        widget: widget,
+                        page_tab: page_tab,
+                    });
                 },
             };
         });
@@ -1137,24 +1138,8 @@ function detail(gvc, cf, vm, cVm, page_tab) {
                 window.parent.glitter.share.switch_to_web_builder(`${domainPrefix}/${vm.data.content.tag}`);
             }
             if (origin !== JSON.stringify(vm.data)) {
-                const dialog = new ShareDialog(gvc.glitter);
-                dialog.checkYesOrNot({
-                    text: '偵測到內容變更，是否保留更改?',
-                    callback: response => {
-                        if (response) {
-                            saveData(gvc, cf, vm, cVm, false).then(res => {
-                                if (res) {
-                                    next();
-                                }
-                                else {
-                                    gvc.notifyDataChange(id);
-                                }
-                            });
-                        }
-                        else {
-                            next();
-                        }
-                    },
+                saveData(gvc, cf, vm, cVm, false).then(res => {
+                    res ? next() : gvc.notifyDataChange(id);
                 });
             }
             else {
@@ -1216,6 +1201,7 @@ function detail(gvc, cf, vm, cVm, page_tab) {
                 }))}
             </div>
           </div>
+          ${BgWidget.mbContainer(18)}
           ${BgWidget.container1x2({
                     html: [
                         gvc.bindView(() => {
@@ -1462,7 +1448,7 @@ function detail(gvc, cf, vm, cVm, page_tab) {
                                                 </div>`;
                                                                             }
                                                                             catch (e) {
-                                                                                console.log(`error=>`, e);
+                                                                                console.error(`error=>`, e);
                                                                                 return '';
                                                                             }
                                                                         },
@@ -1541,7 +1527,7 @@ function detail(gvc, cf, vm, cVm, page_tab) {
                                                       <div class="form-check-label c_updown_label">
                                                         <div class="tx_normal">產品列表</div>
                                                       </div>
-                                                      ${BgWidget.grayButton('搜尋商品', gvc.event(() => {
+                                                      ${BgWidget.grayButton('選擇商品', gvc.event(() => {
                                                                                     BgProduct.productsDialog({
                                                                                         default: d1.value,
                                                                                         gvc: gvc,
@@ -1624,13 +1610,14 @@ function detail(gvc, cf, vm, cVm, page_tab) {
                                                   <div class="form-check-label c_updown_label">
                                                     <div class="tx_normal">產品列表</div>
                                                   </div>
-                                                  ${BgWidget.grayButton('搜尋商品', gvc.event(() => {
+                                                  ${BgWidget.grayButton('選擇商品', gvc.event(() => {
                                                                                 BgProduct.productsDialog({
                                                                                     gvc: gvc,
                                                                                     default: vm.data.content.relative_data.map((dd) => {
                                                                                         return `${dd.product_id}-${dd.variant.spec.join('-')}`;
                                                                                     }),
                                                                                     with_variants: true,
+                                                                                    filter_visible: page_tab === 'hidden' ? 'false' : 'true',
                                                                                     callback: (value) => __awaiter(this, void 0, void 0, function* () {
                                                                                         var _a;
                                                                                         vm.data.content.relative_data =
@@ -1737,8 +1724,8 @@ function detail(gvc, cf, vm, cVm, page_tab) {
                                             return '';
                                         }
                                         catch (e) {
-                                            console.log(e);
-                                            return `${e}`;
+                                            console.error(e);
+                                            return '';
                                         }
                                     },
                                 };
@@ -1749,7 +1736,6 @@ function detail(gvc, cf, vm, cVm, page_tab) {
                 }, {
                     html: BgWidget.summaryCard(gvc.bindView(() => {
                         var _a;
-                        console.log(`vm.data.content.template=>`, vm.data.content.template);
                         const id = gvc.glitter.getUUID();
                         vm.data.status = (_a = vm.data.status) !== null && _a !== void 0 ? _a : '1';
                         return {
@@ -2055,7 +2041,6 @@ function detail(gvc, cf, vm, cVm, page_tab) {
                                 })()
                                 : `blogs`}/${vm.data.content.tag}?preview=true&appName=${window.parent.appName}`;
                         })();
-                        console.log(`vm.data.content=>`, vm.data.content);
                         localStorage.setItem('preview_data', JSON.stringify(vm.data.content));
                         window.parent.glitter.openNewTab(href);
                     }

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

@@ -617,8 +617,10 @@ export class BgBlog {
         limit: 1,
         id: (window.parent as any).glitter.getUrlParameter('page-id'),
       }).then(async data => {
-        vm.data = data.response.data[0];
-        vm.type = 'replace';
+        if (data.result) {
+          vm.data = data.response.data[0];
+          vm.type = 'replace';
+        }
       });
     }
 
@@ -629,7 +631,8 @@ export class BgBlog {
         dataList: [{ obj: vm, key: 'type' }],
         view: () => {
           if ((window.parent as any).glitter.getUrlParameter('page-id') && vm.type !== 'replace') {
-            return '';
+            (window.parent as any).glitter.setUrlParameter('page-id', '');
+            gvc.notifyDataChange(id);
           }
 
           const pageTabMap = {
@@ -775,15 +778,15 @@ export class BgBlog {
                 },
               })
             );
-          } else {
-            return editor({
-              gvc: gvc,
-              vm: vm,
-              is_page: is_page,
-              widget: widget,
-              page_tab: page_tab,
-            });
           }
+
+          return editor({
+            gvc: gvc,
+            vm: vm,
+            is_page: is_page,
+            widget: widget,
+            page_tab: page_tab,
+          });
         },
       };
     });
@@ -1270,26 +1273,34 @@ function detail(gvc: GVC, cf: any, vm: any, cVm: any, page_tab: 'page' | 'hidden
       }
 
       if (origin !== JSON.stringify(vm.data)) {
-        const dialog = new ShareDialog(gvc.glitter);
-        dialog.checkYesOrNot({
-          text: '偵測到內容變更，是否保留更改?',
-          callback: response => {
-            if (response) {
-              saveData(gvc, cf, vm, cVm, false).then(res => {
-                if (res) {
-                  next();
-                } else {
-                  gvc.notifyDataChange(id);
-                }
-              });
-            } else {
-              next();
-            }
-          },
+        saveData(gvc, cf, vm, cVm, false).then(res => {
+          res ? next() : gvc.notifyDataChange(id);
         });
       } else {
         next();
       }
+
+      // if (origin !== JSON.stringify(vm.data)) {
+      //   const dialog = new ShareDialog(gvc.glitter);
+      //   dialog.checkYesOrNot({
+      //     text: '偵測到內容變更，是否保留更改?',
+      //     callback: response => {
+      //       if (response) {
+      //         saveData(gvc, cf, vm, cVm, false).then(res => {
+      //           if (res) {
+      //             next();
+      //           } else {
+      //             gvc.notifyDataChange(id);
+      //           }
+      //         });
+      //       } else {
+      //         next();
+      //       }
+      //     },
+      //   });
+      // } else {
+      //   next();
+      // }
     }
 
     return {
@@ -1357,6 +1368,7 @@ function detail(gvc: GVC, cf: any, vm: any, cVm: any, page_tab: 'page' | 'hidden
               )}
             </div>
           </div>
+          ${BgWidget.mbContainer(18)}
           ${BgWidget.container1x2(
             {
               html: [
@@ -1625,7 +1637,7 @@ function detail(gvc: GVC, cf: any, vm: any, cVm: any, page_tab: 'page' | 'hidden
                                                   })()}
                                                 </div>`;
                                               } catch (e) {
-                                                console.log(`error=>`, e);
+                                                console.error(`error=>`, e);
                                                 return '';
                                               }
                                             },
@@ -1707,7 +1719,7 @@ function detail(gvc: GVC, cf: any, vm: any, cVm: any, page_tab: 'page' | 'hidden
                                                         <div class="tx_normal">產品列表</div>
                                                       </div>
                                                       ${BgWidget.grayButton(
-                                                        '搜尋商品',
+                                                        '選擇商品',
                                                         gvc.event(() => {
                                                           BgProduct.productsDialog({
                                                             default: d1.value,
@@ -1799,7 +1811,7 @@ function detail(gvc: GVC, cf: any, vm: any, cVm: any, page_tab: 'page' | 'hidden
                                                     <div class="tx_normal">產品列表</div>
                                                   </div>
                                                   ${BgWidget.grayButton(
-                                                    '搜尋商品',
+                                                    '選擇商品',
                                                     gvc.event(() => {
                                                       BgProduct.productsDialog({
                                                         gvc: gvc,
@@ -1807,6 +1819,7 @@ function detail(gvc: GVC, cf: any, vm: any, cVm: any, page_tab: 'page' | 'hidden
                                                           return `${dd.product_id}-${dd.variant.spec.join('-')}`;
                                                         }),
                                                         with_variants: true,
+                                                        filter_visible: page_tab === 'hidden' ? 'false' : 'true',
                                                         callback: async value => {
                                                           vm.data.content.relative_data =
                                                             vm.data.content.relative_data ?? [];
@@ -1927,8 +1940,8 @@ function detail(gvc: GVC, cf: any, vm: any, cVm: any, page_tab: 'page' | 'hidden
                           }
                           return '';
                         } catch (e) {
-                          console.log(e);
-                          return `${e}`;
+                          console.error(e);
+                          return '';
                         }
                       },
                     };
@@ -1940,7 +1953,6 @@ function detail(gvc: GVC, cf: any, vm: any, cVm: any, page_tab: 'page' | 'hidden
             {
               html: BgWidget.summaryCard(
                 gvc.bindView(() => {
-                  console.log(`vm.data.content.template=>`, vm.data.content.template);
                   const id = gvc.glitter.getUUID();
                   vm.data.status = vm.data.status ?? '1';
                   return {
@@ -2266,7 +2278,6 @@ function detail(gvc: GVC, cf: any, vm: any, cVm: any, page_tab: 'page' | 'hidden
                         : `blogs`
                     }/${vm.data.content.tag}?preview=true&appName=${(window.parent as any).appName}`;
                   })();
-                  console.log(`vm.data.content=>`, vm.data.content);
                   localStorage.setItem('preview_data', JSON.stringify(vm.data.content));
                   (window.parent as any).glitter.openNewTab(href);
                 }

package/lowcode/backend-manager/bg-list-component.js

@@ -168,7 +168,7 @@ export class BgListComponent {
               </div>
               <div
                 class="position-absolute bottom-0 left-0 w-100 d-flex align-items-center justify-content-end p-3 border-top pe-4"
-                style="gap:10px;"
+                style="gap: 10px; background-color: #fff"
               >
                 ${BgWidget.cancel(gvc.event(() => {
                             this.vm.filter = this.getFilterObject();
@@ -304,7 +304,7 @@ export class BgListComponent {
               </div>
               <div
                 class="position-absolute bottom-0 left-0 w-100 d-flex align-items-center justify-content-end p-3 border-top pe-4"
-                style="gap:10px;"
+                style="gap: 10px; background-color: #fff"
               >
                 ${BgWidget.cancel(gvc.event(() => {
                             const cancelMap = {

package/lowcode/backend-manager/bg-list-component.ts

@@ -201,7 +201,7 @@ export class BgListComponent {
               </div>
               <div
                 class="position-absolute bottom-0 left-0 w-100 d-flex align-items-center justify-content-end p-3 border-top pe-4"
-                style="gap:10px;"
+                style="gap: 10px; background-color: #fff"
               >
                 ${BgWidget.cancel(
                   gvc.event(() => {
@@ -362,7 +362,7 @@ export class BgListComponent {
               </div>
               <div
                 class="position-absolute bottom-0 left-0 w-100 d-flex align-items-center justify-content-end p-3 border-top pe-4"
-                style="gap:10px;"
+                style="gap: 10px; background-color: #fff"
               >
                 ${BgWidget.cancel(
                   gvc.event(() => {

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

@@ -390,6 +390,13 @@ export class BgWidget {
             size: (_b = args === null || args === void 0 ? void 0 : args.size) !== null && _b !== void 0 ? _b : 'md',
         });
     }
+    static watchingInsignia(text, args) {
+        var _a, _b;
+        return this.insignia('watching', text, {
+            type: (_a = args === null || args === void 0 ? void 0 : args.type) !== null && _a !== void 0 ? _a : 'fill',
+            size: (_b = args === null || args === void 0 ? void 0 : args.size) !== null && _b !== void 0 ? _b : 'md',
+        });
+    }
     static normalInsignia(text, args) {
         var _a, _b;
         return this.insignia('normal', text, {
@@ -411,6 +418,20 @@ export class BgWidget {
             size: (_b = args === null || args === void 0 ? void 0 : args.size) !== null && _b !== void 0 ? _b : 'md',
         });
     }
+    static grayInsignia(text, args) {
+        var _a, _b;
+        return this.insignia('gray', text, {
+            type: (_a = args === null || args === void 0 ? void 0 : args.type) !== null && _a !== void 0 ? _a : 'fill',
+            size: (_b = args === null || args === void 0 ? void 0 : args.size) !== null && _b !== void 0 ? _b : 'md',
+        });
+    }
+    static darkInsignia(text, args) {
+        var _a, _b;
+        return this.insignia('dark', text, {
+            type: (_a = args === null || args === void 0 ? void 0 : args.type) !== null && _a !== void 0 ? _a : 'fill',
+            size: (_b = args === null || args === void 0 ? void 0 : args.size) !== null && _b !== void 0 ? _b : 'md',
+        });
+    }
     static languageInsignia(language, style) {
         switch (language) {
             case 'zh-TW':

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

@@ -557,6 +557,13 @@ export class BgWidget {
     });
   }
 
+  static watchingInsignia(text: string, args?: { type?: 'fill' | 'border'; size?: 'sm' | 'md' }) {
+    return this.insignia('watching', text, {
+      type: args?.type ?? 'fill',
+      size: args?.size ?? 'md',
+    });
+  }
+
   static normalInsignia(text: string, args?: { type?: 'fill' | 'border'; size?: 'sm' | 'md' }) {
     return this.insignia('normal', text, {
       type: args?.type ?? 'fill',
@@ -578,6 +585,20 @@ export class BgWidget {
     });
   }
 
+  static grayInsignia(text: string, args?: { type?: 'fill' | 'border'; size?: 'sm' | 'md' }) {
+    return this.insignia('gray', text, {
+      type: args?.type ?? 'fill',
+      size: args?.size ?? 'md',
+    });
+  }
+
+  static darkInsignia(text: string, args?: { type?: 'fill' | 'border'; size?: 'sm' | 'md' }) {
+    return this.insignia('dark', text, {
+      type: args?.type ?? 'fill',
+      size: args?.size ?? 'md',
+    });
+  }
+
   static languageInsignia(language: LanguageLocation, style?: string) {
     switch (language) {
       case 'zh-TW':

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

@@ -217,11 +217,11 @@ export class FilterOptions {
         });
     }
     static getReconciliationFunnel() {
-        var _a, _b;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const saasConfig = window.parent.saasConfig;
             const response = yield saasConfig.api.getPrivateConfig(saasConfig.config.appName, 'logistics_setting');
-            let configData = ((_a = response.response.result[0]) === null || _a === void 0 ? void 0 : _a.value) || {};
+            let configData = ((_b = (_a = response.response.result) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.value) || {};
             if (!configData.language_data) {
                 configData.language_data = {
                     'en-US': { info: '' },
@@ -233,7 +233,7 @@ export class FilterOptions {
                 .map(dd => {
                 return { key: dd.value, name: dd.title };
             })
-                .concat(((_b = configData.custom_delivery) !== null && _b !== void 0 ? _b : []).map((dd) => {
+                .concat(((_c = configData.custom_delivery) !== null && _c !== void 0 ? _c : []).map((dd) => {
                 return { key: dd.id, name: dd.name };
             }));
             return [

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

@@ -317,7 +317,7 @@ export class FilterOptions {
       'logistics_setting'
     );
 
-    let configData: any = response.response.result[0]?.value || {};
+    let configData: any = response.response.result?.[0]?.value || {};
     if (!configData.language_data) {
       configData.language_data = {
         'en-US': { info: '' },

package/lowcode/cms-plugin/pos-pages/models.ts

@@ -16,6 +16,7 @@ export class OrderDetail {
     spec: string[];
     count: number;
     sale_price: number;
+    custom_price:any;
     sku: string;
     product_category?: string;
   }[];

package/lowcode/cms-plugin/pos-pages/payment-page.js

@@ -169,10 +169,10 @@ export class PaymentPage {
                       ${(() => {
                             if (orderDetail.lineItems.length > 0) {
                                 return orderDetail.lineItems
-                                    .map((data) => {
+                                    .map((data, index) => {
                                     return html `
                                 <div class="d-flex" style="">
-                                  <div class="col-9 col-sm-6 d-flex align-items-center">
+                                  <div class="col-12 col-sm-6 d-flex align-items-center">
                                     <div
                                       class="d-flex flex-column align-items-center justify-content-center"
                                       style="gap:5px;width:75px;"
@@ -199,7 +199,12 @@ export class PaymentPage {
                                       </div>
                                     </div>
                                     <div
-                                      class="d-flex flex-column py-2"
+                                      class="d-flex flex-column py-2" onclick="${gvc.event(() => {
+                                        PosFunction.setMoney(gvc, count => {
+                                            obj.ogOrderData.lineItems[index].count = count;
+                                            refreshOrderView();
+                                        }, '更改商品數量');
+                                    })}"
                                       style="font-size: 16px;font-style: normal;font-weight: 500;letter-spacing: 0.64px;margin-left: 12px;"
                                     >
                                       <div class="d-flex justify-content-center flex-column" style="gap:5px;">
@@ -208,7 +213,7 @@ export class PaymentPage {
                                             return ``;
                                         }
                                         else {
-                                            return html `<div>${BgWidget.dangerInsignia('需預購')}</div>`;
+                                            return html ` <div>${BgWidget.dangerInsignia('需預購')}</div>`;
                                         }
                                     })()}
                                         ${data.title}
@@ -236,15 +241,76 @@ export class PaymentPage {
                                           </div>`
                                         : ``}
                                     </div>
+                                    <div class="flex-fill"></div>
+                                    <div class="d-sm-none d-flex align-items-center justify-content-center flex-column" style="gap:0px;" onclick="${gvc.event(() => {
+                                        PosFunction.setMoney(gvc, money => {
+                                            if (money === data.sale_price) {
+                                                delete obj.ogOrderData.lineItems[index].custom_price;
+                                            }
+                                            else {
+                                                obj.ogOrderData.lineItems[index].custom_price = money;
+                                            }
+                                            refreshOrderView();
+                                        }, '更改商品單價');
+                                    })}">
+                                      ${(data.sale_price !== data.variant_sale_price) ? `
+                                    <span class="text-decoration-line-through"
+                                      >$${parseInt((data.variant_sale_price * data.count), 10).toLocaleString()}</span
+                                    >
+                                     <span class="text-danger"
+                                      >$${parseInt((data.sale_price * data.count), 10).toLocaleString()}</span
+                                    >
+                                    ` : `
+                                    <span
+                                      >$${parseInt((data.sale_price * data.count), 10).toLocaleString()}</span
+                                    >
+                                    `}
+
+                                    </div>
                                   </div>
                                   <div class="col-2 d-none d-sm-flex align-items-center justify-content-start">
                                     $${parseInt(data.sale_price, 10).toLocaleString()}
                                   </div>
-                                  <div class="col-3 col-lg-2 d-flex align-items-center justify-content-center">
+                                  <div
+                                    class="col-3 col-lg-2 d-flex align-items-center justify-content-center d-none d-sm-flex"
+                                    style="gap:10px;cursor: pointer;"
+                                    onclick="${gvc.event(() => {
+                                        PosFunction.setMoney(gvc, count => {
+                                            obj.ogOrderData.lineItems[index].count = count;
+                                            refreshOrderView();
+                                        }, '更改商品數量');
+                                    })}"
+                                  >
                                     ${Number(data.count).toLocaleString()}
                                   </div>
-                                  <div class="col-3 col-lg-2 d-flex align-items-center justify-content-center">
-                                    $${parseInt((data.sale_price * data.count), 10).toLocaleString()}
+                                  <div
+                                    class="col-3 col-lg-2 d-flex align-items-center justify-content-center  d-none d-sm-flex"
+                                    style="gap:10px;cursor: pointer;"
+                                    onclick="${gvc.event(() => {
+                                        PosFunction.setMoney(gvc, money => {
+                                            if (money === data.sale_price) {
+                                                delete obj.ogOrderData.lineItems[index].custom_price;
+                                            }
+                                            else {
+                                                obj.ogOrderData.lineItems[index].custom_price = money;
+                                            }
+                                            refreshOrderView();
+                                        }, '更改商品單價');
+                                    })}"
+                                  >
+                                    ${(data.sale_price !== data.variant_sale_price) ? `
+                                    <span class="text-decoration-line-through"
+                                      >$${parseInt((data.variant_sale_price * data.count), 10).toLocaleString()}</span
+                                    >
+                                     <span class="text-danger"
+                                      >$${parseInt((data.sale_price * data.count), 10).toLocaleString()}</span
+                                    >
+                                    ` : `
+                                    <span
+                                      >$${parseInt((data.sale_price * data.count), 10).toLocaleString()}</span
+                                    >
+                                    `}
+                                    
                                   </div>
                                 </div>
                               `;
@@ -1926,7 +1992,7 @@ export class PaymentPage {
                                             text: '請撕取客戶聯，在列印留存聯',
                                             callback: () => {
                                                 resolve(true);
-                                            }
+                                            },
                                         });
                                     });
                                     yield IminModule.printTransactionDetails(res.response.data.orderID, invoice, glitter.share.staff_title);