Skip to content

D
dlink
Commit 2807f7e5 authored by godkaikai's avatar godkaikai
Browse files
Options

0.2.2-rc3

parent 730e5822
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 50 deletions
dlink-client/dlink-client-1.13/src/main/java/com/dlink/executor/custom/CustomTableResultImpl.java
View file @ 2807f7e5
...@@ -5,6 +5,7 @@ import org.apache.flink.core.execution.JobClient; ...@@ -5,6 +5,7 @@ import org.apache.flink.core.execution.JobClient;
import org.apache.flink.table.api.*; import org.apache.flink.table.api.*;
import org.apache.flink.table.catalog.Column; import org.apache.flink.table.catalog.Column;
import org.apache.flink.table.catalog.ResolvedSchema; import org.apache.flink.table.catalog.ResolvedSchema;
import org.apache.flink.table.types.DataType;
import org.apache.flink.table.utils.PrintUtils; import org.apache.flink.table.utils.PrintUtils;
import org.apache.flink.types.Row; import org.apache.flink.types.Row;
import org.apache.flink.util.CloseableIterator; import org.apache.flink.util.CloseableIterator;
...@@ -44,12 +45,13 @@ public class CustomTableResultImpl implements TableResult { ...@@ -44,12 +45,13 @@ public class CustomTableResultImpl implements TableResult {
public static TableResult buildTableResult(List<TableSchemaField> fields,List<Row> rows){ public static TableResult buildTableResult(List<TableSchemaField> fields,List<Row> rows){
Builder builder = builder().resultKind(ResultKind.SUCCESS); Builder builder = builder().resultKind(ResultKind.SUCCESS);
if(fields.size()>0) { if(fields.size()>0) {
//ResolvedSchema tableSchemaBuild = ResolvedSchema.of(); List<String> columnNames = new ArrayList<>();
/*List<Column> columns = new ArrayList<>(); List<DataType> columnTypes = new ArrayList<>();
for (int i = 0; i < fields.size(); i++) { for (int i = 0; i < fields.size(); i++) {
columns.add(new TableColumn.PhysicalColumn(fields.get(i).getName(),fields.get(i).getType())); columnNames.add(fields.get(i).getName());
columnTypes.add(fields.get(i).getType());
} }
builder.schema(tableSchemaBuild.build()).data(rows);*/ builder.schema(ResolvedSchema.physical(columnNames,columnTypes)).data(rows);
} }
return builder.build(); return builder.build();
} }
......
dlink-core/pom.xml
View file @ 2807f7e5
...@@ -31,17 +31,17 @@ ...@@ -31,17 +31,17 @@
<dependency> <dependency>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<artifactId>dlink-client-1.12</artifactId> <artifactId>dlink-client-1.12</artifactId>
<!--<scope>provided</scope>--> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<artifactId>dlink-connector-jdbc</artifactId> <artifactId>dlink-connector-jdbc</artifactId>
<!--<scope>provided</scope>--> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<artifactId>dlink-function</artifactId> <artifactId>dlink-function</artifactId>
<!--<scope>provided</scope>--> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
dlink-web/src/components/Studio/StudioEdit/index.less 0 → 100644
View file @ 2807f7e5
@import '~antd/es/style/themes/default.less';
dlink-web/src/components/Studio/StudioEdit/index.tsx
View file @ 2807f7e5
...@@ -4,8 +4,8 @@ import * as _monaco from "monaco-editor"; ...@@ -4,8 +4,8 @@ import * as _monaco from "monaco-editor";
import MonacoEditor from "react-monaco-editor"; import MonacoEditor from "react-monaco-editor";
import {BaseDataSourceField, BaseDataSourceHeader, CompletionItem} from "./data"; import {BaseDataSourceField, BaseDataSourceHeader, CompletionItem} from "./data";
import Completion from "./completion"; import Completion from "./completion";
import styles from './index.less';
import {executeSql} from "@/pages/FlinkSqlStudio/service";
import {StateType} from "@/pages/FlinkSqlStudio/model"; import {StateType} from "@/pages/FlinkSqlStudio/model";
import {connect} from "umi"; import {connect} from "umi";
......
dlink-web/src/components/Studio/StudioTabs/index.less
View file @ 2807f7e5
...@@ -4,5 +4,9 @@ ...@@ -4,5 +4,9 @@
.ant-tabs-nav, .ant-tabs-bottom > .ant-tabs-nav, .ant-tabs-top > div > .ant-tabs-nav, .ant-tabs-bottom > div > .ant-tabs-nav { .ant-tabs-nav, .ant-tabs-bottom > .ant-tabs-nav, .ant-tabs-top > div > .ant-tabs-nav, .ant-tabs-bottom > div > .ant-tabs-nav {
margin: 0; margin: 0;
} }
.ant-tabs-content {
height: 100%;
}
} }
} }
dlink-web/src/components/Studio/StudioTabs/index.tsx
View file @ 2807f7e5
...@@ -68,10 +68,11 @@ const EditorTabs = (props: any) => { ...@@ -68,10 +68,11 @@ const EditorTabs = (props: any) => {
activeKey={tabs.activeKey+''} activeKey={tabs.activeKey+''}
onEdit={onEdit} onEdit={onEdit}
className={styles["edit-tabs"]} className={styles["edit-tabs"]}
style={{height:"100%"}}
> >
{tabs.panes.map(pane => ( {tabs.panes.map(pane => (
<TabPane tab={pane.title} key={pane.key} closable={pane.closable}> <TabPane tab={pane.title} key={pane.key} closable={pane.closable}>
<StudioEdit tabsKey={pane.key} height='400px'/> <StudioEdit tabsKey={pane.key} height='100%'/>
</TabPane> </TabPane>
))} ))}
</Tabs> </Tabs>
......
dlink-web/src/pages/Welcome.tsx
View file @ 2807f7e5
...@@ -68,28 +68,28 @@ export default (): React.ReactNode => { ...@@ -68,28 +68,28 @@ export default (): React.ReactNode => {
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
<Link href="">FlinkSql Studio 进程监控</Link> <Link>FlinkSql Studio 进程监控</Link>
</li> </li>
<li> <li>
<Link href="">FlinkSql Studio 集群总览</Link> <Link>FlinkSql Studio 集群总览</Link>
</li> </li>
<li> <li>
<Link href="">FlinkSql Studio 集群任务</Link> <Link>FlinkSql Studio 集群任务</Link>
</li> </li>
<li> <li>
<Link href="">FlinkSql Studio 任务详情</Link> <Link>FlinkSql Studio 任务详情</Link>
</li> </li>
<li> <li>
<Link href="">FlinkSql Studio 连接器详情</Link> <Link>FlinkSql Studio 连接器详情</Link>
</li> </li>
<li> <li>
<Link href="">FlinkSql Studio 指标展示</Link> <Link>FlinkSql Studio 指标展示</Link>
</li> </li>
<li> <li>
<Link href="">FlinkSql Studio 自动完成函数</Link> <Link>FlinkSql Studio 自动完成函数</Link>
</li> </li>
<li> <li>
<Link href="">用户与授权</Link> <Link>用户与授权</Link>
</li> </li>
</ul> </ul>
</Paragraph></>} reverse={true}> </Paragraph></>} reverse={true}>
...@@ -98,16 +98,16 @@ export default (): React.ReactNode => { ...@@ -98,16 +98,16 @@ export default (): React.ReactNode => {
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
<Link href="">FlinkSql Studio 基本功能</Link> <Link>FlinkSql Studio 基本功能</Link>
</li> </li>
<li> <li>
<Link href="">Flink 集群管理</Link> <Link>Flink 集群管理</Link>
</li> </li>
<li> <li>
<Link href="">FlinkSql 任务管理</Link> <Link>FlinkSql 任务管理</Link>
</li> </li>
<li> <li>
<Link href="">FlinkSql 文档管理</Link> <Link>FlinkSql 文档管理</Link>
</li> </li>
</ul> </ul>
</Paragraph> </Paragraph>
...@@ -117,28 +117,28 @@ export default (): React.ReactNode => { ...@@ -117,28 +117,28 @@ export default (): React.ReactNode => {
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
<Link href="">FlinkSql Studio 代码底层架构进行大优化</Link> <Link>FlinkSql Studio 代码底层架构进行大优化</Link>
</li> </li>
<li> <li>
<Link href="">支持以 SPI 的方式扩展任意 Connector，同 Flink 官网</Link> <Link>支持以 SPI 的方式扩展任意 Connector，同 Flink 官网</Link>
</li> </li>
<li> <li>
<Link href="">提供了 dlink-connector-jdbc，额外支持 Oracle 和 ClickHouse 读写，该扩展包可直接上传 Flink 集群的 lib 进行远程使用，无需重新编译</Link> <Link>提供了 dlink-connector-jdbc，额外支持 Oracle 和 ClickHouse 读写，该扩展包可直接上传 Flink 集群的 lib 进行远程使用，无需重新编译</Link>
</li> </li>
<li> <li>
<Link href="">提供了 dlink-client-1.12，支持 Flink 1.12.0+ 多集群的远程使用与本地隔离使用，1.10、1.11 和 1.13 集群可能存在问题</Link> <Link>提供了 dlink-client-1.12，支持 Flink 1.12.0+ 多集群的远程使用与本地隔离使用，1.10、1.11 和 1.13 集群可能存在问题</Link>
</li> </li>
<li> <li>
<Link href="">优化了 FlinkSQL 执行与提交到远程集群的任务名，默认为作业的中文别名</Link> <Link>优化了 FlinkSQL 执行与提交到远程集群的任务名，默认为作业的中文别名</Link>
</li> </li>
<li> <li>
<Link href="">优化了目录的操作，点击节点即可打开作业，无须右键打开</Link> <Link>优化了目录的操作，点击节点即可打开作业，无须右键打开</Link>
</li> </li>
<li> <li>
<Link href="">优化了执行结果信息，添加了任务名的展示</Link> <Link>优化了执行结果信息，添加了任务名的展示</Link>
</li> </li>
<li> <li>
<Link href="">对 Studio 界面进行了一定的提示优化</Link> <Link>对 Studio 界面进行了一定的提示优化</Link>
</li> </li>
</ul> </ul>
</Paragraph> </Paragraph>
...@@ -148,71 +148,80 @@ export default (): React.ReactNode => { ...@@ -148,71 +148,80 @@ export default (): React.ReactNode => {
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
<Link href="">FlinkSql Studio 页面仿IDE紧凑型设计改进</Link> <Link>FlinkSql Studio 页面仿IDE紧凑型设计改进</Link>
</li> </li>
<li> <li>
<Link href="">解决了目录树右键菜单的不能任意点关闭问题</Link> <Link>解决了目录树右键菜单的不能任意点关闭问题</Link>
</li> </li>
<li> <li>
<Link href="">解决了选项卡关闭不能正确刷新编辑器的问题</Link> <Link>解决了选项卡关闭不能正确刷新编辑器的问题</Link>
</li> </li>
<li> <li>
<Link href="">解决了当前位置不根据选项卡刷新的问题</Link> <Link>解决了当前位置不根据选项卡刷新的问题</Link>
</li> </li>
<li> <li>
<Link href="">增加了目录树非空文件夹的灰色删除按钮</Link> <Link>增加了目录树非空文件夹的灰色删除按钮</Link>
</li> </li>
<li> <li>
<Link href="">增加了目录树创建根目录按钮以及折叠按钮</Link> <Link>增加了目录树创建根目录按钮以及折叠按钮</Link>
</li> </li>
<li> <li>
<Link href="">优化了连接器刷新与清空按钮</Link> <Link>优化了连接器刷新与清空按钮</Link>
</li> </li>
<li> <li>
<Link href="">优化了作业异步提交的提示</Link> <Link>优化了作业异步提交的提示</Link>
</li> </li>
<li> <li>
<Link href="">增加了简易的使用帮助</Link> <Link>增加了简易的使用帮助</Link>
</li> </li>
</ul> </ul>
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.2.2</Text> <Text type="secondary">2021-06-15</Text> <Timeline.Item><Text code>0.2.2</Text> <Text type="secondary">2021-06-17</Text>
<p> </p> <p> </p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
<Link href="">AGGTABLE 语法实现</Link> <Link>AGGTABLE 语法实现</Link>
</li> </li>
<li> <li>
<Link href="">增加了 dlink-function 模块用来管理 UDF 等，其可直接上传至集群lib</Link> <Link>增加了 dlink-function 模块用来管理 UDF 等，其可直接上传至集群lib</Link>
</li> </li>
<li> <li>
<Link href="">解决了表单无法正确提交 Fragment 的问题</Link> <Link>解决了表单无法正确提交 Fragment 的问题</Link>
</li> </li>
<li> <li>
<Link href="">开启Hash路由解决了历史路由集成Springboot的问题</Link> <Link>开启Hash路由解决了历史路由集成Springboot的问题</Link>
</li> </li>
<li> <li>
<Link href="">解决了 FlinkSQL 编辑器的 CTRL+C 撤销乱窜问题</Link> <Link>解决了 FlinkSQL 编辑器的 CTRL+C 撤销乱窜问题</Link>
</li> </li>
<li> <li>
<Link href="">解决了右键删除目录树的作业时对应选项卡不关闭的问题</Link> <Link>解决了右键删除目录树的作业时对应选项卡不关闭的问题</Link>
</li> </li>
<li> <li>
<Link href="">解决了新增作业其配置无法正常初始化的问题</Link> <Link>解决了新增作业其配置无法正常初始化的问题</Link>
</li> </li>
<li> <li>
<Link href="">增加了新增作业自动定位及打开选项卡的功能</Link> <Link>解决了新增作业集群下拉框值为0的问题</Link>
</li> </li>
<li> <li>
<Link href="">增加了在不选择会话值时自动禁用会话的功能</Link> <Link>增加了新增作业自动定位及打开选项卡的功能</Link>
</li> </li>
<li> <li>
<Link href="">解决了在修改配置后异步提交任务会将作业识别为草稿的问题</Link> <Link>增加了在不选择会话值时自动禁用会话的功能</Link>
</li> </li>
<li> <li>
<Link href="">扩展了 Flink Client 1.13</Link> <Link>解决了在修改配置后异步提交任务会将作业识别为草稿的问题</Link>
</li>
<li>
<Link>扩展了 Flink Client 1.13</Link>
</li>
<li>
<Link>解决了编辑器初始化高度5px的问题</Link>
</li>
<li>
<Link>解决了首页更新日志点击会打开新连接的问题</Link>
</li> </li>
</ul> </ul>
</Paragraph> </Paragraph>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment