ts-glitter 21.3.8 → 21.3.9

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

package/lowcode/Entry.ts

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

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

@@ -821,6 +821,7 @@ export class BgLine {
                             page: 0,
                             limit: 99999,
                             id: tagData.filter.join(','),
+                            only_id: true,
                         }).then(dd => {
                             dd.response.data.map((user) => {
                                 if (user.userData.lineID) {
@@ -843,6 +844,7 @@ export class BgLine {
                                     page: 0,
                                     limit: 99999,
                                     group: { type: 'level', tag: id },
+                                    only_id: true,
                                 }).then(data => {
                                     data.response.data.map((user) => {
                                         if (user.userData.lineID) {
@@ -876,6 +878,7 @@ export class BgLine {
                                     page: 0,
                                     limit: 99999,
                                     group: { type: type },
+                                    only_id: true,
                                 }).then(data => {
                                     let dataArray = data.response.data;
                                     if (data.response.extra) {
@@ -909,6 +912,7 @@ export class BgLine {
                             page: 0,
                             limit: 99999,
                             filter: { birth: tagData.filter },
+                            only_id: true,
                         }).then(data => {
                             data.response.data.map((user) => {
                                 if (user.userData.lineID) {
@@ -927,6 +931,7 @@ export class BgLine {
                             page: 0,
                             limit: 99999,
                             filter: { tags: tagData.filter },
+                            only_id: true,
                         }).then(data => {
                             data.response.data.map((user) => {
                                 if (user.userData.email) {
@@ -947,6 +952,7 @@ export class BgLine {
                             page: 0,
                             limit: 99999,
                             filter: { rebate: { key: 'moreThan', value: tagData.filter } },
+                            only_id: true,
                         }).then(data => {
                             data.response.data.map((user) => {
                                 if (user.userData.lineID) {
@@ -1021,11 +1027,15 @@ export class BgLine {
           <div style="display:flex; align-items: center; gap: 18px; margin: 8px 0;">
             <div class="tx_normal">${postData.userList.length}人</div>
             ${BgWidget.grayButton('查看名單', gvc.event(() => {
+                    const dialog = new ShareDialog(gvc.glitter);
                     if (postData.userList.length === 0) {
-                        const dialog = new ShareDialog(gvc.glitter);
                         dialog.infoMessage({ text: '目前無預計寄件的顧客' });
                         return;
                     }
+                    if (postData.userList.length > 500) {
+                        dialog.infoMessage({ text: '預覽人數超過500筆，請減少名單人數後再次開啟' });
+                        return;
+                    }
                     const userVM = {
                         dataList: [],
                     };
@@ -1041,6 +1051,7 @@ export class BgLine {
                                     page: 0,
                                     limit: 99999,
                                     id: postData.userList.map(user => { var _a; return (_a = user.id) !== null && _a !== void 0 ? _a : 0; }).join(','),
+                                    only_id: true,
                                 }).then(dd => {
                                     if (dd.response.data) {
                                         userVM.dataList = dd.response.data.map((item) => {

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

@@ -927,6 +927,7 @@ export class BgLine {
               page: 0,
               limit: 99999,
               id: tagData.filter.join(','),
+              only_id: true,
             }).then(dd => {
               dd.response.data.map((user: any) => {
                 if (user.userData.lineID) {
@@ -949,6 +950,7 @@ export class BgLine {
                   page: 0,
                   limit: 99999,
                   group: { type: 'level', tag: id },
+                  only_id: true,
                 }).then(data => {
                   data.response.data.map((user: any) => {
                     if (user.userData.lineID) {
@@ -982,6 +984,7 @@ export class BgLine {
                   page: 0,
                   limit: 99999,
                   group: { type: type },
+                  only_id: true,
                 }).then(data => {
                   // 加入額外的會員資料，例如有訂閱但未註冊者
                   let dataArray = data.response.data;
@@ -1016,6 +1019,7 @@ export class BgLine {
               page: 0,
               limit: 99999,
               filter: { birth: tagData.filter },
+              only_id: true,
             }).then(data => {
               data.response.data.map((user: any) => {
                 if (user.userData.lineID) {
@@ -1034,6 +1038,7 @@ export class BgLine {
               page: 0,
               limit: 99999,
               filter: { tags: tagData.filter },
+              only_id: true,
             }).then(data => {
               data.response.data.map((user: any) => {
                 if (user.userData.email) {
@@ -1054,6 +1059,7 @@ export class BgLine {
               page: 0,
               limit: 99999,
               filter: { rebate: { key: 'moreThan', value: tagData.filter } },
+              only_id: true,
             }).then(data => {
               data.response.data.map((user: any) => {
                 if (user.userData.lineID) {
@@ -1142,14 +1148,22 @@ export class BgLine {
             ${BgWidget.grayButton(
               '查看名單',
               gvc.event(() => {
+                const dialog = new ShareDialog(gvc.glitter);
+
                 if (postData.userList.length === 0) {
-                  const dialog = new ShareDialog(gvc.glitter);
                   dialog.infoMessage({ text: '目前無預計寄件的顧客' });
                   return;
                 }
+
+                if (postData.userList.length > 500) {
+                  dialog.infoMessage({ text: '預覽人數超過500筆，請減少名單人數後再次開啟' });
+                  return;
+                }
+
                 const userVM = {
                   dataList: [] as { key: string; value: string; note: string }[],
                 };
+
                 BgWidget.selectDropDialog({
                   gvc: gvc,
                   title: '預計寄件顧客',
@@ -1162,6 +1176,7 @@ export class BgLine {
                         page: 0,
                         limit: 99999,
                         id: postData.userList.map(user => user.id ?? 0).join(','),
+                        only_id: true,
                       }).then(dd => {
                         if (dd.response.data) {
                           userVM.dataList = dd.response.data.map(

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

@@ -880,6 +880,7 @@ export class BgNotify {
                             page: 0,
                             limit: 99999,
                             id: tagData.filter.join(','),
+                            only_id: true,
                         }).then(dd => {
                             dd.response.data.map((user) => {
                                 if (user.userData.email && user.userData.email.length > 0) {
@@ -901,6 +902,7 @@ export class BgNotify {
                                     page: 0,
                                     limit: 99999,
                                     group: { type: 'level', tag: id },
+                                    only_id: true,
                                 }).then(data => {
                                     data.response.data.map((user) => {
                                         if (user.userData.email) {
@@ -933,6 +935,7 @@ export class BgNotify {
                                     page: 0,
                                     limit: 99999,
                                     group: { type: type },
+                                    only_id: true,
                                 }).then(data => {
                                     let dataArray = data.response.data;
                                     if (data.response.extra) {
@@ -965,6 +968,7 @@ export class BgNotify {
                             page: 0,
                             limit: 99999,
                             filter: { birth: tagData.filter },
+                            only_id: true,
                         }).then(data => {
                             data.response.data.map((user) => {
                                 if (user.userData.email) {
@@ -982,6 +986,7 @@ export class BgNotify {
                             page: 0,
                             limit: 99999,
                             filter: { tags: tagData.filter },
+                            only_id: true,
                         }).then(data => {
                             data.response.data.map((user) => {
                                 if (user.userData.email) {
@@ -1001,6 +1006,7 @@ export class BgNotify {
                             page: 0,
                             limit: 99999,
                             filter: { rebate: { key: 'moreThan', value: tagData.filter } },
+                            only_id: true,
                         }).then(data => {
                             data.response.data.map((user) => {
                                 if (user.userData.email) {
@@ -1070,11 +1076,15 @@ export class BgNotify {
           <div style="display:flex; align-items: center; gap: 18px; margin: 8px 0;">
             <div class="tx_normal">${postData.userList.length}人</div>
             ${BgWidget.grayButton('查看名單', gvc.event(() => {
+                    const dialog = new ShareDialog(gvc.glitter);
                     if (postData.userList.length === 0) {
-                        const dialog = new ShareDialog(gvc.glitter);
                         dialog.infoMessage({ text: '目前無預計寄件的顧客' });
                         return;
                     }
+                    if (postData.userList.length > 500) {
+                        dialog.infoMessage({ text: '預覽人數超過500筆，請減少名單人數後再次開啟' });
+                        return;
+                    }
                     const userVM = {
                         dataList: [],
                     };
@@ -1090,6 +1100,7 @@ export class BgNotify {
                                     page: 0,
                                     limit: 99999,
                                     id: postData.userList.map(user => { var _a; return (_a = user.id) !== null && _a !== void 0 ? _a : 0; }).join(','),
+                                    only_id: true,
                                 }).then(dd => {
                                     if (dd.response.data) {
                                         userVM.dataList = dd.response.data.map((item) => {
@@ -1247,8 +1258,8 @@ export class BgNotify {
                                                             ApiUser.getUserList({
                                                                 page: 0,
                                                                 limit: 99999,
-                                                                only_id: true,
                                                                 search: data.query,
+                                                                only_id: true,
                                                             }).then(dd => {
                                                                 if (dd.response.data) {
                                                                     vm.dataList = dd.response.data

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

@@ -984,6 +984,7 @@ export class BgNotify {
               page: 0,
               limit: 99999,
               id: tagData.filter.join(','),
+              only_id: true,
             }).then(dd => {
               dd.response.data.map((user: any) => {
                 if (user.userData.email && user.userData.email.length > 0) {
@@ -1005,6 +1006,7 @@ export class BgNotify {
                   page: 0,
                   limit: 99999,
                   group: { type: 'level', tag: id },
+                  only_id: true,
                 }).then(data => {
                   data.response.data.map((user: any) => {
                     if (user.userData.email) {
@@ -1037,6 +1039,7 @@ export class BgNotify {
                   page: 0,
                   limit: 99999,
                   group: { type: type },
+                  only_id: true,
                 }).then(data => {
                   // 加入額外的會員資料，例如有訂閱但未註冊者
                   let dataArray = data.response.data;
@@ -1070,6 +1073,7 @@ export class BgNotify {
               page: 0,
               limit: 99999,
               filter: { birth: tagData.filter },
+              only_id: true,
             }).then(data => {
               data.response.data.map((user: any) => {
                 if (user.userData.email) {
@@ -1087,6 +1091,7 @@ export class BgNotify {
               page: 0,
               limit: 99999,
               filter: { tags: tagData.filter },
+              only_id: true,
             }).then(data => {
               data.response.data.map((user: any) => {
                 if (user.userData.email) {
@@ -1106,6 +1111,7 @@ export class BgNotify {
               page: 0,
               limit: 99999,
               filter: { rebate: { key: 'moreThan', value: tagData.filter } },
+              only_id: true,
             }).then(data => {
               data.response.data.map((user: any) => {
                 if (user.userData.email) {
@@ -1183,14 +1189,22 @@ export class BgNotify {
             ${BgWidget.grayButton(
               '查看名單',
               gvc.event(() => {
+                const dialog = new ShareDialog(gvc.glitter);
+
                 if (postData.userList.length === 0) {
-                  const dialog = new ShareDialog(gvc.glitter);
                   dialog.infoMessage({ text: '目前無預計寄件的顧客' });
                   return;
                 }
+
+                if (postData.userList.length > 500) {
+                  dialog.infoMessage({ text: '預覽人數超過500筆，請減少名單人數後再次開啟' });
+                  return;
+                }
+
                 const userVM = {
                   dataList: [] as { key: string; value: string; note: string }[],
                 };
+
                 BgWidget.selectDropDialog({
                   gvc: gvc,
                   title: '預計寄件顧客',
@@ -1203,6 +1217,7 @@ export class BgNotify {
                         page: 0,
                         limit: 99999,
                         id: postData.userList.map(user => user.id ?? 0).join(','),
+                        only_id: true,
                       }).then(dd => {
                         if (dd.response.data) {
                           userVM.dataList = dd.response.data.map(
@@ -1369,8 +1384,8 @@ export class BgNotify {
                                           ApiUser.getUserList({
                                             page: 0,
                                             limit: 99999,
-                                            only_id: true,
                                             search: data.query,
+                                            only_id: true,
                                           }).then(dd => {
                                             if (dd.response.data) {
                                               vm.dataList = dd.response.data

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

@@ -54,7 +54,22 @@ export class BgProduct {
                 query: '',
                 queryType: 'title',
                 orderString: '',
+                manager_tag: [],
             };
+            gvc.addStyle(`
+        .bg-product-main {
+          gap: 12px;
+          min-height: 480px;
+          max-height: 500px;
+          border: ${document.body.clientWidth > 800 ? 16 : 8}px solid #fff;
+        }
+        .bg-product-topbar {
+          gap: 6px;
+          position: sticky;
+          top: 0px;
+          background-color: #fff;
+        }
+      `);
             return html ` <div
         class="bg-white shadow rounded-3"
         style="overflow-y: auto; ${document.body.clientWidth > 768
@@ -68,6 +83,57 @@ export class BgProduct {
                     if (vm.loading) {
                         return html `<div class="my-5">${BgWidget.spinner()}</div>`;
                     }
+                    function selectBar() {
+                        return BgWidget.selectFilter({
+                            gvc,
+                            callback: (value) => {
+                                vm.queryType = value;
+                                gvc.notifyDataChange(vm.id);
+                            },
+                            default: vm.queryType || 'title',
+                            options: FilterOptions.productSelect,
+                            style: 'min-width: 120px;',
+                        });
+                    }
+                    function searchBar() {
+                        return gvc.bindView({
+                            bind: gvc.glitter.getUUID(),
+                            dataList: [{ obj: vm, key: 'queryType' }],
+                            view: () => {
+                                if (vm.queryType === 'customize_tag') {
+                                    return BgWidget.searchTagsFilter(gvc, vm.manager_tag, tagArray => {
+                                        vm.query = '';
+                                        vm.manager_tag = tagArray;
+                                        vm.loading = true;
+                                        gvc.notifyDataChange(vm.id);
+                                    }, '搜尋');
+                                }
+                                else {
+                                    return BgWidget.searchFilter(gvc.event(e => {
+                                        vm.query = e.value;
+                                        vm.manager_tag = [];
+                                        vm.loading = true;
+                                        gvc.notifyDataChange(vm.id);
+                                    }), vm.query || '', '搜尋');
+                                }
+                            },
+                            divCreate: {
+                                class: 'w-100 position-relative',
+                            },
+                        });
+                    }
+                    function updownButton() {
+                        return BgWidget.updownFilter({
+                            gvc,
+                            callback: (value) => {
+                                vm.orderString = value;
+                                vm.loading = true;
+                                gvc.notifyDataChange(vm.id);
+                            },
+                            default: vm.orderString || 'default',
+                            options: FilterOptions.productOrderBy,
+                        });
+                    }
                     return html ` <div class="bg-white shadow rounded-3" style="width: 100%; overflow-y: auto;">
               <div class="w-100 d-flex align-items-center p-3 border-bottom">
                 <div class="tx_700">${(_a = obj.title) !== null && _a !== void 0 ? _a : '產品列表'}</div>
@@ -82,34 +148,17 @@ export class BgProduct {
               </div>
               <div class="c_dialog">
                 <div class="c_dialog_body">
-                  <div class="c_dialog_main p-3" style="gap: 12px; min-height: 480px; max-height: 500px;">
-                    <div class="d-flex mb-2" style="gap: 6px;">
-                      ${BgWidget.selectFilter({
-                        gvc,
-                        callback: (value) => {
-                            vm.queryType = value;
-                            gvc.notifyDataChange(vm.id);
-                        },
-                        default: vm.queryType || 'title',
-                        options: FilterOptions.productSelect,
-                        style: 'min-width: 120px;',
-                    })}
-                      ${BgWidget.searchFilter(gvc.event(e => {
-                        vm.query = e.value;
-                        vm.loading = true;
-                        gvc.notifyDataChange(vm.id);
-                    }), vm.query || '', '搜尋')}
-                      ${BgWidget.updownFilter({
-                        gvc,
-                        callback: (value) => {
-                            vm.orderString = value;
-                            vm.loading = true;
-                            gvc.notifyDataChange(vm.id);
-                        },
-                        default: vm.orderString || 'default',
-                        options: FilterOptions.productOrderBy,
-                    })}
-                    </div>
+                  <div class="c_dialog_main p-0 bg-product-main">
+                    ${document.body.clientWidth > 768
+                        ? html ` <div class="d-flex pb-2 px-1 bg-product-topbar">
+                          ${selectBar()} ${searchBar()} ${updownButton()}
+                        </div>`
+                        : html `<div class="pb-2 px-1 bg-product-topbar">
+                          <div class="d-flex align-items-center justify-content-between w-100 mb-1">
+                            ${selectBar()} ${updownButton()}
+                          </div>
+                          <div>${searchBar()}</div>
+                        </div> `}
                     ${gvc
                         .map(vm.options
                         .filter(dd => {
@@ -267,7 +316,7 @@ export class BgProduct {
                 },
                 onCreate: () => {
                     if (vm.loading) {
-                        ApiShop.getProduct({
+                        const apiJSON = {
                             page: 0,
                             limit: 99999,
                             search: vm.query,
@@ -284,7 +333,9 @@ export class BgProduct {
                             productType: obj.productType,
                             filter_visible: obj.filter_visible,
                             status: 'inRange',
-                        }).then(data => {
+                            manager_tag: vm.manager_tag.join(','),
+                        };
+                        ApiShop.getProduct(apiJSON).then(data => {
                             vm.options = [];
                             data.response.data.map((product) => {
                                 var _a;

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

@@ -92,8 +92,24 @@ export class BgProduct {
         query: '',
         queryType: 'title',
         orderString: '',
+        manager_tag: [] as string[],
       };
 
+      gvc.addStyle(`
+        .bg-product-main {
+          gap: 12px;
+          min-height: 480px;
+          max-height: 500px;
+          border: ${document.body.clientWidth > 800 ? 16 : 8}px solid #fff;
+        }
+        .bg-product-topbar {
+          gap: 6px;
+          position: sticky;
+          top: 0px;
+          background-color: #fff;
+        }
+      `);
+
       return html` <div
         class="bg-white shadow rounded-3"
         style="overflow-y: auto; ${document.body.clientWidth > 768
@@ -106,6 +122,69 @@ export class BgProduct {
             if (vm.loading) {
               return html`<div class="my-5">${BgWidget.spinner()}</div>`;
             }
+
+            function selectBar() {
+              return BgWidget.selectFilter({
+                gvc,
+                callback: (value: any) => {
+                  vm.queryType = value;
+                  gvc.notifyDataChange(vm.id);
+                },
+                default: vm.queryType || 'title',
+                options: FilterOptions.productSelect,
+                style: 'min-width: 120px;',
+              });
+            }
+
+            function searchBar() {
+              return gvc.bindView({
+                bind: gvc.glitter.getUUID(),
+                dataList: [{ obj: vm, key: 'queryType' }],
+                view: () => {
+                  if (vm.queryType === 'customize_tag') {
+                    return BgWidget.searchTagsFilter(
+                      gvc,
+                      vm.manager_tag,
+                      tagArray => {
+                        vm.query = '';
+                        vm.manager_tag = tagArray;
+                        vm.loading = true;
+                        gvc.notifyDataChange(vm.id);
+                      },
+                      '搜尋'
+                    );
+                  } else {
+                    return BgWidget.searchFilter(
+                      gvc.event(e => {
+                        vm.query = e.value;
+                        vm.manager_tag = [];
+                        vm.loading = true;
+                        gvc.notifyDataChange(vm.id);
+                      }),
+                      vm.query || '',
+                      '搜尋'
+                    );
+                  }
+                },
+                divCreate: {
+                  class: 'w-100 position-relative',
+                },
+              });
+            }
+
+            function updownButton() {
+              return BgWidget.updownFilter({
+                gvc,
+                callback: (value: any) => {
+                  vm.orderString = value;
+                  vm.loading = true;
+                  gvc.notifyDataChange(vm.id);
+                },
+                default: vm.orderString || 'default',
+                options: FilterOptions.productOrderBy,
+              });
+            }
+
             return html` <div class="bg-white shadow rounded-3" style="width: 100%; overflow-y: auto;">
               <div class="w-100 d-flex align-items-center p-3 border-bottom">
                 <div class="tx_700">${obj.title ?? '產品列表'}</div>
@@ -120,38 +199,17 @@ export class BgProduct {
               </div>
               <div class="c_dialog">
                 <div class="c_dialog_body">
-                  <div class="c_dialog_main p-3" style="gap: 12px; min-height: 480px; max-height: 500px;">
-                    <div class="d-flex mb-2" style="gap: 6px;">
-                      ${BgWidget.selectFilter({
-                        gvc,
-                        callback: (value: any) => {
-                          vm.queryType = value;
-                          gvc.notifyDataChange(vm.id);
-                        },
-                        default: vm.queryType || 'title',
-                        options: FilterOptions.productSelect,
-                        style: 'min-width: 120px;',
-                      })}
-                      ${BgWidget.searchFilter(
-                        gvc.event(e => {
-                          vm.query = e.value;
-                          vm.loading = true;
-                          gvc.notifyDataChange(vm.id);
-                        }),
-                        vm.query || '',
-                        '搜尋'
-                      )}
-                      ${BgWidget.updownFilter({
-                        gvc,
-                        callback: (value: any) => {
-                          vm.orderString = value;
-                          vm.loading = true;
-                          gvc.notifyDataChange(vm.id);
-                        },
-                        default: vm.orderString || 'default',
-                        options: FilterOptions.productOrderBy,
-                      })}
-                    </div>
+                  <div class="c_dialog_main p-0 bg-product-main">
+                    ${document.body.clientWidth > 768
+                      ? html` <div class="d-flex pb-2 px-1 bg-product-topbar">
+                          ${selectBar()} ${searchBar()} ${updownButton()}
+                        </div>`
+                      : html`<div class="pb-2 px-1 bg-product-topbar">
+                          <div class="d-flex align-items-center justify-content-between w-100 mb-1">
+                            ${selectBar()} ${updownButton()}
+                          </div>
+                          <div>${searchBar()}</div>
+                        </div> `}
                     ${gvc
                       .map(
                         vm.options
@@ -338,7 +396,7 @@ export class BgProduct {
           },
           onCreate: () => {
             if (vm.loading) {
-              ApiShop.getProduct({
+              const apiJSON = {
                 page: 0,
                 limit: 99999,
                 search: vm.query,
@@ -355,7 +413,10 @@ export class BgProduct {
                 productType: obj.productType,
                 filter_visible: obj.filter_visible,
                 status: 'inRange',
-              }).then(data => {
+                manager_tag: vm.manager_tag.join(','),
+              };
+
+              ApiShop.getProduct(apiJSON).then(data => {
                 vm.options = [];
                 data.response.data.map(
                   (product: {