ts-glitter 20.6.8 → 20.6.9

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

@@ -851,6 +851,7 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
                     : html ` <i class="fa-solid fa-chevron-right"></i>`}`;
             });
             return html ` <div
+        class="h-100"
         style="display: flex; flex-wrap: wrap; align-items: center; font-size: 14px; font-weight: 500; gap: 6px; line-height: 140%;cursor: default;"
       >
         <div style="width: 28px;height: 28px;display: flex; align-items: center; justify-content:center;">
@@ -1309,6 +1310,47 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
             : `<option class="d-none" selected>${obj.place_holder || `請選擇項目`}</option>`}
       </select>`;
     }
+    static printOption(gvc, vmt, opt) {
+        const id = `print-option-${opt.key}`;
+        opt.key = `${opt.key}`;
+        function call() {
+            if (vmt.postData.includes(opt.key)) {
+                vmt.postData = vmt.postData.filter(item => item !== opt.key);
+            }
+            else {
+                vmt.postData.push(opt.key);
+            }
+            gvc.notifyDataChange(vmt.id);
+        }
+        return html `<div class="d-flex align-items-center gap-3 mb-3">
+      ${gvc.bindView({
+            bind: id,
+            view: () => {
+                return html `<input
+            class="form-check-input mt-0 ${BgWidget.getCheckedClass(gvc)}"
+            type="checkbox"
+            id="${opt.key}"
+            name="radio_${opt.key}"
+            onclick="${gvc.event(() => call())}"
+            ${vmt.postData.includes(opt.key) ? 'checked' : ''}
+          />`;
+            },
+            divCreate: {
+                class: 'd-flex align-items-center justify-content-center',
+            },
+        })}
+      <div class="form-check-label c_updown_label cursor_pointer" onclick="${gvc.event(() => call())}">
+        <div class="tx_normal ${opt.note ? 'mb-1' : ''}">${opt.value}</div>
+        ${opt.note ? html ` <div class="tx_gray_12">${opt.note}</div> ` : ''}
+      </div>
+    </div>`;
+    }
+    static renderOptions(gvc, vmt) {
+        if (vmt.dataList.length === 0) {
+            return html `<div class="d-flex justify-content-center fs-5">查無標籤</div>`;
+        }
+        return vmt.dataList.map((item) => this.printOption(gvc, vmt, { key: item, value: `#${item}` })).join('');
+    }
     static maintenance() {
         return html ` <div class="d-flex flex-column align-items-center justify-content-center vh-100 vw-100">
       <iframe
@@ -2006,7 +2048,7 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
     static container(htmlString, obj) {
         var _a;
         return html ` <div
-      class="mb-0 ${document.body.clientWidth > 768 ? 'mx-auto mt-4' : 'w-100 mx-0'}"
+      class="mb-0 ${document.body.clientWidth > 768 ? 'mx-auto mt-3' : 'w-100 mx-0'}"
       style="max-width: 100%; width: ${this.getContainerWidth()}px; ${(_a = obj === null || obj === void 0 ? void 0 : obj.style) !== null && _a !== void 0 ? _a : ''}"
     >
       ${htmlString}
@@ -2014,7 +2056,7 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
     }
     static container1x2(cont1, cont2) {
         return html ` <div
-      class="d-flex mt-4 mb-0 ${document.body.clientWidth > 768 ? 'mx-auto' : 'w-100 mx-0 flex-column'} "
+      class="d-flex mt-2 mb-0 ${document.body.clientWidth > 768 ? 'mx-auto' : 'w-100 mx-0 flex-column'} "
       style="gap: 24px;"
     >
       <div style="width: ${document.body.clientWidth > 768 ? cont1.ratio : 100}%">${cont1.html}</div>
@@ -2108,7 +2150,50 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
             },
         });
     }
+    static searchSelectContainer(gvc, button_title, data, def, callback) {
+        const id = gvc.glitter.getUUID();
+        let loading = true;
+        let search = '';
+        return gvc.bindView({
+            bind: id,
+            view: () => {
+                try {
+                    def = Array.isArray(def) ? def : [];
+                    return [
+                        this.grayButton(loading ? button_title : '確認', gvc.event(() => {
+                            loading = !loading;
+                            gvc.notifyDataChange(id);
+                        }), {
+                            class: 'w-100',
+                        }),
+                        loading
+                            ? html `<div class="d-flex flex-wrap gap-2">
+                  ${def.map(item => this.normalInsignia(`#${item}`)).join('')}
+                </div>`
+                            : this.mainCard([
+                                this.searchPlace(gvc.event(e => {
+                                    search = e.value;
+                                    gvc.notifyDataChange(id);
+                                }), search || '', '搜尋', '0', '0'),
+                                this.multiCheckboxContainer(gvc, data.filter(item => item.name.includes(search)), def, stringArray => {
+                                    def = stringArray;
+                                    callback(stringArray);
+                                }, {
+                                    single: false,
+                                    containerStyle: 'overflow: auto; max-height: 310px;',
+                                }),
+                            ].join(this.mbContainer(12))),
+                    ].join(this.mbContainer(12));
+                }
+                catch (error) {
+                    console.error(error);
+                    return '';
+                }
+            },
+        });
+    }
     static multiCheckboxContainer(gvc, data, def, callback, obj) {
+        var _a;
         const id = gvc.glitter.getUUID();
         const inputColor = obj && obj.readonly ? '#808080' : undefined;
         const randomString = obj && obj.single ? this.getWhiteDotClass(gvc, inputColor) : this.getCheckedClass(gvc, inputColor);
@@ -2169,6 +2254,9 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
                 });
                 return html ` <div style="width: 100%; display: flex; flex-direction: column; gap: 6px;">${checkboxHTML}</div> `;
             },
+            divCreate: {
+                style: (_a = obj === null || obj === void 0 ? void 0 : obj.containerStyle) !== null && _a !== void 0 ? _a : '',
+            },
         });
     }
     static tripletCheckboxContainer(gvc, name, def, callback, obj) {
@@ -2326,8 +2414,8 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
     }
     static tab(data, gvc, select, callback, style) {
         return html ` <div
-      class="mx-sm-0 mx-2"
-      style="justify-content: flex-start; align-items: flex-start; gap: 22px; display: inline-flex;cursor: pointer;margin-top: 24px;margin-bottom: 24px;font-size: 18px; ${style !== null && style !== void 0 ? style : ''};"
+      class="mx-sm-0 my-sm-4 mx-2 my-3"
+      style="justify-content: flex-start; align-items: flex-start; gap: 22px; display: inline-flex;cursor: pointer;font-size: 18px; ${style !== null && style !== void 0 ? style : ''};"
     >
       ${data
             .map(dd => {

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

@@ -9,7 +9,7 @@ import { ApiStock } from '../glitter-base/route/stock.js';
 import { FormModule } from '../cms-plugin/module/form-module.js';
 import { ShareDialog } from '../glitterBundle/dialog/ShareDialog.js';
 import { FormCheck } from '../cms-plugin/module/form-check.js';
-import { Language } from '../glitter-base/global/language.js';
+import { Language, LanguageLocation } from '../glitter-base/global/language.js';
 import { ProductAi } from '../cms-plugin/ai-generator/product-ai.js';
 import { imageLibrary } from '../modules/image-library.js';
 import { Animation } from '../glitterBundle/module/Animation.js';
@@ -543,7 +543,7 @@ export class BgWidget {
     });
   }
 
-  static languageInsignia(language: 'en-US' | 'zh-CN' | 'zh-TW', style?: string) {
+  static languageInsignia(language: LanguageLocation, style?: string) {
     switch (language) {
       case 'zh-TW':
         return html` <div class="insignia insignia-sm" style="background: #ffe9b2; ${style || ''};">
@@ -1062,6 +1062,7 @@ ${obj.default ?? ''}</textarea
             : html` <i class="fa-solid fa-chevron-right"></i>`}`;
       });
       return html` <div
+        class="h-100"
         style="display: flex; flex-wrap: wrap; align-items: center; font-size: 14px; font-weight: 500; gap: 6px; line-height: 140%;cursor: default;"
       >
         <div style="width: 28px;height: 28px;display: flex; align-items: center; justify-content:center;">
@@ -1553,6 +1554,50 @@ ${obj.default ?? ''}</textarea
       </select>`;
   }
 
+  static printOption(gvc: GVC, vmt: { id: string; postData: string[] }, opt: OptionsItem) {
+    const id = `print-option-${opt.key}`;
+    opt.key = `${opt.key}`;
+
+    function call() {
+      if (vmt.postData.includes(opt.key)) {
+        vmt.postData = vmt.postData.filter(item => item !== opt.key);
+      } else {
+        vmt.postData.push(opt.key);
+      }
+      gvc.notifyDataChange(vmt.id);
+    }
+
+    return html`<div class="d-flex align-items-center gap-3 mb-3">
+      ${gvc.bindView({
+        bind: id,
+        view: () => {
+          return html`<input
+            class="form-check-input mt-0 ${BgWidget.getCheckedClass(gvc)}"
+            type="checkbox"
+            id="${opt.key}"
+            name="radio_${opt.key}"
+            onclick="${gvc.event(() => call())}"
+            ${vmt.postData.includes(opt.key) ? 'checked' : ''}
+          />`;
+        },
+        divCreate: {
+          class: 'd-flex align-items-center justify-content-center',
+        },
+      })}
+      <div class="form-check-label c_updown_label cursor_pointer" onclick="${gvc.event(() => call())}">
+        <div class="tx_normal ${opt.note ? 'mb-1' : ''}">${opt.value}</div>
+        ${opt.note ? html` <div class="tx_gray_12">${opt.note}</div> ` : ''}
+      </div>
+    </div>`;
+  }
+
+  static renderOptions(gvc: GVC, vmt: { id: string; postData: string[]; dataList: any }) {
+    if (vmt.dataList.length === 0) {
+      return html`<div class="d-flex justify-content-center fs-5">查無標籤</div>`;
+    }
+    return vmt.dataList.map((item: any) => this.printOption(gvc, vmt, { key: item, value: `#${item}` })).join('');
+  }
+
   // 頁面
   static dotlottieJS = 'https://unpkg.com/@dotlottie/player-component@latest/dist/dotlottie-player.mjs';
 
@@ -2398,7 +2443,7 @@ ${obj.default ?? ''}</textarea
     }
   ) {
     return html` <div
-      class="mb-0 ${document.body.clientWidth > 768 ? 'mx-auto mt-4' : 'w-100 mx-0'}"
+      class="mb-0 ${document.body.clientWidth > 768 ? 'mx-auto mt-3' : 'w-100 mx-0'}"
       style="max-width: 100%; width: ${this.getContainerWidth()}px; ${obj?.style ?? ''}"
     >
       ${htmlString}
@@ -2416,7 +2461,7 @@ ${obj.default ?? ''}</textarea
     }
   ) {
     return html` <div
-      class="d-flex mt-4 mb-0 ${document.body.clientWidth > 768 ? 'mx-auto' : 'w-100 mx-0 flex-column'} "
+      class="d-flex mt-2 mb-0 ${document.body.clientWidth > 768 ? 'mx-auto' : 'w-100 mx-0 flex-column'} "
       style="gap: 24px;"
     >
       <div style="width: ${document.body.clientWidth > 768 ? cont1.ratio : 100}%">${cont1.html}</div>
@@ -2528,6 +2573,73 @@ ${obj.default ?? ''}</textarea
     });
   }
 
