-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add varibles params in APIController and Web (#2544)
* Optimize the process * add task varibles post * fix world
- Loading branch information
1 parent
3ec1e1f
commit 6e9eafc
Showing
9 changed files
with
167 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
dinky-admin/src/main/java/org/dinky/data/dto/TaskSubmitDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package org.dinky.data.dto; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| import io.swagger.annotations.ApiModelProperty; | ||
| import lombok.Builder; | ||
| import lombok.Data; | ||
|
|
||
| @Data | ||
| @Builder | ||
| public class TaskSubmitDto { | ||
|
|
||
| @ApiModelProperty(value = "ID", dataType = "Integer", example = "6", notes = "The identifier of the execution") | ||
| private Integer id; | ||
|
|
||
| @ApiModelProperty( | ||
| value = "Save Point Path", | ||
| dataType = "String", | ||
| example = "/savepoints", | ||
| notes = "The path for save points") | ||
| private String savePointPath; | ||
|
|
||
| @ApiModelProperty( | ||
| value = "Variables", | ||
| dataType = "Map<String, String>", | ||
| example = "{\"key\": \"value\"}", | ||
| notes = "Variables") | ||
| private Map<String, String> variables; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
dinky-web/src/pages/DataStudio/LeftContainer/GlobaleVar/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| * | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| import { queryList } from '@/services/api'; | ||
| import { API_CONSTANTS } from '@/services/endpoints'; | ||
| import { GlobalVar } from '@/types/RegCenter/data'; | ||
| import { l } from '@/utils/intl'; | ||
| import { EyeTwoTone } from '@ant-design/icons'; | ||
| import ProTable, { ProColumns } from '@ant-design/pro-table'; | ||
| import { Modal, Space, Typography } from 'antd'; | ||
|
|
||
| const { Text, Link } = Typography; | ||
| const { confirm } = Modal; | ||
|
|
||
| const GlobalVariable = (props: any) => { | ||
| const columns: ProColumns<GlobalVar>[] = [ | ||
| { | ||
| title: l('rc.gv.name'), | ||
| dataIndex: 'name', | ||
| sorter: true, | ||
| width: '80%', | ||
| ellipsis: true, | ||
| render: (_, record) => { | ||
| return ( | ||
| <Space direction='vertical' size={0}> | ||
| <Text copyable>{`\$\{${record.name}\}`}</Text> | ||
| <Text type='secondary'>{record.note}</Text> | ||
| </Space> | ||
| ); | ||
| } | ||
| }, | ||
| { | ||
| title: l('rc.gv.value'), | ||
| dataIndex: 'id', | ||
| width: '20%', | ||
| render: (_, record) => ( | ||
| <EyeTwoTone onClick={() => confirm({ content: record.fragmentValue })} /> | ||
| ) | ||
| } | ||
| ]; | ||
|
|
||
| return ( | ||
| <ProTable<GlobalVar> | ||
| showHeader={false} | ||
| tableStyle={{ margin: 0, paddingInline: 0 }} | ||
| search={false} | ||
| defaultSize={'small'} | ||
| options={false} | ||
| type={'list'} | ||
| toolBarRender={() => [<Link href={'/#/registration/fragment'}>{l('rc.gv.Management')}</Link>]} | ||
| columns={columns} | ||
| request={(params) => | ||
| queryList(API_CONSTANTS.GLOBAL_VARIABLE, { ...params, filter: { enabled: [1] } }) | ||
| } | ||
| pagination={{ hideOnSinglePage: true, pageSize: 10, size: 'small', showTotal: () => '' }} | ||
| /> | ||
| ); | ||
| }; | ||
|
|
||
| export default GlobalVariable; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters