Skip to content

Commit

Permalink
Feature bailongsen (#655)
Browse files Browse the repository at this point in the history
* fix: 自定义菜单渲染

* fix: 调整布局

* fix: 调试分配权限接口

* fix: 调试角色分配用户

* feat: The role assigned to a user is added

* feat:Added a resource configuration role

* [Bug][scaleph-security] fix web resource child routes error (#637)

fix: child routes error

* [Bug][docker] fix scaleph-seatunnel image error (#638)

* feature: add doris operator

* feature: add web-resource and role relation table

* feature: add web-resource and role relation mapper

* feature: add web-resource and role relation mapper

* fix: seatunnel base image

* [Bug][docker] fix scaleph-seatunnel image error (#639)

fix: seatunnel base image

* [Bug][docker] fix scaleph-seatunnel image error (#640)

fix: seatunnel base image

* [Bug][docker] fix scaleph-seatunnel image error (#641)

fix: seatunnel base image

* [Bug][docker] fix scaleph-seatunnel image error (#642)

* fix: seatunnel base image

* fix: seatunnel base image

* [Feature][scaleph-security] add security web resource and role relation api (#644)

* fix: seatunnel base image

* feature: add resource-web and role relation api

* [Feature][scaleph-security] add user and role relation api (#645)

* feature: add user and role relation api

* feature: add user and role relation api

* [Feature][scaleph-engine-doris] add selectdb doris-operator crd (#646)

* feature: doris operator crd definition

* fix: resource-web and role relation error

* [Bug][scaleph-security] fix umi route icon error (#647)

* fix: resource-web and role relation error

* fix: route icon error

* [Feature][scaleph-ui-react] add doris template web under project (#648)

* feature: add doris template mapper

* feature: add doris template service

* feature: add doris template service

* feature: add doris template web route

* feature: add doris template web

* [Feature][scaleph-engine-doris] add doris template steps form (#649)

* feature: upgrade flink kubernetes operator to 1.7.0

* feature: add doris template detail web

* feature: add doris template detail web

* feature: add doris template steps

* feature: add doris template steps

* feature: add doris template steps route

* feature: add doris template component step

* fix: knife4j error

* fix: knife4j error

* fix: knife4j error

* fix: knife4j error

* [Feature][scaleph-engine-doris] add doris template detail web (#650)

* fix: doris template step form item error

* feature: add doris template yaml step

* feature: add doris template yaml step

* feature: add createStatus for doris template

* feature: add yaml step for doris template steps

* feature: add yaml step for doris template steps

* feature: add yaml step for doris template steps

* feature: remove doris template createStatus field

* feature: refactor doris template step model

* feature: add yaml area for doris template detail web

* feature: add yaml area for doris template detail web

* [Feature][scaleph-engine-doris] add doris instance service (#651)

* feature: add doris instance service

* feature: add doris instance controller

* feature: add doris instance controller

* feature: add doris instance web

* feature: add doris instance steps

* feature: add doris instance steps

* feature: add doris instance steps

* fix: system nav bar error

* [Feature][scaleph-engine-doris] add doris instance steps form web (#652)

* fix: user resource

* fix: user resource

* feature: add doris instance steps form

* [Feature][scaleph-engine-doris] add doris instance detail web  (#653)

* feature: add doris instance detail web

* feature: add doris instance detail web

* feature: add doris instance detail web

* [Release] release 2.0.0-SNAPSHOT

* fix: Modify the assignment user prompt text display

---------

Co-authored-by: bailongsen <[email protected]>
Co-authored-by: kalencaya <[email protected]>
  • Loading branch information
3 people authored Dec 5, 2023
1 parent 37601ab commit 5ec126a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
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
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

0 comments on commit 5ec126a

Please sign in to comment.