ts-glitter 22.4.6 → 22.4.9

package/lowcode/cms-plugin/menus-setting.js

@@ -23,7 +23,7 @@ export class MenusSetting {
             dataList: undefined,
             query: '',
             tab: def || 'menu',
-            select: { title: '', tag: '' },
+            select: { title: '', tag: '', inner_title: '' },
         };
         function getDatalist() {
             return vm.dataList.map((dd) => {
@@ -124,7 +124,41 @@ export class MenusSetting {
                             </div>
                           `,
                                     },
-                                    ...menu_all.list.filter((d1) => d1.tab === tag),
+                                    ...menu_all.list
+                                        .filter((d1) => d1.tab === tag)
+                                        .map((dd, index) => {
+                                        return {
+                                            tag: tag,
+                                            inner_title: dd.title,
+                                            title: html ` <div class="w-100 d-flex align-items-center">
+                                ${dd.title}
+                                <div class="flex-fill"></div>
+                                <div class="c_filter_view" style="cursor:pointer;width: 30px;height: 30px;" onclick="${gvc.event((e, event) => {
+                                                event.preventDefault();
+                                                event.stopPropagation();
+                                                dialog.checkYesOrNot({
+                                                    text: '是否確認刪除?',
+                                                    callback: (response) => __awaiter(this, void 0, void 0, function* () {
+                                                        if (response) {
+                                                            dialog.dataLoading({ visible: true });
+                                                            let menu_all = (yield ApiUser.getPublicConfig(tag, 'manager')).response.value;
+                                                            menu_all.list = menu_all.list.filter((d1) => d1.tag != tag);
+                                                            yield ApiUser.setPublicConfig({
+                                                                key: tag,
+                                                                value: menu_all,
+                                                                user_id: 'manager',
+                                                            });
+                                                            dialog.dataLoading({ visible: false });
+                                                            gvc.recreateView();
+                                                        }
+                                                    }),
+                                                });
+                                            })}">
+                                  <i class="fa-regular fa-trash"></i>
+                                </div>
+                              </div>`,
+                                        };
+                                    }),
                                 ];
                                 vmi.pageSize = 1;
                                 vmi.originalData = vm.dataList;
@@ -154,7 +188,7 @@ export class MenusSetting {
                             gvc: gvc,
                             widget: widget,
                             key: vm.select.tag,
-                            title: vm.select.title,
+                            title: vm.select.inner_title || vm.select.title,
                             goBack: () => {
                                 vm.type = 'list';
                                 gvc.notifyDataChange(id);
@@ -271,7 +305,7 @@ export class MenusSetting {
                     var _a, _b;
                     vm.link[vm.language] = (_a = vm.link[vm.language]) !== null && _a !== void 0 ? _a : [];
                     const link = vm.link[vm.language];
-                    return html `<div class="title-container" style="width: 100%; max-width: 100%;">
+                    return html ` <div class="title-container" style="width: 100%; max-width: 100%;">
               ${BgWidget.goBack(cf.gvc.event(() => {
                         cf.goBack();
                     }))}${BgWidget.title((_b = cf.title) !== null && _b !== void 0 ? _b : '選單設定')}
@@ -313,7 +347,7 @@ export class MenusSetting {
                         },
                     })}
             </div>
-            ${BgWidget.container(html `<div
+            ${BgWidget.container(html ` <div
                 style="max-width:100%;width: 100%; padding: 20px; background: white; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.08); border-radius: 10px; overflow: hidden; justify-content: center; align-items: center; display: inline-flex"
               >
                 <div style="width: 100%;  position: relative">
@@ -376,7 +410,7 @@ export class MenusSetting {
                       style="align-self: stretch; flex-direction: column; justify-content: flex-start; align-items: flex-start; gap: 18px; display: flex"
                     >
                       ${(() => {
-                        function renderItems(array) {
+                        function renderItems(array, depth) {
                             const id = gvc.glitter.getUUID();
                             return (gvc.bindView(() => {
                                 return {
@@ -453,24 +487,26 @@ export class MenusSetting {
                                               </div>
                                             </div>
                                             <div class="flex-fill"></div>
-                                            <div
-                                              class="child me-2"
-                                              onclick="${cf.gvc.event((_, event) => {
-                                                event.stopPropagation();
-                                                MenusSetting.editEvent({
-                                                    link: '',
-                                                    title: '',
-                                                    visible_type: 'all',
-                                                    items: [],
-                                                }, data => {
-                                                    dd.items = dd.items || [];
-                                                    dd.items.push(data);
-                                                    gvc.notifyDataChange(vm.id);
-                                                });
-                                            })}"
-                                            >
-                                              <i class="fa-solid fa-plus" style="color:#393939;"></i>
-                                            </div>
+                                            ${depth < 2
+                                                ? html ` <div
+                                                  class="child me-2"
+                                                  onclick="${cf.gvc.event((_, event) => {
+                                                    event.stopPropagation();
+                                                    MenusSetting.editEvent({
+                                                        link: '',
+                                                        title: '',
+                                                        visible_type: 'all',
+                                                        items: [],
+                                                    }, data => {
+                                                        dd.items = dd.items || [];
+                                                        dd.items.push(data);
+                                                        gvc.notifyDataChange(vm.id);
+                                                    });
+                                                })}"
+                                                >
+                                                  <i class="fa-solid fa-plus" style="color:#393939;"></i>
+                                                </div>`
+                                                : ''}
                                             <div
                                               class="child"
                                               onclick="${cf.gvc.event((_, event) => {
@@ -491,12 +527,12 @@ export class MenusSetting {
                                                 class=" w-100 ${dd.toggle ? '' : 'd-none'}"
                                                 style="padding-left: 35px;"
                                               >
-                                                ${renderItems(dd.items)}
+                                                ${renderItems(dd.items, depth + 1)}
                                               </div>
                                             `
                                                 : ''}
                                       `;
-                                            return html `<li class="w-100 ">${list}</li>`;
+                                            return html ` <li class="w-100 ">${list}</li>`;
                                         })
                                             .join('');
                                     },
@@ -573,35 +609,13 @@ export class MenusSetting {
                               </div>
                             </div>`);
                         }
