Merge pull request #365 from illa-family/develop

Develop
illacloud · Sep 30, 2022 · e6e01b0 · e6e01b0
2 parents b88fe54 + 9f13c21
commit e6e01b0
Show file tree

Hide file tree

Showing 290 changed files with 6,749 additions and 2,920 deletions.
diff --git a/apps/builder/src/api/base.ts b/apps/builder/src/api/base.ts
@@ -25,7 +25,7 @@ const axios = Axios.create({
 })
 
 axios.interceptors.request.use(
-  (config) => {
+  config => {
     addRequestPendingPool(config)
     const token = getLocalStorage("token")
     if (token) {
@@ -36,13 +36,13 @@ axios.interceptors.request.use(
     }
     return config
   },
-  (err) => {
+  err => {
     return Promise.reject(err)
   },
 )
 
 axios.interceptors.response.use(
-  (response) => {
+  response => {
     const { config } = response
     removeRequestPendingPool(config)
     return response
@@ -80,7 +80,7 @@ export class Api {
     errorState?.(false)
     axios
       .request<RespData, AxiosResponse<RespData>, RequestBody>(config)
-      .then((response) => {
+      .then(response => {
         loading?.(false)
         errorState?.(false)
         success?.(response)

diff --git a/apps/builder/src/api/helpers/axiosPendingPool.tsx b/apps/builder/src/api/helpers/axiosPendingPool.tsx
@@ -12,7 +12,7 @@ export const generateUniqueKey = (config: AxiosRequestConfig) =>
   ].join("/")
 
 export const clearRequestPendingPool = () => {
-  pendingPollMap.forEach((cancel) => {
+  pendingPollMap.forEach(cancel => {
     cancel?.()
   })
   pendingPollMap.clear()

diff --git a/apps/builder/src/api/ws/index.ts b/apps/builder/src/api/ws/index.ts
@@ -229,14 +229,14 @@ function resetHeartbeat(ws: ILLAWebSocket) {
 
 function reconnect(ws: ILLAWebSocket) {
   clearWSTimeout(ws)
-  const callNow = !ws.debounceTimeout
-  ws.debounceTimeout = setTimeout(() => {
-    ws.debounceTimeout = null
-    reconnect(ws)
-  }, RECONNECT_TIMEOUT)
-  if (callNow) {
-    generateWs(ws.url)
-  }
+  // const callNow = !ws.debounceTimeout
+  // ws.debounceTimeout = setTimeout(() => {
+  //   ws.debounceTimeout = null
+  //   reconnect(ws)
+  // }, RECONNECT_TIMEOUT)
+  // if (callNow) {
+  //   generateWs(ws.url)
+  // }
 }
 
 function initWsConfig(ws: ILLAWebSocket) {

diff --git a/apps/builder/src/auth/index.tsx b/apps/builder/src/auth/index.tsx
@@ -12,7 +12,7 @@ interface CheckIsLoginWrapperProps {
   children: ReactNode
 }
 
-export const CheckIsLogin: FC<CheckIsLoginWrapperProps> = (props) => {
+export const CheckIsLogin: FC<CheckIsLoginWrapperProps> = props => {
   const { children } = props
   const navigate = useNavigate()
   const token = getLocalStorage("token")
@@ -31,7 +31,7 @@ export const CheckIsLogin: FC<CheckIsLoginWrapperProps> = (props) => {
           url: "/users",
           method: "GET",
         },
-        (response) => {
+        response => {
           // TIPS: can check user role
           dispatch(
             currentUserActions.updateCurrentUserReducer({

diff --git a/apps/builder/src/components/CodeEditor/CodePreview.tsx b/apps/builder/src/components/CodeEditor/CodePreview.tsx
@@ -24,7 +24,7 @@ function copyToClipboard(content: any) {
   Message.success("copied to clipboard")
 }
 
-export const CodePreview: FC<CodePreviewProps> = (props) => {
+export const CodePreview: FC<CodePreviewProps> = props => {
   const { className, preview, ...otherProps } = props
 
   return (

diff --git a/apps/builder/src/components/CodeEditor/TernSever/HintTooltip/index.tsx b/apps/builder/src/components/CodeEditor/TernSever/HintTooltip/index.tsx
@@ -38,7 +38,7 @@ const formatEvaluate = (data: any) => {
   return format
 }
 
-const Evaluate: FC<{ type: string; data?: any }> = (props) => {
+const Evaluate: FC<{ type: string; data?: any }> = props => {
   const { type, data } = props
 
   return (
@@ -83,7 +83,7 @@ const handleTernCompletions = (data: TypeQueryResult): TransQuery => {
   return result
 }
 
-export const HintTooltip: FC<HintTooltipProps> = (props) => {
+export const HintTooltip: FC<HintTooltipProps> = props => {
   const { current: data } = useRef(handleTernCompletions(props.data))
   const { globalData: executionResult = {} } = props
 

diff --git a/apps/builder/src/components/CodeEditor/TernSever/index.tsx b/apps/builder/src/components/CodeEditor/TernSever/index.tsx
@@ -3,7 +3,7 @@ import "codemirror/addon/tern/tern"
 import "./tern/tern"
 import ecmascript from "tern/defs/ecmascript.json"
 import CodeMirror from "codemirror"
-import ReactDOM from "react-dom"
+import { render } from "react-dom"
 import { TypeQueryResult } from "tern/lib/tern"
 import { isObject } from "@illa-design/system"
 import { getValueType } from "@/components/CodeEditor/utils"
@@ -159,7 +159,7 @@ export const TernServer = (
     // @ts-ignore: type define error
     completionTip: (completion: TypeQueryResult) => {
       let div = document.createElement("div")
-      ReactDOM.render(<HintTooltip data={completion} />, div)
+      render(<HintTooltip data={completion} />, div)
       return div
     },
   })
@@ -171,7 +171,7 @@ export const BaseTern = new CodeMirror.TernServer({
   // @ts-ignore: type define error
   completionTip: (completion: TypeQueryResult) => {
     let div = document.createElement("div")
-    ReactDOM.render(<HintTooltip data={completion} />, div)
+    render(<HintTooltip data={completion} />, div)
     return div
   },
 })
diff --git a/apps/builder/src/components/CodeEditor/hinter.tsx b/apps/builder/src/components/CodeEditor/hinter.tsx
@@ -1,4 +1,4 @@
-import ReactDOM from "react-dom"
+import { render } from "react-dom"
 import CodeMirror, { Hint, Hints } from "codemirror"
 import "codemirror/addon/hint/sql-hint"
 import "codemirror/addon/hint/javascript-hint"
@@ -9,12 +9,13 @@ import { AutoCompleteItem } from "./AutoComplete"
 
 let origJsHint = CodeMirror.hint.javascript
 CodeMirror.hint.javascript = async function (cm, option) {
-  let inner = (await origJsHint(cm, option)) || {
-    from: cm.getCursor(),
-    to: cm.getCursor(),
-    list: [],
-  }
-  return inner
+  return (
+    (await origJsHint(cm, option)) || {
+      from: cm.getCursor(),
+      to: cm.getCursor(),
+      list: [],
+    }
+  )
 }
 
 const transHinters = (inner: Hints) => {
@@ -27,7 +28,7 @@ const transHinters = (inner: Hints) => {
       text: item,
       render: (elt: HTMLLIElement) => {
         let div = document.createElement("div")
-        ReactDOM.render(<AutoCompleteItem content={item as string} />, div)
+        render(<AutoCompleteItem content={item as string} />, div)
         elt?.appendChild(div)
       },
     })
@@ -63,7 +64,7 @@ CodeMirror.hint.xml = async function (cm, option) {
 
 let origHtmlHint = CodeMirror.hint.html
 CodeMirror.hint.html = async function (cm, option) {
-  let inner = (await origXmlHint(cm, option)) || {
+  let inner = (await origHtmlHint(cm, option)) || {
     from: cm.getCursor(),
     to: cm.getCursor(),
     list: [],

diff --git a/apps/builder/src/components/CodeEditor/index.tsx b/apps/builder/src/components/CodeEditor/index.tsx
@@ -1,12 +1,6 @@
-import React, {
-  FC,
-  useCallback,
-  useContext,
-  useEffect,
-  useRef,
-  useState,
-} from "react"
-import { css, Global } from "@emotion/react"
+/* eslint-disable */
+import { FC, useContext, useEffect, useRef, useState } from "react"
+import { Global } from "@emotion/react"
 import { debounce, get } from "lodash"
 import CodeMirror, { Editor } from "codemirror"
 import "codemirror/lib/codemirror.css"
@@ -36,7 +30,7 @@ import {
 import { clearMarks, lineMarker } from "@/components/CodeEditor/lintHelper"
 import { VALIDATION_TYPES } from "@/utils/validationFactory"
 
-export const CodeEditor: FC<CodeEditorProps> = props => {
+export const CodeEditor: FC<CodeEditorProps> = (props) => {
   const {
     className,
     mode = "TEXT_JS",
@@ -83,7 +77,7 @@ export const CodeEditor: FC<CodeEditorProps> = props => {
     setFocus(true)
   }
 
-  const handleBlur = (instance: Editor, event: FocusEvent) => {
+  const handleBlur = () => {
     latestProps.current?.onBlur?.()
     setFocus(false)
     setPreviewVisible(false)
@@ -127,10 +121,10 @@ export const CodeEditor: FC<CodeEditorProps> = props => {
       const error = get(executionError, path)
       const result = get(executionResult, path)
       if (error) {
-        const evalError = error?.find(item => {
+        const evalError = error?.find((item) => {
           return item.errorType !== "LINT"
         })
-        const lintError = error?.find(item => {
+        const lintError = error?.find((item) => {
           return item.errorType === "LINT"
         })
         if (evalError) {
@@ -154,7 +148,7 @@ export const CodeEditor: FC<CodeEditorProps> = props => {
     }
   }, [executionError, executionResult, path])
 
-  const handleChange = (editor: Editor, change: CodeMirror.EditorChange) => {
+  const handleChange = (editor: Editor) => {
     const currentValue = editor?.getValue()
     clearMarks(editor)
     if (path) {
@@ -298,7 +292,7 @@ export const CodeEditor: FC<CodeEditorProps> = props => {
         content={<CodePreview preview={preview} />}
         showArrow={false}
         colorScheme="white"
-        onVisibleChange={visible => {
+        onVisibleChange={(visible) => {
           if (visible !== previewVisible && focus) {
             setPreviewVisible(true)
           }

diff --git a/apps/builder/src/components/CodeEditor/interface.ts b/apps/builder/src/components/CodeEditor/interface.ts
@@ -10,6 +10,7 @@ export enum EditorModes {
   SQL_JS = "sql-js",
   XML_JS = "xml-js",
   HTML_JS = "html-js",
+  Postgre_SQL_JS = "postgre_sql_js",
 }
 
 export type EditorMode = keyof typeof EditorModes

diff --git a/apps/builder/src/components/CodeEditor/lintHelper.tsx b/apps/builder/src/components/CodeEditor/lintHelper.tsx
@@ -1,4 +1,4 @@
-import ReactDOM from "react-dom"
+import { render } from "react-dom"
 import { JSHINT } from "jshint"
 import { Editor } from "codemirror"
 import "codemirror/addon/lint/lint"
@@ -15,7 +15,7 @@ const GUTTER_ID = "CodeMirror-lint-markers"
 export const lineMarker = (cm: Editor, line: number) => {
   cm.clearGutter(GUTTER_ID)
   const div = document.createElement("div")
-  ReactDOM.render(
+  render(
     <div className={"CodeMirror-lint-marker CodeMirror-lint-marker-error"} />,
     div,
   )