meixioacomponent 0.3.89 → 0.3.92

package/packages/config/uploadRequest.js

@@ -1,68 +1,68 @@
-import axios from "axios";
-import { GetToken } from "../utils/utils.js";
-import componentConfig from "./componentConfig.js";
+import axios from 'axios'
+import { GetToken } from '../utils/utils.js'
+import componentConfig from './componentConfig.js'
 
 const ossInstance = (params, uploadProgressFn) => {
   // 创建 axios 实例
   const instance = axios.create({
     // API 请求的默认前缀
-    baseURL: `${componentConfig.uploadPrefix}/${componentConfig.uploadUrl}`,
-  });
+    baseURL: `${componentConfig.uploadUrl}`,
+  })
 
   // 异常拦截处理器
   const errorHandler = (error) => {
-    return Promise.reject(error);
-  };
+    return Promise.reject(error)
+  }
 
   // 响应异常拦截处理器
   const resErrorHandler = (error) => {
     // Message.error(`网络超时，请稍后重试`);
     // return errorHandler(error);
-  };
+  }
 
   // request 拦截器
   instance.interceptors.request.use((config) => {
-    config.headers["Content-Type"] = "multipart/form-data";
-    config.headers["authorization"] = `Bearer ${GetToken("token")}`;
+    config.headers['Content-Type'] = 'multipart/form-data'
+    config.headers['authorization'] = `Bearer ${GetToken('token')}`
     config.onUploadProgress = (progressEvent) => {
       if (uploadProgressFn) {
-        const percent = (progressEvent.loaded / progressEvent.total) * 100 || 0;
-        uploadProgressFn(percent);
+        const percent = (progressEvent.loaded / progressEvent.total) * 100 || 0
+        uploadProgressFn(percent)
       }
-    };
-    return config;
-  }, errorHandler);
+    }
+    return config
+  }, errorHandler)
 
   // response 拦截器
   instance.interceptors.response.use(async (response) => {
-    return response;
-  }, resErrorHandler);
+    return response
+  }, resErrorHandler)
 
-  return instance(params);
-};
+  return instance(params)
+}
 
 export default (file, uploadProgressFn, sourceToken) => {
   return new Promise((resolve, reject) => {
-    const params = new FormData();
-    params.append("file", file);
+    const params = new FormData()
+    params.append('file', file)
     ossInstance(
       {
-        url: "/",
+        url: '/',
         data: params,
-        method: "post",
+        method: 'post',
         cancelToken: sourceToken.token,
       },
-      uploadProgressFn
+      uploadProgressFn,
     )
       .then((res) => {
-        const { status } = res;
+        const { status } = res
         if (status == 200) {
-          const { data } = res;
-          resolve(data.data.original);
+          const { data } = res
+          resolve(data.data.original)
         }
       })
       .catch((error) => {
-        reject();
-      });
-  });
-};
+        reject()
+      })
+  })
+}

package/packages/config/use/UseUpload.js

@@ -1,47 +1,52 @@
-import uploadVue from "../../components/base/upload/upload.vue";
-import DynamicMount from "../../components/dynamicmount/DynamicMount";
+import uploadVue from '../../components/base/upload/upload.vue'
+import DynamicMount from '../../components/dynamicmount/DynamicMount'
 
 class UseUpload {
   constructor() {
-    this.dynamicMount = null;
+    this.cbList = []
+    this.dynamicMount = null
   }
 
   toUpload(uploadList, cb) {
+    if (cb) {
+      this.cbList.push({ cb, uploadList })
+    }
     if (this.dynamicMount) {
-      this.appendUploadItem(uploadList);
+      this.appendUploadItem(uploadList)
     } else {
       this.dynamicMount = new DynamicMount({
         componentProps: {
           uploadEdEvent: (list) => {
-            this.uploadEd(list);
-            if (cb) {
-              cb(list);
-            }
+            this.uploadEd()
           },
-          uploadArray: uploadList,
+          toUploadList: uploadList,
         },
         vueComponent: uploadVue,
-      });
-      this.dynamicMount.init();
+      })
+      this.dynamicMount.init()
     }
   }
 
-  uploadEd(list) {
+  uploadEd() {
+    this.cbList.forEach((item) => {
+      item.cb(item.uploadList)
+    })
     setTimeout(() => {
-      let component = this.dynamicMount.getComponent();
-      component.$destroy();
-      this.dynamicMount = null;
-    }, 3000);
+      let component = this.dynamicMount.getComponent()
+      component.$destroy()
+      this.dynamicMount = null
+      this.cbList = []
+    }, 3000)
   }
 
   appendUploadItem(list) {
-    let refComponent = this.dynamicMount.getComponent();
+    let refComponent = this.dynamicMount.getComponent()
     if (refComponent) {
-      refComponent.appendUploadItem(list);
+      refComponent.appendUploadItem(list)
     }
   }
 }
 
-let useUpload = new UseUpload();
+let useUpload = new UseUpload()
 
-export default useUpload;
+export default useUpload

package/src/App.vue

@@ -1,8 +1,11 @@
 <template>
   <div id="app">
     <div style="height: 100vh;">
-      <el-button @click="click">click</el-button>
-      <test></test>
+      <baseUploadTemplate></baseUploadTemplate>
+      <!-- <el-button @click="click">click</el-button>
+      <base-upload :max="1" v-model="test"></base-upload>
+      <base-upload :max="1" v-model="test2"></base-upload> -->
+      <!-- <test></test> -->
       <!-- <base-upload-item
         :fileType="`img`"
         :cropper="true"
@@ -16,16 +19,24 @@
 
 <script>
 import test from './component/test.vue'
-
+import baseUploadTemplate from '../packages/components/base/baseUploadTemplate/index.vue'
 import BaseArea from '../packages/components/base/baseArea/baseArea.vue'
 import BaseTimeLine from '../packages/components/base/baseTimeLine/baseTimeLine.vue'
 import BaseUpload from '../packages/components/base/baseUpload/baseUpload.vue'
 import BaseUploadItem from '../packages/components/base/baseUpload/baseUploadItem.vue'
 export default {
-  components: { test, BaseArea, BaseTimeLine, BaseUpload, BaseUploadItem },
+  components: {
+    test,
+    BaseArea,
+    BaseTimeLine,
+    BaseUpload,
+    BaseUploadItem,
+    baseUploadTemplate,
+  },
   data() {
     return {
       test: [],
+      test2: [],
       items: [
         { type: '', label: '标签一' },
         { type: 'success', label: '标签二' },