ts-glitter 21.8.2 → 21.8.4

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

@@ -42,6 +42,7 @@ type VM = {
   replaceData?: any;
   stockStores: StockStore[];
   listLimit: number;
+  isEqual: boolean;
 };
 
 type ProductType = 'product' | 'addProduct' | 'giveaway' | 'hidden' | 'all';
@@ -82,8 +83,10 @@ export class StockList {
       replaceData: {},
       stockStores: [],
       listLimit: TableStorage.getLimit(),
+      isEqual: true,
     };
 
+    const dialog = new ShareDialog(gvc.glitter);
     const ListComp = new BgListComponent(gvc, vm, FilterOptions.stockFilterFrame);
     vm.filter = ListComp.getFilterObject();
     let vmi: any = undefined;
@@ -102,6 +105,15 @@ export class StockList {
       return totalStockCount;
     }
 
+    function areArraysEqual(arr1: any[], arr2: any[]): boolean {
+      if (arr1.length !== arr2.length) return false;
+
+      return arr1.every((item1, index) => {
+        const item2 = arr2[index];
+        return JSON.stringify(item1) === JSON.stringify(item2);
+      });
+    }
+
     function getDatalist() {
       return vm.dataList.map((dd: any) => {
         if (Array.isArray(dd.variant_content.stockList)) {
@@ -226,6 +238,7 @@ export class StockList {
                               }
                             });
 
+                            vm.isEqual = areArraysEqual(vm.stockArray, vm.stockOriginArray);
                             gvc.notifyDataChange(vm.updateId);
                           })}"
                           value="${stockData.count ?? 0}"
@@ -427,17 +440,29 @@ export class StockList {
                                 }
                               }
                             },
