ts-glitter 21.8.3 → 21.8.4

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',

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

@@ -1,141 +1,159 @@
 import { BaseApi } from '../../glitterBundle/api/base.js';
 
 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;
 }
 
 export class ApiRecommend {
-    public static getList(json: { data: any; limit: number; page: number; user_id?: number; token?: string ; code?:string }) {
-        return BaseApi.create({
-            url:
-                getBaseUrl() +
-                `/api-public/v1/recommend/list?${(() => {
-                    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}`);
-                    return par.join('&');
-                })()}`,
-            type: 'GET',
-            headers: {
-                'Content-Type': 'application/json',
-                'g-app': getConfig().config.appName,
-                Authorization: json.token || getConfig().config.token,
-            },
-        });
-    }
+  public static getList(json: {
+    data: any;
+    limit: number;
+    page: number;
+    user_id?: number;
+    token?: string;
+    code?: string;
+    id_list?: string;
+  }) {
+    return BaseApi.create({
+      url:
+        getBaseUrl() +
+        `/api-public/v1/recommend/list?${(() => {
+          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',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: json.token || getConfig().config.token,
+      },
+    });
+  }
 
-    public static postListData(cf: { data: any; token?: string }) {
-        return BaseApi.create({
-            url: getBaseUrl() + `/api-public/v1/recommend/list`,
-            type: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                'g-app': getConfig().config.appName,
-                Authorization: cf.token || getConfig().config.token,
-            },
-            data: JSON.stringify(cf.data),
-        });
-    }
+  public static postListData(cf: { data: any; token?: string }) {
+    return BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/recommend/list`,
+      type: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: cf.token || getConfig().config.token,
+      },
+      data: JSON.stringify(cf.data),
+    });
+  }
 
-    public static putListData(cf: { id: number; data: any; token?: string }) {
-        return BaseApi.create({
-            url: getBaseUrl() + `/api-public/v1/recommend/list/${cf.id}`,
-            type: 'PUT',
-            headers: {
-                'Content-Type': 'application/json',
-                'g-app': getConfig().config.appName,
-                Authorization: cf.token || getConfig().config.token,
-            },
-            data: JSON.stringify(cf.data),
-        });
-    }
+  public static putListData(cf: { id: number; data: any; token?: string }) {
+    return BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/recommend/list/${cf.id}`,
+      type: 'PUT',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: cf.token || getConfig().config.token,
+      },
+      data: JSON.stringify(cf.data),
+    });
+  }
 
-    public static toggleListData(cf: { id: number; token?: string }) {
-        return BaseApi.create({
-            url: getBaseUrl() + `/api-public/v1/recommend/list/toggle/${cf.id}`,
-            type: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                'g-app': getConfig().config.appName,
-                Authorization: cf.token || getConfig().config.token,
-            },
-        });
-    }
+  public static toggleListData(cf: { id: number; token?: string }) {
+    return BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/recommend/list/toggle/${cf.id}`,
+      type: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: cf.token || getConfig().config.token,
+      },
+    });
+  }
 
-    public static deleteLinkData(cf: { data: { id: number[] }; token?: string }) {
-        return BaseApi.create({
-            url: getBaseUrl() + `/api-public/v1/recommend/list`,
-            type: 'DELETE',
-            headers: {
-                'Content-Type': 'application/json',
-                'g-app': getConfig().config.appName,
-                Authorization: cf.token || getConfig().config.token,
-            },
-            data: JSON.stringify(cf.data),
-        });
-    }
+  public static deleteLinkData(cf: { data: { id: number[] }; token?: string }) {
+    return BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/recommend/list`,
+      type: 'DELETE',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: cf.token || getConfig().config.token,
+      },
+      data: JSON.stringify(cf.data),
+    });
+  }
 
-    public static getUsers(json: { data: any; limit: number; page: number; type?: string; token?: string; search?: string; searchType?: string; orderBy?: string }) {
-        return BaseApi.create({
-            url:
-                getBaseUrl() +
-                `/api-public/v1/recommend/user?${(() => {
-                    let par = [`limit=${json.limit}`, `page=${json.page}`];
-                    json.search && par.push(`search=${json.search}`);
-                    json.searchType && par.push(`searchType=${json.searchType}`);
-                    json.orderBy && par.push(`orderBy=${json.orderBy}`);
-                    return par.join('&');
-                })()}`,
-            type: 'GET',
-            headers: {
-                'Content-Type': 'application/json',
-                'g-app': getConfig().config.appName,
-                Authorization: json.token || getConfig().config.token,
-            },
-        });
-    }
+  public static getUsers(json: {
+    data: any;
+    limit: number;
+    page: number;
+    type?: string;
+    token?: string;
+    search?: string;
+    searchType?: string;
+    orderBy?: string;
+  }) {
+    return BaseApi.create({
+      url:
+        getBaseUrl() +
+        `/api-public/v1/recommend/user?${(() => {
+          let par = [`limit=${json.limit}`, `page=${json.page}`];
+          json.search && par.push(`search=${json.search}`);
+          json.searchType && par.push(`searchType=${json.searchType}`);
+          json.orderBy && par.push(`orderBy=${json.orderBy}`);
+          return par.join('&');
+        })()}`,
+      type: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: json.token || getConfig().config.token,
+      },
+    });
+  }
 
