mirror of https://github.com/certd/certd
chore:
parent
11a9fe9014
commit
854053e961
|
@ -92,34 +92,34 @@ export const sysResources = [
|
||||||
permission: "sys:settings:view"
|
permission: "sys:settings:view"
|
||||||
},
|
},
|
||||||
component: "/sys/site/index.vue"
|
component: "/sys/site/index.vue"
|
||||||
},
|
|
||||||
{
|
|
||||||
title: "商业版设置",
|
|
||||||
name: "SysCommercial",
|
|
||||||
meta: {
|
|
||||||
icon: "ion:document-text-outline",
|
|
||||||
permission: "sys:settings:view",
|
|
||||||
show: () => {
|
|
||||||
const settingStore = useSettingStore();
|
|
||||||
return settingStore.isComm;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
children: [
|
|
||||||
{
|
|
||||||
title: "套餐设置",
|
|
||||||
name: "suite",
|
|
||||||
path: "/sys/commercial/suite",
|
|
||||||
meta: {
|
|
||||||
icon: "ion:document-text-outline",
|
|
||||||
permission: "sys:settings:view",
|
|
||||||
show: () => {
|
|
||||||
const settingStore = useSettingStore();
|
|
||||||
return settingStore.isComm;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
// {
|
||||||
|
// title: "商业版设置",
|
||||||
|
// name: "SysCommercial",
|
||||||
|
// meta: {
|
||||||
|
// icon: "ion:document-text-outline",
|
||||||
|
// permission: "sys:settings:view",
|
||||||
|
// show: () => {
|
||||||
|
// const settingStore = useSettingStore();
|
||||||
|
// return settingStore.isComm;
|
||||||
|
// }
|
||||||
|
// },
|
||||||
|
// children: [
|
||||||
|
// {
|
||||||
|
// title: "套餐设置",
|
||||||
|
// name: "suite",
|
||||||
|
// path: "/sys/commercial/suite",
|
||||||
|
// meta: {
|
||||||
|
// icon: "ion:document-text-outline",
|
||||||
|
// permission: "sys:settings:view",
|
||||||
|
// show: () => {
|
||||||
|
// const settingStore = useSettingStore();
|
||||||
|
// return settingStore.isComm;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// ]
|
||||||
|
// }
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
@ -87,6 +87,7 @@ import { Modal } from "ant-design-vue";
|
||||||
import { CopyOutlined } from "@ant-design/icons-vue";
|
import { CopyOutlined } from "@ant-design/icons-vue";
|
||||||
import VDraggable from "vuedraggable";
|
import VDraggable from "vuedraggable";
|
||||||
import { useUserStore } from "/@/store/modules/user";
|
import { useUserStore } from "/@/store/modules/user";
|
||||||
|
import { useSettingStore } from "/@/store/modules/settings";
|
||||||
export default {
|
export default {
|
||||||
name: "PiTaskForm",
|
name: "PiTaskForm",
|
||||||
components: { CopyOutlined, PiStepForm, VDraggable },
|
components: { CopyOutlined, PiStepForm, VDraggable },
|
||||||
|
|
|
@ -266,6 +266,8 @@ import { PipelineDetail, PipelineOptions, PluginGroups, RunHistory } from "./typ
|
||||||
import type { Runnable } from "@certd/pipeline";
|
import type { Runnable } from "@certd/pipeline";
|
||||||
import PiHistoryTimelineItem from "/@/views/certd/pipeline/pipeline/component/history-timeline-item.vue";
|
import PiHistoryTimelineItem from "/@/views/certd/pipeline/pipeline/component/history-timeline-item.vue";
|
||||||
import { FsIcon } from "@fast-crud/fast-crud";
|
import { FsIcon } from "@fast-crud/fast-crud";
|
||||||
|
import { useSettingStore } from "/@/store/modules/settings";
|
||||||
|
import { useUserStore } from "/@/store/modules/user";
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
name: "PipelineEdit",
|
name: "PipelineEdit",
|
||||||
// eslint-disable-next-line vue/no-unused-components
|
// eslint-disable-next-line vue/no-unused-components
|
||||||
|
@ -676,11 +678,13 @@ export default defineComponent({
|
||||||
const useTaskRet = useTask();
|
const useTaskRet = useTask();
|
||||||
const useStageRet = useStage(useTaskRet);
|
const useStageRet = useStage(useTaskRet);
|
||||||
const settingStore = useSettingStore();
|
const settingStore = useSettingStore();
|
||||||
|
const userStore = useUserStore();
|
||||||
return {
|
return {
|
||||||
pipeline,
|
pipeline,
|
||||||
currentHistory,
|
currentHistory,
|
||||||
histories,
|
histories,
|
||||||
goBack,
|
goBack,
|
||||||
|
userStore,
|
||||||
settingStore,
|
settingStore,
|
||||||
...useTaskRet,
|
...useTaskRet,
|
||||||
...useStageRet,
|
...useStageRet,
|
||||||
|
|
|
@ -112,6 +112,9 @@ const formState = reactive<Partial<FormState>>({
|
||||||
|
|
||||||
async function load() {
|
async function load() {
|
||||||
const data: any = await api.SettingsGet(SettingKeys.Email);
|
const data: any = await api.SettingsGet(SettingKeys.Email);
|
||||||
|
if (!data?.setting) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
const setting = JSON.parse(data.setting);
|
const setting = JSON.parse(data.setting);
|
||||||
Object.assign(formState, setting);
|
Object.assign(formState, setting);
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<p class="d2-page-cover__sub-title">{{ siteInfo.slogan }}</p>
|
<p class="d2-page-cover__sub-title">{{ siteInfo.slogan }}</p>
|
||||||
<div v-if="siteInfo.warningOff !== false" class="warning">
|
<div v-if="siteInfo.warningOff !== true" class="warning">
|
||||||
<a-alert type="warning" show-icon>
|
<a-alert type="warning" show-icon>
|
||||||
<template #description>
|
<template #description>
|
||||||
<div class="flex">
|
<div class="flex">
|
||||||
|
|
Loading…
Reference in New Issue