From 854053e96117736b3a1ea4e0e10a26c2e14ce26b Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sat, 5 Oct 2024 01:54:01 +0800
Subject: [PATCH] chore:

---
 .../src/router/source/modules/sys.ts          | 54 +++++++++----------
 .../pipeline/component/task-form/index.vue    |  1 +
 .../views/certd/pipeline/pipeline/index.vue   |  4 ++
 .../views/certd/settings/email-setting.vue    |  3 ++
 .../views/framework/home/content/index.vue    |  2 +-
 5 files changed, 36 insertions(+), 28 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 0b4b68f36..fb7f72e9b 100644
--- a/packages/ui/certd-client/src/router/source/modules/sys.ts
+++ b/packages/ui/certd-client/src/router/source/modules/sys.ts
@@ -92,34 +92,34 @@ export const sysResources = [
           permission: "sys:settings:view"
         },
         component: "/sys/site/index.vue"
-      },
-      {
-        title: "商业版设置",
-        name: "SysCommercial",
-        meta: {
-          icon: "ion:document-text-outline",
-          permission: "sys:settings:view",
-          show: () => {
-            const settingStore = useSettingStore();
-            return settingStore.isComm;
-          }
-        },
-        children: [
-          {
-            title: "套餐设置",
-            name: "suite",
-            path: "/sys/commercial/suite",
-            meta: {
-              icon: "ion:document-text-outline",
-              permission: "sys:settings:view",
-              show: () => {
-                const settingStore = useSettingStore();
-                return settingStore.isComm;
-              }
-            }
-          }
-        ]
       }
+      // {
+      //   title: "商业版设置",
+      //   name: "SysCommercial",
+      //   meta: {
+      //     icon: "ion:document-text-outline",
+      //     permission: "sys:settings:view",
+      //     show: () => {
+      //       const settingStore = useSettingStore();
+      //       return settingStore.isComm;
+      //     }
+      //   },
+      //   children: [
+      //     {
+      //       title: "套餐设置",
+      //       name: "suite",
+      //       path: "/sys/commercial/suite",
+      //       meta: {
+      //         icon: "ion:document-text-outline",
+      //         permission: "sys:settings:view",
+      //         show: () => {
+      //           const settingStore = useSettingStore();
+      //           return settingStore.isComm;
+      //         }
+      //       }
+      //     }
+      //   ]
+      // }
     ]
   }
 ];
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-form/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-form/index.vue
index c8b66cd3a..d1f36be8e 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-form/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-form/index.vue
@@ -87,6 +87,7 @@ import { Modal } from "ant-design-vue";
 import { CopyOutlined } from "@ant-design/icons-vue";
 import VDraggable from "vuedraggable";
 import { useUserStore } from "/@/store/modules/user";
+import { useSettingStore } from "/@/store/modules/settings";
 export default {
   name: "PiTaskForm",
   components: { CopyOutlined, PiStepForm, VDraggable },
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue
index 166b52990..cf44f5dd1 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue
@@ -266,6 +266,8 @@ import { PipelineDetail, PipelineOptions, PluginGroups, RunHistory } from "./typ
 import type { Runnable } from "@certd/pipeline";
 import PiHistoryTimelineItem from "/@/views/certd/pipeline/pipeline/component/history-timeline-item.vue";
 import { FsIcon } from "@fast-crud/fast-crud";
+import { useSettingStore } from "/@/store/modules/settings";
+import { useUserStore } from "/@/store/modules/user";
 export default defineComponent({
   name: "PipelineEdit",
   // eslint-disable-next-line vue/no-unused-components
@@ -676,11 +678,13 @@ export default defineComponent({
     const useTaskRet = useTask();
     const useStageRet = useStage(useTaskRet);
     const settingStore = useSettingStore();
+    const userStore = useUserStore();
     return {
       pipeline,
       currentHistory,
       histories,
       goBack,
+      userStore,
       settingStore,
       ...useTaskRet,
       ...useStageRet,
diff --git a/packages/ui/certd-client/src/views/certd/settings/email-setting.vue b/packages/ui/certd-client/src/views/certd/settings/email-setting.vue
index f12063ca1..9eba0d70c 100644
--- a/packages/ui/certd-client/src/views/certd/settings/email-setting.vue
+++ b/packages/ui/certd-client/src/views/certd/settings/email-setting.vue
@@ -112,6 +112,9 @@ const formState = reactive<Partial<FormState>>({
 
 async function load() {
   const data: any = await api.SettingsGet(SettingKeys.Email);
+  if (!data?.setting) {
+    return;
+  }
   const setting = JSON.parse(data.setting);
   Object.assign(formState, setting);
 }
diff --git a/packages/ui/certd-client/src/views/framework/home/content/index.vue b/packages/ui/certd-client/src/views/framework/home/content/index.vue
index a6b09bf34..46b4175b5 100644
--- a/packages/ui/certd-client/src/views/framework/home/content/index.vue
+++ b/packages/ui/certd-client/src/views/framework/home/content/index.vue
@@ -6,7 +6,7 @@
       </div>
     </div>
     <p class="d2-page-cover__sub-title">{{ siteInfo.slogan }}</p>
-    <div v-if="siteInfo.warningOff !== false" class="warning">
+    <div v-if="siteInfo.warningOff !== true" class="warning">
       <a-alert type="warning" show-icon>
         <template #description>
           <div class="flex">