-    public static postUserData(cf: { data: any; token?: string }) {
-        return BaseApi.create({
-            url: getBaseUrl() + `/api-public/v1/recommend/user`,
-            type: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                'g-app': getConfig().config.appName,
-                Authorization: cf.token || getConfig().config.token,
-            },
-            data: JSON.stringify(cf.data),
-        });
-    }
+  public static postUserData(cf: { data: any; token?: string }) {
+    return BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/recommend/user`,
+      type: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: cf.token || getConfig().config.token,
+      },
+      data: JSON.stringify(cf.data),
+    });
+  }
 
-    public static putUserData(cf: { id: number; data: any; token?: string }) {
-        return BaseApi.create({
-            url: getBaseUrl() + `/api-public/v1/recommend/user/${cf.id}`,
-            type: 'PUT',
-            headers: {
-                'Content-Type': 'application/json',
-                'g-app': getConfig().config.appName,
-                Authorization: cf.token || getConfig().config.token,
-            },
-            data: JSON.stringify(cf.data),
-        });
-    }
+  public static putUserData(cf: { id: number; data: any; token?: string }) {
+    return BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/recommend/user/${cf.id}`,
+      type: 'PUT',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: cf.token || getConfig().config.token,
+      },
+      data: JSON.stringify(cf.data),
+    });
+  }
 
-    public static deleteUserData(cf: { data: { id: number[] }; token?: string }) {
-        return BaseApi.create({
-            url: getBaseUrl() + `/api-public/v1/recommend/user`,
-            type: 'DELETE',
-            headers: {
-                'Content-Type': 'application/json',
-                'g-app': getConfig().config.appName,
-                Authorization: cf.token || getConfig().config.token,
-            },
-            data: JSON.stringify(cf.data),
-        });
-    }
+  public static deleteUserData(cf: { data: { id: number[] }; token?: string }) {
+    return BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/recommend/user`,
+      type: 'DELETE',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: cf.token || getConfig().config.token,
+      },
+      data: JSON.stringify(cf.data),
+    });
+  }
 }

package/lowcode/glitterBundle/plugins/html-render.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { init } from '../GVController.js';
 import { TriggerEvent } from './trigger-event.js';
 import { GlobalUser } from '../../glitter-base/global/global-user.js';
+import { FirstBanner } from '../../public-components/banner/first-banner.js';
 import { Language } from '../../glitter-base/global/language.js';
 import { ApplicationConfig } from '../../application-config.js';
 const html = String.raw;
@@ -90,6 +91,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
     return {
         onCreateView: () => {
             var _a, _b, _c, _d, _e, _f, _g, _h;
+            FirstBanner.main({ gvc: gvc });
             if (gBundle.page_config.seo && gBundle.page_config.seo.type === 'custom' && gBundle.page_config.seo.title) {
                 glitter.setUrlParameter('', undefined, [
                     (_a = gBundle.page_config.seo.title_prefix) !== null && _a !== void 0 ? _a : '',

package/lowcode/glitterBundle/plugins/html-render.ts

@@ -76,6 +76,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
 
   return {
     onCreateView: () => {
+      FirstBanner.main({ gvc: gvc });
       //定義SEO TITLE
       if (gBundle.page_config.seo && gBundle.page_config.seo.type === 'custom' && gBundle.page_config.seo.title) {
         glitter.setUrlParameter(

package/lowcode/jspage/function-page/tool-setting.js

@@ -173,7 +173,6 @@ export class ToolSetting {
                         const htmlGenerate = new gvc.glitter.htmlGenerate(widget_container, [], {
                             editor_updated_callback: (oWidget) => {
                                 if (dd.tag === '廣告輪播') {
-                                    console.log(`oWidget==>`, oWidget);
                                     FirstBanner.main({
                                         gvc: document.querySelector('.iframe_view').contentWindow.glitter.pageConfig[0].gvc,
                                         ed_widget: oWidget,

package/lowcode/jspage/function-page/tool-setting.ts

@@ -213,7 +213,6 @@ export class ToolSetting {
             {
               editor_updated_callback: (oWidget: any) => {
                 if (dd.tag === '廣告輪播') {
-                  console.log(`oWidget==>`,oWidget)
                   FirstBanner.main({
                     gvc: (document.querySelector('.iframe_view') as any).contentWindow.glitter.pageConfig[0].gvc,
                     ed_widget: oWidget,

package/lowcode/jspage/main.js

@@ -743,7 +743,12 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
                                                 src: `fa-sharp fa-regular fa-globe guide-user-editor-11-icon`,
                                                 index: 'color',
                                                 hint: '全站樣式',
-                                            }
+                                            },
+                                            {
+                                                src: `fa-regular fa-grid-2 design-guide-1-icon`,
+                                                index: 'widget',
+                                                hint: '設計元件',
+                                            },
                                         ]
                                             .filter(dd => {
                                             if (gvc.glitter.getUrlParameter('device') === 'mobile') {

package/lowcode/jspage/main.ts

@@ -804,7 +804,12 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
                               src: `fa-sharp fa-regular fa-globe guide-user-editor-11-icon`,
                               index: 'color',
                               hint: '全站樣式',
-                            }
+                            },
+                            {
+                              src: `fa-regular fa-grid-2 design-guide-1-icon`,
+                              index: 'widget',
+                              hint: '設計元件',
+                            },
                           ]
                             .filter(dd => {
                               if (gvc.glitter.getUrlParameter('device') === 'mobile') {

package/lowcode/modules/image-library-clone.ts

@@ -110,6 +110,8 @@ export class imageLibrary {
             });
         }
 
+
+
         const isSafari = (() => {
             const userAgent = navigator.userAgent.toLowerCase();
             return userAgent.includes('safari') && !userAgent.includes('chrome') && !userAgent.includes('edg');