fix: change btoa func to encodeURI

illacloud · Nov 17, 2022 · 4be4db4 · 4be4db4
1 parent 19babc6
commit 4be4db4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/apps/builder/src/components/CodeEditor/TernSever/HintTooltip/index.tsx b/apps/builder/src/components/CodeEditor/TernSever/HintTooltip/index.tsx
@@ -69,7 +69,7 @@ const Evaluate: FC<{ type: string; data?: any }> = (props) => {
 
 const handleTernCompletions = (data: TypeQueryResult): TransQuery => {
   const result: TransQuery = data ?? {}
-  const doc = atob(data?.doc ?? "")
+  const doc = decodeURI(data?.doc ?? "")
   if (doc?.slice(0, 1) === "{") {
     const format = JSON.parse(doc)
     result["data"] = format.data

diff --git a/apps/builder/src/components/CodeEditor/TernSever/index.tsx b/apps/builder/src/components/CodeEditor/TernSever/index.tsx
@@ -75,7 +75,7 @@ const transDataToDefs = (
     const def: Record<string, any> = {}
     if (current) {
       path = path ? path + "." + current : current
-      def["!doc"] = btoa(JSON.stringify({ path, data }))
+      def["!doc"] = encodeURI(JSON.stringify({ path, data }))
     }
     for (const dataKey in data) {
       let newPath = path ? path + "." + dataKey : dataKey
@@ -84,12 +84,16 @@ const transDataToDefs = (
         def[dataKey] = {
           ...d,
           ...transDataToDefs(d),
-          "!doc": btoa(JSON.stringify({ path: newPath, data: data[dataKey] })),
+          "!doc": encodeURI(
+            JSON.stringify({ path: newPath, data: data[dataKey] }),
+          ),
         }
       } else {
         def[dataKey] = {
           "!type": transTernTypeName(data[dataKey]),
-          "!doc": btoa(JSON.stringify({ path: newPath, data: data[dataKey] })),
+          "!doc": encodeURI(
+            JSON.stringify({ path: newPath, data: data[dataKey] }),
+          ),
         }
       }
     }