refactor: Consolidate delete functions and update component imports

Author: xjh22222228

src/components/delete-modal/index.component.ts

@@ -11,7 +11,7 @@ import { NzMessageService } from 'ng-zorro-antd/message'
 import event from 'src/utils/mitt'
 import { $t } from 'src/locale'
 import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'
-import { deleteWebByIds, deleteClassByIds } from 'src/utils/web'
+import { deleteByIds } from 'src/utils/web'
 
 interface Props {
   ids: number[]
@@ -69,9 +69,7 @@ export class DeleteModalComponent {
       isDelRid = true
     }
 
-    const ok = await (this.isClass
-      ? deleteClassByIds(this.ids, isDelRid)
-      : deleteWebByIds(this.ids, isDelRid))
+    const ok = await deleteByIds(this.ids, isDelRid)
     if (ok) {
       this.onOk?.()
       this.message.success($t('_delSuccess'))

src/components/move-web/index.component.ts

@@ -13,7 +13,7 @@ import { NzMessageService } from 'ng-zorro-antd/message'
 import { NzModalModule } from 'ng-zorro-antd/modal'
 import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'
 import { NzSelectModule } from 'ng-zorro-antd/select'
-import { deleteWebByIds, deleteClassByIds } from 'src/utils/web'
+import { deleteByIds } from 'src/utils/web'
 import { getClassById } from 'src/utils'
 import { getTempId, isSelfDevelop } from 'src/utils/utils'
 import event from 'src/utils/mitt'
@@ -124,7 +124,7 @@ export class MoveWebComponent {
               delete item.rId
             }
           } else {
-            await deleteClassByIds([item.rId || id], !!item.rId)
+            await deleteByIds([item.rId || id], !!item.rId)
           }
           this.navs.update((prev) => {
             prev[oneIndex].nav.unshift(item)
@@ -155,7 +155,7 @@ export class MoveWebComponent {
               delete item.rId
             }
           } else {
-            await deleteClassByIds([item.rId || id], !!item.rId)
+            await deleteByIds([item.rId || id], !!item.rId)
           }
           this.navs.update((prev) => {
             prev[oneIndex].nav[twoIndex].nav.unshift(item)
@@ -189,7 +189,7 @@ export class MoveWebComponent {
               delete item.rId
             }
           } else {
-            await deleteWebByIds([item.rId || id], !!item.rId)
+            await deleteByIds([item.rId || id], !!item.rId)
           }
           this.navs.update((prev) => {
             prev[oneIndex].nav[twoIndex].nav[threeIndex].nav.unshift(item)

src/utils/web.ts

@@ -94,19 +94,17 @@ export function toggleCollapseAll(navs: INavProps[]): boolean {
   return collapsed
 }
 
-export async function deleteWebByIds(
+export async function deleteByIds(
   ids: number[],
   isDelRid = false,
 ): Promise<boolean> {
   let hasDelete = false
   const navsData = dfsNavs({
     navs: navs(),
     filter: (w) => {
-      if (w.name) {
-        if (ids.includes(isDelRid ? (w.rId as number) : w.id)) {
-          hasDelete = true
-          return false
-        }
+      if (ids.includes(isDelRid ? (w.rId as number) : w.id)) {
+        hasDelete = true
+        return false
       }
       return true
     },
@@ -182,32 +180,6 @@ export function updateByClass(oldId: number, newData: any) {
   return ok
 }
 
-export async function deleteClassByIds(
-  ids: number[],
-  isDelRid = false,
-): Promise<boolean> {
-  let hasDelete = false
-
-  const navsData = dfsNavs({
-    navs: navs(),
-    filter: (w) => {
-      if (w.title) {
-        if (ids.includes(isDelRid ? (w['rId'] as number) : w.id)) {
-          hasDelete = true
-          return false
-        }
-      }
-      return true
-    },
-  })
-
-  if (hasDelete) {
-    navs.set(navsData)
-    await setNavs(navsData)
-  }
-  return hasDelete
-}
-
 export function pushDataByAny(parentId: number, data: any): boolean {
   let ok = false
 

src/view/system/collect/index.component.ts

@@ -18,7 +18,7 @@ import { NzTableModule } from 'ng-zorro-antd/table'
 import { LogoComponent } from 'src/components/logo/logo.component'
 import { TagListComponent } from 'src/components/tag-list/index.component'
 import { ActionType } from 'src/types'
-import { deleteWebByIds, getWebById } from 'src/utils/web'
+import { deleteByIds, getWebById } from 'src/utils/web'
 import { JumpService } from 'src/services/jump'
 import event from 'src/utils/mitt'
 
@@ -227,7 +227,7 @@ export default class CollectComponent {
     this.modal.info({
       nzTitle: $t('_confirmDel'),
       nzOnOk: async () => {
-        if (await deleteWebByIds([data.id])) {
+        if (await deleteByIds([data.id])) {
           this.message.success($t('_delSuccess'))
         } else {
           this.message.error('Delete failed')

src/view/system/web/index.component.html

@@ -12,7 +12,7 @@
     *ngIf="!isSelfDevelop"
     nz-button
     style="margin: 0 15px 20px 15px"
-    (click)="handleReset()"
+    (click)="handleRestoreData()"
   >
     {{ $t('_resetInitData') }}
   </button>

src/view/system/web/index.component.ts

@@ -35,7 +35,7 @@ import { NzIconModule } from 'ng-zorro-antd/icon'
 import { NzModalModule } from 'ng-zorro-antd/modal'
 import { NzFormModule } from 'ng-zorro-antd/form'
 import { NzSwitchModule } from 'ng-zorro-antd/switch'
-import { NzToolTipModule } from 'ng-zorro-antd/tooltip'
+import { NzTooltipModule } from 'ng-zorro-antd/tooltip'
 import { LogoComponent } from 'src/components/logo/logo.component'
 import { TagListComponent } from 'src/components/tag-list/index.component'
 import { CommonService } from 'src/services/common'
@@ -47,7 +47,7 @@ import { cleanWebAttrs } from 'src/utils/pureUtils'
   standalone: true,
   imports: [
     CommonModule,
-    NzToolTipModule,
+    NzTooltipModule,
     FormsModule,
     ReactiveFormsModule,
     NzInputModule,
@@ -233,7 +233,7 @@ export default class WebpComponent {
     }
   }
 
-  handleReset() {
+  handleRestoreData() {
     this.modal.info({
       nzTitle: $t('_resetInitData'),
       nzContent: $t('_warnReset'),