From 89686399f90058835435b92872fc236fac990148 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Fri, 8 Nov 2024 18:11:26 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E6=89=A7=E8=A1=8C=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E7=BA=BF=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/router/source/modules/sys.ts | 25 ++++++++++--------- .../src/views/certd/history/crud.tsx | 8 ++++-- .../src/views/certd/pipeline/detail.vue | 5 ++++ packages/ui/certd-server/.env.commdev.yaml | 11 ++------ 4 files changed, 26 insertions(+), 23 deletions(-) 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 8b6d8e63..7bf1870b 100644 --- a/packages/ui/certd-client/src/router/source/modules/sys.ts +++ b/packages/ui/certd-client/src/router/source/modules/sys.ts @@ -27,16 +27,7 @@ export const sysResources = [ permission: "sys:auth:user:view" } }, - { - title: "用户管理", - name: "UserManager", - path: "/sys/authority/user", - component: "/sys/authority/user/index.vue", - meta: { - icon: "ion:person-outline", - permission: "sys:auth:user:view" - } - }, + { title: "系统设置", name: "SysSettings", @@ -92,7 +83,7 @@ export const sysResources = [ const settingStore = useSettingStore(); return settingStore.isComm; }, - icon: "ion:document-text-outline", + icon: "ion:menu", permission: "sys:settings:view" } }, @@ -168,7 +159,17 @@ export const sysResources = [ icon: "ion:people-outline", permission: "sys:auth:role:view" } - } + }, + { + title: "用户管理", + name: "UserManager", + path: "/sys/authority/user", + component: "/sys/authority/user/index.vue", + meta: { + icon: "ion:person-outline", + permission: "sys:auth:user:view" + } + }, // { // title: "商业版设置", diff --git a/packages/ui/certd-client/src/views/certd/history/crud.tsx b/packages/ui/certd-client/src/views/certd/history/crud.tsx index 1898c38a..687e8e2e 100644 --- a/packages/ui/certd-client/src/views/certd/history/crud.tsx +++ b/packages/ui/certd-client/src/views/certd/history/crud.tsx @@ -128,7 +128,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat }, pipelineTitle: { title: "流水线名称", - type: "link", + type: "text", search: { show: true, component: { @@ -136,7 +136,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat } }, column: { - width: 300 + width: 300, + cellRender: ({ row, value }) => { + debugger; + return {value}; + } } }, createTime: { diff --git a/packages/ui/certd-client/src/views/certd/pipeline/detail.vue b/packages/ui/certd-client/src/views/certd/pipeline/detail.vue index 563ea67a..a8d346e3 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/detail.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/detail.vue @@ -15,6 +15,7 @@ import { useRoute } from "vue-router"; import { PipelineDetail, PipelineOptions, PluginGroups, RunHistory } from "./pipeline/type"; import { TourProps } from "ant-design-vue"; import { LocalStorage } from "/@/utils/util.storage"; +import { useUserStore } from "/@/store/modules/user"; defineOptions({ name: "PipelineDetail" @@ -124,7 +125,11 @@ function useTour() { const { tour, tourHandleOpen } = useTour(); +const userStore = useUserStore(); async function onLoaded(pipeline: PipelineDetail) { + if (pipeline.pipeline?.userId !== userStore.getUserInfo?.id) { + return; + } const count = LocalStorage.get("pipeline-count") ?? 0; if (count > 1) { return; diff --git a/packages/ui/certd-server/.env.commdev.yaml b/packages/ui/certd-server/.env.commdev.yaml index db01752f..e00e38bd 100644 --- a/packages/ui/certd-server/.env.commdev.yaml +++ b/packages/ui/certd-server/.env.commdev.yaml @@ -22,18 +22,11 @@ typeorm: default: database: './data/db-comm.sqlite' -#plus: -# server: -# baseUrls: ['https://api.ai.handsfree.work', 'https://api.ai.docmirror.cn'] + # -#account: -# server: -# baseUrl: 'https://ai.handsfree.work/subject' +#PLUS_SERVER_BASE_URL=http://127.0.0.1:11007 -plus: - server: - baseUrls: ['http://127.0.0.1:11007'] account: server: