Merge branch 'feature/BRT-23-classify' of http://git.yilibili.com/1-bright/admin into feature/24-article

src/api/category.ts

@@ -1,6 +1,6 @@
 import httpClient from '@/api/httpClient'
 import type { PageResult } from '@/model/base'
-import type { Category,CategorySearchFilter,CategoryDeleteRequest } from '@/model/category'
+import type { Category,CategorySearchFilter, } from '@/model/category'
 
 export const searchCategoryRequest = (categoryFilterParam:CategorySearchFilter ) => {
   return httpClient.get<PageResult<Category>>('/categories',categoryFilterParam)
@@ -13,8 +13,8 @@ export const createCategoryRequest = (category: Pick<Category,'name'|'code'|'ord
   return httpClient.post<Category>('/categories',category)
 }
 
-export const deleteCategoryRequest = (categoryDeleteParam:CategoryDeleteRequest) => {
-  return httpClient.delete(`/categories`,categoryDeleteParam)
+export const deleteCategoryRequest = (id: string) => {
+  return httpClient.delete(`/categories/${id}`,)
 }
 
 export const searchCategoryByIdRequest = (id: string) => {

src/model/category.ts

@@ -12,9 +12,6 @@ export interface CategorySearchFilter extends Partial<Paging>{
   order?: string
 }
 
-export interface CategoryDeleteRequest{
-  id:string
-}
 
 export interface UpdateCategoryRequest{
   name: string

src/pages/category/index.vue

@@ -51,8 +51,8 @@ const handleCategoryDialogClosed = () => {
   isEdit.value = false
   currentTableData.value = {}
 }
-const deleteCategoryClick = async (category: Category) => {
-  await deleteCategoryRequest({ id: category.id })
+const deleteCategoryClick = async (id: string) => {
+  await deleteCategoryRequest(id)
   fetchData()
   MessagePlugin.success('删除分类成功')
 }
@@ -80,13 +80,6 @@ const deleteCategoryClick = async (category: Category) => {
         onChange: onPageChange
       }"
     >
-      <template #roles="{ row }">
-        <TSpace>
-          <TTag v-for="role in row.roles" :key="role.id" theme="success" variant="light">{{
-            role.label
-          }}</TTag>
-        </TSpace>
-      </template>
       <template #operation="{ row }">
         <TSpace :size="1">
           <TButton variant="text" size="small" theme="primary" @click="editClick(row)"
@@ -95,7 +88,7 @@ const deleteCategoryClick = async (category: Category) => {
           <t-popconfirm
             theme="default"
             content="确认删除此项分类吗"
-            @confirm="deleteCategoryClick(row)"
+            @confirm="deleteCategoryClick(row.id)"
           >
             <TButton variant="text" size="small" theme="danger">删除</TButton>
           </t-popconfirm>