Merge branch 'main_dev' into ft

@@ -91,7 +91,7 @@ export const saveDataViewList = (data: object) => {
  */
  */
 export const uploadFile = async (file: FormData, mode: ErrorMessageMode = 'modal') => {
 export const uploadFile = async (file: FormData, mode: ErrorMessageMode = 'modal') => {
   return defHttp.post(
   return defHttp.post(
-    { url: Api.FILE_UPLOAD, params: file },
+    { url: Api.FILE_UPLOAD, params: file},
     {
     {
       errorMessageMode: mode
       errorMessageMode: mode
     }
     }

@@ -33,6 +33,8 @@ const option = shallowReactive({
   dataset: ''
   dataset: ''
 })
 })
 
 
+
+
 const getStyle = (radius: number) => {
 const getStyle = (radius: number) => {
   return {
   return {
     borderRadius: `${radius}px`,
     borderRadius: `${radius}px`,
@@ -40,12 +42,44 @@ const getStyle = (radius: number) => {
   }
   }
 }
 }
 
 
+async function getBase64(imgUrl: string): Promise<string> {
+   return new Promise(resolve => {
+    let xhr = new XMLHttpRequest();
+     xhr.open('get', imgUrl, true);
+     xhr.responseType = 'blob';
+     xhr.onload = function() {
+         if (this.status == 200) {
+              //得到一个blob对象
+              let blob = this.response;
+              // 重点2
+              let oFileReader = new FileReader();
+              oFileReader.onloadend = function(e) {
+                  // 结果
+                  const base64 = e.target?.result as string
+                  resolve(base64)
+              }; 
+              oFileReader.readAsDataURL(blob);
+         }
+     };
+     xhr.send();
+   })
+} 
+
 // 编辑更新
 // 编辑更新
 watch(
 watch(
   () => props.chartConfig.option.dataset,
   () => props.chartConfig.option.dataset,
-  (newData: any) => {
+ async (newData: any) => { 
+    // const base64 = await getBase64(newData)
+    // option.dataset = base64
+    const reg = /^https?/ig
+    if(reg.test(newData)){
+      const base64 = await getBase64(newData)
+      option.dataset = base64
+      return
+    }
     option.dataset = newData
     option.dataset = newData
-  },
+    
+  }, 
   {
   {
     immediate: true
     immediate: true
   }
   }