From c96c84e0c447ea8230aeb3c54d124e97bd75335a Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 26 Jul 2022 20:36:46 +0800 Subject: [PATCH] =?UTF-8?q?style(=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/business/DeLayoutContent.vue | 8 ++--- frontend/src/icons/svg/none_select.svg | 6 ++-- frontend/src/lang/en.js | 3 ++ frontend/src/lang/tw.js | 3 ++ frontend/src/lang/zh.js | 3 ++ frontend/src/styles/deicon/demo_index.html | 29 ++++++++++++++++-- frontend/src/styles/deicon/iconfont.css | 10 ++++-- frontend/src/styles/deicon/iconfont.js | 2 +- frontend/src/styles/deicon/iconfont.json | 7 +++++ frontend/src/styles/deicon/iconfont.ttf | Bin 31404 -> 31612 bytes frontend/src/styles/deicon/iconfont.woff | Bin 19172 -> 19304 bytes frontend/src/styles/deicon/iconfont.woff2 | Bin 16208 -> 16360 bytes .../dataset/data/components/LazyTree.vue | 2 -- frontend/src/views/msg/setting.vue | 2 -- .../src/views/panel/GrantAuth/dept/index.vue | 1 - .../system/authority/components/LazyTree.vue | 2 -- frontend/src/views/system/plugin/dynamic.vue | 2 +- 17 files changed, 58 insertions(+), 22 deletions(-) diff --git a/frontend/src/components/business/DeLayoutContent.vue b/frontend/src/components/business/DeLayoutContent.vue index 33aa2760da..39a0daa9fa 100644 --- a/frontend/src/components/business/DeLayoutContent.vue +++ b/frontend/src/components/business/DeLayoutContent.vue @@ -4,7 +4,7 @@ {{ routeTitle }}

-
+
@@ -33,8 +33,8 @@ export default { showBack({ backPath, backName, backTo }) { return backPath || backName || backTo }, - isDept() { - return ['system-dept', 'system-dept-form'].includes(this.$route.name) + needInnerPadding() { + return ['system-dept', 'system-dept-form', 'system-auth'].includes(this.$route.name) } } } @@ -74,7 +74,7 @@ export default { flex: 1; } - .dept-padding { + .layout-inner-padding { padding: 0; margin-top: 16px; } diff --git a/frontend/src/icons/svg/none_select.svg b/frontend/src/icons/svg/none_select.svg index d129fc7238..ebafc75e0f 100644 --- a/frontend/src/icons/svg/none_select.svg +++ b/frontend/src/icons/svg/none_select.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 429ffa0efa..b4aaafe832 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1880,6 +1880,9 @@ export default { }, auth: { + no_item_selected: 'Please select resources on the left', + search_pre: 'Search by ', + search_suf: ' name', separate_auth: 'Separate Authorization', auth_extent_tips: 'Permissions Inherited From The Following Organizations Or Roles:', authConfig: 'Configure Permissions By User', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 82b5fa89e7..59e0f75302 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1889,6 +1889,9 @@ export default { }, auth: { + no_item_selected: '请在左侧选择资源', + search_pre: '通过', + search_suf: '名称来搜索', separate_auth: '单独授权', auth_extent_tips: '继承自以下组织或角色的权限:', authConfig: '按用戶配置權限', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 4bc67a27ac..1ff2688228 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1898,6 +1898,9 @@ export default { }, auth: { + no_item_selected: '请在左侧选择资源', + search_pre: '通过', + search_suf: '名称来搜索', separate_auth: '单独授权', auth_extent_tips: '继承自以下组织或角色的权限:', authConfig: '按用户配置权限', diff --git a/frontend/src/styles/deicon/demo_index.html b/frontend/src/styles/deicon/demo_index.html index 4dc197d39e..381228577f 100644 --- a/frontend/src/styles/deicon/demo_index.html +++ b/frontend/src/styles/deicon/demo_index.html @@ -54,6 +54,12 @@