diff --git a/mock/account.js b/mock/account.js index 2d50057c3e8e26385044125666358c91c71f762f..890d29d8d71b2c6f18c2d4aaf351bebd107b6314 100644 --- a/mock/account.js +++ b/mock/account.js @@ -2,8 +2,8 @@ * @Description: * @Autor: dongjunhua * @Date: 2021-01-28 10:12:07 - * @LastEditors: Qun - * @LastEditTime: 2021-09-03 12:37:20 + * @LastEditors: dongjunhua + * @LastEditTime: 2021-09-04 10:20:18 */ const { deepClone } = require('./utils'); @@ -58,7 +58,7 @@ const menuList = [ id: '5', available: 'YES', menuNo: '0001', - name: 'Document', + name: '瀹樻柟鏂囨。', icon: 'fas fa-file-alt', routingUrl: '', isNewWindow: 'NO', @@ -75,7 +75,7 @@ const menuList = [ creator: '1', applicationId: '1', menuNo: 'SBD_005', - name: 'Vue.js Official', + name: 'Vue.js', icon: 'fab fa-vuejs', parentId: '1', routingUrl: 'frame/vue', diff --git a/src/config/index.js b/src/config/index.js index 7616724617f34688e6c7db9d82f87e45a54fa7fd..12c5ae6761a9e6dcd45cb33ca4c43ddd7b491d47 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -2,8 +2,8 @@ * @Description: * @Autor: dongjunhua * @Date: 2020-12-17 14:51:38 - * @LastEditors: Qun - * @LastEditTime: 2021-09-03 13:47:29 + * @LastEditors: dongjunhua + * @LastEditTime: 2021-09-04 10:37:52 */ const npmConfig = require('../../package.json'); @@ -19,7 +19,7 @@ module.exports = { /** * 鐗堟湰 */ - releaseCycle: '尾eta', + releaseCycle: 'beta', /** * 鐗堟湰鍙� */ diff --git a/src/config/theme.js b/src/config/theme.js index d684df6ba3bdbca2d928e5b2cf3e7c572c0151fa..9fc803b299acbe4a87e5a0017169811f62164d3d 100644 --- a/src/config/theme.js +++ b/src/config/theme.js @@ -2,8 +2,8 @@ * @Description: * @Author: dongjunhua * @Date: 2021-02-14 16:58:25 - * @LastEditors: Qun - * @LastEditTime: 2021-09-02 09:47:50 + * @LastEditors: dongjunhua + * @LastEditTime: 2021-09-04 11:23:53 * 鏂板鑷畾涔夐厤鑹叉椂娉ㄦ剰锛宯ame锛歭ocal涓烘湰鍦扮紦瀛樻爣璇嗭紝璇峰嬁鍗犵敤 */ @@ -11,6 +11,7 @@ module.exports = { themeConfigs: [ { name: 'classic', // 涓婚鍚嶇О + titleName: '缁忓吀', // default: true, // 鏄惁榛樿涓婚锛堝彲閫夛級 styleColor: { menuBg: '#303a4b', // 涓昏壊璋冿紙涓€绾ц彍鍗曡儗鏅壊锛岀櫥褰曠晫闈㈣儗鏅壊锛� @@ -25,6 +26,7 @@ module.exports = { }, { name: 'light', + titleName: '璞$墮鐧�', default: true, styleColor: { menuBg: '#fafafa', @@ -39,6 +41,7 @@ module.exports = { }, { name: 'dark', + titleName: '鍗堝榛�', styleColor: { menuBg: '#292732', menuHover: '#53525a', @@ -52,6 +55,7 @@ module.exports = { }, { name: 'blue-dark', + titleName: '鏂牚鐨勭撼缁翠簹钃�', styleColor: { menuBg: '#2E55B1', menuHover: '#3A69D9', @@ -65,6 +69,7 @@ module.exports = { }, { name: 'blue', + titleName: '娉㈢綏鐨勬捣钃�', styleColor: { menuBg: '#70D2EF', menuHover: '#44A6C4', @@ -78,6 +83,7 @@ module.exports = { }, { name: 'cyan', + titleName: '缈犵帀缁�', styleColor: { menuBg: '#29C4B2', menuHover: '#13C8B3', diff --git a/src/core/model/App.js b/src/core/model/App.js index 2e032919710bfc82d5ab7dd9006f902b0e243f10..9c6b5846bed71d81c61d7d8cf8396f3310c25476 100644 --- a/src/core/model/App.js +++ b/src/core/model/App.js @@ -2,8 +2,8 @@ * @Description: * @Autor: dongjunhua * @Date: 2021-02-01 10:38:02 - * @LastEditors: Qun - * @LastEditTime: 2021-08-27 12:48:46 + * @LastEditors: dongjunhua + * @LastEditTime: 2021-09-04 11:34:07 */ import Storage from '@/utils/Storage'; @@ -102,6 +102,7 @@ class App { this.themes = themeConfigs.map((t, i) => { return { name: t.name, + titleName: t.titleName, styleColor: t.styleColor, active: i === activeIndex }; @@ -198,7 +199,7 @@ class App { this.sidebar.enabled = false; this.navbar.enabled = true; break; - case 'hide': + case 'hidden': this.sidebar.enabled = false; this.navbar.enabled = false; break; diff --git a/src/layout/components/Navigation/components/Breadcrumb.vue b/src/layout/components/Navigation/components/Breadcrumb.vue index c8b1afb2bc3653fd5681faf2b2d54d9dc1ec2fa7..14c138ebbaefc80f1c47966e08602ffb38bdea97 100644 --- a/src/layout/components/Navigation/components/Breadcrumb.vue +++ b/src/layout/components/Navigation/components/Breadcrumb.vue @@ -3,7 +3,7 @@ * @Autor: dongjunhua * @Date: 2020-12-29 15:32:29 * @LastEditors: dongjunhua - * @LastEditTime: 2021-01-20 14:58:43 + * @LastEditTime: 2021-09-04 10:16:06 --> <template> @@ -38,7 +38,12 @@ export default { if (route.path === '/i') { data.levelList.unshift({ id: 0, - name: 'Home' + name: '棣栭〉' + }); + } else if (route.path === '/i/workplace') { + data.levelList.unshift({ + id: 'workplace', + name: '鐢ㄦ埛涓績' }); } const menus = JSON.parse(JSON.stringify(menuList)); diff --git a/src/layout/components/Navigation/index.vue b/src/layout/components/Navigation/index.vue index 5b26bbcf156604915f6d232213af62aefa9a660d..1b0ccb3c2ab207f1d1c5cfa204524f94fd94b87a 100644 --- a/src/layout/components/Navigation/index.vue +++ b/src/layout/components/Navigation/index.vue @@ -2,8 +2,8 @@ * @Description: * @Autor: dongjunhua * @Date: 2020-12-21 09:02:04 - * @LastEditors: Qun - * @LastEditTime: 2021-09-02 10:46:10 + * @LastEditors: dongjunhua + * @LastEditTime: 2021-09-04 10:42:27 --> <template> <div class="navigation-container"> @@ -38,7 +38,7 @@ <div @click="about"> <el-dropdown-item ><span class="dropdown-menu-item" - ><i class="far fa-hdd" />Ver. {{ version }}({{ + ><i class="far fa-hdd" />鐗堟湰: {{ version }}({{ coreVersion }})</span ></el-dropdown-item @@ -47,7 +47,7 @@ <div @click="logout"> <el-dropdown-item divided ><span class="dropdown-menu-item" - ><i class="fas fa-power-off" />Safety Logout</span + ><i class="fas fa-power-off" />娉ㄩ攢</span ></el-dropdown-item > </div> @@ -79,7 +79,7 @@ v-if="mock" class="item" effect="dark" - content="mock-server is running" + content="mock-server 姝e湪杩愯" placement="bottom-start" > <div class="function" v-if="mock"> @@ -102,6 +102,7 @@ export default { const store = useStore(); const router = useRouter(); + const applicationName = computed(() => store.state.app.applicationName); const version = computed(() => store.state.app.version); const coreVersion = computed(() => store.state.app.coreVersion); const sidebar = computed(() => store.state.app.sidebar); @@ -124,8 +125,8 @@ export default { }; const about = () => { ElNotification({ - title: 'Noctua Admin', - message: `Version: ${version.value}(${coreVersion.value})`, + title: applicationName.value, + message: `鐗堟湰: ${version.value}(${coreVersion.value})`, type: 'info', duration: 10 * 1000 }); @@ -204,6 +205,7 @@ export default { background-color: #eee; i.rotate { animation: function-icon-shake 0.5s; + transform: scale(1.3); } } @@ -277,13 +279,13 @@ export default { transform: rotate(0deg); } 70% { - transform: rotate(20deg); + transform: rotate(20deg) scale(1.1); } 80% { - transform: rotate(0deg); + transform: rotate(0deg) scale(1.2); } 90% { - transform: rotate(-20deg); + transform: rotate(-20deg) scale(1.3); } } </style> diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue index 8c31ff23845c9557a52dfb45fd02868917fd8fef..d478acac6bfd729a09a99b18009bed3c7775ffce 100644 --- a/src/layout/components/Settings/index.vue +++ b/src/layout/components/Settings/index.vue @@ -2,8 +2,8 @@ * @Description: * @Autor: Qun * @Date: 2021-08-17 9:07:30 - * @LastEditors: Qun - * @LastEditTime: 2021-09-03 13:48:45 + * @LastEditors: dongjunhua + * @LastEditTime: 2021-09-04 11:40:56 --> <template> @@ -50,9 +50,9 @@ <div class="settings-item-content" :class="{ - 'settings-item-active': layout === 'hide' + 'settings-item-active': layout === 'hidden' }" - @click="layout = 'hide'" + @click="layout = 'hidden'" > <div class="settings-item-content-label">闅愯棌</div> <section class="el-container is-vertical"> @@ -108,15 +108,21 @@ <el-divider content-position="left">棰勭疆閰嶈壊</el-divider> <div class="settings-item settings-item-theme"> - <div - :title="theme.name" + <el-tooltip + class="item" + effect="dark" + placement="top" + :content="theme.titleName" v-for="theme in themes" :key="theme.name" - class="theme-selection" - :class="{ active: theme.active }" - :style="{ 'background-color': theme.styleColor.menuBg }" - @click="setTheme(theme)" - ></div> + > + <div + class="theme-selection" + :class="{ active: theme.active }" + :style="{ 'background-color': theme.styleColor.menuBg }" + @click="setTheme(theme)" + ></div> + </el-tooltip> </div> <el-divider content-position="left">鑷畾涔夐厤鑹�</el-divider> @@ -137,19 +143,26 @@ </div> </div> <div class="copy-theme"> - <el-alert + <!-- <el-alert title="鏂板鑷畾涔夐厤鑹诧紝鐐瑰嚮涓嬫柟澶嶅埗閰嶈壊锛岀矘璐磋嚦鈥榗onfig/theme.js鈥欐柊澧炶妭鐐瑰嵆鍙�" type="warning" :closable="false" - /> - <el-button - icon="el-icon-document-copy" - type="primary" - plain - @click="onCopyTheme" - > - 澶嶅埗閰嶈壊 - </el-button> + /> --> + <el-tooltip class="item" effect="dark" placement="top-start"> + <template #content> + <i class="el-icon-info"></i> + 鐐瑰嚮涓嬫柟澶嶅埗閰嶈壊锛岀矘璐磋嚦 config/theme.js + 鏂板鑺傜偣锛屽嵆鍙皢褰撳墠閰嶈壊娣诲姞鍒伴缃厤鑹� + </template> + <el-button + icon="el-icon-document-copy" + type="primary" + plain + @click="onCopyTheme" + > + 澶嶅埗閰嶈壊 + </el-button> + </el-tooltip> </div> <el-divider content-position="left">鍏朵粬閰嶇疆</el-divider> @@ -174,12 +187,12 @@ <div class="clear-storage"> <el-button - icon="el-icon-brush" + icon="el-icon-delete" type="danger" plain @click="onClearStorage" > - 娓呯┖娴忚鍣ㄧ紦瀛� + 娓呯┖缂撳瓨 </el-button> </div> </el-scrollbar> @@ -286,6 +299,7 @@ export default { ); setTheme({ name: 'local', + titleName: '鑷畾涔�', active: true, styleColor: themeStyleColor.value }); @@ -294,6 +308,7 @@ export default { var oInput = document.createElement('textarea'); oInput.value = JSON.stringify({ name: `theme${themes.value.length + 1}`, + titleName: '鑷畾涔�', styleColor: themeStyleColor.value }); document.body.appendChild(oInput); diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index 1fdacd6b0d9849081c5e9256c956eec748d3b28c..2e7aad5e09d15b5edbbad5ffde07ea29e71cd5fe 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -2,8 +2,8 @@ * @Description: * @Autor: dongjunhua * @Date: 2020-12-21 09:02:14 - * @LastEditors: Qun - * @LastEditTime: 2021-09-02 10:57:02 + * @LastEditors: dongjunhua + * @LastEditTime: 2021-09-04 10:05:10 --> <template> <transition name="fade-transform-top"> @@ -89,9 +89,9 @@ export default { 'app/addTagView', new TagView( 'workplace', - '涓汉涓績', + '鐢ㄦ埛涓績', 'workplace', - 'fas fa-tachometer-alt', + 'fas fa-user-circle', null, true, true diff --git a/src/views/login/components/SelectUser.vue b/src/views/login/components/SelectUser.vue index 27d4a58ca56256e83c7f82822976a1e62878bc2f..dd804b3a9dcdd64a0b50d06485fa1a0dc86066b8 100644 --- a/src/views/login/components/SelectUser.vue +++ b/src/views/login/components/SelectUser.vue @@ -3,17 +3,17 @@ * @Autor: dongjunhua * @Date: 2020-12-23 12:56:35 * @LastEditors: dongjunhua - * @LastEditTime: 2021-02-02 13:29:47 + * @LastEditTime: 2021-09-04 10:23:34 --> <template> <div class="selection-container"> <div class="title"> - <span class="big">:) Welcome!</span> + <span class="big">:) 娆㈣繋!</span> <span class="small">{{ transitionList.length > 0 - ? 'Please select a user:' - : 'No user can be selected.' + ? '璇烽€夋嫨涓€浣嶇敤鎴�:' + : '鎶辨瓑锛屾病鏈夊彲閫夋嫨鐨勭敤鎴�.' }}</span> </div> <div v-for="item in transitionList" :key="item.id"> diff --git a/src/views/login/index.vue b/src/views/login/index.vue index c083768c0fdf48d2b82281cb1fa17a6876fa6e33..0d1fe09679ade95f0808b232e7f50203e071eabc 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -98,7 +98,7 @@ size="medium" style="width:100%" @click.prevent="handleLogin" - >Login</el-button + >鐧� 褰�</el-button > </el-form> </transition> @@ -511,7 +511,7 @@ $light_gray: #eee; width: 400px; max-width: 100%; overflow: hidden; - margin: 20vh auto 0; + margin: 15vh auto 0; padding: 20px 20px 40px 20px; &.mobile { padding: 0px 20px; diff --git a/src/views/workplace/index.vue b/src/views/workplace/index.vue index df38bce9b949cc5d4021f97a3db44a5fda888b96..d03cb6ac2e57be0e11f53fbe38d8e0e80753a006 100644 --- a/src/views/workplace/index.vue +++ b/src/views/workplace/index.vue @@ -2,20 +2,20 @@ * @Description: * @Autor: dongjunhua * @Date: 2021-01-20 09:16:50 - * @LastEditors: Qun - * @LastEditTime: 2021-09-02 11:10:03 + * @LastEditors: dongjunhua + * @LastEditTime: 2021-09-04 10:06:25 --> <template> <div class="workplace-container"> <div class="user-info"> - <div class="user-info-header">涓汉涓績</div> + <div class="user-info-header">鐢ㄦ埛涓績</div> <el-row :gutter="20"> <el-col class="user-info-box" :xs="24" :sm="14" :lg="14"> <i class="fas fa-user-circle rotate"></i> <div class="user-info-text"> <div class="user-info-text-top"><b>Admin</b>锛屾棭涓婂ソ!</div> <div class="user-info-text-footer"> - 杞欢寮€鍙戦儴-鍓嶇寮€鍙戝伐绋嬪笀-XX + 杞欢寮€鍙戦儴-鍓嶇寮€鍙戝伐绋嬪笀 </div> </div> </el-col>