From bc326489abc1d50a0930b4f47aa2d62d3a486798 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Sat, 28 Feb 2026 19:29:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E7=BA=BF=E4=BF=9D=E5=AD=98=E5=90=8E=E4=B8=A2?= =?UTF-8?q?=E5=A4=B1=E5=88=86=E7=BB=84=E5=92=8C=E6=8E=92=E5=BA=8F=E5=8F=B7?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/project-selector/index.vue | 2 +- .../plugin/permission/use-crud-permission.ts | 1 - .../src/router/source/modules/certd.ts | 9 ++++++++ .../src/router/source/modules/sys.ts | 22 ++++++++++++++++--- .../certd-client/src/store/project/index.ts | 5 +++-- .../src/views/certd/pipeline/crud.tsx | 5 +++-- .../pipeline/service/pipeline-service.ts | 1 + 7 files changed, 36 insertions(+), 9 deletions(-) diff --git a/packages/ui/certd-client/src/components/project-selector/index.vue b/packages/ui/certd-client/src/components/project-selector/index.vue index 1d6a30bd0..37139a6a2 100644 --- a/packages/ui/certd-client/src/components/project-selector/index.vue +++ b/packages/ui/certd-client/src/components/project-selector/index.vue @@ -35,7 +35,7 @@ defineOptions({ const projectStore = useProjectStore(); onMounted(async () => { - await projectStore.reload(); + await projectStore.init(); console.log(projectStore.myProjects); }); diff --git a/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts b/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts index 964921ee2..f19f582c8 100644 --- a/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts +++ b/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts @@ -82,7 +82,6 @@ export function useCrudPermission({ permission }: UseCrudPermissionProps) { if (isProjectPermission) { removePermission = per.projectPermission || "write"; } - debugger; return LodashMerge( { actionbar: { diff --git a/packages/ui/certd-client/src/router/source/modules/certd.ts b/packages/ui/certd-client/src/router/source/modules/certd.ts index 2bab1acf7..936733a8b 100644 --- a/packages/ui/certd-client/src/router/source/modules/certd.ts +++ b/packages/ui/certd-client/src/router/source/modules/certd.ts @@ -26,6 +26,7 @@ export const certdResources = [ isMenu: false, icon: "ion:apps", keepAlive: true, + auth: true, }, }, { @@ -40,6 +41,7 @@ export const certdResources = [ }, isMenu: true, icon: "ion:apps", + auth: true, }, }, { @@ -51,6 +53,7 @@ export const certdResources = [ isMenu: false, show: true, icon: "ion:apps", + auth: true, }, }, { @@ -61,6 +64,7 @@ export const certdResources = [ meta: { icon: "ion:analytics-sharp", keepAlive: true, + auth: true, }, }, { @@ -70,6 +74,7 @@ export const certdResources = [ component: "/certd/pipeline/detail.vue", meta: { isMenu: false, + auth: true, }, }, { @@ -80,6 +85,7 @@ export const certdResources = [ meta: { icon: "ion:timer-outline", keepAlive: true, + auth: true, }, }, { @@ -90,6 +96,7 @@ export const certdResources = [ meta: { isMenu: true, icon: "ion:duplicate-outline", + auth: true, }, }, { @@ -99,6 +106,7 @@ export const certdResources = [ component: "/certd/pipeline/template/edit.vue", meta: { isMenu: false, + auth: true, }, }, { @@ -108,6 +116,7 @@ export const certdResources = [ component: "/certd/pipeline/template/import/index.vue", meta: { isMenu: false, + auth: true, }, }, { diff --git a/packages/ui/certd-client/src/router/source/modules/sys.ts b/packages/ui/certd-client/src/router/source/modules/sys.ts index 7f22df52e..161ba44cd 100644 --- a/packages/ui/certd-client/src/router/source/modules/sys.ts +++ b/packages/ui/certd-client/src/router/source/modules/sys.ts @@ -1,7 +1,4 @@ -import LayoutPass from "/@/layout/layout-pass.vue"; import { useSettingStore } from "/@/store/settings"; -import aboutResource from "/@/router/source/modules/about"; -import i18n from "/@/locales/i18n"; export const sysResources = [ { @@ -13,6 +10,7 @@ export const sysResources = [ icon: "ion:settings-outline", permission: "sys:settings:view", order: 10, + auth: true, }, children: [ { @@ -27,6 +25,7 @@ export const sysResources = [ }, icon: "ion:speedometer-outline", permission: "sys:auth:user:view", + auth: true, }, }, @@ -38,6 +37,7 @@ export const sysResources = [ meta: { icon: "ion:settings-outline", permission: "sys:settings:view", + auth: true, }, }, { @@ -47,6 +47,7 @@ export const sysResources = [ component: "/sys/enterprise/project/index.vue", meta: { show: true, + auth: true, icon: "ion:apps", permission: "sys:settings:edit", keepAlive: true, @@ -60,6 +61,7 @@ export const sysResources = [ meta: { isMenu: false, show: true, + auth: true, icon: "ion:apps", permission: "sys:settings:edit", }, @@ -73,6 +75,7 @@ export const sysResources = [ icon: "ion:earth-outline", permission: "sys:settings:view", keepAlive: true, + auth: true, }, }, { @@ -96,6 +99,7 @@ export const sysResources = [ const settingStore = useSettingStore(); return settingStore.isComm; }, + auth: true, icon: "ion:document-text-outline", permission: "sys:settings:view", }, @@ -110,6 +114,7 @@ export const sysResources = [ const settingStore = useSettingStore(); return settingStore.isComm; }, + auth: true, icon: "ion:menu", permission: "sys:settings:view", keepAlive: true, @@ -125,6 +130,7 @@ export const sysResources = [ const settingStore = useSettingStore(); return settingStore.isComm; }, + auth: true, icon: "ion:disc-outline", permission: "sys:settings:view", keepAlive: true, @@ -139,6 +145,7 @@ export const sysResources = [ icon: "ion:extension-puzzle-outline", permission: "sys:settings:view", keepAlive: true, + auth: true, }, }, { @@ -151,6 +158,7 @@ export const sysResources = [ icon: "ion:extension-puzzle", permission: "sys:settings:view", keepAlive: true, + auth: true, }, }, { @@ -165,6 +173,7 @@ export const sysResources = [ }, icon: "ion:extension-puzzle", permission: "sys:settings:view", + auth: true, }, }, { @@ -176,6 +185,7 @@ export const sysResources = [ icon: "ion:golf-outline", permission: "sys:settings:view", keepAlive: true, + auth: true, }, }, { @@ -187,6 +197,7 @@ export const sysResources = [ icon: "ion:list-outline", permission: "sys:auth:per:view", keepAlive: true, + auth: true, }, }, { @@ -198,6 +209,7 @@ export const sysResources = [ icon: "ion:people-outline", permission: "sys:auth:role:view", keepAlive: true, + auth: true, }, }, { @@ -209,6 +221,7 @@ export const sysResources = [ icon: "ion:person-outline", permission: "sys:auth:user:view", keepAlive: true, + auth: true, }, }, { @@ -224,6 +237,7 @@ export const sysResources = [ return settingStore.isComm; }, keepAlive: true, + auth: true, }, children: [ { @@ -238,6 +252,7 @@ export const sysResources = [ }, icon: "ion:cart", permission: "sys:settings:edit", + auth: true, }, }, { @@ -253,6 +268,7 @@ export const sysResources = [ icon: "ion:bag-check", permission: "sys:settings:edit", keepAlive: true, + auth: true, }, }, { diff --git a/packages/ui/certd-client/src/store/project/index.ts b/packages/ui/certd-client/src/store/project/index.ts index 0627f8420..09c1bb967 100644 --- a/packages/ui/certd-client/src/store/project/index.ts +++ b/packages/ui/certd-client/src/store/project/index.ts @@ -17,7 +17,8 @@ export const useProjectStore = defineStore("app.project", () => { const inited = ref(false); const userStore = useUserStore(); const userId = userStore.getUserInfo?.id; - const lastProjectId = LocalStorage.get("currentProjectId:" + userId); + const lastProjectIdCacheKey = "currentProjectId:" + userId; + const lastProjectId = LocalStorage.get(lastProjectIdCacheKey); const currentProjectId = ref(lastProjectId); // 直接调用 const projects = computed(() => { @@ -63,7 +64,7 @@ export const useProjectStore = defineStore("app.project", () => { function changeCurrentProject(id: string, silent?: boolean) { currentProjectId.value = id; - LocalStorage.set("currentProjectId", id); + LocalStorage.set(lastProjectIdCacheKey, id); if (!silent) { message.success("切换项目成功"); } diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx index 028694b01..c69119847 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx +++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx @@ -50,6 +50,7 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply delete form.lastVars; delete form.createTime; delete form.id; + delete form.webhook; let pipeline = form.content; if (typeof pipeline === "string" && pipeline.startsWith("{")) { pipeline = JSON.parse(form.content); @@ -75,8 +76,8 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply function onDialogOpen(opt: any) { const searchForm = crudExpose.getSearchValidatedFormData(); opt.initialForm = { - ...opt.initialForm, groupId: searchForm.groupId, + ...opt.initialForm, }; } @@ -219,7 +220,7 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply row = info.pipeline; row.content = JSON.parse(row.content); row.title = row.title + "_copy"; - await crudExpose.openCopy({ + await crudExpose.openAdd({ row: row, index: context.index, }); diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts index 303bf981e..7eddef03f 100644 --- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts +++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts @@ -251,6 +251,7 @@ export class PipelineService extends BaseService { if (bean.id > 0) { //修改 old = await this.info(bean.id); + bean.order = old.order; } if (!old || !old.webhookKey) { bean.webhookKey = await this.genWebhookKey();