Merge branch 'v2-dev' into v2_admin_mode

packages/ui/certd-client/src/components/plugins/common/api-test.vue

@@ -13,6 +13,7 @@
 import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
 import { ref, inject } from "vue";
 import { Form } from "ant-design-vue";
+import { getInputFromForm } from "./utils";
 
 defineOptions({
   name: "ApiTest",
@@ -45,13 +46,15 @@ const doTest = async () => {
   message.value = "";
   hasError.value = false;
   loading.value = true;
+  const { input, record } = getInputFromForm(form, pluginType);
   try {
     const res = await doRequest(
       {
         type: pluginType,
         typeName: form.type,
         action: props.action,
-        input: pluginType === "plugin" ? form.input : form,
+        input,
+        record,
       },
       {
         onError(err: any) {

packages/ui/certd-client/src/components/plugins/common/remote-auto-complete.vue

@@ -16,6 +16,7 @@
 import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
 import { defineComponent, inject, ref, useAttrs, watch, Ref } from "vue";
 import { PluginDefine } from "@certd/pipeline";
+import { getInputFromForm } from "./utils";
 
 defineOptions({
   name: "RemoteAutoComplete",
@@ -48,18 +49,6 @@ const message = ref("");
 const hasError = ref(false);
 const loading = ref(false);
 
-function getInputFromForm(form: any, pluginType: string) {
-  let input: any = {};
-  if (pluginType === "plugin") {
-    input = form?.input || {};
-  } else if (pluginType === "access") {
-    input = form?.access || {};
-  } else {
-    input = form || {};
-  }
-  return input;
-}
-
 const getOptions = async () => {
   if (loading.value) {
     return;
@@ -75,7 +64,7 @@ const getOptions = async () => {
   }
   const pluginType = getPluginType();
   const { form } = getScope();
-  const input = getInputFromForm(form, pluginType);
+  const { input, record } = getInputFromForm(form, pluginType);
   for (let key in define.input) {
     const inWatches = props.watches?.includes(key);
     const inputDefine = define.input[key];
@@ -99,6 +88,7 @@ const getOptions = async () => {
         action: props.action,
         input,
         data: {},
+        record,
       },
       {
         onError(err: any) {
@@ -140,7 +130,7 @@ watch(
   () => {
     const pluginType = getPluginType();
     const { form, key } = getScope();
-    const input = getInputFromForm(form, pluginType);
+    const { input, record } = getInputFromForm(form, pluginType);
     const watches: any = {};
     if (props.watches && props.watches.length > 0) {
       for (const key of props.watches) {

packages/ui/certd-client/src/components/plugins/common/remote-input.vue

@@ -9,6 +9,7 @@ import { doRequest } from "/@/components/plugins/lib";
 import { inject, ref, useAttrs } from "vue";
 import { useFormWrapper } from "@fast-crud/fast-crud";
 import { notification } from "ant-design-vue";
+import { getInputFromForm } from "./utils";
 
 defineOptions({
   name: "RemoteInput",
@@ -71,15 +72,18 @@ const doPluginFormSubmit = async (data: any) => {
   }
 
   loading.value = true;
+
   try {
     const pluginType = getPluginType();
     const { form } = getScope();
+    const { input, record } = getInputFromForm(form, pluginType);
     const res = await doRequest({
       type: pluginType,
       typeName: form.type,
       action: props.action,
-      input: pluginType === "plugin" ? form.input : form,
+      input,
       data: data,
+      record,
     });
     //获取返回值 填入到input中
     emit("update:modelValue", res);

packages/ui/certd-client/src/components/plugins/common/remote-select.vue

@@ -38,6 +38,7 @@
 import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
 import { defineComponent, inject, ref, useAttrs, watch, Ref } from "vue";
 import { PluginDefine } from "@certd/pipeline";
+import { getInputFromForm } from "./utils";
 
 defineOptions({
   name: "RemoteSelect",
@@ -79,17 +80,6 @@ const getPluginType: any = inject("get:plugin:type", () => {
   return "plugin";
 });
 
-function getInputFromForm(form: any, pluginType: string) {
-  let input: any = {};
-  if (pluginType === "plugin") {
-    input = form?.input || {};
-  } else if (pluginType === "access") {
-    input = form?.access || {};
-  } else {
-    input = form || {};
-  }
-  return input;
-}
 const searchKeyRef = ref("");
 const optionsRef = ref([]);
 const message = ref("");
@@ -115,7 +105,7 @@ const getOptions = async () => {
   }
   const pluginType = getPluginType();
   const { form } = getScope();
-  const input = getInputFromForm(form, pluginType);
+  const { input, record } = getInputFromForm(form, pluginType);
 
   for (let key in define.input) {
     const inWatches = props.watches?.includes(key);
@@ -141,6 +131,7 @@ const getOptions = async () => {
         typeName: form.type,
         action: props.action,
         input,
+        record,
         data: {
           searchKey: props.search ? searchKeyRef.value : "",
           pageNo,
@@ -211,7 +202,7 @@ watch(
   () => {
     const pluginType = getPluginType();
     const { form, key } = getScope();
-    const input = getInputFromForm(form, pluginType);
+    const { input, record } = getInputFromForm(form, pluginType);
     const watches: any = {};
     if (props.watches && props.watches.length > 0) {
       for (const key of props.watches) {

packages/ui/certd-client/src/components/plugins/common/remote-tree-select.vue

@@ -15,6 +15,7 @@
 import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
 import { defineComponent, inject, ref, useAttrs, watch, Ref } from "vue";
 import { PluginDefine } from "@certd/pipeline";
+import { getInputFromForm } from "./utils";
 
 defineOptions({
   name: "RemoteTreeSelect",
@@ -67,7 +68,7 @@ const getOptions = async () => {
   }
   const pluginType = getPluginType();
   const { form } = getScope();
-  const input = (pluginType === "plugin" ? form?.input : form) || {};
+  const { input, record } = getInputFromForm(form, pluginType);
 
   for (let key in define.input) {
     const inWatches = props.watches?.includes(key);
@@ -98,6 +99,7 @@ const getOptions = async () => {
           pageNo,
           pageSize,
         },
+        record,
       },
       {
         onError(err: any) {

packages/ui/certd-client/src/components/plugins/common/utils.ts

@@ -0,0 +1,26 @@
+import { cloneDeep } from "lodash-es";
+
+export function getInputFromForm(form: any, pluginType: string) {
+  form = cloneDeep(form);
+  let input: any = {};
+  const record: any = form;
+  if (pluginType === "plugin") {
+    input = form?.input || {};
+    delete form.input;
+  } else if (pluginType === "access") {
+    input = form?.access || {};
+    delete form.access;
+  } else if (pluginType === "notification") {
+    input = form?.body || {};
+    delete form.body;
+  } else if (pluginType === "addon") {
+    input = form?.body || {};
+    delete form.body;
+  } else {
+    throw new Error(`pluginType ${pluginType} not support`);
+  }
+  return {
+    input,
+    record,
+  };
+}

packages/ui/certd-client/src/components/plugins/lib/dicts.ts

@@ -20,6 +20,7 @@ export const Dicts = {
   uploaderTypeDict: dict({
     data: [
       { label: "SFTP", value: "sftp" },
+      { label: "SCP", value: "scp" },
       { label: "FTP", value: "ftp" },
       { label: "阿里云OSS", value: "alioss" },
       { label: "腾讯云COS", value: "tencentcos" },

packages/ui/certd-client/src/components/plugins/lib/index.ts

@@ -12,11 +12,12 @@ export type RequestHandleReq<T = any> = {
   action: string;
   data?: any;
   input: T;
+  record?: any;
 };
 
 export async function doRequest(req: RequestHandleReq, opts: any = {}) {
   const url = `/pi/handle/${req.type}`;
-  const { typeName, action, data, input } = req;
+  const { typeName, action, data, input, record } = req;
   const res = await request({
     url,
     method: "post",
@@ -25,6 +26,7 @@ export async function doRequest(req: RequestHandleReq, opts: any = {}) {
       action,
       data,
       input,
+      record,
     },
     ...opts,
   });

packages/ui/certd-client/src/locales/langs/en-US/certd.ts

@@ -160,6 +160,7 @@ export default {
     updateTime: "Update Time",
     triggerType: "Trigger Type",
     pipelineId: "Pipeline Id",
+    nextRunTime: "Next Run Time",
     projectName: "Project",
     adminId: "Admin",
   },

packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts

@@ -167,6 +167,7 @@ export default {
     updateTime: "更新时间",
     triggerType: "触发类型",
     pipelineId: "流水线Id",
+    nextRunTime: "下次运行时间",
     projectName: "项目",
     adminId: "管理员",
   },

packages/ui/certd-client/src/style/certd.less

@@ -117,3 +117,4 @@ span.fs-icon-svg {
     margin: 0 !important;
   }
 }
+

packages/ui/certd-client/src/style/common.less

@@ -5,6 +5,7 @@
 @import "./fix-windicss.less";
 @import "./antdv4.less";
 @import "./certd.less";
+@import "./dark.less";
 
 html,
 body {

packages/ui/certd-client/src/style/dark.less

@@ -0,0 +1,7 @@
+.dark{
+  .fs-page-header{
+    .title {
+        color: #d5d5d5 !important;
+      }
+    }
+}

packages/ui/certd-client/src/vben/preferences/config.ts

@@ -94,7 +94,7 @@ const defaultPreferences: Preferences = {
     colorPrimary: "hsl(212 100% 45%)",
     colorSuccess: "hsl(144 57% 58%)",
     colorWarning: "hsl(42 84% 61%)",
-    mode: "light",
+    mode: "auto",
     radius: "0.5",
     semiDarkHeader: false,
     semiDarkSidebar: false,

packages/ui/certd-client/src/views/certd/access/common.tsx

@@ -67,7 +67,10 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
         set(form, key, column.value);
       }
       //字段配置赋值
-      columnsRef.value[key] = column;
+      if (columnsRef.value) {
+        columnsRef.value[key] = column;
+      }
+
       console.log("form", columnsRef.value);
     });
   }

packages/ui/certd-client/src/views/certd/monitor/site/setting/index.vue

@@ -25,7 +25,7 @@
         </a-form-item>
         <a-form-item :label="t('certd.monitor.setting.dnsServer')" :name="['dnsServer']">
           <div class="flex">
-            <a-select v-model:value="formState.dnsServer" mode="tags" :open="false" />
+            <a-select v-model:value="formState.dnsServer" :token-separators="[' ', ',', '，', '、', '|']" mode="tags" :open="false" />
           </div>
           <div class="helper">{{ t("certd.monitor.setting.dnsServerHelper") }}</div>
         </a-form-item>
@@ -75,7 +75,7 @@ async function loadUserSettings() {
 
 loadUserSettings();
 const doSave = async (form: any) => {
-  await utils.sleep(1);
+  await utils.sleep(300);
   await api.SiteMonitorSettingsSave({
     ...formState,
   });

packages/ui/certd-client/src/views/certd/pipeline/crud.tsx

@@ -358,6 +358,7 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
           column: {
             align: "center",
             width: 120,
+            show: false,
             sorter: true,
           },
           form: {
@@ -471,6 +472,18 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
             align: "center",
           },
         },
+        nextRunTime: {
+          title: t("certd.fields.nextRunTime"),
+          type: "datetime",
+          form: {
+            show: false,
+          },
+          column: {
+            sorter: true,
+            width: 150,
+            align: "center",
+          },
+        },
         disabled: {
           title: t("certd.fields.enabled"),
           type: "dict-switch",

packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue

@@ -885,6 +885,7 @@ export default defineComponent({
           saveLoading.value = false;
         }
       };
+
       const edit = () => {
         pipeline.value = cloneDeep(currentPipeline.value);
         currentHistory.value = null;

packages/ui/certd-client/src/views/certd/pipeline/template/edit.vue

@@ -36,7 +36,7 @@
           <a-collapse v-if="detail?.template?.pipelineId > 0" v-model:active-key="activeKey">
             <a-collapse-panel v-for="(step, stepId) in steps" :key="stepId" class="step-item" :header="step.title">
               <div class="step-inputs flex flex-wrap">
-                <div v-for="(input, key) of step.input" :key="key" class="hover:bg-gray-100 p-5 w-full xl:w-[50%]">
+                <div v-for="(input, key) of step.input" :key="key" class="hover:bg-gray-100 dark:hover:bg-[#2d2d2d] p-5 w-full xl:w-[50%]">
                   <div class="flex flex-between" :title="input.define.helper">
                     <div class="flex flex-1 overflow-hidden mr-5">
                       <span style="min-width: 140px" class="bas">

packages/ui/certd-client/src/views/certd/pipeline/template/form.vue

@@ -7,7 +7,7 @@
 </template>
 <script setup lang="ts">
 import { get, set } from "lodash-es";
-import { computed, reactive, ref, defineProps } from "vue";
+import { computed, reactive, ref } from "vue";
 import { useStepHelper } from "./utils";
 import { usePluginStore } from "/@/store/plugin";
 

packages/ui/certd-client/src/views/sys/nettest/DomainTestCard.vue

@@ -221,14 +221,12 @@ onMounted(() => {
   border: 1px solid #e8e8e8;
   border-radius: 4px;
   overflow: hidden;
-  background-color: #fff;
 
   .card-header {
     display: flex;
     justify-content: space-between;
     align-items: center;
     padding: 12px 16px;
-    background-color: #fafafa;
     border-bottom: 1px solid #e8e8e8;
   }
 
@@ -245,13 +243,11 @@ onMounted(() => {
   .input-form {
     margin-bottom: 12px;
     padding: 12px;
-    background-color: #fafafa;
     border-radius: 4px;
   }
 
   .domain-info {
     padding: 5.5px 12px;
-    background-color: #f0f0f0;
     border-radius: 4px;
     display: flex;
     gap: 16px;
@@ -272,7 +268,6 @@ onMounted(() => {
   .summary {
     margin-top: 16px;
     padding: 12px;
-    background-color: #f8f9fa;
     border-radius: 4px;
     .summary-text {
     }

packages/ui/certd-client/src/views/sys/nettest/ServerInfoCard.vue

@@ -110,7 +110,6 @@ onMounted(() => {
   }
 
   .info-item {
-    background-color: #fafafa;
     border-radius: 4px;
     padding: 12px;
 

packages/ui/certd-client/src/views/sys/nettest/TestCase.vue

@@ -138,7 +138,6 @@ const resultError = computed(() => {
 .port-info {
   font-size: 12px;
   color: #999;
-  background-color: #f0f0f0;
   padding: 2px 6px;
   border-radius: 3px;
   margin-right: 8px;
@@ -154,7 +153,6 @@ const resultError = computed(() => {
   .error-message,
   .object-result,
   .text-result {
-    background-color: #f8f8f8;
     padding: 8px 10px;
     border-radius: 3px;
     overflow-x: auto;
@@ -170,7 +168,6 @@ const resultError = computed(() => {
   }
 
   .test-log {
-    background-color: #f8f8f8;
     padding: 8px 10px;
     border-radius: 3px;
     overflow-x: auto;

packages/ui/certd-client/src/views/sys/nettest/index.vue

@@ -30,7 +30,6 @@ import ServerInfoCard from "./ServerInfoCard.vue";
 .page-sys-nettest {
   .nettest-container {
     padding: 16px;
-    background-color: #fff;
   }
 
   .test-areas {