Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature bailongsen #655

Merged
merged 26 commits into from
Dec 5, 2023
Merged

Feature bailongsen #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
56b7b5c
fix: 自定义菜单渲染
Nov 8, 2023
8db1ae8
fix: 调整布局
Nov 15, 2023
ab94914
fix: 调试分配权限接口
Nov 27, 2023
4c7f388
fix: 调试角色分配用户
Nov 28, 2023
05f5fdf
feat: The role assigned to a user is added
Dec 2, 2023
266884d
feat:Added a resource configuration role
Dec 5, 2023
bf2b6a3
[Bug][scaleph-security] fix web resource child routes error (#637)
kalencaya Nov 7, 2023
46286f7
[Bug][docker] fix scaleph-seatunnel image error (#638)
kalencaya Nov 14, 2023
e6ca12e
[Bug][docker] fix scaleph-seatunnel image error (#639)
kalencaya Nov 14, 2023
09bf25d
[Bug][docker] fix scaleph-seatunnel image error (#640)
kalencaya Nov 15, 2023
70476c9
[Bug][docker] fix scaleph-seatunnel image error (#641)
kalencaya Nov 15, 2023
b99881b
[Bug][docker] fix scaleph-seatunnel image error (#642)
kalencaya Nov 15, 2023
1280b36
[Feature][scaleph-security] add security web resource and role relati…
kalencaya Nov 15, 2023
018fd48
[Feature][scaleph-security] add user and role relation api (#645)
kalencaya Nov 20, 2023
3aa59de
[Feature][scaleph-engine-doris] add selectdb doris-operator crd (#646)
kalencaya Nov 20, 2023
b52462b
[Bug][scaleph-security] fix umi route icon error (#647)
kalencaya Nov 20, 2023
af29121
[Feature][scaleph-ui-react] add doris template web under project (#648)
kalencaya Nov 21, 2023
04d62c6
[Feature][scaleph-engine-doris] add doris template steps form (#649)
kalencaya Nov 26, 2023
311fdde
[Feature][scaleph-engine-doris] add doris template detail web (#650)
kalencaya Nov 27, 2023
5b64e7d
[Feature][scaleph-engine-doris] add doris instance service (#651)
kalencaya Nov 29, 2023
ffc377c
[Feature][scaleph-engine-doris] add doris instance steps form web (#652)
kalencaya Dec 2, 2023
7617895
[Feature][scaleph-engine-doris] add doris instance detail web (#653)
kalencaya Dec 5, 2023
8b36ce7
[Release] release 2.0.0-SNAPSHOT
kalencaya Dec 5, 2023
3c30032
Merge branch 'dev' into feature-bailongsen
bailongsen1027 Dec 5, 2023
16c2a3c
fix: Modify the assignment user prompt text display
Dec 5, 2023
2d9e655
Merge branch 'dev' into feature-bailongsen
bailongsen1027 Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ const WebResourceForm: React.FC<ModalFormParentProps<SecResourceWeb>> = ({
>
<TableTransfer
containerHeight={containerInfo.height}
titles={[intl.formatMessage({ id: 'app.common.operate.new.accreditUser' }), intl.formatMessage({ id: 'app.common.operate.new.notAccreditUser' })]}
titles={[intl.formatMessage({ id: 'app.common.operate.new.notAccreditUser' }), intl.formatMessage({ id: 'app.common.operate.new.accreditUser' })]}
dataSource={roleLists}
targetKeys={originTargetKeys}
showSearch={true}
Expand Down
2 changes: 1 addition & 1 deletion scaleph-ui-react/src/pages/Admin/User/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ const User: React.FC = () => {
<>
<Space>
{access.canAccess(PRIVILEGE_CODE.datadevProjectEdit) && (
<Tooltip title={intl.formatMessage({ id: 'app.common.operate.new.user' })}>
<Tooltip title={intl.formatMessage({ id: 'app.common.operate.new.roles' })}>
<Button
shape="default"
type="link"
Expand Down