Merge branch 'DataLinkDC:dev' into dev

dlink-web/src/components/Studio/StudioEdit/index.tsx

@@ -157,9 +157,10 @@ const FlinkSqlEditor = (props:any) => {
         var formatted = format(model.getValueInRange(range), {
           indent: ' '.repeat(options.tabSize)
         });
-        formatted = formatted.replace(/` ([^`]*) `/g,function (){return '`'+arguments[1].trim()+'`'})
-          .replace(/\$ {([^}]*)}/g,function (){return '${'+arguments[1].trim()+'}'})
-          .replace(/\| ([^}]*)\|/g,function (){return '|'+arguments[1].trim()+'|'})
+        formatted = formatted.replaceAll(/` ([^`]*) `/g,function (){return '`'+arguments[1].trim()+'`'})
+          .replaceAll(/\$ {([^}]*)}/g,function (){return '${'+arguments[1].trim()+'}'})
+          .replaceAll(/\| ([^}]*)\|/g,function (){return '|'+arguments[1].trim()+'|'})
+          .replaceAll(/ - /g,function (){return '-'});
         return [
           {
             range: range,

dlink-web/src/components/Studio/StudioMenu/index.tsx

@@ -4,7 +4,7 @@ import {
   PauseCircleTwoTone, CarryOutTwoTone, DeleteTwoTone, PlayCircleTwoTone, CameraTwoTone, SnippetsTwoTone,
   FileAddTwoTone, FolderOpenTwoTone, SafetyCertificateTwoTone, SaveTwoTone, FlagTwoTone, CodeTwoTone,
   EnvironmentOutlined, SmileOutlined, RocketTwoTone, QuestionCircleTwoTone, MessageOutlined, ClusterOutlined
-  , EditTwoTone, RestTwoTone
+  , EditTwoTone, RestTwoTone, ShrinkOutlined
 } from "@ant-design/icons";
 import Space from "antd/es/space";
 import Divider from "antd/es/divider";
@@ -698,7 +698,16 @@ const StudioMenu = (props: any) => {
         style={{top: 0, padding: 0, margin: 0, maxWidth: '100vw'}}
         destroyOnClose
         maskClosable={false}
-        closable={false}
+        closable={true}
+        closeIcon={
+          <Tooltip title="退出全屏">
+            <Button
+              icon={<ShrinkOutlined/>}
+              type="primary"
+              style={{position: "fixed", right: "0"}}>
+              退出
+            </Button>
+          </Tooltip>}
         visible={isFullScreen}
         footer={null}
         onCancel={() => {

docs/zh-CN/extend/datasource.md

@@ -11,4 +11,4 @@
 
 使用以上数据源,请查阅注册中心[数据源管理](/zh-CN/administrator-guide/registerCenter/datasource_manage.md),配置数据源连接
 
-**说明：** Dinky不在对Starorcks进行额外扩展，Doris和Starorcks底层并无差别，原则上只是有些功能区分而已。在Flink Connector 上，目前Doris只支持Sink，而Starocks Source和Sink均支持。经过社区测试验证，可采用Doris的扩展连接Starrocks。
+**说明：** Dinky不在对Starorcks进行额外扩展，Doris和Starorcks底层并无差别，原则上只是功能区分。经社区测试验证，可采用Doris扩展连接Starrocks。
\ No newline at end of file