Merge branch 'v2-dev' into v2_admin_mode

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 {