From 0a81db157bec6da80ec7b522c1f59ce5f0153fc2 Mon Sep 17 00:00:00 2001 From: Sun <95302870@qq.com> Date: Fri, 10 Nov 2023 13:02:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=A0=E9=99=A4=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/api/api_v1/panel/itemIcon.go | 17 +++++++++++ service/router/panel/itemIcon.go | 2 +- src/api/panel/itemIcon.ts | 14 ++-------- src/views/components/UserInfoFooter/index.vue | 2 ++ .../home/components/EditItem/IconEditor.vue | 2 +- src/views/home/index.vue | 28 +++++++++++++++++-- 6 files changed, 49 insertions(+), 16 deletions(-) diff --git a/service/api/api_v1/panel/itemIcon.go b/service/api/api_v1/panel/itemIcon.go index 4587bb9..67aafbb 100644 --- a/service/api/api_v1/panel/itemIcon.go +++ b/service/api/api_v1/panel/itemIcon.go @@ -98,3 +98,20 @@ func (a *ItemIcon) GetListByGroupId(c *gin.Context) { apiReturn.SuccessListData(c, itemIcons, 0) } + +func (a *ItemIcon) Deletes(c *gin.Context) { + req := commonApiStructs.RequestDeleteIds[uint]{} + + if err := c.ShouldBindBodyWith(&req, binding.JSON); err != nil { + apiReturn.ErrorParamFomat(c, err.Error()) + return + } + + userInfo, _ := base.GetCurrentUserInfo(c) + if err := global.Db.Debug().Delete(&models.ItemIcon{}, "id in ? AND user_id=?", req.Ids, userInfo.ID).Error; err != nil { + apiReturn.ErrorDatabase(c, err.Error()) + return + } + + apiReturn.Success(c) +} diff --git a/service/router/panel/itemIcon.go b/service/router/panel/itemIcon.go index 11dc69d..3f49c27 100644 --- a/service/router/panel/itemIcon.go +++ b/service/router/panel/itemIcon.go @@ -13,6 +13,6 @@ func InitItemIcon(router *gin.RouterGroup) { { r.POST("/panel/itemIcon/edit", itemIcon.Edit) r.POST("/panel/itemIcon/getListByGroupId", itemIcon.GetListByGroupId) - + r.POST("/panel/itemIcon/deletes", itemIcon.Deletes) } } diff --git a/src/api/panel/itemIcon.ts b/src/api/panel/itemIcon.ts index e4e785e..b822100 100644 --- a/src/api/panel/itemIcon.ts +++ b/src/api/panel/itemIcon.ts @@ -1,13 +1,5 @@ import { post } from '@/utils/request' -// // 获取绘图的列表 -// export function getMyDrawList(req: Common.ListRequest) { -// return post({ -// url: '/aiDraw/getMyDrawList', -// data: req, -// }) -// } - export function edit(req: Panel.ItemInfo) { return post({ url: '/panel/itemIcon/edit', @@ -28,9 +20,9 @@ export function getListByGroupId() { }) } -export function getSystemList(data: Common.ListRequest) { +export function deletes(ids: number[]) { return post({ - url: '/aiApplet/getSystemList', - data, + url: '/panel/itemIcon/deletes', + data: { ids }, }) } diff --git a/src/views/components/UserInfoFooter/index.vue b/src/views/components/UserInfoFooter/index.vue index 924e634..28e27bf 100644 --- a/src/views/components/UserInfoFooter/index.vue +++ b/src/views/components/UserInfoFooter/index.vue @@ -12,6 +12,8 @@ const show = ref(false)
+ Gitee + Github diff --git a/src/views/home/components/EditItem/IconEditor.vue b/src/views/home/components/EditItem/IconEditor.vue index c35044b..16b8ad3 100644 --- a/src/views/home/components/EditItem/IconEditor.vue +++ b/src/views/home/components/EditItem/IconEditor.vue @@ -118,7 +118,7 @@ const handleUploadFinish = ({
-import { NButton, NButtonGroup, NDropdown, NEllipsis, NGrid, NGridItem, NModal, NSkeleton, NSpin, useMessage } from 'naive-ui' +import { NButton, NButtonGroup, NDropdown, NEllipsis, NGrid, NGridItem, NModal, NSkeleton, NSpin, useDialog, useMessage } from 'naive-ui' import { nextTick, onMounted, ref } from 'vue' import { EditItem, Setting } from './components' import { Clock } from '@/components/deskModule' import { ItemIcon, SvgIcon } from '@/components/common' -import { getListByGroupId } from '@/api/panel/itemIcon' +import { deletes, getListByGroupId } from '@/api/panel/itemIcon' import { getInfo } from '@/api/system/user' import { usePanelState, useUserStore } from '@/store' import { PanelStateNetworkModeEnum } from '@/enum' import { setTitle } from '@/utils/cmn' const ms = useMessage() +const dialog = useDialog() const panelState = usePanelState() const userStore = useUserStore() @@ -39,6 +40,10 @@ const dropdownMenuOptions = [ label: '编辑', key: 'edit', }, + { + label: '删除', + key: 'delete', + }, ] const items = ref() @@ -100,7 +105,24 @@ function handleSelect(key: string | number) { editItemInfoData.value = { ...currentRightSelectItem.value } as Panel.ItemInfo editItemInfoShow.value = true break - case 'del': + case 'delete': + dialog.warning({ + title: '警告', + content: `你确定要删除图标 ${currentRightSelectItem.value?.title} ?`, + positiveText: '确定', + negativeText: '取消', + onPositiveClick: () => { + deletes([currentRightSelectItem.value?.id as number]).then(({ code, msg }) => { + if (code === 0) { + ms.success('已删除') + getList() + } + else { + ms.error(`删除失败:${msg}`) + } + }) + }, + }) break default: