ts-glitter 22.0.1 → 22.0.2

package/lowcode/Entry.js

@@ -151,7 +151,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_22.0.1';
+            glitter.share.editerVersion = 'V_22.0.2';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {

package/lowcode/Entry.ts

@@ -155,7 +155,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_22.0.1';
+      glitter.share.editerVersion = 'V_22.0.2';
       glitter.share.start = new Date();
       const vm = { appConfig: [] };
       (window as any).saasConfig = {
@@ -618,7 +618,7 @@ export class Entry {
       //   }
       // },100)
     }
-    ApiUser.getUserData(GlobalUser.token,'me').then(async (r) => {
+    ApiUser.getUserData(GlobalUser.token,'me').then(async (r:any) => {
       try {
         if (!r.result) {
           GlobalUser.token = ''

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

@@ -1353,6 +1353,7 @@ function detail(gvc, cf, vm, cVm, page_tab) {
                                                                         bind: id,
                                                                         view: () => {
                                                                             try {
+                                                                                const dialog = new ShareDialog(gvc.glitter);
                                                                                 return html ` <div
                                                   class="d-flex justify-content-between align-items-center gap-3 mb-1"
                                                   style="cursor: pointer;"
@@ -1406,7 +1407,6 @@ function detail(gvc, cf, vm, cVm, page_tab) {
                                                                                                             editor.undo.saveStep();
                                                                                                         }
                                                                                                         else {
-                                                                                                            const dialog = new ShareDialog(gvc.glitter);
                                                                                                             dialog.errorMessage({ text: '請選擇至少一張圖片' });
                                                                                                         }
                                                                                                     }, html ` <div
@@ -1432,12 +1432,26 @@ function detail(gvc, cf, vm, cVm, page_tab) {
                                                                                         footer_html: (gvc2) => {
                                                                                             return [
                                                                                                 BgWidget.cancel(gvc2.event(() => {
-                                                                                                    language_data.text = originContent;
-                                                                                                    gvc2.closeDialog();
+                                                                                                    dialog.checkYesOrNot({
+                                                                                                        text: '確定要取消並關閉嗎？',
+                                                                                                        callback: bool => {
+                                                                                                            if (bool) {
+                                                                                                                language_data.text = originContent;
+                                                                                                                gvc2.closeDialog();
+                                                                                                            }
+                                                                                                        },
+                                                                                                    });
                                                                                                 })),
                                                                                                 BgWidget.save(gvc2.event(() => {
-                                                                                                    gvc2.closeDialog();
-                                                                                                    gvc.notifyDataChange(id);
+                                                                                                    dialog.checkYesOrNot({
+                                                                                                        text: '確定要儲存並更新嗎？',
+                                                                                                        callback: bool => {
+                                                                                                            if (bool) {
+                                                                                                                gvc2.closeDialog();
+                                                                                                                gvc.notifyDataChange(id);
+                                                                                                            }
+                                                                                                        },
+                                                                                                    });
                                                                                                 })),
                                                                                             ].join('');
                                                                                         },

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

@@ -1526,6 +1526,8 @@ function detail(gvc: GVC, cf: any, vm: any, cVm: any, page_tab: 'page' | 'hidden
                                             bind: id,
                                             view: () => {
                                               try {
+                                                const dialog = new ShareDialog(gvc.glitter);
+
                                                 return html` <div
                                                   class="d-flex justify-content-between align-items-center gap-3 mb-1"
                                                   style="cursor: pointer;"
@@ -1585,7 +1587,6 @@ function detail(gvc: GVC, cf: any, vm: any, cVm: any, page_tab: 'page' | 'hidden
                                                                     );
                                                                     editor.undo.saveStep();
                                                                   } else {
-                                                                    const dialog = new ShareDialog(gvc.glitter);
                                                                     dialog.errorMessage({ text: '請選擇至少一張圖片' });
                                                                   }
                                                                 },
@@ -1621,14 +1622,28 @@ function detail(gvc: GVC, cf: any, vm: any, cVm: any, page_tab: 'page' | 'hidden
                                                         return [
                                                           BgWidget.cancel(
                                                             gvc2.event(() => {
-                                                              language_data.text = originContent;
-                                                              gvc2.closeDialog();
+                                                              dialog.checkYesOrNot({
+                                                                text: '確定要取消並關閉嗎？',
+                                                                callback: bool => {
+                                                                  if (bool) {
+                                                                    language_data.text = originContent;
+                                                                    gvc2.closeDialog();
+                                                                  }
+                                                                },
+                                                              });
                                                             })
                                                           ),
                                                           BgWidget.save(
                                                             gvc2.event(() => {
-                                                              gvc2.closeDialog();
-                                                              gvc.notifyDataChange(id);
+                                                              dialog.checkYesOrNot({
+                                                                text: '確定要儲存並更新嗎？',
+                                                                callback: bool => {
+                                                                  if (bool) {
+                                                                    gvc2.closeDialog();
+                                                                    gvc.notifyDataChange(id);
+                                                                  }
+                                                                },
+                                                              });
                                                             })
                                                           ),
                                                         ].join('');

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

@@ -1049,7 +1049,7 @@ export class BgLine {
                             return new Promise(resolve => {
                                 ApiUser.getUserListOrders({
                                     page: 0,
-                                    limit: 99999,
+                                    limit: 999,
                                     id: postData.userList.map(user => { var _a; return (_a = user.id) !== null && _a !== void 0 ? _a : 0; }).join(','),
                                     only_id: true,
                                 }).then(dd => {
@@ -1212,7 +1212,7 @@ export class BgLine {
                                                         return new Promise(resolve => {
                                                             ApiUser.getUserList({
                                                                 page: 0,
-                                                                limit: 99999,
+                                                                limit: 999,
                                                                 search: data.query,
                                                                 only_id: true,
                                                             }).then(dd => {

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

@@ -1174,7 +1174,7 @@ export class BgLine {
                     return new Promise(resolve => {
                       ApiUser.getUserListOrders({
                         page: 0,
-                        limit: 99999,
+                        limit: 999,
                         id: postData.userList.map(user => user.id ?? 0).join(','),
                         only_id: true,
                       }).then(dd => {
@@ -1361,7 +1361,7 @@ export class BgLine {
                                         return new Promise(resolve => {
                                           ApiUser.getUserList({
                                             page: 0,
-                                            limit: 99999,
+                                            limit: 999,
                                             search: data.query,
                                             only_id: true,
                                           }).then(dd => {

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

@@ -667,7 +667,14 @@ export class BgNotify {
             }), '取消排定發送')
             : ''}
         ${BgWidget.cancel(gvc.event(() => {
-            vm.type = 'list';
+            dialog.checkYesOrNot({
+                text: '確定要取消嗎？',
+                callback: bool => {
+                    if (bool) {
+                        vm.type = 'list';
+                    }
+                },
+            });
         }), obj.readonly ? '關閉' : undefined)}
         ${obj.readonly
             ? ''
@@ -1098,7 +1105,7 @@ export class BgNotify {
                             return new Promise(resolve => {
                                 ApiUser.getUserListOrders({
                                     page: 0,
-                                    limit: 99999,
+                                    limit: 999,
                                     id: postData.userList.map(user => { var _a; return (_a = user.id) !== null && _a !== void 0 ? _a : 0; }).join(','),
                                     only_id: true,
                                 }).then(dd => {
@@ -1257,7 +1264,7 @@ export class BgNotify {
                                                         return new Promise(resolve => {
                                                             ApiUser.getUserList({
                                                                 page: 0,
-                                                                limit: 99999,
+                                                                limit: 999,
                                                                 search: data.query,
                                                                 only_id: true,
                                                             }).then(dd => {

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

@@ -768,7 +768,14 @@ export class BgNotify {
           : ''}
         ${BgWidget.cancel(
           gvc.event(() => {
-            vm.type = 'list';
+            dialog.checkYesOrNot({
+              text: '確定要取消嗎？',
+              callback: bool => {
+                if (bool) {
+                  vm.type = 'list';
+                }
+              },
+            });
           }),
           obj.readonly ? '關閉' : undefined
         )}
@@ -1215,7 +1222,7 @@ export class BgNotify {
                     return new Promise(resolve => {
                       ApiUser.getUserListOrders({
                         page: 0,
-                        limit: 99999,
+                        limit: 999,
                         id: postData.userList.map(user => user.id ?? 0).join(','),
                         only_id: true,
                       }).then(dd => {
@@ -1383,7 +1390,7 @@ export class BgNotify {
                                         return new Promise(resolve => {
                                           ApiUser.getUserList({
                                             page: 0,
-                                            limit: 99999,
+                                            limit: 999,
                                             search: data.query,
                                             only_id: true,
                                           }).then(dd => {

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

@@ -836,7 +836,7 @@ export class BgSNS {
         function setUserList() {
             let n = 0;
             postData.userList = [];
-            dialog.dataLoading({ visible: true, text: '1更新預計寄件人...' });
+            dialog.dataLoading({ visible: true, text: '更新預計寄件人...' });
             new Promise(resolve => {
                 const si = setInterval(() => {
                     if (postData.tagList.length === n) {
@@ -1096,7 +1096,7 @@ export class BgSNS {
                             return new Promise(resolve => {
                                 ApiUser.getUserListOrders({
                                     page: 0,
-                                    limit: 99999,
+                                    limit: 999,
                                     id: postData.userList.map(user => { var _a; return (_a = user.id) !== null && _a !== void 0 ? _a : 0; }).join(','),
                                     only_id: true,
                                 }).then(dd => {
@@ -1262,7 +1262,7 @@ export class BgSNS {
                                                         return new Promise(resolve => {
                                                             ApiUser.getUserList({
                                                                 page: 0,
-                                                                limit: 99999,
+                                                                limit: 999,
                                                                 search: data.query,
                                                                 only_id: true,
                                                             }).then(dd => {

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

@@ -938,7 +938,7 @@ export class BgSNS {
     function setUserList() {
       let n = 0;
       postData.userList = [];
-      dialog.dataLoading({ visible: true, text: '1更新預計寄件人...' });
+      dialog.dataLoading({ visible: true, text: '更新預計寄件人...' });
 
       new Promise<void>(resolve => {
         const si = setInterval(() => {
@@ -1218,7 +1218,7 @@ export class BgSNS {
                     return new Promise(resolve => {
                       ApiUser.getUserListOrders({
                         page: 0,
-                        limit: 99999,
+                        limit: 999,
                         id: postData.userList.map(user => user.id ?? 0).join(','),
                         only_id: true,
                       }).then(dd => {
@@ -1407,7 +1407,7 @@ export class BgSNS {
                                         return new Promise(resolve => {
                                           ApiUser.getUserList({
                                             page: 0,
-                                            limit: 99999,
+                                            limit: 999,
                                             search: data.query,
                                             only_id: true,
                                           }).then(dd => {

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

@@ -3447,15 +3447,15 @@ ${(_d = obj.default) !== null && _d !== void 0 ? _d : ''}</textarea
                     ${obj.readonly
                         ? ''
                         : html ` <div
-                          class="d-flex position-sticky px-1"
-                          style="gap: 12px; top: 0; background-color: #fff;"
-                        >
-                          ${this.searchFilter(gvc.event((e, event) => {
+                            class="d-flex position-sticky px-1"
+                            style="gap: 12px; top: 0; background-color: #fff;"
+                          >
+                            ${this.searchFilter(gvc.event(e => {
                             vm.query = e.value;
                             vm.loading = true;
                             obj.gvc.notifyDataChange(vm.id);
                         }), vm.query || '', '搜尋')}
-                          ${obj.updownOptions
+                            ${obj.updownOptions
                             ? this.updownFilter({
                                 gvc,
                                 callback: (value) => {
@@ -3467,62 +3467,69 @@ ${(_d = obj.default) !== null && _d !== void 0 ? _d : ''}</textarea
                                 options: obj.updownOptions || [],
                             })
                             : ''}
-                        </div>`}
+                          </div>
+                          ${this.grayNote('系統提示：資料選項過多時，請善用搜尋功能')}`}
                     ${obj.gvc.map(vm.options.map((opt, index) => {
                         if (obj.custom_line_items) {
                             return obj.custom_line_items(opt);
                         }
+                        const opt_id = `_opt_${opt.key}`;
                         function call() {
-                            vm.selectKey = {
-                                name: opt.key,
-                                index: index,
-                            };
+                            vm.selectKey = { name: opt.key, index: index };
+                            if (obj.single) {
+                                const originKeys = obj.default.slice().map(key => `_opt_${key}`);
+                                obj.default = [opt.key];
+                                gvc.notifyDataChange([...originKeys, opt_id]);
+                                return;
+                            }
+                            const filterSelected = obj.default.filter(key => {
+                                return !vm.options.some(opt => opt.key === key);
+                            });
                             if (obj.default.includes(opt.key)) {
                                 obj.default = obj.default.filter(item => item !== opt.key);
                             }
                             else {
                                 obj.default.push(opt.key);
                             }
-                            obj.gvc.notifyDataChange(vm.id);
+                            obj.default = [...new Set(filterSelected.concat(obj.default))];
+                            gvc.notifyDataChange(opt_id);
                         }
-                        return html ` <div
-                          class="d-flex align-items-center"
-                          style="gap: 24px"
-                          onclick="${gvc.event(() => {
-                            if (obj.single) {
-                                obj.callback(opt.key);
-                                gvc.closeDialog();
-                            }
-                        })}"
-                        >
-                          ${obj.readonly || obj.single
-                            ? ''
-                            : html `<input
-                                class="form-check-input mt-0 ${vm.checkClass}"
-                                type="checkbox"
-                                id="${opt.key}"
-                                name="radio_${vm.id}"
-                                onclick="${obj.gvc.event(() => call())}"
-                                ${obj.default.includes(opt.key) ? 'checked' : ''}
-                              />`}
-                          ${opt.image
-                            ? BgWidget.validImageBox({
-                                gvc: obj.gvc,
-                                image: opt.image,
-                                width: 40,
-                            })
-                            : ''}
-                          <div
-                            class="form-check-label c_updown_label ${obj.readonly ? '' : 'cursor_pointer'}"
-                            onclick="${obj.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>`;
+                        return gvc.bindView({
+                            bind: opt_id,
+                            view: () => {
+                                return html `${obj.readonly
+                                    ? ''
+                                    : html `<input
+                                    class="form-check-input mt-0 ${vm.checkClass}"
+                                    type="checkbox"
+                                    id="${opt.key}"
+                                    name="radio_${vm.id}"
+                                    onclick="${gvc.event(() => call())}"
+                                    ${obj.default.find(k => k == opt.key) ? 'checked' : ''}
+                                  />`}
+                              ${opt.image
+                                    ? BgWidget.validImageBox({
+                                        gvc: gvc,
+                                        image: opt.image,
+                                        width: 40,
+                                    })
+                                    : ''}
+                              <div
+                                class="form-check-label c_updown_label ${obj.readonly ? '' : '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>`;
+                            },
+                            divCreate: {
+                                class: 'd-flex align-items-center',
+                                style: 'gap: 24px',
+                            },
+                        });
                     }))}
                   </div>
-                  ${obj.readonly || obj.single
+                  ${obj.readonly
                         ? ''
                         : html ` <div class="c_dialog_bar">
                         ${BgWidget.cancel(obj.gvc.event(() => {
@@ -3534,9 +3541,7 @@ ${(_d = obj.default) !== null && _d !== void 0 ? _d : ''}</textarea
                             gvc.closeDialog();
                         }))}
                         ${BgWidget.save(obj.gvc.event(() => {
-                            obj.callback(obj.default.filter(item => {
-                                return vm.options.find((opt) => opt.key === item);
-                            }), 1);
+                            obj.callback(obj.default, 1);
                             gvc.closeDialog();
                         }), '確認')}
                       </div>`}
@@ -3558,24 +3563,6 @@ ${(_d = obj.default) !== null && _d !== void 0 ? _d : ''}</textarea
                         });
                     }
                     else {
-                        let n = 0;
-                        const si = setInterval(() => {
-                            const element = document.getElementById(vm.selectKey.name);
-                            if (element) {
-                                element.scrollIntoView();
-                                const element2 = document.querySelector('.c_dialog_main');
-                                if (element2 && vm.selectKey.index < vm.options.length - 5) {
-                                    element2.scrollTop -= element2.clientHeight / 2;
-                                }
-                                clearInterval(si);
-                            }
-                            else {
-                                n++;
-                                if (n > 50) {
-                                    clearInterval(si);
-                                }
-                            }
-                        }, 100);
                     }
                 },
             })}
@@ -3775,7 +3762,7 @@ ${(_d = obj.default) !== null && _d !== void 0 ? _d : ''}</textarea
                     if (vm.loading) {
                         ApiShop.getVariants({
                             page: 0,
-                            limit: 99,
+                            limit: 9999,
                             search: vm.query || undefined,
                             searchType: 'title',
                             orderBy: vm.orderString || undefined,
@@ -4380,7 +4367,7 @@ ${(_d = obj.default) !== null && _d !== void 0 ? _d : ''}</textarea
                 <div class="c_dialog_body h-100">
                   <div
                     class="c_dialog_main h-100"
-                    style="max-height: 100%; padding: 0; gap: 24px; z-index: 1; position: relative;"
+                    style="max-height: 100%; padding: 0; border: 0; gap: 24px; z-index: 1; position: relative;"
                   >
                     ${(_d = obj.innerHTML(gvc)) !== null && _d !== void 0 ? _d : ''}
                   </div>
@@ -4822,6 +4809,7 @@ ${(_d = obj.default) !== null && _d !== void 0 ? _d : ''}</textarea
     }
     static richTextEditor(obj) {
         const gvc = obj.gvc;
+        const dialog = new ShareDialog(gvc.glitter);
         return gvc.bindView((() => {
             const id = gvc.glitter.getUUID();
             function refresh() {
@@ -4906,13 +4894,27 @@ ${(_d = obj.default) !== null && _d !== void 0 ? _d : ''}</textarea
                                 footer_html: (gvc2) => {
                                     return [
                                         BgWidget.cancel(gvc2.event(() => {
-                                            obj.content = originContent;
-                                            gvc2.closeDialog();
+                                            dialog.checkYesOrNot({
+                                                text: '確定要取消並關閉嗎？',
+                                                callback: bool => {
+                                                    if (bool) {
+                                                        obj.content = originContent;
+                                                        gvc2.closeDialog();
+                                                    }
+                                                },
+                                            });
                                         })),
                                         BgWidget.save(gvc2.event(() => {
-                                            gvc2.closeDialog();
-                                            gvc.notifyDataChange(id);
-                                            obj.callback(obj.content);
+                                            dialog.checkYesOrNot({
+                                                text: '確定要儲存並更新嗎？',
+                                                callback: bool => {
+                                                    if (bool) {
+                                                        gvc2.closeDialog();
+                                                        gvc.notifyDataChange(id);
+                                                        obj.callback(obj.content);
+                                                    }
+                                                },
+                                            });
                                         })),
                                     ].join('');
                                 },