xianniu-ui 0.6.1 → 0.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xianniu-ui",
-  "version": "0.6.1",
+  "version": "0.6.4",
   "private": false,
   "main": "lib/xianniu-ui.umd.min.js",
   "scripts": {

package/packages/city/main.vue

@@ -17,7 +17,7 @@
 </template>
 
 <script>
-const ZXCITY = ['北京市','天津市','上海市','重庆市']
+const ZXCITY = ["北京市", "天津市", "上海市", "重庆市"];
 import citys from "xn-ui/src/area/index.js";
 export default {
   name: "XnCity",
@@ -251,19 +251,24 @@ export default {
     getCity(data, nameList) {
       if (nameList.length === 0) return [];
       const [cityName, ...rest] = nameList;
-      const item = data.find((i) => i.cityName === cityName || i.cityName.indexOf(cityName.substring(0,2)) > -1);
-      if(item){
+      const item =
+        data &&
+        data.find((i) => i.cityName === cityName || cityName.indexOf(i.cityName) > -1);
+      if (item) {
         return [item.cityCode, ...this.getCity(item.subCitys, rest)];
-      }else{
-        return [...this.getCity([], rest)]
+      } else {
+        return [...this.getCity([], rest)];
       }
     },
     str2Code(val) {
       if (!val) return;
+      val = val.replace(/[^\u4e00-\u9fa5]/g, "");
       const cityArr = val.match(this.$reg.getCity) || [];
-      const newarr = cityArr.length&&cityArr.map((item,idx,arr)=>{
-        return ZXCITY.includes(item) && idx === 0 ? [item,...arr] : arr
-      })[0]
+      const newarr =
+        cityArr.length &&
+        cityArr.map((item, idx, arr) => {
+          return ZXCITY.includes(item) && idx === 0 ? [item, ...arr] : arr;
+        })[0];
       const arr = this.getCity(this.cityList, newarr);
       return arr[arr.length - 1];
     },

package/packages/upload/main.vue

@@ -178,6 +178,7 @@ export default {
   created() {
     this.client = new Client({
       stsUrl: this.$XN.stsUrl || "",
+      setFileIdUrl: this.$XN.setFileIdUrl || "",
     });
   },
   beforeDestroy() {
@@ -276,21 +277,7 @@ export default {
     },
     async handleDownload(file) {
       const { url, name } = file;
-      const x = new XMLHttpRequest();
-      x.open("GET", url, true);
-      x.responseType = "blob";
-      x.onload = function () {
-        const _url = window.URL.createObjectURL(x.response);
-        const elt = document.createElement("a");
-        elt.setAttribute("href", _url);
-        elt.setAttribute("download", name);
-        elt.style.display = "none";
-        elt.target = "_blank";
-        document.body.appendChild(elt);
-        elt.click();
-        document.body.removeChild(elt);
-      };
-      x.send();
+      return this.$utils.download({url, name})
     },
     handleRemove(file, fileList) {
       fileList.forEach((item, idx) => {

package/src/oss/index.js

@@ -6,6 +6,7 @@ class Client {
     constructor(params = {}) {
         this.uploadHost = null
         this.stsUrl = params.stsUrl || ''
+        this.setFileIdUrl = params.setFileIdUrl || ''
         this.oss = null
     }
     getToken() {
@@ -26,7 +27,7 @@ class Client {
         return `${fileExt}`.toLowerCase();
     }
     isImg(file) {
-        return ~~file.type.indexOf('image') > -1
+        return file.type.indexOf('image') > -1
     }
     getFileNameUUID() {
         const uuid = uuidv4()
@@ -37,6 +38,7 @@ class Client {
             if (!this.stsUrl) {
                 return console.error('获取临时凭证地址不能为空')
             }
+
             fetch(this.stsUrl + '?xnToken=' + this.getToken()).then(response => response.json()).then((res) => {
                 const { data: { accessKeyId, accessKeySecret, securityToken: stsToken, uploadHost, bucket, region } } = res
                 const obj = {
@@ -47,7 +49,7 @@ class Client {
                     bucket,
                     region
                 }
-               this.uploadHost = uploadHost
+                this.uploadHost = uploadHost
                 this.oss = new OSS({
                     ...obj,
                 })
@@ -58,6 +60,29 @@ class Client {
 
         })
     }
+    setFileId(params) {
+        return new Promise((resolve, reject) => {
+            fetch(this.setFileIdUrl, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'xnToken': this.getToken()
+                },
+                body: JSON.stringify(params)
+            })
+                .then(response => {
+                    if (!response.ok) {
+                        throw new Error(`HTTP error! status: ${response.status}`);
+                    }
+                    return response.json()
+                })
+                .then(({ data }) => {
+                    resolve(data)
+                }).catch((err) => {
+                    reject(err)
+                });
+        })
+    }
     upload(file, headers = {}) {
         const currentFile = file.file
         const fileName = currentFile.name
@@ -70,16 +95,25 @@ class Client {
                     const _progress = parseFloat(p * 100)
                     file.onProgress({ percent: _progress });
                 }
-            }).then(res => {
+            }).then(async res => {
                 file.onSuccess()
                 const obj = {
                     name: fileName,
                     size: currentFile.size,
                     ext: this.getExt(currentFile),
-                    imgFlag: this.isImg(currentFile),
+                    imgFlag: ~~this.isImg(currentFile),
                     url: this.uploadHost + res.name,
+                    accessoryName: fileName,
+                    accessorySize: currentFile.size
                 }
-                resolve(obj)
+                this.setFileId(obj).then((res) => {
+                    resolve({ ...obj, fileId: res.fileId })
+                }).catch((err) => {
+                    console.log('err: ', err);
+                    file.onError();
+                    reject(err)
+                })
+
             }).catch(err => {
                 file.onError();
                 reject(err)

package/src/utils/utils.js

@@ -65,27 +65,23 @@ const download = (params = { name: '', url: '' }) => {
     name: '下载模板'
   }
   const _params = Object.assign(defaultParams, params)
+  console.log('_params: ', _params);
   const { url, name } = _params
-  var x = new XMLHttpRequest()
-  x.open('GET', url, true)
-  // x.responseType = 'blob'
-  // x.responseType = 'blob'
-  x.onprogress = function () {
-  }
+  const x = new XMLHttpRequest();
+  x.open("GET", url, true);
+  x.responseType = "blob";
   x.onload = function () {
-    var _url = ''
-    try {
-      _url = window.URL.createObjectURL(x.response)
-    } catch (error) {
-      _url = url
-    }
-    var a = document.createElement('a')
-    a.href = _url
-    a.target = '_blank'
-    a.download = name
-    a.click()
-  }
-  x.send()
+    const _url = window.URL.createObjectURL(x.response);
+    const elt = document.createElement("a");
+    elt.setAttribute("href", _url);
+    elt.setAttribute("download", name);
+    elt.style.display = "none";
+    elt.target = "_blank";
+    document.body.appendChild(elt);
+    elt.click();
+    document.body.removeChild(elt);
+  };
+  x.send();
 }
 /**
  * 根据某个key 对数组去重合并
@@ -97,7 +93,7 @@ const arrMerge = (arr = [], key = '') => {
   if (!key) {
     throw new Error('error arguments: key is required')
   }
-  if(!arr.length) return
+  if (!arr.length) return
   var map = {}; var result = []
 
   for (var i = 0; i < arr.length; i++) {