From a4e0855f0a90dd500a5ca53633de1638b19d49dd Mon Sep 17 00:00:00 2001
From: zhuoda <zhuoluodada@qq.com>
Date: Sun, 5 May 2024 20:42:49 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90v3.4.0=E3=80=91=201=E3=80=81=E3=80=90?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=91=E9=A1=B5=E9=9D=A2=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E5=9C=86=E8=A7=92=E5=8F=AF=E9=85=8D=E7=BD=AE=E5=8C=96=EF=BC=9B?=
 =?UTF-8?q?2=E3=80=81=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E5=BF=83=E7=81=B5=E9=B8=A1=E6=B1=A4=E8=AF=AD=E5=BD=95?=
 =?UTF-8?q?=EF=BC=9B3=E3=80=81=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=85=AC=E5=8F=B8=E4=BF=A1=E6=81=AF=E5=86=99?=
 =?UTF-8?q?=E6=B3=95=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../javascript-ant-design-vue3/src/App.vue    | 17 +++++++++-----
 .../src/config/app-config.js                  |  2 ++
 .../src/i18n/lang/en-US/index.js              |  1 +
 .../src/i18n/lang/zh-CN/index.js              |  1 +
 .../header-user-space/header-setting.vue      | 22 ++++++++++++++-----
 .../src/layout/components/page-tag/index.vue  |  4 +++-
 .../components/side-expand-menu/top-menu.vue  | 14 ++++++------
 .../src/layout/components/side-menu/index.vue |  4 ++--
 .../layout/components/smart-footer/index.vue  | 15 +++++++------
 .../src/layout/components/top-menu/index.vue  | 16 +++++++-------
 .../src/views/system/home/heart-sentence.js   | 19 ++++++++--------
 11 files changed, 68 insertions(+), 47 deletions(-)

diff --git a/smart-admin-web/javascript-ant-design-vue3/src/App.vue b/smart-admin-web/javascript-ant-design-vue3/src/App.vue
index fe95e80e..3c7370f7 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/App.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/App.vue
@@ -1,11 +1,11 @@
 <!--
   * 主应用页面
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-12 23:46:47 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-12 23:46:47
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 
 <template>
@@ -19,6 +19,7 @@
         colorLinkActive: themeColors[colorIndex].activeColor,
         colorLinkHover: themeColors[colorIndex].hoverColor,
         colorIcon: themeColors[colorIndex].primaryColor,
