ts-glitter 21.3.8 → 21.3.9

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

@@ -641,7 +641,6 @@ export class BgSNS {
             ApiSns.delete({
                 id: vm.data.name,
             }).then(r => {
-                console.log('res -- ', r);
                 dialog.dataLoading({ visible: false });
                 if (r.result) {
                     vm.status = 'list';
@@ -837,7 +836,7 @@ export class BgSNS {
         function setUserList() {
             let n = 0;
             postData.userList = [];
-            dialog.dataLoading({ visible: true, text: '更新預計寄件人...' });
+            dialog.dataLoading({ visible: true, text: '1更新預計寄件人...' });
             new Promise(resolve => {
                 const si = setInterval(() => {
                     if (postData.tagList.length === n) {
@@ -869,6 +868,7 @@ export class BgSNS {
                             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 && user.userData.phone) {
@@ -891,6 +891,7 @@ export class BgSNS {
                                     page: 0,
                                     limit: 99999,
                                     group: { type: 'level', tag: id },
+                                    only_id: true,
                                 }).then(data => {
                                     data.response.data.map((user) => {
                                         if (user.userData.email && user.userData.phone) {
@@ -924,6 +925,7 @@ export class BgSNS {
                                     page: 0,
                                     limit: 99999,
                                     group: { type: type },
+                                    only_id: true,
                                 }).then(data => {
                                     let dataArray = data.response.data;
                                     if (data.response.extra) {
@@ -957,6 +959,7 @@ export class BgSNS {
                             page: 0,
                             limit: 99999,
                             filter: { birth: tagData.filter },
+                            only_id: true,
                         }).then(data => {
                             data.response.data.map((user) => {
                                 if (user.userData.email && user.userData.phone) {
@@ -975,6 +978,7 @@ export class BgSNS {
                             page: 0,
                             limit: 99999,
                             filter: { tags: tagData.filter },
+                            only_id: true,
                         }).then(data => {
                             data.response.data.map((user) => {
                                 if (user.userData.email) {
@@ -995,6 +999,7 @@ export class BgSNS {
                             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 && user.userData.phone) {
@@ -1069,11 +1074,15 @@ export class BgSNS {
           <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: [],
                     };
@@ -1089,6 +1098,7 @@ export class BgSNS {
                                     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) => {
@@ -1253,8 +1263,8 @@ export class BgSNS {
                                                             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-sns.ts

@@ -738,7 +738,6 @@ export class BgSNS {
             ApiSns.delete({
               id: vm.data.name,
             }).then(r => {
-              console.log('res -- ', r);
               dialog.dataLoading({ visible: false });
               if (r.result) {
                 vm.status = 'list';
@@ -939,7 +938,7 @@ export class BgSNS {
     function setUserList() {
       let n = 0;
       postData.userList = [];
-      dialog.dataLoading({ visible: true, text: '更新預計寄件人...' });
+      dialog.dataLoading({ visible: true, text: '1更新預計寄件人...' });
 
       new Promise<void>(resolve => {
         const si = setInterval(() => {
@@ -972,6 +971,7 @@ export class BgSNS {
               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 && user.userData.phone) {
@@ -994,6 +994,7 @@ export class BgSNS {
                   page: 0,
                   limit: 99999,
                   group: { type: 'level', tag: id },
+                  only_id: true,
                 }).then(data => {
                   data.response.data.map((user: any) => {
                     if (user.userData.email && user.userData.phone) {
@@ -1027,6 +1028,7 @@ export class BgSNS {
                   page: 0,
                   limit: 99999,
                   group: { type: type },
+                  only_id: true,
                 }).then(data => {
                   // 加入額外的會員資料，例如有訂閱但未註冊者
                   let dataArray = data.response.data;
@@ -1061,6 +1063,7 @@ export class BgSNS {
               page: 0,
               limit: 99999,
               filter: { birth: tagData.filter },
+              only_id: true,
             }).then(data => {
               data.response.data.map((user: any) => {
                 if (user.userData.email && user.userData.phone) {
@@ -1079,6 +1082,7 @@ export class BgSNS {
               page: 0,
               limit: 99999,
               filter: { tags: tagData.filter },
+              only_id: true,
             }).then(data => {
               data.response.data.map((user: any) => {
                 if (user.userData.email) {
@@ -1099,6 +1103,7 @@ export class BgSNS {
               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 && user.userData.phone) {
@@ -1187,14 +1192,22 @@ export class BgSNS {
             ${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: '預計寄件顧客',
@@ -1207,6 +1220,7 @@ export class BgSNS {
                         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(
@@ -1394,8 +1408,8 @@ export class BgSNS {
                                           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-widget.js

@@ -765,7 +765,7 @@ export class BgWidget {
                         obj.default = e.value;
                         obj.oninput && obj.oninput(e.value);
                     })}"
-                onclick="${obj.gvc.event((e) => {
+                onclick="${obj.gvc.event(e => {
                         obj.onclick && obj.onclick(e);
                     })}"
                 value="${((_e = obj.default) !== null && _e !== void 0 ? _e : '').replace(/"/g, '"')}"
@@ -2294,12 +2294,18 @@ ${(_d = obj.default) !== null && _d !== void 0 ? _d : ''}</textarea
                 </div>`
                             : this.mainCard([
                                 this.searchPlace(gvc.event(e => {
-                                    search = e.value;
+                                    search = `${e.value}`.trim();
                                     gvc.notifyDataChange(id);
                                 }), search || '', '搜尋', '0', '0'),
-                                this.multiCheckboxContainer(gvc, data.filter(item => item.name.includes(search)), def, stringArray => {
-                                    def = stringArray;
-                                    callback(stringArray);
+                                this.multiCheckboxContainer(gvc, data.filter(item => item.name.toLowerCase().includes(search.toLowerCase())), def, stringArray => {
+                                    def = [
+                                        ...new Set(def
+                                            .filter(tag => {
+                                            return !tag.toLowerCase().includes(search.toLowerCase());
+                                        })
+                                            .concat(stringArray)),
+                                    ];
+                                    callback(def);
                                 }, {
                                     single: false,
                                     containerStyle: 'overflow: auto; max-height: 310px;',
@@ -2929,6 +2935,156 @@ ${(_d = obj.default) !== null && _d !== void 0 ? _d : ''}</textarea
       />
     </div>`;
     }
+    static searchTagsFilter(gvc, def, callback, placeholder, margin) {
+        const id = gvc.glitter.getUUID();
+        let loading = true;
+        let show = false;
+        let tagList = [];
+        let search = '';
+        let selectTags = def || [];
+        return gvc.bindView({
+            bind: id,
+            view: () => {
+                if (loading) {
+                    return '';
+                }
+                if (show) {
+                    return html `<div
+            style="margin-top: 1px;border: 8px solid #fff; outline: 1px solid #aeaeae; height: 300px; width: 100%; border-radius: 5px; position: absolute; top: 0; background-color: #fff; border-radius: 5px; overflow: auto;"
+          >
+            <div class="position-relative">
+              <div
+                class="w-100 d-flex align-items-center gap-1 position-sticky mb-1"
+                style="top: 0; background-color: #fff;"
+              >
+                <div class="w-100">
+                  <i
+                    class="fa-regular fa-magnifying-glass"
+                    style="font-size: 18px; color: #A0A0A0; position: absolute; left: 18px; top: 50%; transform: translateY(-50%);"
+                    aria-hidden="true"
+                  ></i>
+                  <input
+                    class="form-control h-100"
+                    style="border-radius: 10px; border: 1px solid #DDD; padding-left: 50px; height: 100%;"
+                    placeholder="${placeholder}"
+                    onchange="${gvc.event(e => {
+                        search = `${e.value}`.trim();
+                        gvc.notifyDataChange(id);
+                    })}"
+                    value="${search}"
+                  />
+                </div>
+                ${this.customButton({
+                        button: {
+                            color: 'black',
+                            size: 'md',
+                        },
+                        text: {
+                            name: '確認',
+                            style: 'font-size: 14px;',
+                        },
+                        event: gvc.event(() => {
+                            show = false;
+                            gvc.notifyDataChange(id);
+                            callback(selectTags);
+                        }),
+                    })}
+              </div>
+              <div class="p-2">
+                ${this.multiCheckboxContainer(gvc, tagList.filter(tag => tag.name.toLowerCase().includes(search.toLowerCase())), selectTags, text => {
+                        if (search) {
+                            selectTags = [
+                                ...new Set(selectTags
+                                    .filter(tag => {
+                                    return !tag.toLowerCase().includes(search.toLowerCase());
+                                })
+                                    .concat(text)),
+                            ];
+                        }
+                        else {
+                            selectTags = text;
+                        }
+                    }, { single: false })}
+              </div>
+            </div>
+          </div>`;
+                }
+                else {
+                    return html `<div
+            class="h-100"
+            onclick="${gvc.event(() => {
+                        show = true;
+                        gvc.notifyDataChange(id);
+                    })}"
+          >
+            <i
+              class="fa-regular fa-magnifying-glass"
+              style="font-size: 18px; color: #A0A0A0; position: absolute; left: 18px; top: 50%; transform: translateY(-50%);"
+              aria-hidden="true"
+            ></i>
+            <div
+              class="form-control h-100"
+              style="border-radius: 10px; border: 1px solid #DDD; padding-left: 50px; height: 100%; color: #aeaeae; ${selectTags.length >
+                        0 && false
+                        ? 'padding: 0.3rem 3rem;'
+                        : ''}"
+            >
+              ${placeholder}
+              <!-- ${selectTags.length > 0
+                        ? html `<div class="d-flex flex-wrap gap-2">
+                    ${selectTags.map(item => this.normalInsignia(`#${item}`)).join('')}
+                  </div>`
+                        : placeholder} -->
+            </div>
+          </div>`;
+                }
+            },
+            divCreate: {
+                class: 'w-100 position-relative search-tags-filter',
+                style: `height: 40px !important; margin: ${margin !== null && margin !== void 0 ? margin : 0};`,
+            },
+            onCreate: () => __awaiter(this, void 0, void 0, function* () {
+                if (loading) {
+                    tagList = yield ApiUser.getPublicConfig('product_manager_tags', 'manager').then((dd) => {
+                        var _b, _c;
+                        if (dd.result && ((_c = (_b = dd.response) === null || _b === void 0 ? void 0 : _b.value) === null || _c === void 0 ? void 0 : _c.list)) {
+                            return dd.response.value.list.map((item) => {
+                                return {
+                                    key: item,
+                                    name: `#${item}`,
+                                };
+                            });
+                        }
+                        return [];
+                    });
+                    loading = false;
+                    gvc.notifyDataChange(id);
+                }
+                else if (show) {
+                    function hasSearchTagsFilterAncestor(target) {
+                        let el = target;
+                        for (let i = 0; i < 10 && el; i++) {
+                            if (el.classList.contains('search-tags-filter')) {
+                                return true;
+                            }
+                            el = el.parentElement;
+                        }
+                        return false;
+                    }
+                    function clickEvent(event) {
+                        if (!hasSearchTagsFilterAncestor(event.target) &&
+                            !event.target.classList.contains('form-check-input') &&
+                            !event.target.classList.contains('form-check-label')) {
+                            show = false;
+                            gvc.notifyDataChange(id);
+                            window.parent.document.removeEventListener('click', clickEvent);
+                        }
+                    }
+                    setTimeout(() => window.parent.document.addEventListener('click', clickEvent), 100);
+                }
+            }),
+        });
+    }
     static columnFilter(obj) {
         const id = 'columnFilter';
         return html ` <div
@@ -3282,7 +3438,10 @@ ${(_d = obj.default) !== null && _d !== void 0 ? _d : ''}</textarea
                   <div class="c_dialog_main">
                     ${obj.readonly
                         ? ''
-                        : html ` <div class="d-flex" style="gap: 12px;">
+                        : html ` <div
+                          class="d-flex position-sticky px-1"
+                          style="gap: 12px; top: 0; background-color: #fff;"
+                        >
                           ${this.searchFilter(gvc.event((e, event) => {
                             vm.query = e.value;
                             vm.loading = true;
@@ -4613,11 +4772,16 @@ ${(_d = obj.default) !== null && _d !== void 0 ? _d : ''}</textarea
                     if (vm.loading) {
                         return html ` <div class="my-4">${this.spinner()}</div>`;
                     }
-                    return html ` <div class="bg-white shadow rounded-3 h-100 d-flex flex-column" style="width: 100%; ">
-              <div class="w-100 d-flex align-items-center p-3 border-bottom" style="background: #F2F2F2;">
-                <div class="tx_700">${(_b = obj.title) !== null && _b !== void 0 ? _b : '產品列表'}</div>
+                    return html ` <div
+              class="bg-white shadow rounded-3 h-100 d-flex flex-column position-relative overflow-hidden"
+              style="width: 100%; padding-top: 61px;"
+            >
+              <div
+                class="w-100 d-flex align-items-center p-3 border-bottom position-absolute"
+                style="background: #F2F2F2;top:0;left:0"
+              >
+                <div class="tx_700 dialog-title">${(_b = obj.title) !== null && _b !== void 0 ? _b : '圖片庫'}</div>
                 <div class="flex-fill"></div>
-
                 <i
                   class="fa-sharp fa-solid fa-xmark fs-5 text-dark cursor_pointer"
                   onclick="${gvc.event(() => {
@@ -4628,9 +4792,9 @@ ${(_d = obj.default) !== null && _d !== void 0 ? _d : ''}</textarea
                     })}"
                 ></i>
               </div>
-              <div class="c_dialog flex-fill">
+              <div class="c_dialog flex-fill " style="height: 600px;">
                 <div class="c_dialog_body d-flex flex-column h-100">
-                  <div class="c_dialog_main flex-fill" style="gap: 24px;max-height:100%; ">
+                  <div class="c_dialog_main flex-fill" style="gap: 24px;max-height:100%;padding-top:0;">
                     ${(_c = obj.innerHTML(gvc)) !== null && _c !== void 0 ? _c : ''}
                   </div>
                   <div class="c_dialog_bar">${(_d = obj.footer_html(gvc)) !== null && _d !== void 0 ? _d : ''}</div>