+  static searchSelectContainer(
+    gvc: GVC,
+    button_title: string,
+    data: { key: string; name: string; type: string; placeHolder: string; unit?: string }[],
+    def: string[],
+    callback: (value: string[]) => void
+  ) {
+    const id = gvc.glitter.getUUID();
+    let loading = true;
+    let search = '';
+
+    return gvc.bindView({
+      bind: id,
+      view: () => {
+        try {
+          def = Array.isArray(def) ? def : [];
+          return [
+            this.grayButton(
+              loading ? button_title : '確認',
+              gvc.event(() => {
+                loading = !loading;
+                gvc.notifyDataChange(id);
+              }),
+              {
+                class: 'w-100',
+              }
+            ),
+            loading
+              ? html`<div class="d-flex flex-wrap gap-2">
+                  ${def.map(item => this.normalInsignia(`#${item}`)).join('')}
+                </div>`
+              : this.mainCard(
+                  [
+                    this.searchPlace(
+                      gvc.event(e => {
+                        search = e.value;
+                        gvc.notifyDataChange(id);
+                      }),
+                      search || '',
+                      '搜尋',
+                      '0',
+                      '0'
+                    ),
+                    this.multiCheckboxContainer(
+                      gvc,
+                      data.filter(item => item.name.includes(search)),
+                      def,
+                      stringArray => {
+                        def = stringArray;
+                        callback(stringArray);
+                      },
+                      {
+                        single: false,
+                        containerStyle: 'overflow: auto; max-height: 310px;',
+                      }
+                    ),
+                  ].join(this.mbContainer(12))
+                ),
+          ].join(this.mbContainer(12));
+        } catch (error) {
+          console.error(error);
+          return '';
+        }
+      },
+    });
+  }
+
   static multiCheckboxContainer(
     gvc: GVC,
     data: {
@@ -2543,6 +2655,7 @@ ${obj.default ?? ''}</textarea
       readonly?: boolean;
       single?: boolean;
       zeroOption?: boolean;
+      containerStyle?: string;
     }
   ) {
     const id = gvc.glitter.getUUID();
@@ -2605,6 +2718,9 @@ ${obj.default ?? ''}</textarea
 
         return html` <div style="width: 100%; display: flex; flex-direction: column; gap: 6px;">${checkboxHTML}</div> `;
       },
+      divCreate: {
+        style: obj?.containerStyle ?? '',
+      },
     });
   }
 
@@ -2795,8 +2911,8 @@ ${obj.default ?? ''}</textarea
     style?: string
   ) {
     return html` <div
-      class="mx-sm-0 mx-2"
-      style="justify-content: flex-start; align-items: flex-start; gap: 22px; display: inline-flex;cursor: pointer;margin-top: 24px;margin-bottom: 24px;font-size: 18px; ${style ??
+      class="mx-sm-0 my-sm-4 mx-2 my-3"
+      style="justify-content: flex-start; align-items: flex-start; gap: 22px; display: inline-flex;cursor: pointer;font-size: 18px; ${style ??
       ''};"
     >
       ${data

package/lowcode/backend-manager/splitPage.js

@@ -159,45 +159,6 @@ export class PageSplit {
                 loading: false,
                 dataList: [],
             };
-            gvc.addStyle(`
-        .page-link-v2 {
-          display: inline-flex;
-          height: 32px;
-          padding: 10px;
-          flex-direction: column;
-          justify-content: center;
-          align-items: center;
-          gap: 10px;
-          cursor: pointer;
-          background: #fff;
-          border: 1px solid #393939;
-          color: #393939;
-        }
-
-        .page-link-prev {
-          border-radius: 7px 0px 0px 7px;
-          border: 1px solid #d8d8d8;
-          background: #fff;
-          color: #393939;
-        }
-
-        .page-link-next {
-          border-radius: 0px 7px 7px 0px;
-          border: 1px solid #d8d8d8;
-          background: #fff;
-          color: #393939;
-        }
-
-        .page-link-active {
-          background: #393939;
-          color: #fff;
-        }
-
-        .angle-style {
-          font-size: 12px;
-          color: #d8d8d8;
-        }
-      `);
             return gvc.bindView({
                 bind: vm.id,
                 view: () => {

package/lowcode/backend-manager/splitPage.ts

@@ -162,46 +162,6 @@ export class PageSplit {
         dataList: <any>[],
       };
 
-      gvc.addStyle(`
-        .page-link-v2 {
-          display: inline-flex;
-          height: 32px;
-          padding: 10px;
-          flex-direction: column;
-          justify-content: center;
-          align-items: center;
-          gap: 10px;
-          cursor: pointer;
-          background: #fff;
-          border: 1px solid #393939;
-          color: #393939;
-        }
-
-        .page-link-prev {
-          border-radius: 7px 0px 0px 7px;
-          border: 1px solid #d8d8d8;
-          background: #fff;
-          color: #393939;
-        }
-
-        .page-link-next {
-          border-radius: 0px 7px 7px 0px;
-          border: 1px solid #d8d8d8;
-          background: #fff;
-          color: #393939;
-        }
-
-        .page-link-active {
-          background: #393939;
-          color: #fff;
-        }
-
-        .angle-style {
-          font-size: 12px;
-          color: #d8d8d8;
-        }
-      `);
-
       return gvc.bindView({
         bind: vm.id,
         view: () => {

package/lowcode/cms-plugin/auto-fcm-advertise.js

@@ -31,13 +31,14 @@ export class AutoFcmAdvertise {
             dataList: [],
         };
         const postData = {
-            type: 'notify-sns-config',
+            type: 'notify-fcm-config',
             tag: '',
             tagList: [],
             userList: [],
             boolean: 'or',
             name: '',
             title: '',
+            link: '',
             content: '',
             sendTime: { date: startDate, time: startTime },
             sendGroup: [],
@@ -168,6 +169,7 @@ export class AutoFcmAdvertise {
                         ApiUser.getUserList({
                             page: 0,
                             limit: 99999,
+                            only_id: true
                         }).then(dd => {
                             dd.response.data.map((user) => {
                                 postData.userList.push({
@@ -464,9 +466,10 @@ export class AutoFcmAdvertise {
                                         case 'all':
                                             dialog.dataLoading({ visible: true, text: '取得所有會員資料中...' });
                                             new Promise(resolve => {
-                                                ApiUser.getUserListOrders({
+                                                ApiUser.getUserList({
                                                     page: 0,
                                                     limit: 99999,
+                                                    only_id: true
                                                 }).then(dd => {
                                                     if (dd.response.data) {
                                                         const ids = [];
@@ -514,11 +517,11 @@ export class AutoFcmAdvertise {
                                                     default: getDefault([]),
                                                     api: (data) => {
                                                         return new Promise(resolve => {
-                                                            ApiUser.getUserListOrders({
+                                                            ApiUser.getUserList({
                                                                 page: 0,
                                                                 limit: 99999,
-                                                                search: data.query,
-                                                                orderString: data.orderString,
+                                                                only_id: true,
+                                                                search: data.query
                                                             }).then(dd => {
                                                                 if (dd.response.data) {
                                                                     vm.dataList = dd.response.data
@@ -618,6 +621,15 @@ export class AutoFcmAdvertise {
                                             },
                                             global_language: true,
                                         }),
+                                        BgWidget.linkList({
+                                            gvc: gvc,
+                                            title: '跳轉頁面',
+                                            default: postData.link || '',
+                                            placeHolder: '為空則為首頁',
+                                            callback: text => {
+                                                postData.link = text;
+                                            },
+                                        })
                                     ].join('');
                                 },
                                 divCreate: {

package/lowcode/cms-plugin/auto-fcm-advertise.ts

@@ -16,7 +16,7 @@ interface EmailObject {
 }
 
 type PostData = {
-  type: 'notify-sns-config';
+  type: 'notify-fcm-config';
   tag: string;
   tagList: { tag: string; filter: any; valueString: string }[];
   userList: EmailObject[];
@@ -24,6 +24,7 @@ type PostData = {
   boolean: 'and' | 'or';
   title: string;
   content: string;
+  link:string;
   sendTime: { date: string; time: string } | undefined;
   sendGroup: string[];
   email?: string[];
@@ -47,13 +48,14 @@ export class AutoFcmAdvertise {
       dataList: [] as { key: string; value: string }[],
     };
     const postData: PostData = {
-      type: 'notify-sns-config',
+      type: 'notify-fcm-config',
       tag: '',
       tagList: [],
       userList: [],
       boolean: 'or',
       name: '',
       title: '',
+      link:'',
       content: '',
       sendTime: { date: startDate, time: startTime },
       sendGroup: [],
@@ -185,6 +187,7 @@ export class AutoFcmAdvertise {
             ApiUser.getUserList({
               page: 0,
               limit: 99999,
+              only_id:true
             }).then(dd => {
               dd.response.data.map((user: any) => {
                 postData.userList.push({
@@ -497,9 +500,10 @@ export class AutoFcmAdvertise {
                               case 'all':
                                 dialog.dataLoading({ visible: true, text: '取得所有會員資料中...' });
                                 new Promise(resolve => {
-                                  ApiUser.getUserListOrders({
+                                  ApiUser.getUserList({
                                     page: 0,
                                     limit: 99999,
+                                    only_id:true
                                   }).then(dd => {
                                     if (dd.response.data) {
                                       const ids: number[] = [];
@@ -548,11 +552,11 @@ export class AutoFcmAdvertise {
                                       default: getDefault([]),
                                       api: (data: { query: string; orderString: string }) => {
                                         return new Promise(resolve => {
-                                          ApiUser.getUserListOrders({
+                                          ApiUser.getUserList({
                                             page: 0,
                                             limit: 99999,
-                                            search: data.query,
-                                            orderString: data.orderString,
+                                            only_id:true,
+                                            search: data.query
                                           }).then(dd => {
                                             if (dd.response.data) {
                                               vm.dataList = dd.response.data
@@ -660,6 +664,15 @@ export class AutoFcmAdvertise {
                             },
                             global_language: true,
                           }),
+                          BgWidget.linkList({
+                            gvc: gvc,
+                            title: '跳轉頁面',
+                            default: postData.link || '',
+                            placeHolder: '為空則為首頁',
+                            callback: text => {
+                              postData.link = text;
+                            },
+                          })
                         ].join('');
                       },
                       divCreate: {