github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 11:32:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #13836 from dataease/pr@dev-v2@perf_oauth2

Browse Source 
perf(X-Pack): 优化OAuth2文案
This commit is contained in:
xuwei-fit2cloud 2024-12-04 17:48:30 +08:00 committed by GitHub
commit 6823d1e96f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/core-frontend/src/assets/svg/logo_oauth.svg
View File

@ -1,18 +1,3 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="logo_oauth">
<g id="logo_oauth_2">
<mask id="mask0_3028_68887" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="1" y="1" width="30" height="30">
<circle id="Ellipse 130" cx="16" cy="16" r="15" fill="white"/>
</mask>
<g mask="url(#mask0_3028_68887)">
<g id="OAUTH">
<path d="M4.43585 13.176C5.30785 13.176 5.99585 13.456 6.49985 14.024C6.97985 14.56 7.21985 15.272 7.21985 16.152C7.21985 17.032 6.97985 17.736 6.49985 18.272C5.99585 18.832 5.30785 19.112 4.43585 19.112C3.55585 19.112 2.86785 18.824 2.37185 18.264C1.89185 17.72 1.65985 17.016 1.65985 16.152C1.65985 15.28 1.89185 14.576 2.37185 14.032C2.86785 13.456 3.55585 13.176 4.43585 13.176ZM4.43585 14C3.84385 14 3.38785 14.2 3.05985 14.6C2.74785 14.984 2.59585 15.496 2.59585 16.152C2.59585 16.8 2.74785 17.312 3.05985 17.696C3.37985 18.088 3.84385 18.288 4.43585 18.288C5.02785 18.288 5.48385 18.096 5.80385 17.72C6.11585 17.344 6.27585 16.824 6.27585 16.152C6.27585 15.48 6.11585 14.952 5.80385 14.568C5.48385 14.184 5.02785 14 4.43585 14Z" fill="#3370FF"/>
<path d="M9.72698 13.288H10.791L12.975 19H11.975L11.455 17.568H9.06298L8.54298 19H7.54298L9.72698 13.288ZM9.34298 16.8H11.175L10.279 14.296H10.247L9.34298 16.8Z" fill="#3370FF"/>
<path d="M13.5327 13.288H14.4687V16.848C14.4687 17.344 14.5807 17.704 14.8127 17.944C15.0367 18.176 15.4047 18.296 15.9087 18.296C16.4047 18.296 16.7727 18.176 17.0047 17.944C17.2287 17.704 17.3487 17.344 17.3487 16.848V13.288H18.2847V16.832C18.2847 17.576 18.0767 18.144 17.6607 18.536C17.2447 18.92 16.6607 19.112 15.9087 19.112C15.1487 19.112 14.5647 18.92 14.1647 18.544C13.7407 18.144 13.5327 17.576 13.5327 16.832V13.288Z" fill="#3370FF"/>
<path d="M18.9677 13.288H23.6477V14.088H21.7757V19H20.8397V14.088H18.9677V13.288Z" fill="#3370FF"/>
<path d="M24.3295 13.288H25.2655V15.672H28.1615V13.288H29.0975V19H28.1615V16.472H25.2655V19H24.3295V13.288Z" fill="#3370FF"/>
</g>
</g>
</g>
</g>
<svg width="27" height="8" viewBox="0 0 27 8" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M3.66736 0.448C4.63936 0.448 5.41336 0.763 5.98036 1.402C6.52036 2.005 6.79036 2.806 6.79036 3.796C6.79036 4.777 6.52036 5.569 5.98036 6.181C5.41336 6.811 4.63936 7.126 3.66736 7.126C2.68636 7.126 1.91236 6.802 1.35436 6.172C0.814359 5.56 0.553359 4.768 0.553359 3.796C0.553359 2.815 0.814359 2.023 1.35436 1.411C1.91236 0.763 2.68636 0.448 3.66736 0.448ZM3.66736 1.312C2.98336 1.312 2.45236 1.537 2.07436 2.005C1.71436 2.446 1.53436 3.04 1.53436 3.796C1.53436 4.543 1.71436 5.137 2.07436 5.578C2.45236 6.028 2.98336 6.262 3.66736 6.262C4.35136 6.262 4.88236 6.037 5.25136 5.596C5.61136 5.164 5.80036 4.561 5.80036 3.796C5.80036 3.022 5.61136 2.419 5.25136 1.978C4.88236 1.528 4.35136 1.312 3.66736 1.312ZM9.6293 0.574H10.7453L13.2203 7H12.1673L11.5643 5.344H8.8013L8.1983 7H7.1543L9.6293 0.574ZM9.0983 4.534H11.2673L10.2053 1.627H10.1693L9.0983 4.534ZM13.7588 2.347H14.7128V5.182C14.7128 5.578 14.7938 5.866 14.9648 6.046C15.1268 6.226 15.3968 6.325 15.7658 6.325C16.0178 6.325 16.2428 6.217 16.4588 6.019C16.6748 5.812 16.8278 5.533 16.9088 5.191V2.347H17.8628V7H16.9088V6.37C16.5128 6.874 16.0268 7.126 15.4418 7.126C14.3168 7.126 13.7588 6.496 13.7588 5.245V2.347ZM20.3661 0.844V2.347H21.4281V3.139H20.3661V5.839C20.3661 5.965 20.3931 6.055 20.4471 6.118C20.5011 6.172 20.5821 6.208 20.6991 6.208H21.3111V7H20.5461C20.1501 7 19.8531 6.892 19.6731 6.685C19.4931 6.487 19.4121 6.208 19.4121 5.839V3.139H18.5481V2.347H19.4121V1.24L20.3661 0.844ZM22.1963 0.448H23.1503V3.004C23.3213 2.734 23.5373 2.527 23.7983 2.401C24.0322 2.275 24.2933 2.221 24.5903 2.221C25.1483 2.221 25.5713 2.383 25.8593 2.716C26.1293 3.031 26.2643 3.499 26.2643 4.111V7H25.3103V4.273C25.3103 3.859 25.2203 3.553 25.0583 3.337C24.8783 3.112 24.5993 3.004 24.2393 3.004C23.9153 3.004 23.6543 3.13 23.4563 3.391C23.2493 3.652 23.1503 3.985 23.1503 4.39V7H22.1963V0.448Z" fill="#3370FF"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