-                            rowClick: (data, index) => {
-                              if (option.select_mode) {
+                            rowClick: (data, index, e, event) => {
+                              if (option.select_mode || (event.target as HTMLElement).tagName === 'TR') {
                                 return;
                               }
-                              const product = vm.dataList[index].product_content;
-                              const variant = vm.dataList[index].variant_content;
-                              product.variants.map((dd: any) => {
-                                dd.editable = JSON.stringify(variant.spec) === JSON.stringify(dd.spec);
-                              });
-                              vm.replaceData = product;
-                              vm.type = 'editSpec';
+
+                              function call() {
+                                const product = vm.dataList[index].product_content;
+                                const variant = vm.dataList[index].variant_content;
+                                product.variants.map((dd: any) => {
+                                  dd.editable = JSON.stringify(variant.spec) === JSON.stringify(dd.spec);
+                                });
+                                vm.replaceData = product;
+                                vm.type = 'editSpec';
+                              }
+
+                              if (vm.isEqual) {
+                                call();
+                              } else {
+                                dialog.checkYesOrNot({
+                                  text: '已修正的資料尚未儲存，確定要進到此規格詳細頁嗎',
+                                  callback: bool => bool && call(),
+                                });
+                              }
                             },
                             filter: option.select_mode
                               ? [
@@ -462,46 +487,39 @@ export class StockList {
                 gvc.bindView({
                   bind: vm.updateId,
                   view: () => {
-                    const areArraysEqual = (arr1: any[], arr2: any[]): boolean => {
-                      if (arr1.length !== arr2.length) return false;
-
-                      return arr1.every((item1, index) => {
-                        const item2 = arr2[index];
-                        return JSON.stringify(item1) === JSON.stringify(item2);
-                      });
-                    };
-
-                    if (!areArraysEqual(vm.stockArray, vm.stockOriginArray)) {
-                      return html` <div class="update-bar-container">
-                        ${BgWidget.cancel(
-                          gvc.event(() => {
-                            gvc.notifyDataChange(vm.tableId);
-                          })
-                        )}
-                        ${BgWidget.save(
-                          gvc.event(() => {
-                            const dialog = new ShareDialog(gvc.glitter);
-                            dialog.dataLoading({
-                              text: '更新庫存中',
-                              visible: true,
-                            });
-                            ApiShop.putVariants({
-                              data: vm.dataList,
-                              token: (window.parent as any).config.token,
-                            }).then(re => {
-                              dialog.dataLoading({ visible: false });
-                              if (re.result) {
-                                dialog.successMessage({ text: '更新成功' });
-                                gvc.notifyDataChange(vm.tableId);
-                              } else {
-                                dialog.errorMessage({ text: '更新失敗' });
-                              }
-                            });
-                          })
-                        )}
-                      </div>`;
+                    if (vm.isEqual) {
+                      return '';
                     }
-                    return '';
+
+                    return html` <div class="update-bar-container">
+                      ${BgWidget.cancel(
+                        gvc.event(() => {
+                          vm.isEqual = true;
+                          gvc.notifyDataChange(vm.tableId);
+                        }),
+                        '回到初始值'
+                      )}
+                      ${BgWidget.save(
+                        gvc.event(() => {
+                          dialog.dataLoading({
+                            text: '更新庫存中',
+                            visible: true,
+                          });
+                          ApiShop.putVariants({
+                            data: vm.dataList,
+                            token: (window.parent as any).config.token,
+                          }).then(re => {
+                            dialog.dataLoading({ visible: false });
+                            if (re.result) {
+                              dialog.successMessage({ text: '更新成功' });
+                              gvc.notifyDataChange(vm.tableId);
+                            } else {
+                              dialog.errorMessage({ text: '更新失敗' });
+                            }
+                          });
+                        })
+                      )}
+                    </div>`;
                   },
                 }),
               ].join('')
@@ -515,7 +533,6 @@ export class StockList {
               defData: vm.replaceData,
               goBackEvent: {
                 save: postMD => {
-                  const dialog = new ShareDialog(gvc.glitter);
                   dialog.dataLoading({ visible: true });
                   ApiShop.putProduct({
                     data: postMD,

package/lowcode/css/editor.css

@@ -629,7 +629,7 @@ h6 {
 
 .btn-gray-disable {
   display: flex;
-  padding: 8px 14px;
+  padding: 3.25px 18px;
   max-height: 36px;
   justify-content: center;
   align-items: center;
@@ -646,7 +646,7 @@ h6 {
 
 .btn-gray {
   display: flex;
-  padding: 8px 14px;
+  padding: 3.25px 18px;
   max-height: 36px;
   justify-content: center;
   align-items: center;
@@ -663,7 +663,7 @@ h6 {
 
 .btn-black {
   display: flex;
-  padding: 8px 14px;
+  padding: 3.25px 18px;
   max-height: 36px;
   justify-content: center;
   align-items: center;
@@ -680,7 +680,7 @@ h6 {
 
 .btn-orange {
   display: flex;
-  padding: 8px 14px;
+  padding: 3.25px 18px;
   max-height: 36px;
   justify-content: center;
   align-items: center;
@@ -694,7 +694,7 @@ h6 {
 
 .btn-red {
   display: flex;
-  padding: 8px 14px;
+  padding: 3.25px 18px;
   max-height: 36px;
   justify-content: center;
   align-items: center;
@@ -711,7 +711,7 @@ h6 {
 
 .btn-snow {
   display: flex;
-  padding: 8px 14px;
+  padding: 3.25px 18px;
   max-height: 36px;
   justify-content: center;
   align-items: center;
@@ -774,7 +774,7 @@ h6 {
   padding: 14px 16px;
   background: var(--main-white);
   box-shadow: 0px 1px 10px 0px var(--main-dark-alpha-15);
-  gap: 14px;
+  gap: 12px;
   left: 0;
   bottom: 0;
   width: 100%;
@@ -1292,7 +1292,7 @@ h6 {
   .btn-red,
   .btn-snow {
     max-height: 30px;
-    padding: 8px 14px;
+    padding: 4px 18px;
   }
 
   .btn .tx_700,
@@ -1302,7 +1302,6 @@ h6 {
 
   .update-bar-container {
     padding: 10px 16px;
-    gap: 12px;
   }
 
   .main-card {

package/lowcode/editor/basic-component.js

@@ -9452,11 +9452,6 @@ BasicComponent.componentList = [
             "formData": {}
         },
         image: `https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/size1440_s*px$_scs0sfs1sasbs1sf_Screenshot2024-11-14at2.03.47 AM.jpg`
-    },
-    {
-        title: '社群按鈕',
-        config: { "id": "s6s7sbs4s5s5sasd", "js": "./official_view_component/official.js", "css": { "class": {}, "style": {} }, "data": { "tag": "social_popup", "_gap": "", "attr": [], "elem": "div", "list": [], "inner": "", "_other": {}, "_border": {}, "_margin": {}, "_radius": "", "_padding": {}, "_reverse": "false", "carryData": {}, "refer_app": "shop_template_black_style", "_max_width": "", "_background": "", "_style_refer": "global", "_hor_position": "center", "refer_form_data": { "social_list": [{ "icon": "https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg", "social_type": "fb" }, { "social_type": "ig" }, { "social_type": "line" }] }, "_background_setting": { "type": "none" } }, "list": [], "type": "component", "class": "w-100", "index": 2, "label": "社群彈窗", "style": "", "global": [], "mobile": { "id": "s6s7sbs4s5s5sasd", "js": "./official_view_component/official.js", "css": { "class": {}, "style": {} }, "data": { "refer_app": "shop_template_black_style" }, "list": [], "type": "component", "class": "w-100", "index": 2, "label": "社群彈窗", "style": "", "global": [], "toggle": true, "stylist": [], "version": "v2", "visible": true, "dataType": "static", "style_from": "code", "classDataType": "static", "editor_bridge": {}, "preloadEvenet": {}, "container_fonts": 0, "mobile_editable": [], "desktop_editable": [], "refreshAllParameter": {}, "refreshComponentParameter": {}, "refer": "custom" }, "toggle": true, "desktop": { "data": { "refer_app": "shop_template_black_style", "refer_form_data": {} }, "refer": "custom" }, "stylist": [], "version": "v2", "visible": true, "dataType": "static", "style_from": "code", "classDataType": "static", "editor_bridge": {}, "preloadEvenet": {}, "container_fonts": 0, "mobile_editable": [], "desktop_editable": [], "refreshAllParameter": {}, "refreshComponentParameter": {}, "formData": {} },
-        image: `https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/Screenshot 2025-05-21 at 6.22.03 PM.jpg`
     }
 ];
 BasicComponent.productList = [

package/lowcode/editor/basic-component.ts

@@ -9067,12 +9067,7 @@ export class BasicComponent {
                 "formData": {}
             },
             image: `https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/size1440_s*px$_scs0sfs1sasbs1sf_Screenshot2024-11-14at2.03.47 AM.jpg`
-        },
-      {
-        title: '社群按鈕',
-        config: {"id":"s6s7sbs4s5s5sasd","js":"./official_view_component/official.js","css":{"class":{},"style":{}},"data":{"tag":"social_popup","_gap":"","attr":[],"elem":"div","list":[],"inner":"","_other":{},"_border":{},"_margin":{},"_radius":"","_padding":{},"_reverse":"false","carryData":{},"refer_app":"shop_template_black_style","_max_width":"","_background":"","_style_refer":"global","_hor_position":"center","refer_form_data":{"social_list":[{"icon":"https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg","social_type":"fb"},{"social_type":"ig"},{"social_type":"line"}]},"_background_setting":{"type":"none"}},"list":[],"type":"component","class":"w-100","index":2,"label":"社群彈窗","style":"","global":[],"mobile":{"id":"s6s7sbs4s5s5sasd","js":"./official_view_component/official.js","css":{"class":{},"style":{}},"data":{"refer_app":"shop_template_black_style"},"list":[],"type":"component","class":"w-100","index":2,"label":"社群彈窗","style":"","global":[],"toggle":true,"stylist":[],"version":"v2","visible":true,"dataType":"static","style_from":"code","classDataType":"static","editor_bridge":{},"preloadEvenet":{},"container_fonts":0,"mobile_editable":[],"desktop_editable":[],"refreshAllParameter":{},"refreshComponentParameter":{},"refer":"custom"},"toggle":true,"desktop":{"data":{"refer_app":"shop_template_black_style","refer_form_data":{}},"refer":"custom"},"stylist":[],"version":"v2","visible":true,"dataType":"static","style_from":"code","classDataType":"static","editor_bridge":{},"preloadEvenet":{},"container_fonts":0,"mobile_editable":[],"desktop_editable":[],"refreshAllParameter":{},"refreshComponentParameter":{},"formData":{}},
-        image: `https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/Screenshot 2025-05-21 at 6.22.03 PM.jpg`
-      }
+        }
     ]
 
     public static productList = [

package/lowcode/glitter-base/route/article.js

@@ -1,80 +1,79 @@
-import { BaseApi } from "../../glitterBundle/api/base.js";
+import { BaseApi } from '../../glitterBundle/api/base.js';
 export class Article {
     static get(json) {
         return BaseApi.create({
-            "url": getBaseUrl() + `/api-public/v1/article/manager?${(() => {
-                let par = [
-                    `limit=${json.limit}`,
-                    `page=${json.page}`
-                ];
-                json.search && par.push(`search=${json.search}`);
-                json.id && par.push(`id=${json.id}`);
-                json.tag && par.push(`tag=${json.tag}`);
-                json.label && par.push(`label=${json.label}`);
-                json.for_index && par.push(`for_index=${json.for_index}`);
-                json.status && par.push(`status=${json.status}`);
-                json.page_type && par.push(`page_type=${json.page_type}`);
-                return par.join('&');
-            })()}`,
-            "type": "GET",
-            "headers": {
-                "g-app": json.app_name || getConfig().config.appName,
-                "Content-Type": "application/json",
-                "Authorization": getConfig().config.token
-            }
+            url: getBaseUrl() +
+                `/api-public/v1/article/manager?${(() => {
+                    let par = [`limit=${json.limit}`, `page=${json.page}`];
+                    json.search && par.push(`search=${json.search}`);
+                    json.id && par.push(`id=${json.id}`);
+                    json.tag && par.push(`tag=${json.tag}`);
+                    json.label && par.push(`label=${json.label}`);
+                    json.for_index && par.push(`for_index=${json.for_index}`);
+                    json.status && par.push(`status=${json.status}`);
+                    json.page_type && par.push(`page_type=${json.page_type}`);
+                    json.id_list && par.push(`id_list=${json.id_list}`);
+                    return par.join('&');
+                })()}`,
+            type: 'GET',
+            headers: {
+                'g-app': json.app_name || getConfig().config.appName,
+                'Content-Type': 'application/json',
+                Authorization: getConfig().config.token,
+            },
         });
     }
     static delete(json) {
         return BaseApi.create({
-            "url": getBaseUrl() + `/api-public/v1/article`,
-            "type": "DELETE",
-            "headers": {
-                "Content-Type": "application/json",
-                "g-app": getConfig().config.appName,
-                "Authorization": getConfig().config.token
+            url: getBaseUrl() + `/api-public/v1/article`,
+            type: 'DELETE',
+            headers: {
+                'Content-Type': 'application/json',
+                'g-app': getConfig().config.appName,
+                Authorization: getConfig().config.token,
             },
-            data: JSON.stringify(json)
+            data: JSON.stringify(json),
         });
     }
     static deleteV2(json) {
         return BaseApi.create({
-            "url": getBaseUrl() + `/api-public/v1/article/manager`,
-            "type": "DELETE",
-            "headers": {
-                "Content-Type": "application/json",
-                "g-app": getConfig().config.appName,
-                "Authorization": getConfig().config.token
+            url: getBaseUrl() + `/api-public/v1/article/manager`,
+            type: 'DELETE',
+            headers: {
+                'Content-Type': 'application/json',
+                'g-app': getConfig().config.appName,
+                Authorization: getConfig().config.token,
             },
-            data: JSON.stringify(json)
+            data: JSON.stringify(json),
         });
     }
     static post(tData, status = 1) {
         return BaseApi.create({
-            "url": getBaseUrl() + `/api-public/v1/article/manager`,
-            "type": "POST",
-            "headers": {
-                "Content-Type": "application/json",
-                "g-app": getConfig().config.appName,
-                "Authorization": getConfig().config.token
+            url: getBaseUrl() + `/api-public/v1/article/manager`,
+            type: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'g-app': getConfig().config.appName,
+                Authorization: getConfig().config.token,
             },
             data: JSON.stringify({
                 status: status,
-                "data": tData
-            })
+                data: tData,
+            }),
         });
     }
     static put(tData) {
         return BaseApi.create({
-            "url": getBaseUrl() + `/api-public/v1/article/manager`,
-            "type": "PUT",
-            "headers": {
-                "Content-Type": "application/json",
-                "g-app": getConfig().config.appName,
-                "Authorization": getConfig().config.token
+            url: getBaseUrl() + `/api-public/v1/article/manager`,
+            type: 'PUT',
+            headers: {
+                'Content-Type': 'application/json',
+                'g-app': getConfig().config.appName,
+                Authorization: getConfig().config.token,
             },
             data: JSON.stringify({
-                "data": tData
-            })
+                data: tData,
+            }),
         });
     }
 }

package/lowcode/glitter-base/route/article.ts

@@ -1,111 +1,110 @@
-import {BaseApi} from "../../glitterBundle/api/base.js";
+import { BaseApi } from '../../glitterBundle/api/base.js';
 
-export class Article{
-    public static get(json: {
-        limit: number,
-        page: number,
-        search?: string,
-        id?: string,
-        tag?:string,
-        label?:string,
-        for_index?:string,
-        status?:string,
-        page_type?:string
-        app_name?:string
-    }) {
-        return BaseApi.create({
-            "url": getBaseUrl() + `/api-public/v1/article/manager?${ (() => {
-                let par = [
-                    `limit=${json.limit}`,
-                    `page=${json.page}`
-                ]
-                json.search && par.push(`search=${json.search}`);
-                json.id && par.push(`id=${json.id}`);
-                json.tag &&par.push(`tag=${json.tag}`)
-                json.label &&par.push(`label=${json.label}`)
-                json.for_index &&par.push(`for_index=${json.for_index}`)
-                json.status && par.push(`status=${json.status}`)
-                json.page_type && par.push(`page_type=${json.page_type}`);
-                return par.join('&')
-            })()}`,
-            "type": "GET",
-            "headers": {
-                "g-app": json.app_name || getConfig().config.appName,
-                "Content-Type": "application/json",
-                "Authorization": getConfig().config.token
-            }
-        })
-    }
-    public static delete(json: {
-        id: string
-    }) {
-        return BaseApi.create({
-            "url": getBaseUrl() + `/api-public/v1/article`,
-            "type": "DELETE",
-            "headers": {
-                "Content-Type": "application/json",
-                "g-app": getConfig().config.appName,
-                "Authorization": getConfig().config.token
-            },
-            data: JSON.stringify(json)
-        })
-    }
-    public static deleteV2(json: {
-        id: string
-    }) {
-        return BaseApi.create({
-            "url": getBaseUrl() + `/api-public/v1/article/manager`,
-            "type": "DELETE",
-            "headers": {
-                "Content-Type": "application/json",
-                "g-app": getConfig().config.appName,
-                "Authorization": getConfig().config.token
-            },
-            data: JSON.stringify(json)
-        })
-    }
-
-    public static post(tData:{
-        tag:string,
-        name:string,
-        copy:string
-    },status:number=1){
-        return BaseApi.create({
-            "url": getBaseUrl() + `/api-public/v1/article/manager`,
-            "type": "POST",
-            "headers": {
-                "Content-Type": "application/json",
-                "g-app": getConfig().config.appName,
-                "Authorization": getConfig().config.token
-            },
-            data: JSON.stringify({
-                status:status,
-                "data":tData
-            })
-        })
-    }
-    public static put(tData:any){
-        return BaseApi.create({
-            "url": getBaseUrl() + `/api-public/v1/article/manager`,
-            "type": "PUT",
-            "headers": {
-                "Content-Type": "application/json",
-                "g-app": getConfig().config.appName,
-                "Authorization": getConfig().config.token
-            },
-            data: JSON.stringify({
-                "data":tData
-            })
-        })
-    }
+export class Article {
+  public static get(json: {
+    limit: number;
+    page: number;
+    search?: string;
+    id?: string;
+    tag?: string;
+    label?: string;
+    for_index?: string;
+    status?: string;
+    page_type?: string;
+    app_name?: string;
+    id_list?: string;
+  }) {
+    return BaseApi.create({
+      url:
+        getBaseUrl() +
+        `/api-public/v1/article/manager?${(() => {
+          let par = [`limit=${json.limit}`, `page=${json.page}`];
+          json.search && par.push(`search=${json.search}`);
+          json.id && par.push(`id=${json.id}`);
+          json.tag && par.push(`tag=${json.tag}`);
+          json.label && par.push(`label=${json.label}`);
+          json.for_index && par.push(`for_index=${json.for_index}`);
+          json.status && par.push(`status=${json.status}`);
+          json.page_type && par.push(`page_type=${json.page_type}`);
+          json.id_list && par.push(`id_list=${json.id_list}`);
+          return par.join('&');
+        })()}`,
+      type: 'GET',
+      headers: {
+        'g-app': json.app_name || getConfig().config.appName,
+        'Content-Type': 'application/json',
+        Authorization: getConfig().config.token,
+      },
+    });
+  }
+  public static delete(json: { id: string }) {
+    return BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/article`,
+      type: 'DELETE',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: getConfig().config.token,
+      },
+      data: JSON.stringify(json),
+    });
+  }
+  public static deleteV2(json: { id: string }) {
+    return BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/article/manager`,
+      type: 'DELETE',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: getConfig().config.token,
+      },
+      data: JSON.stringify(json),
+    });
+  }
 
+  public static post(
+    tData: {
+      tag: string;
+      name: string;
+      copy: string;
+    },
+    status: number = 1
+  ) {
+    return BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/article/manager`,
+      type: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: getConfig().config.token,
+      },
+      data: JSON.stringify({
+        status: status,
+        data: tData,
+      }),
+    });
+  }
+  public static put(tData: any) {
+    return BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/article/manager`,
+      type: 'PUT',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: getConfig().config.token,
+      },
+      data: JSON.stringify({
+        data: tData,
+      }),
+    });
+  }
 }
 
 function getConfig() {
-    const saasConfig: { config: any; api: any } = (window.parent as any).saasConfig;
-    return saasConfig
+  const saasConfig: { config: any; api: any } = (window.parent as any).saasConfig;
+  return saasConfig;
 }
 
 function getBaseUrl() {
-    return getConfig().config.url
-}
+  return getConfig().config.url;
+}

package/lowcode/glitter-base/route/recommend.js

@@ -14,6 +14,7 @@ export class ApiRecommend {
                     let par = [`limit=${json.limit}`, `page=${json.page}`];
                     json.user_id && par.push(`user_id=${json.user_id}`);
                     json.code && par.push(`code=${json.code}`);
+                    json.id_list && par.push(`id_list=${json.id_list}`);
                     return par.join('&');
                 })()}`,
             type: 'GET',