From 61e753c52025855cd495c4cc5b9d031ed4471bdc Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Wed, 16 Oct 2024 22:42:15 +0800 Subject: [PATCH] =?UTF-8?q?optimize:=20=E2=99=BB=EF=B8=8F=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84=E4=B8=BB=E9=94=AE?= =?UTF-8?q?id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mock/data.js | 82 +++++++++++++++++++ .../configuration/emailUsers/utils/columns.ts | 2 - .../configuration/menuIcon/utils/columns.ts | 1 - src/views/i18n/i18n-setting/utils/columns.tsx | 1 - .../i18n/i18n-type-setting/utils/columns.tsx | 1 - src/views/monitor/files/utils/columns.ts | 2 +- src/views/monitor/schedulers/index.vue | 16 +--- src/views/monitor/schedulers/utils/columns.ts | 1 - src/views/monitor/schedulers/utils/hooks.ts | 22 ----- .../monitor/schedulersGroup/utils/columns.ts | 1 - src/views/system/adminUser/utils/columns.tsx | 2 - src/views/system/power/utils/columns.ts | 3 - src/views/system/role/utils/columns.ts | 1 - 13 files changed, 84 insertions(+), 51 deletions(-) create mode 100644 mock/data.js diff --git a/mock/data.js b/mock/data.js new file mode 100644 index 0000000..ec0a5e5 --- /dev/null +++ b/mock/data.js @@ -0,0 +1,82 @@ +(async function requestPath() { + // 获取基础paths对象 + const response = await fetch('http://localhost:7070/v3/api-docs/admin%E7%AE%A1%E7%90%86%E5%91%98%E6%8E%A5%E5%8F%A3%E8%AF%B7%E6%B1%82', { method: 'GET' }); + const json = await response.json(); + const paths = json.paths; + + // 设置父级id顺序 + let id = 1; + + // 最后整理的数据内容 + const data = {}; + + // 获取所有键 + Object.keys(paths) + .filter(item => !item.includes('noAuth')) + .forEach(key => { + const pathKey = paths[key]; + const { tags, description } = pathKey[Object.keys(pathKey)[0]]; + const tag = tags[0]; + + // 父级内容为info信息 + const path = key.match(/\w+\/\w+/, key)[0]; + const info = { + id: 1, + parentId: 0, + powerCode: path.replaceAll('/', '::'), + powerName: tag, + requestUrl: undefined, + }; + + // 整理子级内容信息 + const powerCode = key.replace('/admin', '').replace('/{page}/{limit}', '').replace('/{id}', '').replace('/', ''); + const item = { + parentId: info.id, + powerCode: powerCode.replaceAll('/', '::'), + powerName: description, + requestUrl: key.replace('{page}', '\\d+').replace('{limit}', '\\d+').replace('/{id}', '\\d+'), + }; + + // 向父级内容添加子级Children内容 + if (!data[tag]) { + data[tag] = { + info, + children: [item], + }; + } + data[tag].children.push(item); + }); + + // 便利整理好的参数data + for (const item in data) { + // 先添加父级内容 + const info = data[item].info; + info.id = id; + await add(info); + + // 遍历子级内容向服务器添加 + const children = data[item].children; + for (const item1 of children) { + item1.parentId = id; + await add(item1); + } + + // 父级添加后id增加 + id++; + } +})(); + +// 向服务器添加的内容 +async function add(data) { + const response = await fetch('http://localhost:7070/admin/power/addPower', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + token: + 'eyJhbGciOiJIUzI1NiIsInppcCI6IkdaSVAifQ.H4sIAAAAAAAA_yWLQQqDMBBF7zJrUzJ24iSuirtuvINxJtCCtlYDLdK7G3D3ee_9HdYcoYUuz_MPKtDvG1rkOjiPTU0V5FU_dynsnP0wacnxiiFYi45uy3IZX1O5PrdHMWNiFK9kUiQxpMwmKDrjZUiaohA3Fv4HKp13G3cAAAA.qDzOIts0Wckglwm3L-BcprzRiW06ARC6Q8jN9qbVjQ0', + }, + body: JSON.stringify(data), + }); + const json = await response.json(); + console.log(json); +} diff --git a/src/views/configuration/emailUsers/utils/columns.ts b/src/views/configuration/emailUsers/utils/columns.ts index c57021f..4b231cd 100644 --- a/src/views/configuration/emailUsers/utils/columns.ts +++ b/src/views/configuration/emailUsers/utils/columns.ts @@ -7,8 +7,6 @@ export const columns: TableColumnList = [ { type: 'index', index: (index: number) => index + 1, label: '序号', width: 60 }, // 邮箱 { label: $t('emailUsers_email'), prop: 'email' }, - // // 邮件模板 - // { label: $t('emailUsers_emailTemplate'), prop: 'emailTemplate' }, // 密码 { label: $t('emailUsers_password'), prop: 'password' }, // Host地址 diff --git a/src/views/configuration/menuIcon/utils/columns.ts b/src/views/configuration/menuIcon/utils/columns.ts index 73c0fc3..ec95adb 100644 --- a/src/views/configuration/menuIcon/utils/columns.ts +++ b/src/views/configuration/menuIcon/utils/columns.ts @@ -5,7 +5,6 @@ import { $t } from '@/plugins/i18n'; export const columns: TableColumnList = [ { type: 'selection', align: 'left' }, { type: 'index', index: (index: number) => index + 1, label: '序号', width: 60 }, - { label: $t('id'), prop: 'id' }, // icon 类名 { label: $t('menuIcon_iconCode'), prop: 'iconCode', slot: 'iconCode' }, // icon 名称 diff --git a/src/views/i18n/i18n-setting/utils/columns.tsx b/src/views/i18n/i18n-setting/utils/columns.tsx index 3544a36..74c5ee4 100644 --- a/src/views/i18n/i18n-setting/utils/columns.tsx +++ b/src/views/i18n/i18n-setting/utils/columns.tsx @@ -6,7 +6,6 @@ import { $t } from '@/plugins/i18n'; export const columns: TableColumnList = [ { type: 'selection', align: 'left' }, { type: 'index', index: (index: number) => index + 1, label: '序号', width: 60 }, - { label: $t('id'), prop: 'id' }, { label: $t('i18n.keyName'), prop: 'keyName' }, { label: $t('i18n.translation'), prop: 'translation' }, { label: $t('i18n.typeName'), prop: 'typeName' }, diff --git a/src/views/i18n/i18n-type-setting/utils/columns.tsx b/src/views/i18n/i18n-type-setting/utils/columns.tsx index 04bfd0c..13267f1 100644 --- a/src/views/i18n/i18n-type-setting/utils/columns.tsx +++ b/src/views/i18n/i18n-type-setting/utils/columns.tsx @@ -5,7 +5,6 @@ export const editMap = ref({}); export const columns: TableColumnList = [ { type: 'index', index: (index: number) => index + 1, label: '序号', width: 60 }, - { label: $t('id'), prop: 'id' }, { label: $t('i18n_typeName'), prop: 'typeName' }, { label: $t('i18n_summary'), prop: 'summary' }, { label: $t('isDefault'), prop: 'isDefault', slot: 'isDefault' }, diff --git a/src/views/monitor/files/utils/columns.ts b/src/views/monitor/files/utils/columns.ts index fa315cb..351f0c8 100644 --- a/src/views/monitor/files/utils/columns.ts +++ b/src/views/monitor/files/utils/columns.ts @@ -4,7 +4,7 @@ import { $t } from '@/plugins/i18n'; // 表格列 export const columns: TableColumnList = [ { type: 'selection', align: 'left' }, - { type: 'index', index: (index: number) => index + 1 }, + { type: 'index', index: (index: number) => index + 1, label: '序号', width: 60 }, // 文件的名称 { label: $t('files_filename'), prop: 'filename', width: 400 }, // 文件在服务器上的存储路径 diff --git a/src/views/monitor/schedulers/index.vue b/src/views/monitor/schedulers/index.vue index 5772c18..7077dbf 100644 --- a/src/views/monitor/schedulers/index.vue +++ b/src/views/monitor/schedulers/index.vue @@ -4,7 +4,7 @@ import { columns } from '@/views/monitor/schedulers/utils/columns'; import PureTableBar from '@/components/TableBar/src/bar'; import AddFill from '@iconify-icons/ri/add-circle-line'; import PureTable from '@pureadmin/table'; -import { deleteIds, onAdd, onDelete, onDeleteBatch, onSearch, onUpdate } from '@/views/monitor/schedulers/utils/hooks'; +import { onAdd, onDelete, onSearch, onUpdate } from '@/views/monitor/schedulers/utils/hooks'; import Delete from '@iconify-icons/ep/delete'; import EditPen from '@iconify-icons/ep/edit-pen'; import Refresh from '@iconify-icons/ep/refresh'; @@ -35,14 +35,6 @@ const onPageSizeChange = async (value: number) => { await onSearch(); }; -/** - * * 选择多行 - * @param rows - */ -const onSelectionChange = (rows: Array) => { - deleteIds.value = rows.map((row: any) => row.id); -}; - /** * 重置表单 * @param formEl @@ -88,11 +80,6 @@ onMounted(() => {