From 8d3e7155356ceb725e41f4b0b59ba5f0f4799c35 Mon Sep 17 00:00:00 2001 From: bailongsen1027 <132729499+bailongsen1027@users.noreply.github.com> Date: Fri, 27 Oct 2023 01:37:55 -0500 Subject: [PATCH] Feature bailongsen (#630) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 调试请求接口 * fix: 添加执行结果 * fix: 完善执行结果 * fix: 调试执行sql结果 * [Bug][scaleph-engine-sql-gateway] fix flink sql gateway query result error (#616) fix: flink sql gateway query result error * [Bug][scaleph-engine-sql-gateway] fix flink sql gateway query result error (#617) fix: flink sql gateway query result error * [Feature][scaleph-engine-sql-gateway] add column info for flink sql query result (#618) feature: add column info for flink sql query result * [Feature][scaleph-engine-sql-gateway] optimize Flink TimestampData and DecimalData format (#619) feature: optimize Flink TimestampData and DecimalData format * [Feature][scaleph-engine-sql-gateway] add sql gateway splited service (#623) * feature: add flink sql gateway service interface * feature: upgrade flink kubernetes operator api * feature: upgrade flink kubernetes operator api * feature: add dataservice module * feature: add flink sql gateway service interface * feature: add dataservice module * fix: dataservice sql script error * feature: dataservice config mapper * feature: dataservice config controller * feature: dataservice parameter and result map sql table * feature: dataservice parameter and result map mapper * feature: dataservice parameter and result map interface * feature: dataservice parameter and result map service * feature: add dataservice parameter and result mapping sql table * feature: add dataservice parameter and result mapping mapper * fix: jobId NPE * fix: jobId NPE * feature: add parametermap and resultmap * feature: add parametermap and resultmap * feature: add parametermap and resultmap * feature: add parametermap and resultmap * feature: add parametermapping and resultmapping * feature: add parametermapping and resultmapping * feature: add flink custom artifact table * fix: docker build * fix: docker build * fix: docker build * fix: flink sql gateway feitch results api page param error * fix: 修改sql执行结果 * fix: 将sql执行结果对象和数组格式转换成字符串格式并添加超出省略 * fix: 修改图片展示格式 --------- Co-authored-by: bailongsen Co-authored-by: kalencaya <1942460489@qq.com> --- .../public/images/EditorResult/folderMinus.svg | 1 + .../public/images/EditorResult/folderOpen.svg | 1 + .../EditorResult/\345\210\206\347\261\273.svg" | 1 + .../EditorResult/\345\210\267\346\226\260.svg" | 1 + .../EditorResult/\345\220\221\344\270\213.svg" | 1 + .../EditorResult/\345\244\215\345\210\266.svg" | 1 + .../EditorResult/\346\210\220\345\212\237.svg" | 1 + .../EditorResult/\346\220\234\347\264\242.svg" | 1 + .../EditorResult/\346\222\255\346\224\276.svg" | 1 + .../EditorResult/\346\237\234\345\255\220.svg" | 1 + .../EditorResult/\346\237\245\347\234\213.svg" | 1 + .../EditorResult/\347\233\256\345\275\225.svg" | 1 + .../Artifact/Sql/CodeEditor/EditMenu/index.tsx | 4 ++-- .../Artifact/Sql/CodeEditor/Editor/index.tsx | 2 +- .../EditorRightResult/EditorRightResultTable.tsx | 14 ++++++++++---- .../Sql/CodeEditor/EditorRightResult/index.tsx | 2 +- .../src/pages/Project/components/Tree/index.tsx | 14 +++++++------- 17 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 scaleph-ui-react/public/images/EditorResult/folderMinus.svg create mode 100644 scaleph-ui-react/public/images/EditorResult/folderOpen.svg create mode 100644 "scaleph-ui-react/public/images/EditorResult/\345\210\206\347\261\273.svg" create mode 100644 "scaleph-ui-react/public/images/EditorResult/\345\210\267\346\226\260.svg" create mode 100644 "scaleph-ui-react/public/images/EditorResult/\345\220\221\344\270\213.svg" create mode 100644 "scaleph-ui-react/public/images/EditorResult/\345\244\215\345\210\266.svg" create mode 100644 "scaleph-ui-react/public/images/EditorResult/\346\210\220\345\212\237.svg" create mode 100644 "scaleph-ui-react/public/images/EditorResult/\346\220\234\347\264\242.svg" create mode 100644 "scaleph-ui-react/public/images/EditorResult/\346\222\255\346\224\276.svg" create mode 100644 "scaleph-ui-react/public/images/EditorResult/\346\237\234\345\255\220.svg" create mode 100644 "scaleph-ui-react/public/images/EditorResult/\346\237\245\347\234\213.svg" create mode 100644 "scaleph-ui-react/public/images/EditorResult/\347\233\256\345\275\225.svg" diff --git a/scaleph-ui-react/public/images/EditorResult/folderMinus.svg b/scaleph-ui-react/public/images/EditorResult/folderMinus.svg new file mode 100644 index 000000000..a9f82cc3d --- /dev/null +++ b/scaleph-ui-react/public/images/EditorResult/folderMinus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/scaleph-ui-react/public/images/EditorResult/folderOpen.svg b/scaleph-ui-react/public/images/EditorResult/folderOpen.svg new file mode 100644 index 000000000..a4e2f42ec --- /dev/null +++ b/scaleph-ui-react/public/images/EditorResult/folderOpen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git "a/scaleph-ui-react/public/images/EditorResult/\345\210\206\347\261\273.svg" "b/scaleph-ui-react/public/images/EditorResult/\345\210\206\347\261\273.svg" new file mode 100644 index 000000000..6b020b727 --- /dev/null +++ "b/scaleph-ui-react/public/images/EditorResult/\345\210\206\347\261\273.svg" @@ -0,0 +1 @@ + \ No newline at end of file diff --git "a/scaleph-ui-react/public/images/EditorResult/\345\210\267\346\226\260.svg" "b/scaleph-ui-react/public/images/EditorResult/\345\210\267\346\226\260.svg" new file mode 100644 index 000000000..a0e64faa3 --- /dev/null +++ "b/scaleph-ui-react/public/images/EditorResult/\345\210\267\346\226\260.svg" @@ -0,0 +1 @@ + \ No newline at end of file diff --git "a/scaleph-ui-react/public/images/EditorResult/\345\220\221\344\270\213.svg" "b/scaleph-ui-react/public/images/EditorResult/\345\220\221\344\270\213.svg" new file mode 100644 index 000000000..1e4bcec2b --- /dev/null +++ "b/scaleph-ui-react/public/images/EditorResult/\345\220\221\344\270\213.svg" @@ -0,0 +1 @@ + \ No newline at end of file diff --git "a/scaleph-ui-react/public/images/EditorResult/\345\244\215\345\210\266.svg" "b/scaleph-ui-react/public/images/EditorResult/\345\244\215\345\210\266.svg" new file mode 100644 index 000000000..32a0ac531 --- /dev/null +++ "b/scaleph-ui-react/public/images/EditorResult/\345\244\215\345\210\266.svg" @@ -0,0 +1 @@ + \ No newline at end of file diff --git "a/scaleph-ui-react/public/images/EditorResult/\346\210\220\345\212\237.svg" "b/scaleph-ui-react/public/images/EditorResult/\346\210\220\345\212\237.svg" new file mode 100644 index 000000000..78c62e850 --- /dev/null +++ "b/scaleph-ui-react/public/images/EditorResult/\346\210\220\345\212\237.svg" @@ -0,0 +1 @@ + \ No newline at end of file diff --git "a/scaleph-ui-react/public/images/EditorResult/\346\220\234\347\264\242.svg" "b/scaleph-ui-react/public/images/EditorResult/\346\220\234\347\264\242.svg" new file mode 100644 index 000000000..406eb7524 --- /dev/null +++ "b/scaleph-ui-react/public/images/EditorResult/\346\220\234\347\264\242.svg" @@ -0,0 +1 @@ + \ No newline at end of file diff --git "a/scaleph-ui-react/public/images/EditorResult/\346\222\255\346\224\276.svg" "b/scaleph-ui-react/public/images/EditorResult/\346\222\255\346\224\276.svg" new file mode 100644 index 000000000..26d61443f --- /dev/null +++ "b/scaleph-ui-react/public/images/EditorResult/\346\222\255\346\224\276.svg" @@ -0,0 +1 @@ + \ No newline at end of file diff --git "a/scaleph-ui-react/public/images/EditorResult/\346\237\234\345\255\220.svg" "b/scaleph-ui-react/public/images/EditorResult/\346\237\234\345\255\220.svg" new file mode 100644 index 000000000..0c501e2c8 --- /dev/null +++ "b/scaleph-ui-react/public/images/EditorResult/\346\237\234\345\255\220.svg" @@ -0,0 +1 @@ + \ No newline at end of file diff --git "a/scaleph-ui-react/public/images/EditorResult/\346\237\245\347\234\213.svg" "b/scaleph-ui-react/public/images/EditorResult/\346\237\245\347\234\213.svg" new file mode 100644 index 000000000..a6a739f3a --- /dev/null +++ "b/scaleph-ui-react/public/images/EditorResult/\346\237\245\347\234\213.svg" @@ -0,0 +1 @@ + \ No newline at end of file diff --git "a/scaleph-ui-react/public/images/EditorResult/\347\233\256\345\275\225.svg" "b/scaleph-ui-react/public/images/EditorResult/\347\233\256\345\275\225.svg" new file mode 100644 index 000000000..75e3e5b28 --- /dev/null +++ "b/scaleph-ui-react/public/images/EditorResult/\347\233\256\345\275\225.svg" @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Artifact/Sql/CodeEditor/EditMenu/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Artifact/Sql/CodeEditor/EditMenu/index.tsx index 6889f1f6b..a55b0e443 100644 --- a/scaleph-ui-react/src/pages/Project/Workspace/Artifact/Sql/CodeEditor/EditMenu/index.tsx +++ b/scaleph-ui-react/src/pages/Project/Workspace/Artifact/Sql/CodeEditor/EditMenu/index.tsx @@ -131,10 +131,10 @@ const RenderTableBox: React.FC = () => {
Table
refreshTableList()}> - +
openSearch()}> - +
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Artifact/Sql/CodeEditor/Editor/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Artifact/Sql/CodeEditor/Editor/index.tsx index 094555e1a..0da96136d 100644 --- a/scaleph-ui-react/src/pages/Project/Workspace/Artifact/Sql/CodeEditor/Editor/index.tsx +++ b/scaleph-ui-react/src/pages/Project/Workspace/Artifact/Sql/CodeEditor/Editor/index.tsx @@ -120,7 +120,7 @@ const CodeEditor: React.FC = () => {