2
core/core-frontend/src/locales/en.ts
View File

@ -546,7 +546,7 @@ export default {
"Filter [Possible options are cn or uid or sAMAccountName={'{'}0{'}'}, such as: (uid={'{'}0{'}'})]",
ldap_attribute_mapping: 'LDAP attribute mapping',
incorrect_please_re_enter_de: 'URL format error, please re-enter',
oauth2_settings: 'OAUTH2 settings',
oauth2_settings: 'OAuth2 settings',
authorization_end_address: 'Authorization end address',
token_end_address: 'Token end address',
information_end_address: 'User information end address',

2
core/core-frontend/src/locales/tw.ts
View File

@ -531,7 +531,7 @@ export default {
such_as_uid: "過濾器[可能的選項是cn或uid或sAMAccountName={'{'}0{'}'}, 如：(uid={'{'}0{'}'})]",
ldap_attribute_mapping: 'LDAP屬性映射',
incorrect_please_re_enter_de: 'url格式錯誤，請重新輸入',
oauth2_settings: 'OAUTH2設定',
oauth2_settings: 'OAuth2設定',
authorization_end_address: '授權端位址',
token_end_address: 'Token 端位址',
information_end_address: '使用者訊息端位址',

2
core/core-frontend/src/locales/zh-CN.ts
View File

@ -534,7 +534,7 @@ export default {
such_as_uid: "过滤器 [可能的选项是cn或uid或sAMAccountName={'{'}0{'}'}, 如：(uid={'{'}0{'}'})]",
ldap_attribute_mapping: 'LDAP属性映射',
incorrect_please_re_enter_de: 'url格式错误，请重新输入',
oauth2_settings: 'OAUTH2设置',
oauth2_settings: 'OAuth2设置',
authorization_end_address: '授权端地址',
token_end_address: 'Token 端地址',
information_end_address: '用户信息端地址',

2
core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue
View File

@ -50,7 +50,7 @@ const state = reactive({
{ value: '1', label: 'LDAP' },
{ value: '2', label: 'OIDC' },
{ value: '3', label: 'CAS' },
{ value: '9', label: 'OAUTH2' }
{ value: '9', label: 'OAuth2' }
],
sortOptions: [
{ value: '0', label: t('resource_sort.time_asc') },

2
core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue
View File

@ -126,7 +126,7 @@ const state = reactive({
{ value: '1', label: 'LDAP' },
{ value: '2', label: 'OIDC' },
{ value: '3', label: 'CAS' },
{ value: '9', label: 'OAUTH2' }
{ value: '9', label: 'OAuth2' }
],
sortOptions: [
{ value: '0', label: t('resource_sort.time_asc') },

2
de-xpack

@ -1 +1 @@
Subproject commit 9e46a3a6ffc6f7501e34845bc5d676b678628f18
Subproject commit bb6521428355868b800aa1f812a8e2a485628908