Skip to content

Commit d740a48

Browse files
committed
Merge branch 'dev-4.3.3' of https://code.alipay.com/oceanbase/oceanbase-developer-center into dev-4.3.3
2 parents 681b6d4 + cdf4cb2 commit d740a48

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

  • src
    • component/Task/AlterDdlTask/DetailContent
    • page/Datasource/Datasource/NewDatasourceDrawer/Form

src/component/Task/AlterDdlTask/DetailContent/index.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import ThrottleEditableCell from '../../component/ThrottleEditableCell';
3030
import { OscMaxDataSizeLimit, OscMaxRowLimit } from '../../const';
3131
import { ClearStrategy, SwapTableType } from '../CreateModal';
3232
import { ProjectRole } from '@/d.ts/project';
33+
import userStore from '@/store/login';
3334

3435
const { Text } = Typography;
3536
interface IDDLAlterParamters {
@@ -131,16 +132,15 @@ export function getItems(
131132
sectionRender?: (task: TaskDetail<IDDLAlterParamters>) => void;
132133
}[] {
133134
const { parameters, id, status, project } = task;
134-
const isProjectDBAorOwner = useMemo(() => {
135-
return project.currentUserResourceRoles?.some((item) =>
136-
[ProjectRole.DBA, ProjectRole.OWNER].includes(item),
135+
const haveOperationPermission = useMemo(() => {
136+
return (
137+
project.currentUserResourceRoles?.some((item) =>
138+
[ProjectRole.DBA, ProjectRole.OWNER].includes(item),
139+
) || userStore?.user?.id === task?.creator?.id
137140
);
138141
}, [project]);
139142

140-
const cantBeModified =
141-
[TaskStatus.EXECUTION_SUCCEEDED, TaskStatus.EXECUTION_FAILED, TaskStatus.CANCELLED]?.includes(
142-
status,
143-
) && isProjectDBAorOwner;
143+
const cantBeModified = [TaskStatus.EXECUTING]?.includes(status) && haveOperationPermission;
144144
if (!task) {
145145
return [];
146146
}

src/page/Datasource/Datasource/NewDatasourceDrawer/Form/index.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ import ExtraConfig from './ExtraConfig';
4141
import ParseURLItem from './ParseURLItem';
4242
import ProjectItem from './ProjectItem';
4343
import CloudStorageForm from './CloudStorageForm';
44+
import odc from '@/plugins/odc';
45+
4446
const Option = Select.Option;
4547
export interface IFormRef {
4648
form: FormInstance<IDatasource>;
@@ -181,7 +183,9 @@ export default forwardRef<IFormRef, IProps>(function DatasourceForm(
181183
}}
182184
action={
183185
<a
184-
href={getLocalDocs('100.create-a-personal-connection.html')}
186+
href={
187+
odc.appConfig?.docs.url || getLocalDocs('100.create-a-personal-connection.html')
188+
}
185189
target={'_blank'}
186190
onClick={(e) => {
187191
e.stopPropagation();

0 commit comments

Comments
 (0)