From 1d5b914c96d908a0758310b97ea89c200e445883 Mon Sep 17 00:00:00 2001 From: sc Date: Thu, 12 Aug 2021 17:13:15 +0800 Subject: [PATCH] UP --- package.json | 14 +++++++------- src/components/scFilterBar/index.vue | 14 +++++--------- src/components/scFilterBar/my.vue | 3 +++ src/components/scPageHeader/index.vue | 3 +++ src/config/index.js | 2 +- src/layout/components/setting.vue | 21 +++++++++++++++++++++ src/locales/index.js | 6 ++++++ src/locales/lang/ja.js | 11 +++++++++++ src/views/userCenter/index.vue | 5 +++-- 9 files changed, 60 insertions(+), 19 deletions(-) create mode 100644 src/locales/lang/ja.js diff --git a/package.json b/package.json index 23daf694..ab8aeb02 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "scui", - "version": "1.1.21", + "version": "1.2.0", "private": true, "scripts": { "serve": "vue-cli-service serve", @@ -8,17 +8,17 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "@tinymce/tinymce-vue": "4.0.3", + "@tinymce/tinymce-vue": "4.0.4", "axios": "0.21.1", - "core-js": "3.15.2", + "core-js": "3.16.1", "cropperjs": "1.5.12", - "crypto-js": "4.0.0", + "crypto-js": "4.1.1", "echarts": "5.1.2", "element-plus": "1.0.2-beta.70", "nprogress": "0.2.0", - "sortablejs": "1.13.0", + "sortablejs": "1.14.0", "tinymce": "5.8.2", - "vue": "3.1.4", + "vue": "3.2.2", "vue-i18n": "9.1.7", "vue-router": "4.0.10", "vuedraggable": "4.0.3", @@ -28,7 +28,7 @@ "@vue/cli-plugin-babel": "4.5.13", "@vue/cli-plugin-eslint": "4.5.13", "@vue/cli-service": "4.5.13", - "@vue/compiler-sfc": "3.1.4", + "@vue/compiler-sfc": "3.2.2", "babel-eslint": "10.1.0", "eslint": "6.8.0", "eslint-plugin-vue": "7.12.1", diff --git a/src/components/scFilterBar/index.vue b/src/components/scFilterBar/index.vue index abafd194..7f243eaa 100644 --- a/src/components/scFilterBar/index.vue +++ b/src/components/scFilterBar/index.vue @@ -272,18 +272,14 @@ .sc-filter-main table td .del {background: #fff;color: #999;width: 32px;height: 32px;line-height: 32px;text-align: center;border-radius:50%;font-size: 12px;cursor: pointer;} .sc-filter-main table td .del:hover {background: #F56C6C;color: #fff;} - - - .root { - display: flex; - height: 100%; - flex-direction: column - } + .root {display: flex;height: 100%;flex-direction: column} .root:deep(.el-tabs__header) {margin: 0;} .root:deep(.el-tabs__content) {flex: 1;background: #f6f8f9;} .root:deep(.el-tabs__content) .el-tab-pane{overflow: auto;height:100%;} [data-theme='dark'] .root:deep(.el-tabs__content) {background: none;} - [data-theme='dark'] .sc-filter-main {background: none;border-color:var(--el-border-color-base) ;} - + [data-theme='dark'] .sc-filter-main {background: none;border-color:var(--el-border-color-base);} + [data-theme='dark'] .sc-filter-main table td .del {background: none;} + [data-theme='dark'] .sc-filter-main table td .del:hover {background: #F56C6C;} + [data-theme='dark'] .nodata {border-color:var(--el-border-color-base);} diff --git a/src/components/scFilterBar/my.vue b/src/components/scFilterBar/my.vue index c98bcc25..3a3b425b 100644 --- a/src/components/scFilterBar/my.vue +++ b/src/components/scFilterBar/my.vue @@ -106,4 +106,7 @@ .sc-filter-my-list li .del:hover {background: #F56C6C;color: #fff;} [data-theme='dark'] .sc-filter-my .el-empty h2 {color: #fff;} + [data-theme='dark'] .sc-filter-my-list {background: none;border-color:var(--el-border-color-base);} + [data-theme='dark'] .sc-filter-my-list li {color: #d0d0d0;} + [data-theme='dark'] .sc-filter-my-list li:hover {background: var(--el-color-white);} diff --git a/src/components/scPageHeader/index.vue b/src/components/scPageHeader/index.vue index 4ef3e9b5..fbf285a5 100644 --- a/src/components/scPageHeader/index.vue +++ b/src/components/scPageHeader/index.vue @@ -46,4 +46,7 @@ .sc-page-header__title {flex: 1;} .sc-page-header__title h2 {font-size: 17px;color: #3c4a54;font-weight: bold;margin-top: 3px;} .sc-page-header__title p {font-size: 13px;color: #999;margin-top: 15px;} + + [data-theme='dark'] .sc-page-header {background:#2b2b2b ;border-color:var(--el-border-color-base);} + [data-theme='dark'] .sc-page-header__title h2 {color: #d0d0d0;} diff --git a/src/config/index.js b/src/config/index.js index 23b2fc91..6e2ef523 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -3,7 +3,7 @@ const DEFAULT_CONFIG = { APP_NAME: "SCUI", //版本号 - APP_VER: "1.1.21", + APP_VER: "1.2.0", //接口地址 API_URL: "/api", diff --git a/src/layout/components/setting.vue b/src/layout/components/setting.vue index e671a763..d160d77c 100644 --- a/src/layout/components/setting.vue +++ b/src/layout/components/setting.vue @@ -2,6 +2,17 @@ + + + + + + + + + + + @@ -27,6 +38,8 @@ layout: this.$store.state.global.layout, menuIsCollapse: this.$store.state.global.menuIsCollapse, layoutTags: this.$store.state.global.layoutTags, + lang: this.$TOOL.data.get('APP_LANG') || this.$CONFIG.LANG, + theme: this.$TOOL.data.get('APP_THEME') || 'default' } }, watch: { @@ -38,6 +51,14 @@ }, layoutTags(){ this.$store.commit("TOGGLE_layoutTags") + }, + theme(val){ + document.body.setAttribute('data-theme', val) + this.$TOOL.data.set("APP_THEME", val); + }, + lang(val){ + this.$i18n.locale = val + this.$TOOL.data.set("APP_LANG", val); } } } diff --git a/src/locales/index.js b/src/locales/index.js index 81b04bcc..a043000d 100644 --- a/src/locales/index.js +++ b/src/locales/index.js @@ -3,9 +3,11 @@ import tool from '@/utils/tool' import { createI18n } from 'vue-i18n' import elementLocale_zh_cn from 'element-plus/lib/locale/lang/zh-cn' import elementLocale_en from 'element-plus/lib/locale/lang/en' +import elementLocale_ja from 'element-plus/lib/locale/lang/ja' import zh_cn from './lang/zh-cn.js' import en from './lang/en.js' +import ja from './lang/ja.js' const messages = { 'zh-cn': { @@ -15,6 +17,10 @@ const messages = { 'en': { el: elementLocale_en.el, ...en + }, + 'ja': { + el: elementLocale_ja.el, + ...ja } } diff --git a/src/locales/lang/ja.js b/src/locales/lang/ja.js new file mode 100644 index 00000000..132c630f --- /dev/null +++ b/src/locales/lang/ja.js @@ -0,0 +1,11 @@ +export default { + user: { + dynamic: 'ダイナミック', + info: 'ユーザー', + settings: '設定', + nightmode: 'ナイトモード', + nightmode_msg: '光の弱い環境に適しています，現在のブラックモードはベータバージョンです。', + language: '言語', + language_msg: '翻訳が進行中、本ビューのテキストを一時的に翻訳しました。', + } +} diff --git a/src/views/userCenter/index.vue b/src/views/userCenter/index.vue index 5b42d429..6ef2562a 100644 --- a/src/views/userCenter/index.vue +++ b/src/views/userCenter/index.vue @@ -81,6 +81,7 @@ +
{{ $t('user.language_msg') }}
 @@ -149,8 +150,8 @@ about: "正所谓富贵险中求" }, config: { - lang: this.$TOOL.data.get('APP_LANG')||this.$CONFIG.LANG, - theme: this.$TOOL.data.get('APP_THEME') + lang: this.$TOOL.data.get('APP_LANG') || this.$CONFIG.LANG, + theme: this.$TOOL.data.get('APP_THEME') || 'default' } } },