Merge remote-tracking branch 'origin/Add-tag-right-click-to-disable-f…

…unction' into Add-tag-right-click-to-disable-function

# Conflicts:
#	dinky-web/src/pages/DataStudioNew/index.tsx

dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask.tsx

@@ -435,7 +435,11 @@ export const SqlTask = memo((props: FlinkSqlProps & any) => {
   }, [currentState, updateAction]);
 
   const handleStop = useCallback(async () => {
-    const result = await cancelTask(l('pages.datastudio.editor.stop.job'), currentState.taskId, false);
+    const result = await cancelTask(
+      l('pages.datastudio.editor.stop.job'),
+      currentState.taskId,
+      false
+    );
     if (result.success) {
       setCurrentState((prevState) => {
         return {

dinky-web/src/pages/DataStudioNew/ContextMenuSpace.tsx

@@ -1,18 +1,18 @@
-import {Space} from "antd";
-import React from "react";
-
+import { Space } from 'antd';
+import React from 'react';
 
 interface ContextMenuSpaceProps {
   onContextMenu: (e: React.MouseEvent<HTMLElement>) => void;
-  children: React.ReactNode| JSX.Element | string;
+  children: React.ReactNode | JSX.Element | string;
 }
 
 export const ContextMenuSpace = (props: ContextMenuSpaceProps) => {
-
-  const {onContextMenu, children} = props;
-  return <>
-    <Space onContextMenu={onContextMenu} size={0}>
-      {children}
-    </Space>
-  </>
-}
+  const { onContextMenu, children } = props;
+  return (
+    <>
+      <Space onContextMenu={onContextMenu} size={0}>
+        {children}
+      </Space>
+    </>
+  );
+};

dinky-web/src/pages/RegCenter/Resource/components/ResourceOverView/index.tsx

@@ -80,10 +80,10 @@ const ResourceOverView: React.FC<connect> = (props) => {
     });
   }, []);
 
-  useEffect( () => {
+  useEffect(() => {
     // if enableResource is true, then refresh the tree, otherwise do nothing
     if (enableResource) {
-       refreshTree();
+      refreshTree();
     }
   }, [enableResource]);