-                        return renderItems(link);
+                        return renderItems(link, 0);
                     })()}
                     </div>
                   </div>
                 </div>
               </div>`)}
             <div class="update-bar-container">
-              ${['menu-setting', 'footer-setting', 'text-manager'].includes(cf.key)
-                        ? ''
-                        : BgWidget.danger(gvc.event(() => __awaiter(this, void 0, void 0, function* () {
-                            dialog.checkYesOrNot({
-                                text: '是否確認刪除?',
-                                callback: (response) => __awaiter(this, void 0, void 0, function* () {
-                                    if (response) {
-                                        dialog.dataLoading({ visible: true });
-                                        let menu_all = (yield ApiUser.getPublicConfig('menu-setting-list', 'manager')).response
-                                            .value;
-                                        menu_all.list = menu_all.list.filter((d1) => d1.tag != cf.key);
-                                        yield ApiUser.setPublicConfig({
-                                            key: 'menu-setting-list',
-                                            value: menu_all,
-                                            user_id: 'manager',
-                                        });
-                                        dialog.dataLoading({ visible: false });
-                                        cf.goBack();
-                                    }
-                                }),
-                            });
-                        })))}
               ${BgWidget.cancel(gvc.event(() => {
                         cf.goBack();
                     }))}
@@ -742,7 +756,7 @@ export class MenusSetting {
                                 ? data.visible_type === 'user'
                                     ? vm.visibleDataList
                                         .map(item => {
-                                        return html `<div class="d-flex gap-1">
+                                        return html ` <div class="d-flex gap-1">
                               <div>${item.userData.name}</div>
                               ${BgWidget.grayNote(item.account)}
                             </div>`;
