Skip to content

Commit ede37ab

Browse files
LZS911LZS911
authored
Merge pull request #777 from actiontech/fix/issue-560
Fix/issue 560
2 parents 5bb8935 + d09343f commit ede37ab

File tree

132 files changed

+1203
-1084
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+1203
-1084
lines changed

‎packages/base/src/__snapshots__/App.test.tsx.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ exports[`App render App when "checkPageAction" is false 1`] = `
229229
</div>
230230
</div>
231231
<div
232-
class="ant-select ant-select-lg ant-select-borderless basic-select-wrapper custom-select-namespace custom-project-selector css-wk9fc9 ant-select-single ant-select-show-arrow"
232+
class="ant-select ant-select-lg ant-select-borderless basic-select-wrapper custom-select-namespace custom-project-selector css-1be09ba ant-select-single ant-select-show-arrow"
233233
searchinputref="[object Object]"
234234
>
235235
<div
@@ -1382,7 +1382,7 @@ exports[`App render App when token is existed 1`] = `
13821382
</div>
13831383
</div>
13841384
<div
1385-
class="ant-select ant-select-lg ant-select-borderless basic-select-wrapper custom-select-namespace custom-project-selector css-wk9fc9 ant-select-single ant-select-show-arrow"
1385+
class="ant-select ant-select-lg ant-select-borderless basic-select-wrapper custom-select-namespace custom-project-selector css-1be09ba ant-select-single ant-select-show-arrow"
13861386
searchinputref="[object Object]"
13871387
>
13881388
<div

