github
/
halo-admin
mirror of https://github.com/halo-dev/halo-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

perf: refine ui permissions adapter 

Signed-off-by: Ryan Wang <i@ryanc.cc>
pull/636/head
Ryan Wang 2022-10-10 15:29:05 +08:00
parent b7389529d7
commit 655fae2669
12 changed files with 216 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

326
src/components/global-search/GlobalSearchModal.vue
View File

@ -15,10 +15,13 @@ import {
import { computed, markRaw, onMounted, ref, watch, type Component } from "vue";
import Fuse from "fuse.js";
import { apiClient } from "@/utils/api-client";
import { usePermission } from "@/utils/permission";
const router = useRouter();
const route = useRoute();
const { currentUserHasPermission } = usePermission();
const props = withDefaults(
defineProps<{
visible: boolean;
@ -74,200 +77,217 @@ const handleBuildSearchIndex = () => {
});
});
apiClient.extension.user.listv1alpha1User().then((response) => {
response.data.items.forEach((user) => {
fuse.add({
title: user.spec.displayName,
icon: {
component: markRaw(IconUserSettings),
},
group: "用户",
route: {
name: "UserDetail",
params: {
name: user.metadata.name,
},
},
});
});
});
apiClient.extension.plugin
.listpluginHaloRunV1alpha1Plugin()
.then((response) => {
response.data.items.forEach((plugin) => {
if (currentUserHasPermission(["system:users:view"])) {
apiClient.extension.user.listv1alpha1User().then((response) => {
response.data.items.forEach((user) => {
fuse.add({
title: plugin.spec.displayName as string,
title: user.spec.displayName,
icon: {
src: plugin.spec.logo as string,
component: markRaw(IconUserSettings),
},
group: "插件",
group: "用户",
route: {
name: "PluginDetail",
name: "UserDetail",
params: {
name: plugin.metadata.name,
name: user.metadata.name,
},
},
});
});
});
}
apiClient.extension.post.listcontentHaloRunV1alpha1Post().then((response) => {
response.data.items.forEach((post) => {
fuse.add({
title: post.spec.title,
icon: {
component: markRaw(IconBookRead),
},
group: "文章",
route: {
name: "PostEditor",
query: {
name: post.metadata.name,
},
},
if (currentUserHasPermission(["system:plugins:view"])) {
apiClient.extension.plugin
.listpluginHaloRunV1alpha1Plugin()
.then((response) => {
response.data.items.forEach((plugin) => {
fuse.add({
title: plugin.spec.displayName as string,
icon: {
src: plugin.spec.logo as string,
},
group: "插件",
route: {
name: "PluginDetail",
params: {
name: plugin.metadata.name,
},
},
});
});
});
});
});
}
apiClient.extension.category
.listcontentHaloRunV1alpha1Category()
.then((response) => {
response.data.items.forEach((category) => {
if (currentUserHasPermission(["system:posts:view"])) {
apiClient.extension.post
.listcontentHaloRunV1alpha1Post()
.then((response) => {
response.data.items.forEach((post) => {
fuse.add({
title: post.spec.title,
icon: {
component: markRaw(IconBookRead),
},
group: "文章",
route: {
name: "PostEditor",
query: {
name: post.metadata.name,
},
},
});
});
});
apiClient.extension.category
.listcontentHaloRunV1alpha1Category()
.then((response) => {
response.data.items.forEach((category) => {
fuse.add({
title: category.spec.displayName,
icon: {
component: markRaw(IconBookRead),
},
group: "分类",
route: {
name: "Categories",
query: {
name: category.metadata.name,
},
},
});
});
});
apiClient.extension.tag.listcontentHaloRunV1alpha1Tag().then((response) => {
response.data.items.forEach((tag) => {
fuse.add({
title: category.spec.displayName,
title: tag.spec.displayName,
icon: {
component: markRaw(IconBookRead),
},
group: "分类",
group: "标签",
route: {
name: "Categories",
name: "Tags",
query: {
name: category.metadata.name,
name: tag.metadata.name,
},
},
});
});
});
}
apiClient.extension.tag.listcontentHaloRunV1alpha1Tag().then((response) => {
response.data.items.forEach((tag) => {
fuse.add({
title: tag.spec.displayName,
icon: {
component: markRaw(IconBookRead),
},
group: "标签",
route: {
name: "Tags",
query: {
name: tag.metadata.name,
},
},
});
});
});
apiClient.extension.singlePage
.listcontentHaloRunV1alpha1SinglePage()
.then((response) => {
response.data.items.forEach((singlePage) => {
fuse.add({
title: singlePage.spec.title,
icon: {
component: markRaw(IconPages),
},
group: "自定义页面",
route: {
name: "SinglePageEditor",
query: {
name: singlePage.metadata.name,
if (currentUserHasPermission(["system:singlepages:view"])) {
apiClient.extension.singlePage
.listcontentHaloRunV1alpha1SinglePage()
.then((response) => {
response.data.items.forEach((singlePage) => {
fuse.add({
title: singlePage.spec.title,
icon: {
component: markRaw(IconPages),
},
},
group: "自定义页面",
route: {
name: "SinglePageEditor",
query: {
name: singlePage.metadata.name,
},
},
});
});
});
});
}
apiClient.extension.storage.attachment
.liststorageHaloRunV1alpha1Attachment()
.then((response) => {
response.data.items.forEach((attachment) => {
fuse.add({
title: attachment.spec.displayName as string,
icon: {
component: markRaw(IconFolder),
},
group: "附件",
route: {
name: "Attachments",
query: {
name: attachment.metadata.name,
if (currentUserHasPermission(["system:attachments:view"])) {
apiClient.extension.storage.attachment
.liststorageHaloRunV1alpha1Attachment()
.then((response) => {
response.data.items.forEach((attachment) => {
fuse.add({
title: attachment.spec.displayName as string,
icon: {
component: markRaw(IconFolder),
},
},
group: "附件",
route: {
name: "Attachments",
query: {
name: attachment.metadata.name,
},
},
});
});
});
});
}
apiClient.extension.setting
.getv1alpha1Setting({ name: "system" })
.then((response) => {
response.data.spec.forms.forEach((form) => {
fuse.add({
title: form.label as string,
icon: {
component: markRaw(IconSettings),
},
group: "设置",
route: {
name: "SystemSetting",
params: {
group: form.group,
if (
currentUserHasPermission(["system:settings:view"]) &&
currentUserHasPermission(["system:configmaps:view"])
) {
apiClient.extension.setting
.getv1alpha1Setting({ name: "system" })
.then((response) => {
response.data.spec.forms.forEach((form) => {
fuse.add({
title: form.label as string,
icon: {
component: markRaw(IconSettings),
},
},
group: "设置",
route: {
name: "SystemSetting",
params: {
group: form.group,
},
},
});
});
});
});
// get theme settings
apiClient.extension.configMap
.getv1alpha1ConfigMap({
name: "system",
})
.then(({ data: systemConfigMap }) => {
if (systemConfigMap.data?.theme) {
const themeConfig = JSON.parse(systemConfigMap.data.theme);
// get theme settings
apiClient.extension.configMap
.getv1alpha1ConfigMap({
name: "system",
})
.then(({ data: systemConfigMap }) => {
if (systemConfigMap.data?.theme) {
const themeConfig = JSON.parse(systemConfigMap.data.theme);
apiClient.extension.theme
.getthemeHaloRunV1alpha1Theme({
name: themeConfig.active,
})
.then(({ data: theme }) => {
if (theme && theme.spec.settingName) {
apiClient.extension.setting
.getv1alpha1Setting({
name: theme.spec.settingName,
})
.then(({ data: themeSettings }) => {
themeSettings.spec.forms.forEach((form) => {
fuse.add({
title: `${theme.spec.displayName} / ${form.label}`,
icon: {
component: markRaw(IconPalette),
},
group: "主题设置",
route: {
name: "ThemeSetting",
params: {
group: form.group,
apiClient.extension.theme
.getthemeHaloRunV1alpha1Theme({
name: themeConfig.active,
})
.then(({ data: theme }) => {
if (theme && theme.spec.settingName) {
apiClient.extension.setting
.getv1alpha1Setting({
name: theme.spec.settingName,
})
.then(({ data: themeSettings }) => {
themeSettings.spec.forms.forEach((form) => {
fuse.add({
title: `${theme.spec.displayName} / ${form.label}`,
icon: {
component: markRaw(IconPalette),
},
},
group: "主题设置",
route: {
name: "ThemeSetting",
params: {
group: form.group,
},
},
});
});
});
});
}
});
}
});
}
});
}
});
}
};
const handleKeydown = (e: KeyboardEvent) => {

8
src/modules/contents/posts/categories/components/CategoryListItem.vue
View File

@ -10,6 +10,9 @@ import Draggable from "vuedraggable";
import type { CategoryTree } from "../utils";
import { ref } from "vue";
import { formatDatetime } from "@/utils/date";
import { usePermission } from "@/utils/permission";
const { currentUserHasPermission } = usePermission();
withDefaults(
defineProps<{
@ -87,7 +90,10 @@ function onDelete(category: CategoryTree) {
</template>
</VEntityField>
</template>
<template #dropdownItems>
<template
v-if="currentUserHasPermission(['system:posts:manage'])"
#dropdownItems
>
<VButton
v-permission="['system:posts:manage']"
v-close-popper

8
src/modules/contents/posts/tags/TagList.vue
View File

@ -28,6 +28,9 @@ import { formatDatetime } from "@/utils/date";
import { useRouteQuery } from "@vueuse/router";
import { apiClient } from "@/utils/api-client";
import { usePermission } from "@/utils/permission";
const { currentUserHasPermission } = usePermission();
const viewTypes = [
{
@ -206,7 +209,10 @@ onMounted(async () => {
</template>
</VEntityField>
</template>
<template #dropdownItems>
<template
v-if="currentUserHasPermission(['system:posts:manage'])"
#dropdownItems
>
<VButton
v-permission="['system:posts:manage']"
v-close-popper

2
src/modules/interface/themes/ThemeSetting.vue
View File

@ -68,7 +68,7 @@ watch(
<FormKitSchema :schema="formSchema" />
</FormKit>
</div>
<div class="pt-5">
<div v-permission="['system:configmaps:manage']" class="pt-5">
<div class="flex justify-start">
<VButton
:loading="saving"

9
src/modules/interface/themes/layouts/ThemeLayout.vue
View File

@ -27,6 +27,9 @@ import {
} from "@halo-dev/components";
import ThemeListModal from "../components/ThemeListModal.vue";
import type { SettingForm, Theme } from "@halo-dev/api-client";
import { usePermission } from "@/utils/permission";
const { currentUserHasPermission } = usePermission();
interface ThemeTab {
id: string;
@ -83,6 +86,12 @@ watch(
if (selectedTheme.value) {
// reset tabs
tabs.value = cloneDeep(initialTabs);
if (!currentUserHasPermission(["system:settings:view"])) {
handleTriggerTabChange();
return;
}
await handleFetchSettings();
if (setting.value) {

2
src/modules/interface/themes/module.ts
View File

@ -29,7 +29,7 @@ export default definePlugin({
component: ThemeSetting,
meta: {
title: "主题设置",
permissions: ["system:themes:view"],
permissions: ["system:settings:view"],
},
},
],

5
src/modules/system/plugins/PluginList.vue
View File

@ -16,6 +16,9 @@ import PluginInstallModal from "./components/PluginInstallModal.vue";
import { onMounted, ref } from "vue";
import { apiClient } from "@/utils/api-client";
import type { PluginList } from "@halo-dev/api-client";
import { usePermission } from "@/utils/permission";
const { currentUserHasPermission } = usePermission();
const plugins = ref<PluginList>({
page: 1,
@ -119,8 +122,8 @@ function handleSortItemChange(sortItem?: SortItem) {
</script>
<template>
<PluginInstallModal
v-if="currentUserHasPermission(['system:plugins:manage'])"
v-model:visible="pluginInstall"
v-permission="['system:plugins:manage']"
@close="handleFetchPlugins"
/>

2
src/modules/system/plugins/PluginSetting.vue
View File

@ -77,7 +77,7 @@ await handleFetchPlugin();
<FormKitSchema :schema="formSchema" />
</FormKit>
</div>
<div class="pt-5">
<div v-permission="['system:configmaps:manage']" class="pt-5">
<div class="flex justify-start">
<VButton
:loading="saving"

9
src/modules/system/plugins/layouts/PluginLayout.vue
View File

@ -17,6 +17,9 @@ import { BasicLayout } from "@halo-dev/console-shared";
// types
import type { Ref } from "vue";
import type { Plugin, SettingForm } from "@halo-dev/api-client";
import { usePermission } from "@/utils/permission";
const { currentUserHasPermission } = usePermission();
interface PluginTab {
id: string;
@ -96,6 +99,12 @@ const handleTriggerTabChange = () => {
onMounted(async () => {
await handleFetchPlugin();
if (!currentUserHasPermission(["system:settings:view"])) {
handleTriggerTabChange();
return;
}
await handleFetchSettings();
tabs.value = cloneDeep(initialTabs);

2
src/modules/system/plugins/module.ts
View File

@ -43,6 +43,7 @@ export default definePlugin({
component: PluginDetail,
meta: {
title: "插件详情",
permissions: ["system:plugins:view"],
},
},
{
@ -51,6 +52,7 @@ export default definePlugin({
component: PluginSetting,
meta: {
title: "插件设置",
permissions: ["system:settings:view"],
},
},
],

2
src/modules/system/settings/SystemSetting.vue
View File

@ -48,7 +48,7 @@ await handleFetchConfigMap();
<FormKitSchema :schema="formSchema" />
</FormKit>
</div>
<div class="pt-5">
<div v-permission="['system:configmaps:manage']" class="pt-5">
<div class="flex justify-start">
<VButton
:loading="saving"

1
src/modules/system/settings/module.ts
View File

@ -18,6 +18,7 @@ export default definePlugin({
component: SystemSetting,
meta: {
title: "系统设置",
permissions: ["system:settings:view"],
},
},
],