+        borderRadius: borderRadius,
       },
       components: {
         Button: {
@@ -62,4 +63,8 @@
   const colorIndex = computed(() => {
     return useAppConfigStore().colorIndex;
   });
+  // 圆角
+  const borderRadius = computed(() => {
+    return useAppConfigStore().borderRadius;
+  });
 </script>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/config/app-config.js b/smart-admin-web/javascript-ant-design-vue3/src/config/app-config.js
index b8cef028..8d967df4 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/config/app-config.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/config/app-config.js
@@ -20,6 +20,8 @@ export const appDefaultConfig = {
   colorIndex: 0,
   // 顶部菜单页面宽度
   pageWidth: '99%',
+  // 圆角
+  borderRadius: 6,
   // 标签页
   pageTagFlag: true,
   // 面包屑
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/i18n/lang/en-US/index.js b/smart-admin-web/javascript-ant-design-vue3/src/i18n/lang/en-US/index.js
index 57e118b9..6d4a3eb7 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/i18n/lang/en-US/index.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/i18n/lang/en-US/index.js
@@ -19,6 +19,7 @@ export default {
   'setting.menu.width': 'Menu Width',
   'setting.menu.theme': 'Menu Theme',
   'setting.page.width': 'Page Width',
+  'setting.border.radius': 'Border Radius',
   'setting.compact': 'Page Compact',
   'setting.bread': 'Show Bread',
   'setting.pagetag': 'Show PageTag',
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/i18n/lang/zh-CN/index.js b/smart-admin-web/javascript-ant-design-vue3/src/i18n/lang/zh-CN/index.js
index aed86b1e..28b2e2a9 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/i18n/lang/zh-CN/index.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/i18n/lang/zh-CN/index.js
@@ -19,6 +19,7 @@ export default {
   'setting.menu.width': '菜单宽度',
   'setting.menu.theme': '菜单主题',
   'setting.compact': '页面紧凑',
+  'setting.border.radius': '页面圆角',
   'setting.page.width': '页面宽度',
   'setting.bread': '面包屑',
   'setting.pagetag': '标签页',
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue
index c3f8e57a..f0c57f4c 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue
@@ -1,11 +1,11 @@
 <!--
   * 设置模块
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-06 20:18:20 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:18:20
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 
 <template>
@@ -35,6 +35,9 @@
           </template>
         </div>
       </a-form-item>
+      <a-form-item :label="$t('setting.border.radius')">
+        <a-slider v-model:value="formState.borderRadius" :min="0" :max="6" @change="changeBorderRadius" />
+      </a-form-item>
       <a-form-item :label="$t('setting.compact')">
         <a-radio-group v-model:value="formState.compactFlag" button-style="solid" @change="changeCompactFlag">
           <a-radio-button :value="false">默认</a-radio-button>
@@ -169,6 +172,8 @@
     sideMenuTheme: appConfigStore.sideMenuTheme,
     // 页面紧凑
     compactFlag: appConfigStore.compactFlag,
+    // 页面圆角
+    borderRadius: appConfigStore.borderRadius,
     // 标签页
     pageTagFlag: appConfigStore.pageTagFlag,
     // 面包屑
@@ -227,6 +232,11 @@
       compactFlag: e.target.value,
     });
   }
+  function changeBorderRadius(e) {
+    appConfigStore.$patch({
+      borderRadius: e,
+    });
+  }
 
   function changeBreadCrumbFlag(e) {
     appConfigStore.$patch({
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/index.vue
index e34147c1..2ca50430 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/index.vue
@@ -130,7 +130,9 @@
 
   const { useToken } = theme;
   const { token } = useToken();
-  const borderRadius = token.value.borderRadius + 'px';
+  const borderRadius = computed(() => {
+    return token.value.borderRadius + 'px';
+  });
 </script>
 
 <style scoped lang="less">
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/top-menu.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/top-menu.vue
index 95107f9d..78dad471 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/top-menu.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/top-menu.vue
@@ -1,18 +1,18 @@
 <!--
   * 第一列菜单
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-06 20:29:12 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:29:12
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <div class="top-menu-container">
     <!-- 顶部logo区域 -->
     <div class="logo" @click="onGoHome">
       <img class="logo-img" :src="logoImg" />
-      <div class="title">{{ websiteName }}</div>
+      <div class="title smart-logo">{{ websiteName }}</div>
     </div>
     <!-- 一级菜单展示 -->
     <a-menu :selectedKeys="selectedKeys" mode="inline" :theme="theme">
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-menu/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-menu/index.vue
index 8bfd6487..39c69cf8 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-menu/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-menu/index.vue
@@ -13,8 +13,8 @@
   <!-- 1、顶部logo区域 -->
   <div class="logo" @click="onGoHome" :style="sideMenuWidth" v-if="!collapsed">
     <img class="logo-img" :src="logoImg" />
-    <div class="title title-light" v-if="sideMenuTheme === 'light'">{{ websiteName }}</div>
-    <div class="title title-dark" v-if="sideMenuTheme === 'dark'">{{ websiteName }}</div>
+    <div class="title smart-logo title-light" v-if="sideMenuTheme === 'light'">{{ websiteName }}</div>
+    <div class="title smart-logo title-dark" v-if="sideMenuTheme === 'dark'">{{ websiteName }}</div>
   </div>
   <div class="min-logo" @click="onGoHome" v-if="collapsed">
     <img class="logo-img" :src="logoImg" />
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/smart-footer/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/smart-footer/index.vue
index 731daaef..ea954358 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/smart-footer/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/smart-footer/index.vue
@@ -1,15 +1,16 @@
 <!--
   * 底部：版权、公司等信息
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-06 20:29:12 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:29:12
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <div class="version">
-    <a target="_blank" href="javascript:void(0)"> SmartAdmin V3.x @copyright 河南·洛阳【1024创新实验室】 Since 2012-{{ currentYear }} </a>
+    <a target="_blank" class="smart-copyright" href="https://www.1024lab.net"> ©2012-{{ currentYear }} 河南·洛阳「1024创新实验室」 SmartAdmin </a>
+    <a target="_blank" class="smart-version" href="https://smartadmin.vip/views/other/change-log.html"> V3.4.0 </a>
   </div>
 </template>
 <script setup>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/top-menu/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/top-menu/index.vue
index b79681cb..af3d9b91 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/top-menu/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/top-menu/index.vue
@@ -1,11 +1,11 @@
 <!--
   * 顶部菜单
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-06 20:29:12 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:29:12
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <!--总共3部分：1、logo区域，包含 logo和名称; 2、菜单区域  ;3、用户操作区域-->
@@ -13,8 +13,8 @@
     <!-- 1、logo区域 -->
     <div class="logo" @click="onGoHome">
       <img class="logo-img" :src="logoImg" />
-      <div class="title title-light" v-if="sideMenuTheme === 'light'">{{ websiteName }}</div>
-      <div class="title title-dark" v-if="sideMenuTheme === 'dark'">{{ websiteName }}</div>
+      <div class="title smart-logo title-light" v-if="sideMenuTheme === 'light'">{{ websiteName }}</div>
+      <div class="title smart-logo title-dark" v-if="sideMenuTheme === 'dark'">{{ websiteName }}</div>
     </div>
     <!-- 2、菜单区域 -->
     <RecursionMenu ref="menuRef" />
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/heart-sentence.js b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/heart-sentence.js
index 2d122515..e9521752 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/heart-sentence.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/heart-sentence.js
@@ -1,12 +1,11 @@
 export default [
-    '每个人的一生好比一根蜡烛，看似不经意间散发的光和热，都可能照亮和温暖他人。这是生活赋予我们的智慧，也让我们在寻常的日子成为一个温暖善良的人。',
-    '立规矩的目的，不是禁锢、限制，而是教育；孩子犯了错，父母不能帮孩子逃避，而应该让孩子学会承担责任。让孩子有面对错误的诚实和勇气，这才是立规矩的意义所在。',
-    '人这一辈子，格局大了、善良有了，成功自然也就近了。格局越大，人生越宽。你的人生会是什么样，与你在为人处世时的表现有很大关系。世间美好都是环环相扣的，善良的人总不会被亏待。',
-    '平日里的千锤百炼，才能托举出光彩时刻；逆境中的亮剑、失败后的奋起，才能让梦想成真。哪有什么一战成名，其实都是百炼成钢。“天才”都是汗水浇灌出来的，天赋或许可以决定起点，但唯有坚持和努力才能达到终点。',
-    '家，不在于奢华，而在于温馨；家，不在于大小，而在于珍惜。在家里，有父母的呵护，有爱人的陪伴，有子女的欢笑。一家人整整齐齐、和和睦睦，就是人生最大的幸福！',
-    '每一个不向命运低头、努力生活的人，都值得被尊重。',
-    '青年的肩上，从不只有清风明月，更有责任担当。岁月因青春慨然以赴而更加美好，世间因少年挺身向前而更加瑰丽。请相信，不会有人永远年轻，但永远有人年轻。',
-    '人生路上，总有人走得比你快，但不必介意，也不必着急。一味羡慕别人的成绩，只会给自己平添压力、徒增烦恼。不盲从别人的脚步，坚定目标，才能找到自己的节奏，进而逢山开路、遇水搭桥。',
-    '如果你真的在乎一个人，首先要学会的就是感恩对方的好。这样，对方才会在和你的相处中找到价值感，相处起来也会更加舒适愉悦。',
-    '一个人只有心里装得下别人，有换位思考的品质，有为他人谋幸福的信念，才能真正做到慷慨施予。同样，也只有赠人玫瑰而无所求时，你才会手有余香、真有所得。',
+  '梦想不会自动成真，奋斗是其桥梁；目标不会自动抵达，奔跑才有远方!',
+  '成长是一场和自己的比赛，不要担心别人会做得比你好，只要你每天都比前一天做得好!',
+  '最慢的步伐不是跬步，而是徘徊；最快的脚步不是冲刺，而是坚持!',
+  '平日里的千锤百炼，才能托举出光彩时刻；逆境中的亮剑、失败后的奋起，才能让梦想成真。哪有什么一战成名，其实都是百炼成钢。“天才”都是汗水浇灌出来的，天赋或许可以决定起点，但唯有坚持和努力才能达到终点。',
+  '历尽天华成此景，人间万事出艰辛。志不求易者成，事不避难者进!',
+  '每一个不向命运低头、努力生活的人，都值得被尊重。',
+  '青年的肩上，从不只有清风明月，更有责任担当。岁月因青春慨然以赴而更加美好，世间因少年挺身向前而更加瑰丽。请相信，不会有人永远年轻，但永远有人年轻。',
+  '人生路上，总有人走得比你快，但不必介意，也不必着急。一味羡慕别人的成绩，只会给自己平添压力、徒增烦恼。不盲从别人的脚步，坚定目标，才能找到自己的节奏，进而逢山开路、遇水搭桥。',
+  '没有理所当然的成功，也没有毫无道理的平庸。值得拥有的东西，永远都来之不易。所以在徘徊迷茫时，不要质疑你的付出，这些累积都会变成一种沉淀，默默为你铺路!',
 ];