From d255a0bc7880ed0ae2ff34d37b96bedfaf32579d Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Tue, 24 Oct 2023 15:28:34 +0800
Subject: [PATCH] fix: bug#18263

---
 README.md                                 | 12 ++++++++++++
 package.json                              |  2 +-
 src/App.vue                               |  6 +++++-
 src/components/Layout/BasicLayoutPage.vue |  6 ++++--
 src/main.ts                               |  2 +-
 src/store/system.ts                       |  2 +-
 src/style.less                            |  6 +++---
 yarn.lock                                 |  8 ++++----
 8 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index d9709551..ee607b6f 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,18 @@ yarn dev:force
 
 此处可以更改系统名称、主题色、系统logo、浏览器页签等
 
+#### 主题色
+
+```javascript
+// src/App.vue
+
+ConfigProvider.config({
+  theme: {
+    primaryColor: "#315efb"
+  }
+})
+```
+
 #### 2.默认配置
 
 在代码根目录找到`config\config.ts`文件
diff --git a/package.json b/package.json
index e3ce16ae..d6fd157d 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "event-source-polyfill": "^1.0.31",
     "global": "^4.4.0",
     "jetlinks-store": "^0.0.3",
-    "jetlinks-ui-components": "^1.0.34",
+    "jetlinks-ui-components": "^1.0.34-2",
     "js-cookie": "^3.0.1",
     "jsencrypt": "^3.3.2",
     "less": "^4.1.3",
diff --git a/src/App.vue b/src/App.vue
index 8c6581c2..0c14af16 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -15,7 +15,11 @@ const system = useSystem();
 const {configInfo} = storeToRefs(system);
 
 system.setDocumentTitle()
-
+ConfigProvider.config({
+  theme: {
+    primaryColor: "#315efb"
+  }
+})
 </script>
 
 <style scoped>
diff --git a/src/components/Layout/BasicLayoutPage.vue b/src/components/Layout/BasicLayoutPage.vue
index d029fac1..d3be17e0 100644
--- a/src/components/Layout/BasicLayoutPage.vue
+++ b/src/components/Layout/BasicLayoutPage.vue
@@ -107,8 +107,6 @@ const jump = (item: any) => {
   router.push(item.path)
 }
 
-
-
 watchEffect(() => {
   if (router.currentRoute) {
     const paths = router.currentRoute.value.matched
@@ -116,6 +114,10 @@ watchEffect(() => {
     basicLayout.value.openKeys = paths.map(item => item.path)
     console.log(paths) //
   }
+
+  if (route.query?.layout === 'false') {
+    basicLayout.value.pure = true
+  }
 })
 
 const toDoc = () => window.open('http://doc.v2.jetlinks.cn/');
diff --git a/src/main.ts b/src/main.ts
index 4cc48040..4f371d2c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -4,7 +4,7 @@ import store from './store'
 import components from './components'
 import router from './router'
 import './style.less'
-
+import 'ant-design-vue/dist/antd.variable.min.css'
 import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
 dayjs.locale('zh-cn');
diff --git a/src/store/system.ts b/src/store/system.ts
index 97186d67..204a4298 100644
--- a/src/store/system.ts
+++ b/src/store/system.ts
@@ -89,4 +89,4 @@ export const useSystem = defineStore('system', {
             }
         }
     }
-})
\ No newline at end of file
+})
diff --git a/src/style.less b/src/style.less
index b119250d..bfd73195 100644
--- a/src/style.less
+++ b/src/style.less
@@ -30,9 +30,9 @@ body {
 
     .ant-pro-top-nav-header {
         .ant-menu-item {
-            padding: 0 10px !important;
-            &:not(:first-child) {
-                margin-left: 8px !important;
+            padding: 0 14px !important;
+            &:first-child {
+                padding: 0 10px !important;
             }
         }
     }
diff --git a/yarn.lock b/yarn.lock
index bdaf773a..ee9c801e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3738,10 +3738,10 @@ jetlinks-store@^0.0.3:
   resolved "https://registry.npmjs.org/jetlinks-store/-/jetlinks-store-0.0.3.tgz"
   integrity sha512-AZf/soh1hmmwjBZ00fr1emuMEydeReaI6IBTGByQYhTmK1Zd5pQAxC7WLek2snRAn/HHDgJfVz2hjditKThl6Q==
 
-jetlinks-ui-components@^1.0.34:
-  version "1.0.34"
-  resolved "https://registry.npmjs.org/jetlinks-ui-components/-/jetlinks-ui-components-1.0.34.tgz#e158f87cf626904fd97b63fa379dbea12dc0230f"
-  integrity sha512-1O41g3VYrwnHJ3AWCbfbTaq62B55EwLvOC9frbiF1y/Lf+GZBkK1D1R4+gFQF/pgDdonlZoaT5pE1mdZWXrfHQ==
+jetlinks-ui-components@^1.0.34-2:
+  version "1.0.34-2"
+  resolved "https://registry.npmjs.org/jetlinks-ui-components/-/jetlinks-ui-components-1.0.34-2.tgz#8acd9f5dd4e5baa89703391620c80545c60ea98d"
+  integrity sha512-Z8/TRoJut1CuGsXXkzUYwvmKdQ1FhvXc46uK308M76Ezv4iJIGphwt1ancqVst0+WRBWoG6ps2ZsBbqCSQB7Rg==
   dependencies:
     "@vueuse/core" "^9.12.0"
     "@vueuse/router" "^9.13.0"