diff --git a/packages/core/pipeline/src/core/executor.ts b/packages/core/pipeline/src/core/executor.ts
index 06e2dae7..81e4f78d 100644
--- a/packages/core/pipeline/src/core/executor.ts
+++ b/packages/core/pipeline/src/core/executor.ts
@@ -352,6 +352,7 @@ export class Executor {
pipeline: this.pipeline,
runtime: this.runtime,
step,
+ define: cloneDeep(define),
lastStatus,
http,
download,
diff --git a/packages/core/pipeline/src/plugin/api.ts b/packages/core/pipeline/src/plugin/api.ts
index 2f49f5dc..4598a6a9 100644
--- a/packages/core/pipeline/src/plugin/api.ts
+++ b/packages/core/pipeline/src/plugin/api.ts
@@ -86,6 +86,7 @@ export type TaskInstanceContext = {
runtime: RunHistory;
//步骤定义
step: Step;
+ define: PluginDefine;
//日志
logger: ILogger;
//当前步骤输入参数跟上一次执行比较是否有变化
@@ -164,9 +165,7 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
this.registerSecret(cert.one);
}
- debugger
- // @ts-ignore
- if (this.ctx.step.onlyAdmin) {
+ if (this.ctx.define.onlyAdmin) {
if (!this.isAdmin()) {
throw new Error("只有管理员才能运行此任务");
}
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue
index fb87f334..97a1c858 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue
@@ -26,43 +26,45 @@
-
-
-
-
-
-
- 没有找到插件
-
-
-
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ 没有找到插件
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
@@ -124,6 +126,7 @@ import { useReference } from "/@/use/use-refrence";
import { useSettingStore } from "/@/store/settings";
import { mitter } from "/@/utils/util.mitt";
import { utils } from "/@/utils";
+import { useUserStore } from "/@/store/user";
defineOptions({
name: "PiStepForm",
@@ -138,7 +141,7 @@ const props = defineProps({
const emit = defineEmits(["update"]);
const pluginStore = usePluginStore();
-
+const userStore = useUserStore();
function transformDesc(desc: string = "") {
return utils.transformLink(desc);
}
diff --git a/packages/ui/certd-server/src/plugins/plugin-admin/plugin-restart.ts b/packages/ui/certd-server/src/plugins/plugin-admin/plugin-restart.ts
index 402eeec9..4a165947 100644
--- a/packages/ui/certd-server/src/plugins/plugin-admin/plugin-restart.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-admin/plugin-restart.ts
@@ -6,7 +6,7 @@ import { httpsServer } from '../../modules/auto/https/server.js';
title: '重启 Certd',
icon: 'mdi:restart',
desc: '【仅管理员可用】 重启 certd的https服务,用于更新 Certd 的 ssl 证书',
- group: pluginGroups.other.key,
+ group: pluginGroups.admin.key,
onlyAdmin:true,
default: {
strategy: {
diff --git a/packages/ui/certd-server/src/plugins/plugin-admin/plugin-script.ts b/packages/ui/certd-server/src/plugins/plugin-admin/plugin-script.ts
index 3d29d674..aa34667f 100644
--- a/packages/ui/certd-server/src/plugins/plugin-admin/plugin-script.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-admin/plugin-script.ts
@@ -11,7 +11,7 @@ export type CustomScriptContext = {
title: '自定义js脚本',
icon: 'ri:javascript-line',
desc: '【仅管理员】运行自定义js脚本执行',
- group: pluginGroups.other.key,
+ group: pluginGroups.admin.key,
showRunStrategy: true,
onlyAdmin: true,
default: {