Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev

This commit is contained in:
JiangQiming 2023-03-15 15:46:03 +08:00
commit 2aeaae3a50
1 changed files with 9 additions and 9 deletions

View File

@ -190,7 +190,7 @@ import { useMenuStore } from '@/store/menu';
import { message } from 'ant-design-vue'; import { message } from 'ant-design-vue';
const menuStory = useMenuStore(); const menuStory = useMenuStore();
const permission = 'system/User'; const permission = 'system/Apply';
const typeOptions = [ const typeOptions = [
{ {
label: '内部独立应用', label: '内部独立应用',
@ -312,7 +312,7 @@ const table = {
const result = [ const result = [
{ {
permission: true, permission: `${permission}:update`,
key: 'edit', key: 'edit',
text: '编辑', text: '编辑',
tooltip: { tooltip: {
@ -322,7 +322,7 @@ const table = {
onClick: () => table.toSave(data.id), onClick: () => table.toSave(data.id),
}, },
{ {
permission: true, permission: `${permission}:update`,
key: 'action', key: 'action',
text: disabled ? '禁用' : '启用', text: disabled ? '禁用' : '启用',
tooltip: { tooltip: {
@ -335,7 +335,7 @@ const table = {
icon: disabled ? 'StopOutlined' : 'PlayCircleOutlined', icon: disabled ? 'StopOutlined' : 'PlayCircleOutlined',
}, },
{ {
permission: true, permission: `${permission}:delete`,
key: 'delete', key: 'delete',
text: '删除', text: '删除',
tooltip: { tooltip: {
@ -348,7 +348,7 @@ const table = {
disabled, disabled,
icon: 'DeleteOutlined', icon: 'DeleteOutlined',
}, },
] as ActionsType[]; ] as any[];
const otherServers = data.integrationModes.map( const otherServers = data.integrationModes.map(
(item: any) => item.value as string, (item: any) => item.value as string,
); );
@ -356,12 +356,12 @@ const table = {
key: 'others', key: 'others',
text: '其他', text: '其他',
icon: 'EllipsisOutlined', icon: 'EllipsisOutlined',
children: [] as ActionsType[], children: [] as any[],
}; };
// //
if (otherServers.includes('page')) if (otherServers.includes('page'))
others.children?.push({ others.children?.push({
permission: true, permission: [`${permission}:add`,`${permission}:update`],
key: 'page', key: 'page',
text: '集成菜单', text: '集成菜单',
tooltip: { tooltip: {
@ -378,7 +378,7 @@ const table = {
if (otherServers.includes('apiServer')) if (otherServers.includes('apiServer'))
others.children?.push( others.children?.push(
{ {
permission: true, permission: [`${permission}:add`,`${permission}:update`],
key: 'empowerment', key: 'empowerment',
text: '赋权', text: '赋权',
tooltip: { tooltip: {
@ -394,7 +394,7 @@ const table = {
}, },
}, },
{ {
permission: true, permission: [`${permission}:add`,`${permission}:update`],
key: 'viewApi', key: 'viewApi',
text: '查看API', text: '查看API',
tooltip: { tooltip: {