‎packages/base/src/hooks/useMemberTips/__snapshots__/index.test.tsx.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ exports[`useUsername should render options when use generateUsernameSelectOption
180180
>
181181
<div
182182
aria-selected="false"
183-
class="ant-select-item ant-select-item-option ant-select-item-option-active"
183+
class="ant-select-item ant-select-item-option select-option-whitespace-pre ant-select-item-option-active"
184184
label="a1"
185185
title="a1"
186186
>
@@ -198,7 +198,7 @@ exports[`useUsername should render options when use generateUsernameSelectOption
198198
</div>
199199
<div
200200
aria-selected="false"
201-
class="ant-select-item ant-select-item-option"
201+
class="ant-select-item ant-select-item-option select-option-whitespace-pre"
202202
label="a2"
203203
title="a2"
204204
>

‎packages/base/src/hooks/useMemberTips/index.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ const useMemberTips = () => {
3535
key={member.user_id}
3636
value={member.user_id ?? ''}
3737
label={member.user_name}
38+
className="select-option-whitespace-pre"
3839
>
3940
{member.user_name}
4041
</Select.Option>
@@ -47,7 +48,9 @@ const useMemberTips = () => {
4748
label: (
4849
<Space>
4950
<CustomAvatar noTips size="small" name={member.user_name} />
50-
<Typography.Text>{member.user_name}</Typography.Text>
51+
<Typography.Text className="whitespace-pre">
52+
{member.user_name}
53+
</Typography.Text>
5154
</Space>
5255
),
5356
value: member.user_id

‎packages/base/src/hooks/useUsername/index.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@ const useUsername = () => {
3232
const generateUsernameSelectOption = React.useCallback(() => {
3333
return usernameList.map((user) => {
3434
return (
35-
<Select.Option key={user.uid} value={user.uid ?? ''} label={user.name}>
35+
<Select.Option
36+
key={user.uid}
37+
value={user.uid ?? ''}
38+
label={user.name}
39+
className="select-option-whitespace-pre"
40+
>
3641
{user.name}
3742
</Select.Option>
3843
);

‎packages/base/src/locale/zh-CN/dmsUserCenter.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default {
1919
},
2020
userForm: {
2121
username: '用户名',
22-
usernameNoSpaces: '用户名不支持空格',
22+
usernameNoSpaces: '用户名不支持首尾空格',
2323
needUpdatePassWord: '是否需要更新密码',
2424
passwordConfirm: '确认密码',
2525
passwordConfirmPlaceholder: '请保持两次密码输入一致',

‎packages/base/src/page/Account/__snapshots__/index.ce.test.tsx.snap‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,11 @@ exports[`test base/page/Account ce should match snapshot 1`] = `
6161
class="ant-space-item"
6262
style="margin-right: 8px;"
6363
>
64-
admin
64+
<span
65+
class="whitespace-pre"
66+
>
67+
admin
68+
</span>
6569
</div>
6670
<div
6771
class="ant-space-item"

‎packages/base/src/page/Account/__snapshots__/index.test.tsx.snap‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,11 @@ exports[`test base/page/Account should match snapshot 1`] = `
6161
class="ant-space-item"
6262
style="margin-right: 8px;"
6363
>
64-
admin
64+
<span
65+
class="whitespace-pre"
66+
>
67+
admin
68+
</span>
6569
</div>
6670
<div
6771
class="ant-space-item"
@@ -738,7 +742,11 @@ exports[`test base/page/Account should match snapshot 2`] = `
738742
class="ant-space-item"
739743
style="margin-right: 8px;"
740744
>
741-
admin
745+
<span
746+
class="whitespace-pre"
747+
>
748+
admin
749+
</span>
742750
</div>
743751
<div
744752
class="ant-space-item"
@@ -1765,7 +1773,11 @@ exports[`test base/page/Account should match snapshot when "getUserInfoLoading"
17651773
class="ant-space-item"
17661774
style="margin-right: 8px;"
17671775
>
1768-
admin
1776+
<span
1777+
class="whitespace-pre"
1778+
>
1779+
admin
1780+
</span>
17691781
</div>
17701782
<div
17711783
class="ant-space-item"

‎packages/base/src/page/Account/index.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ const Account: React.FC = () => {
4747
{t('dmsUserCenter.user.userForm.username')}
4848
</LabelContent>
4949
}
50-
descNode={!!userInfo?.name ? userInfo?.name : '-'}
50+
descNode={
51+
<span className="whitespace-pre">
52+
{!!userInfo?.name ? userInfo?.name : '-'}
53+
</span>
54+
}
5155
fieldVisible={false}
5256
needEditButton={false}
5357
/>

‎packages/base/src/page/CloudBeaver/List/__snapshots__/index.test.tsx.snap‎

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ exports[`test base/CloudBeaver/List filter data with search 1`] = `
332332
style="margin-right: 12px; padding-bottom: 12px;"
333333
>
334334
<div
335-
class="ant-select ant-select-sm ant-select-borderless basic-select-wrapper custom-select-namespace css-pti5z8 ant-select-single ant-select-allow-clear ant-select-show-arrow"
335+
class="ant-select ant-select-sm ant-select-borderless basic-select-wrapper custom-select-namespace css-wd6pz6 ant-select-single ant-select-allow-clear ant-select-show-arrow"
336336
>
337337
<div
338338
class="ant-select-selector"
@@ -454,7 +454,7 @@ exports[`test base/CloudBeaver/List filter data with search 1`] = `
454454
style="margin-right: 12px; padding-bottom: 12px;"
455455
>
456456
<div
457-
class="ant-select ant-select-sm ant-select-borderless basic-select-wrapper custom-select-namespace css-pti5z8 ant-select-single ant-select-allow-clear ant-select-show-arrow"
457+
class="ant-select ant-select-sm ant-select-borderless basic-select-wrapper custom-select-namespace css-wd6pz6 ant-select-single ant-select-allow-clear ant-select-show-arrow"
458458
>
459459
<div
460460
class="ant-select-selector"
@@ -512,7 +512,7 @@ exports[`test base/CloudBeaver/List filter data with search 1`] = `
512512
style="padding-bottom: 12px;"
513513
>
514514
<div
515-
class="ant-select ant-select-sm ant-select-borderless basic-select-wrapper custom-select-namespace exec-result-filter-item css-pti5z8 ant-select-single ant-select-allow-clear ant-select-show-arrow"
515+
class="ant-select ant-select-sm ant-select-borderless basic-select-wrapper custom-select-namespace exec-result-filter-item css-wd6pz6 ant-select-single ant-select-allow-clear ant-select-show-arrow"
516516
>
517517
<div
518518
class="ant-select-selector"
@@ -1673,14 +1673,22 @@ exports[`test base/CloudBeaver/List filter data with search 1`] = `
16731673
<td
16741674
class="ant-table-cell"
16751675
>
1676-
<span
1677-
class="ant-avatar ant-avatar-sm ant-avatar-circle action-avatar css-6ssfc7"
1676+
<div
1677+
class="ant-space ant-space-horizontal ant-space-align-center basic-tooltips-wrapper css-4jbtl9"
16781678
>
1679-
<span
1680-
class="ant-avatar-string"
1681-
style="transform: scale(1) translateX(-50%);"
1682-
/>
1683-
</span>
1679+
<div
1680+
class="ant-space-item"
1681+
>
1682+
<span
1683+
class="ant-avatar ant-avatar-sm ant-avatar-circle action-avatar css-6ssfc7"
1684+
>
1685+
<span
1686+
class="ant-avatar-string"
1687+
style="transform: scale(1) translateX(-50%);"
1688+
/>
1689+
</span>
1690+
</div>
1691+
</div>
16841692
</td>
16851693
<td
16861694
class="ant-table-cell"
@@ -3418,14 +3426,22 @@ exports[`test base/CloudBeaver/List render init table 1`] = `
34183426
<td
34193427
class="ant-table-cell"
34203428
>
3421-
<span
3422-
class="ant-avatar ant-avatar-sm ant-avatar-circle action-avatar css-6ssfc7"
3429+
<div
3430+
class="ant-space ant-space-horizontal ant-space-align-center basic-tooltips-wrapper css-4jbtl9"
34233431
>
3424-
<span
3425-
class="ant-avatar-string"
3426-
style="transform: scale(1) translateX(-50%);"
3427-
/>
3428-
</span>
3432+
<div
3433+
class="ant-space-item"
3434+
>
3435+
<span
3436+
class="ant-avatar ant-avatar-sm ant-avatar-circle action-avatar css-6ssfc7"
3437+
>
3438+
<span
3439+
class="ant-avatar-string"
3440+
style="transform: scale(1) translateX(-50%);"
3441+
/>
3442+
</span>
3443+
</div>
3444+
</div>
34293445
</td>
34303446
<td
34313447
class="ant-table-cell"

‎packages/base/src/page/CloudBeaver/__snapshots__/index.test.tsx.snap‎

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2144,14 +2144,22 @@ exports[`test base/page/CloudBeaver should match snapshot when sql query is disa
21442144
<td
21452145
class="ant-table-cell"
21462146
>
2147-
<span
2148-
class="ant-avatar ant-avatar-sm ant-avatar-circle action-avatar css-6ssfc7"
2147+
<div
2148+
class="ant-space ant-space-horizontal ant-space-align-center basic-tooltips-wrapper css-4jbtl9"
21492149
>
2150-
<span
2151-
class="ant-avatar-string"
2152-
style="transform: scale(1) translateX(-50%);"
2153-
/>
2154-
</span>
2150+
<div
2151+
class="ant-space-item"
2152+
>
2153+
<span
2154+
class="ant-avatar ant-avatar-sm ant-avatar-circle action-avatar css-6ssfc7"
2155+
>
2156+
<span
2157+
class="ant-avatar-string"
2158+
style="transform: scale(1) translateX(-50%);"
2159+
/>
2160+
</span>
2161+
</div>
2162+
</div>
21552163
</td>
21562164
<td
21572165
class="ant-table-cell"
@@ -3916,14 +3924,22 @@ exports[`test base/page/CloudBeaver should render jump to cloud beaver when sql
39163924
<td
39173925
class="ant-table-cell"
39183926
>
3919-
<span
3920-
class="ant-avatar ant-avatar-sm ant-avatar-circle action-avatar css-6ssfc7"
3927+
<div
3928+
class="ant-space ant-space-horizontal ant-space-align-center basic-tooltips-wrapper css-4jbtl9"
39213929
>
3922-
<span
3923-
class="ant-avatar-string"
3924-
style="transform: scale(1) translateX(-50%);"
3925-
/>
3926-
</span>
3930+
<div
3931+
class="ant-space-item"
3932+
>
3933+
<span
3934+
class="ant-avatar ant-avatar-sm ant-avatar-circle action-avatar css-6ssfc7"
3935+
>
3936+
<span
3937+
class="ant-avatar-string"
3938+
style="transform: scale(1) translateX(-50%);"
3939+
/>
3940+
</span>
3941+
</div>
3942+
</div>
39273943
</td>
39283944
<td
39293945
class="ant-table-cell"

0 commit comments

Comments
 (0)