Skip to content

Commit 860d0b9

Browse files
孙超ZQKC
authored andcommitted
V3.2
1 parent 5bceed7 commit 860d0b9

Some content is hidden

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

59 files changed

+25971
-1496
lines changed

km-console/packages/config-manager-fe/config/theme.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const themeConfig = {
2-
primaryColor: '#556ee6',
2+
primaryColor: '#5664FF',
33
theme: {
4-
'primary-color': '#556ee6',
4+
'primary-color': '#5664FF',
55
'border-radius-base': '2px',
66
'border-radius-sm': '2px',
77
'font-size-base': '12px',

km-console/packages/config-manager-fe/src/pages/UserManage/RoleTabContent.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ export default (props: { curTabKey: string }): JSX.Element => {
423423
dataIndex: 'authedUserCnt',
424424
width: 100,
425425
render(cnt: Pick<RoleProps, 'authedUserCnt'>, record: RoleProps) {
426-
return (
426+
return cnt ? (
427427
<Popover
428428
placement="right"
429429
overlayClassName="tags-with-hide-popover"
@@ -441,6 +441,10 @@ export default (props: { curTabKey: string }): JSX.Element => {
441441
{cnt}
442442
</Button>
443443
</Popover>
444+
) : (
445+
<Button size="small" type="link">
446+
{cnt}
447+
</Button>
444448
);
445449
},
446450
},

km-console/packages/config-manager-fe/src/pages/UserManage/UserTabContent.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ const EditUserDrawer = forwardRef((props, ref) => {
5353
})
5454
: request(api.editUser, {
5555
method: 'POST',
56-
data: { ...formData },
56+
data: { ...formData, phone: Date.now() },
5757
});
5858
requestPromise.then(
5959
(res) => {

km-console/packages/layout-clusters-fe/config/theme.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const themeConfig = {
2-
primaryColor: '#556ee6',
2+
primaryColor: '#5664FF',
33
theme: {
4-
'primary-color': '#556ee6',
4+
'primary-color': '#5664FF',
55
'border-radius-base': '2px',
66
'border-radius-sm': '2px',
77
'font-size-base': '12px',

km-console/packages/layout-clusters-fe/config/webpack.dev.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ module.exports = {
3434
proxy: {
3535
'/ks-km/api/v3': {
3636
changeOrigin: true,
37-
target: 'http://localhost:8080/',
37+
target: 'https://api-kylin-xg02.intra.xiaojukeji.com/ks-km/',
3838
},
3939
'/logi-security/api/v1': {
4040
changeOrigin: true,
41-
target: 'http://localhost:8080/',
41+
target: 'https://api-kylin-xg02.intra.xiaojukeji.com/ks-km/',
4242
},
4343
},
4444
},

0 commit comments

Comments
 (0)