ts-glitter 21.4.4 → 21.4.6

package/lowcode/Entry.js

@@ -127,23 +127,6 @@ export class Entry {
             if (glitter.getUrlParameter('page') !== 'backend_manager') {
                 Entry.checkRedirectPage(glitter);
             }
-            if (['pages/', 'hidden/', 'shop/'].find((dd) => {
-                return (glitter.getUrlParameter('page') || '').startsWith(dd) || ((glitter.getUrlParameter('page_refer') || '').startsWith(dd));
-            })) {
-                const og_path = glitter.getUrlParameter('page_refer') || glitter.getUrlParameter('page');
-                window.page_refer = og_path;
-                setInterval(() => {
-                    if (glitter.getUrlParameter('page') === 'index') {
-                        glitter.href = '/' + og_path;
-                    }
-                    else if (glitter.getUrlParameter('page') !== og_path) {
-                        glitter.setUrlParameter('page_refer', og_path);
-                    }
-                    else {
-                        glitter.setUrlParameter('page_refer', undefined);
-                    }
-                }, 100);
-            }
             glitter.share.logID = glitter.getUUID();
             glitter.addStyle(`
       @media (prefers-reduced-motion: no-preference) {
@@ -163,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.4.4';
+            glitter.share.editerVersion = 'V_21.4.6';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {
@@ -564,6 +547,23 @@ export class Entry {
         callback();
     }
     static toNormalRender(glitter, vm, callback) {
+        if (['hidden/', 'shop/'].find((dd) => {
+            return (glitter.getUrlParameter('page') || '').startsWith(dd) || ((glitter.getUrlParameter('page_refer') || '').startsWith(dd));
+        })) {
+            const og_path = glitter.getUrlParameter('page_refer') || glitter.getUrlParameter('page');
+            window.page_refer = og_path;
+            setInterval(() => {
+                if (glitter.getUrlParameter('page') === 'index') {
+                    glitter.href = '/' + og_path;
+                }
+                else if (glitter.getUrlParameter('page') !== og_path) {
+                    glitter.setUrlParameter('page_refer', og_path);
+                }
+                else {
+                    glitter.setUrlParameter('page_refer', undefined);
+                }
+            }, 100);
+        }
         ApiUser.getUserData(GlobalUser.token, 'me').then((r) => __awaiter(this, void 0, void 0, function* () {
             try {
                 if (!r.result) {

package/lowcode/Entry.ts

@@ -131,24 +131,6 @@ export class Entry {
       if (glitter.getUrlParameter('page') !== 'backend_manager') {
         Entry.checkRedirectPage(glitter);
       }
-
-      //紀錄初始載入頁面，後續會帶入query當中用與替換Header避免跳頁
-      if(['pages/','hidden/','shop/'].find((dd)=>{
-        return (glitter.getUrlParameter('page') || '').startsWith(dd) || ((glitter.getUrlParameter('page_refer') || '').startsWith(dd))
-      })){
-        const og_path=glitter.getUrlParameter('page_refer') || glitter.getUrlParameter('page');
-        (window as any).page_refer=og_path;
-
-        setInterval(()=>{
-          if(glitter.getUrlParameter('page')==='index'){
-            glitter.href='/'+og_path
-          }else if(glitter.getUrlParameter('page')!==og_path){
-            glitter.setUrlParameter('page_refer',og_path)
-          }else{
-            glitter.setUrlParameter('page_refer',undefined)
-          }
-        },100)
-      }
       glitter.share.logID = glitter.getUUID();
       glitter.addStyle(`
       @media (prefers-reduced-motion: no-preference) {
@@ -168,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.4.4';
+      glitter.share.editerVersion = 'V_21.4.6';
       glitter.share.start = new Date();
       const vm = { appConfig: [] };
       (window as any).saasConfig = {
@@ -614,6 +596,23 @@ export class Entry {
 
   // 跳轉至一般頁面
   public static toNormalRender(glitter: Glitter, vm: any, callback: () => void) {
+    //紀錄初始載入頁面，後續會帶入query當中用與替換Header避免跳頁
+    if(['hidden/','shop/'].find((dd)=>{
+      return (glitter.getUrlParameter('page') || '').startsWith(dd) || ((glitter.getUrlParameter('page_refer') || '').startsWith(dd))
+    })){
+      const og_path=glitter.getUrlParameter('page_refer') || glitter.getUrlParameter('page');
+      (window as any).page_refer=og_path;
+
+      setInterval(()=>{
+        if(glitter.getUrlParameter('page')==='index'){
+          glitter.href='/'+og_path
+        }else if(glitter.getUrlParameter('page')!==og_path){
+          glitter.setUrlParameter('page_refer',og_path)
+        }else{
+          glitter.setUrlParameter('page_refer',undefined)
+        }
+      },100)
+    }
     ApiUser.getUserData(GlobalUser.token,'me').then(async (r) => {
       try {
         if (!r.result) {

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

@@ -411,8 +411,8 @@ export class BgProduct {
               </div>
               <div class="c_dialog">
                 <div class="c_dialog_body">
-                  <div class="c_dialog_main" style="gap: 24px; max-height: 500px;">
-                    <div class="d-flex" style="gap: 12px;">
+                  <div class="c_dialog_main" style="gap: 18px; max-height: 500px;">
+                    <div class="position-sticky px-1" style="top: 0; background-color: #fff;">
                       ${BgWidget.searchFilter(gvc.event((e, event) => {
                         vm.query = e.value;
                         vm.loading = true;
@@ -771,11 +771,13 @@ export class BgProduct {
                         }
                         else {
                             return [
-                                BgWidget.searchPlace(gvc2.event(e => {
+                                html `<div class="position-sticky px-1" style="top: 0; background-color: #fff;">
+                  ${BgWidget.searchPlace(gvc2.event(e => {
                                     vmt.search = e.value;
                                     vmt.loading = true;
                                     gvc2.notifyDataChange(vmt.id);
-                                }), vmt.search, '搜尋標籤', '0', '0'),
+                                }), vmt.search, '搜尋標籤', '0', '0')}
+                </div>`,
                                 BgWidget.renderOptions(gvc2, vmt),
                             ].join(BgWidget.mbContainer(18));
                         }
@@ -838,7 +840,7 @@ export class BgProduct {
                         });
                     }
                     return result
-                        .filter(item => item.lang === defaultLanguage)
+                        .filter(item => item.tag && item.lang === defaultLanguage)
                         .map(item => {
                         return {
                             key: item.tag,
@@ -855,7 +857,7 @@ export class BgProduct {
             return yield ApiUser.getPublicConfig('product_manager_tags', 'manager').then((dd) => {
                 var _a, _b;
                 if (dd.result && ((_b = (_a = dd.response) === null || _a === void 0 ? void 0 : _a.value) === null || _b === void 0 ? void 0 : _b.list)) {
-                    return dd.response.value.list.map((item) => {
+                    return dd.response.value.list.filter(Boolean).map((item) => {
                         return {
                             key: item,
                             name: `#${item}`,

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

@@ -531,8 +531,8 @@ export class BgProduct {
               </div>
               <div class="c_dialog">
                 <div class="c_dialog_body">
-                  <div class="c_dialog_main" style="gap: 24px; max-height: 500px;">
-                    <div class="d-flex" style="gap: 12px;">
+                  <div class="c_dialog_main" style="gap: 18px; max-height: 500px;">
+                    <div class="position-sticky px-1" style="top: 0; background-color: #fff;">
                       ${BgWidget.searchFilter(
                         gvc.event((e, event) => {
                           vm.query = e.value;
@@ -996,17 +996,19 @@ export class BgProduct {
               return BgWidget.spinner();
             } else {
               return [
-                BgWidget.searchPlace(
-                  gvc2.event(e => {
-                    vmt.search = e.value;
-                    vmt.loading = true;
-                    gvc2.notifyDataChange(vmt.id);
-                  }),
-                  vmt.search,
-                  '搜尋標籤',
-                  '0',
-                  '0'
-                ),
+                html`<div class="position-sticky px-1" style="top: 0; background-color: #fff;">
+                  ${BgWidget.searchPlace(
+                    gvc2.event(e => {
+                      vmt.search = e.value;
+                      vmt.loading = true;
+                      gvc2.notifyDataChange(vmt.id);
+                    }),
+                    vmt.search,
+                    '搜尋標籤',
+                    '0',
+                    '0'
+                  )}
+                </div>`,
                 BgWidget.renderOptions(gvc2, vmt),
               ].join(BgWidget.mbContainer(18));
             }
@@ -1074,7 +1076,7 @@ export class BgProduct {
         }
 
         return result
-          .filter(item => item.lang === defaultLanguage)
+          .filter(item => item.tag && item.lang === defaultLanguage)
           .map(item => {
             return {
               key: item.tag,
@@ -1089,7 +1091,7 @@ export class BgProduct {
   static async getProductManagerTag() {
     return await ApiUser.getPublicConfig('product_manager_tags', 'manager').then((dd: any) => {
       if (dd.result && dd.response?.value?.list) {
-        return dd.response.value.list.map((item: string) => {
+        return dd.response.value.list.filter(Boolean).map((item: string) => {
           return {
             key: item,
             name: `#${item}`,

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

@@ -754,7 +754,6 @@ export class BgRecommend {
                                                 BgWidget.title('分潤商品', 'font-size: 16px;'),
                                                 html ` <div class="my-2"></div>`,
                                                 gvc.bindView(() => {
-                                                    var _a;
                                                     const subVM = {
                                                         id: gvc.glitter.getUUID(),
                                                         loading: true,
@@ -770,14 +769,15 @@ export class BgRecommend {
                                                             return products_data;
                                                         });
                                                     }
-                                                    (_a = newOrder.productCheck) !== null && _a !== void 0 ? _a : (newOrder.productCheck = []);
-                                                    const relativeCloneData = structuredClone(newOrder.productCheck);
                                                     return {
                                                         bind: subVM.id,
                                                         view: () => {
+                                                            var _a;
                                                             if (subVM.loading) {
                                                                 return BgWidget.spinner();
                                                             }
+                                                            (_a = newOrder.productCheck) !== null && _a !== void 0 ? _a : (newOrder.productCheck = []);
+                                                            const relativeCloneData = structuredClone(newOrder.productCheck);
                                                             return html `
                                       <div class="d-flex flex-column p-2" style="gap: 18px;">
                                         <div
@@ -792,8 +792,19 @@ export class BgRecommend {
                                                                     gvc: gvc,
                                                                     default: relativeCloneData.map((dd) => dd.id),
                                                                     callback: product_array => {
-                                                                        getSelectProducts(product_array).then(resp => {
-                                                                            newOrder.productCheck = resp;
+                                                                        dialog.dataLoading({ visible: true });
+                                                                        new Promise(resolve => {
+                                                                            if (product_array.length === 0) {
+                                                                                resolve([]);
+                                                                            }
+                                                                            else {
+                                                                                getSelectProducts(product_array).then(resp => {
+                                                                                    resolve(resp);
+                                                                                });
+                                                                            }
+                                                                        }).then(productArray => {
+                                                                            dialog.dataLoading({ visible: false });
+                                                                            newOrder.productCheck = productArray;
                                                                             subVM.loading = true;
                                                                             gvc.notifyDataChange(subVM.id);
                                                                         });

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

@@ -896,9 +896,6 @@ export class BgRecommend {
                                   return products_data;
                                 }
 
-                                newOrder.productCheck ??= [];
-                                const relativeCloneData = structuredClone(newOrder.productCheck);
-
                                 return {
                                   bind: subVM.id,
                                   view: () => {
@@ -906,6 +903,9 @@ export class BgRecommend {
                                       return BgWidget.spinner();
                                     }
 
+                                    newOrder.productCheck ??= [];
+                                    const relativeCloneData = structuredClone(newOrder.productCheck);
+
                                     return html`
                                       <div class="d-flex flex-column p-2" style="gap: 18px;">
                                         <div
@@ -922,8 +922,18 @@ export class BgRecommend {
                                                 gvc: gvc,
                                                 default: relativeCloneData.map((dd: any) => dd.id),
                                                 callback: product_array => {
-                                                  getSelectProducts(product_array).then(resp => {
-                                                    newOrder.productCheck = resp;
+                                                  dialog.dataLoading({ visible: true });
+                                                  new Promise<[]>(resolve => {
+                                                    if (product_array.length === 0) {
+                                                      resolve([]);
+                                                    } else {
+                                                      getSelectProducts(product_array).then(resp => {
+                                                        resolve(resp);
+                                                      });
+                                                    }
+                                                  }).then(productArray => {
+                                                    dialog.dataLoading({ visible: false });
+                                                    newOrder.productCheck = productArray;
                                                     subVM.loading = true;
                                                     gvc.notifyDataChange(subVM.id);
                                                   });