@@ -750,7 +764,7 @@ export class MenusSetting {
                                         .join('')
                                     : vm.visibleDataList
                                         .map(item => {
-                                        return html `<div class="d-flex gap-1">
+                                        return html ` <div class="d-flex gap-1">
                               <div>${item.title.replace('會員等級 - ', '')}</div>
                             </div>`;
                                     })
@@ -760,7 +774,7 @@ export class MenusSetting {
               `;
                         }
                         return BgWidget.mainCard([
-                            html `<div
+                            html ` <div
                   class="d-flex align-items-center cursor_pointer"
                   onclick="${gvc.event(() => {
                                 vm.show = false;
@@ -801,7 +815,7 @@ export class MenusSetting {
             });
         };
         const backToDefault = () => {
-            return html `<div
+            return html ` <div
         class="position-absolute bottom-0 left-0 w-100 d-flex align-items-center justify-content-end p-3 border-top pe-4"
         style="gap: 10px; background-color: #fff"
       >
@@ -836,7 +850,7 @@ export class MenusSetting {
             setVisibleDataArray(),
             backToDefault(),
         ]
-            .map(h => html `<div class="w-100">${h}</div>`)
+            .map(h => html ` <div class="w-100">${h}</div>`)
             .join('');
         rightMenu.closeEvent = () => {
             if (data.title.length > 0 || data.link.length > 0) {
@@ -848,7 +862,7 @@ export class MenusSetting {
             title: '新增選單',
             view: gvc.bindView({
                 bind: ids.main,
-                view: () => html `<div class="d-flex flex-column p-3">${view}</div>`,
+                view: () => html ` <div class="d-flex flex-column p-3">${view}</div>`,
             }),
             right: true,
         });

package/lowcode/cms-plugin/menus-setting.ts

@@ -26,7 +26,7 @@ export class MenusSetting {
       index: number;
       dataList: any;
       query?: string;
-      select: { title: string; tag: string };
+      select: { inner_title:string,title: string; tag: string };
       tab: 'menu' | 'footer';
     } = {
       type: 'list',
@@ -34,7 +34,7 @@ export class MenusSetting {
       dataList: undefined,
       query: '',
       tab: def || 'menu',
-      select: { title: '', tag: '' },
+      select: { title: '', tag: '',inner_title:'' },
     };
 
     function getDatalist() {
@@ -64,6 +64,7 @@ export class MenusSetting {
                   `新增${vm.tab === 'menu' ? `頁首選單` : `頁腳選單`}`,
                   gvc.event(async () => {
                     let title = '';
+
                     async function next() {
                       dialog.dataLoading({ visible: true });
                       const tab = vm.tab === 'menu' ? `頁首選單` : `頁腳選單`;
@@ -84,6 +85,7 @@ export class MenusSetting {
                       dialog.dataLoading({ visible: false });
                       gvc.notifyDataChange(id);
                     }
+
                     BgWidget.settingDialog({
                       gvc: gvc,
                       title: '選單名稱',
@@ -148,7 +150,41 @@ export class MenusSetting {
                             </div>
                           `,
                         },
-                        ...menu_all.list.filter((d1: any) => d1.tab === tag),
+                        ...menu_all.list
+                          .filter((d1: any) => d1.tab === tag)
+                          .map((dd: any, index: number) => {
+                            return {
+                              tag: tag,
+                              inner_title: dd.title,
+                              title: html` <div class="w-100 d-flex align-items-center">
+                                ${dd.title}
+                                <div class="flex-fill"></div>
+                                <div class="c_filter_view" style="cursor:pointer;width: 30px;height: 30px;" onclick="${gvc.event((e,event)=>{
+                                  event.preventDefault();
+                                  event.stopPropagation();
+                                  dialog.checkYesOrNot({
+                                    text: '是否確認刪除?',
+                                    callback: async response => {
+                                      if (response) {
+                                        dialog.dataLoading({ visible: true });
+                                        let menu_all = (await ApiUser.getPublicConfig(tag, 'manager')).response.value;
+                                        menu_all.list = menu_all.list.filter((d1: any) => d1.tag != tag);
+                                        await ApiUser.setPublicConfig({
+                                          key: tag,
+                                          value: menu_all,
+                                          user_id: 'manager',
+                                        });
+                                        dialog.dataLoading({ visible: false });
+                                        gvc.recreateView();
+                                      }
+                                    },
+                                  });
+                                })}">
+                                  <i class="fa-regular fa-trash"></i>
+                                </div>
+                              </div>`,
+                            };
+                          }),
                       ];
 
                       vmi.pageSize = 1;
@@ -182,7 +218,7 @@ export class MenusSetting {
                 gvc: gvc,
                 widget: widget,
                 key: vm.select.tag as any,
-                title: vm.select.title,
+                title: vm.select.inner_title || vm.select.title,
                 goBack: () => {
                   vm.type = 'list';
                   gvc.notifyDataChange(id);
@@ -321,7 +357,7 @@ export class MenusSetting {
           vm.link[vm.language] = vm.link[vm.language] ?? [];
           const link = vm.link[vm.language];
 
-          return html`<div class="title-container" style="width: 100%; max-width: 100%;">
+          return html` <div class="title-container" style="width: 100%; max-width: 100%;">
               ${BgWidget.goBack(
                 cf.gvc.event(() => {
                   cf.goBack();
@@ -372,7 +408,7 @@ export class MenusSetting {
               })}
             </div>
             ${BgWidget.container(
-              html`<div
+              html` <div
                 style="max-width:100%;width: 100%; padding: 20px; background: white; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.08); border-radius: 10px; overflow: hidden; justify-content: center; align-items: center; display: inline-flex"
               >
                 <div style="width: 100%;  position: relative">
@@ -435,7 +471,7 @@ export class MenusSetting {
                       style="align-self: stretch; flex-direction: column; justify-content: flex-start; align-items: flex-start; gap: 18px; display: flex"
                     >
                       ${(() => {
-                        function renderItems(array: MenuItem[]): string {
+                        function renderItems(array: MenuItem[], depth: number): string {
                           const id = gvc.glitter.getUUID();
                           return (
                             gvc.bindView(() => {
@@ -512,27 +548,29 @@ export class MenusSetting {
                                               </div>
                                             </div>
                                             <div class="flex-fill"></div>
-                                            <div
-                                              class="child me-2"
-                                              onclick="${cf.gvc.event((_, event) => {
-                                                event.stopPropagation();
-                                                MenusSetting.editEvent(
-                                                  {
-                                                    link: '',
-                                                    title: '',
-                                                    visible_type: 'all',
-                                                    items: [],
-                                                  },
-                                                  data => {
-                                                    dd.items = dd.items || [];
-                                                    dd.items.push(data);
-                                                    gvc.notifyDataChange(vm.id);
-                                                  }
-                                                );
-                                              })}"
-                                            >
-                                              <i class="fa-solid fa-plus" style="color:#393939;"></i>
-                                            </div>
+                                            ${depth < 2
+                                              ? html` <div
+                                                  class="child me-2"
+                                                  onclick="${cf.gvc.event((_, event) => {
+                                                    event.stopPropagation();
+                                                    MenusSetting.editEvent(
+                                                      {
+                                                        link: '',
+                                                        title: '',
+                                                        visible_type: 'all',
+                                                        items: [],
+                                                      },
+                                                      data => {
+                                                        dd.items = dd.items || [];
+                                                        dd.items.push(data);
+                                                        gvc.notifyDataChange(vm.id);
+                                                      }
+                                                    );
+                                                  })}"
+                                                >
+                                                  <i class="fa-solid fa-plus" style="color:#393939;"></i>
+                                                </div>`
+                                              : ''}
                                             <div
                                               class="child"
                                               onclick="${cf.gvc.event((_, event) => {
@@ -553,12 +591,12 @@ export class MenusSetting {
                                                 class=" w-100 ${(dd as any).toggle ? '' : 'd-none'}"
                                                 style="padding-left: 35px;"
                                               >
-                                                ${renderItems(dd.items as MenuItem[]) as any}
+                                                ${renderItems(dd.items as MenuItem[], depth + 1) as any}
                                               </div>
                                             `
                                           : ''}
                                       `;
-                                      return html`<li class="w-100 ">${list}</li>`;
+                                      return html` <li class="w-100 ">${list}</li>`;
                                     })
                                     .join('');
                                 },
@@ -587,11 +625,13 @@ export class MenusSetting {
                                             padding: 0;
                                           }
                                         `);
+
                                         function swapArr(arr: any, index1: number, index2: number) {
                                           const data = arr[index1];
                                           arr.splice(index1, 1);
                                           arr.splice(index2, 0, data);
                                         }
+
                                         let startIndex = 0;
                                         //@ts-ignore
                                         Sortable.create(gvc.getBindViewElem(id).get(0), {
@@ -645,7 +685,7 @@ export class MenusSetting {
                           );
                         }
 
-                        return renderItems(link);
+                        return renderItems(link, 0);
                       })()}
                     </div>
                   </div>
@@ -653,30 +693,6 @@ export class MenusSetting {
               </div>`
             )}
             <div class="update-bar-container">
-              ${['menu-setting', 'footer-setting', 'text-manager'].includes(cf.key)
-                ? ''
-                : BgWidget.danger(
-                    gvc.event(async () => {
-                      dialog.checkYesOrNot({
-                        text: '是否確認刪除?',
-                        callback: async response => {
-                          if (response) {
-                            dialog.dataLoading({ visible: true });
-                            let menu_all = (await ApiUser.getPublicConfig('menu-setting-list', 'manager')).response
-                              .value;
-                            menu_all.list = menu_all.list.filter((d1: any) => d1.tag != cf.key);
-                            await ApiUser.setPublicConfig({
-                              key: 'menu-setting-list',
-                              value: menu_all,
-                              user_id: 'manager',
-                            });
-                            dialog.dataLoading({ visible: false });
-                            cf.goBack();
-                          }
-                        },
-                      });
-                    })
-                  )}
               ${BgWidget.cancel(
                 gvc.event(() => {
                   cf.goBack();
@@ -835,7 +851,7 @@ export class MenusSetting {
                     ? data.visible_type === 'user'
                       ? vm.visibleDataList
                           .map(item => {
-                            return html`<div class="d-flex gap-1">
+                            return html` <div class="d-flex gap-1">
                               <div>${item.userData.name}</div>
                               ${BgWidget.grayNote(item.account)}
                             </div>`;
@@ -843,7 +859,7 @@ export class MenusSetting {
                           .join('')
                       : vm.visibleDataList
                           .map(item => {
-                            return html`<div class="d-flex gap-1">
+                            return html` <div class="d-flex gap-1">
                               <div>${item.title.replace('會員等級 - ', '')}</div>
                             </div>`;
                           })
@@ -855,7 +871,7 @@ export class MenusSetting {
 
             return BgWidget.mainCard(
               [
-                html`<div
+                html` <div
                   class="d-flex align-items-center cursor_pointer"
                   onclick="${gvc.event(() => {
                     vm.show = false;
@@ -907,7 +923,7 @@ export class MenusSetting {
     };
 
     const backToDefault = () => {
-      return html`<div
+      return html` <div
         class="position-absolute bottom-0 left-0 w-100 d-flex align-items-center justify-content-end p-3 border-top pe-4"
         style="gap: 10px; background-color: #fff"
       >
@@ -946,7 +962,7 @@ export class MenusSetting {
       setVisibleDataArray(),
       backToDefault(),
     ]
-      .map(h => html`<div class="w-100">${h}</div>`)
+      .map(h => html` <div class="w-100">${h}</div>`)
       .join('');
 
     rightMenu.closeEvent = () => {
@@ -960,7 +976,7 @@ export class MenusSetting {
       title: '新增選單',
       view: gvc.bindView({
         bind: ids.main,
-        view: () => html`<div class="d-flex flex-column p-3">${view}</div>`,
+        view: () => html` <div class="d-flex flex-column p-3">${view}</div>`,
       }),
       right: true,
     });