From 436e26af37b17c80ab93582ee2eb977b8107b265 Mon Sep 17 00:00:00 2001 From: youngS Date: Thu, 29 Jul 2021 17:09:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=89=B9=E9=87=8F=E5=BA=94=E7=94=A8=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fir_client/src/components/FirDownload.vue | 8 +- fir_client/src/components/ShortDownload.vue | 6 +- fir_client/src/components/apps/FirApps.vue | 381 ++++++++++++++------ fir_client/src/utils/index.js | 33 ++ 4 files changed, 308 insertions(+), 120 deletions(-) diff --git a/fir_client/src/components/FirDownload.vue b/fir_client/src/components/FirDownload.vue index 67715ac..d068ca3 100644 --- a/fir_client/src/components/FirDownload.vue +++ b/fir_client/src/components/FirDownload.vue @@ -387,7 +387,7 @@ let download_url = res.data.download_url; this.downloadurl = "itms-services://?action=download-manifest&url=" + encodeURIComponent(download_url); // eslint-disable-next-line no-unused-vars - this.timmer = setTimeout(data => { + this.timer = setTimeout(data => { this.gomobile = false; }, 5000); } @@ -397,7 +397,7 @@ window.location.href = this.downloadurl; if (res.data.extra_url !== "") { // eslint-disable-next-line no-unused-vars - this.timmer = setTimeout(data => { + this.timer = setTimeout(data => { window.location.href = res.data.extra_url; }, 3000); } @@ -411,7 +411,7 @@ if (res.data.extra_url !== "") { this.mobileprovision = res.data.extra_url; // eslint-disable-next-line no-unused-vars - this.timmer = setTimeout(data => { + this.timer = setTimeout(data => { this.gomobile = false; }, 5000); } @@ -606,7 +606,7 @@ } else { if (data.msg) { document.title = data.msg; - this.wrong=true; + this.wrong = true; this.$message({ message: data.msg, type: 'error', diff --git a/fir_client/src/components/ShortDownload.vue b/fir_client/src/components/ShortDownload.vue index 4bc012f..cb33298 100644 --- a/fir_client/src/components/ShortDownload.vue +++ b/fir_client/src/components/ShortDownload.vue @@ -380,7 +380,7 @@ let download_url = res.data.download_url; this.downloadurl = "itms-services://?action=download-manifest&url=" + encodeURIComponent(download_url); // eslint-disable-next-line no-unused-vars - this.timmer = setTimeout(data => { + this.timer = setTimeout(data => { this.gomobile = false; }, 5000); } @@ -390,7 +390,7 @@ window.location.href = this.downloadurl; if (res.data.extra_url !== "") { // eslint-disable-next-line no-unused-vars - this.timmer = setTimeout(data => { + this.timer = setTimeout(data => { window.location.href = res.data.extra_url; }, 3000); } @@ -404,7 +404,7 @@ if (res.data.extra_url !== "") { this.mobileprovision = res.data.extra_url; // eslint-disable-next-line no-unused-vars - this.timmer = setTimeout(data => { + this.timer = setTimeout(data => { this.gomobile = false; }, 5000); } diff --git a/fir_client/src/components/apps/FirApps.vue b/fir_client/src/components/apps/FirApps.vue index fe3713d..fdf2c8b 100644 --- a/fir_client/src/components/apps/FirApps.vue +++ b/fir_client/src/components/apps/FirApps.vue @@ -77,6 +77,63 @@ + + + + + + + + + + + + + + + + + + + + 取 消 + 开始上传 + + - - + {{ uploadprocess[currentfile.uid] }} + - {{ analyseappinfo.is_new|get_upload_text}} + {{ analyseappinfo.is_new|get_upload_text}} @@ -374,10 +434,13 @@
拖拽到这里上传
@@ -409,8 +472,6 @@ :src="r.has_combo.master_release.icon_url|make_icon_url" alt="">
- -

{{ r.name }} @@ -497,14 +558,27 @@ getWindowHeight, uploadaliyunoss, uploadlocalstorage, - uploadqiniuoss + uploadqiniuoss, + getUserInfoFun, + makeFiveC, + deepCopy, + diskSize } from "@/utils"; - import {getUserInfoFun} from "../../utils"; + let fiveProcess = {}; + let fiveProcessList = []; + for (const c of makeFiveC()) { + fiveProcess[c] = {process: 0, short: '', appname: ''}; + fiveProcessList.push(c) + } export default { name: "FirApps", data() { return { + timer: '', + multiupload: false, + multiuploaddisable: false, + multiFileList: [], default_pay_radio: '', default_price_radio: '', pay_choices: [], @@ -526,8 +600,8 @@ autoloadflag: true, firstloadflag: true, currentfile: null, - uploadprocess: 0, - uploadsuccess: 0, + uploadprocess: deepCopy(fiveProcess), + uploadprocessList: fiveProcessList, loadingobj: null, show_buy_download_times: false, data_package_prices: [], @@ -540,6 +614,79 @@ PaymentQuestionMsg: '', } }, methods: { + multirun(process, keylist, func) { + let thr = []; + for (let i = 0; i < process; i++) { + thr.push(Promise.resolve()) + } + for (let j = 0; j < keylist.length; j += process) { + for (let i = 0; i < process; i++) { + if (i + j < keylist.length) { + // eslint-disable-next-line no-unused-vars + thr[(j + i) % process] = thr[(j + i) % process].then(_ => func(keylist[i + j])) + } + } + + } + + }, + uploadasync(file) { + return new Promise((resolve, reject) => { + try { + const loading = this.$loading({ + lock: true, + text: `文件 ${file.name} 解析中`, + spinner: 'el-icon-loading', + }); + getappinfo(file.raw, appinfo => { + if (appinfo && appinfo.bundleid) { + let analyseappinfo = appinfo; + if (this.currentfile) { + this.analyseappinfo = appinfo; + } + analyseApps(data => { + if (data.code === 1000) { + this.short = data.data.short; + for (let name of Object.keys(data.data)) { + analyseappinfo[name] = data.data[name] + } + if (this.currentfile) { + this.willuploadApp = true; + resolve() + } else { + this.uploadcloud(analyseappinfo, file, true, resolve) + } + + } else { + this.$message.error("应用 " + analyseappinfo.appname + " 上传token获取失败，请刷新重试") + } + loading.close(); + }, { + 'methods': 'POST', + 'data': {"bundleid": analyseappinfo.bundleid, "type": analyseappinfo.type} + }); + + } else { + this.$message.error("文件 " + file.raw.name + " 解析失败,请检查是否为APP应用") + } + }, err => { + loading.close(); + this.$message.error("应用解析失败,请检查是否为APP应用"); + // eslint-disable-next-line no-console + console.log('Error ', err); + }); + + } catch (e) { + reject(e); + } + }); + }, + multiuploadFun() { + this.multiuploaddisable = true; + if (this.multiFileList && this.multiFileList.length > 0) { + this.multirun(3, this.multiFileList, this.uploadasync) + } + }, show_package_prices() { get_package_prices(res => { if (res.code === 1000) { @@ -588,89 +735,101 @@ dangerouslyUseHTMLString: true, }); }, - updateappinfo(file) { - this.uploadsuccess += 1; - if (this.uploadsuccess === 2) { - delete this.analyseappinfo.icon; - this.$message.success(file.name + '上传成功'); - this.analyseappinfo.short = this.short; + updateappinfo(file, analyseappinfo, multiFlag, binaryFlag, resolve) { + if (binaryFlag) { + delete analyseappinfo.icon; + this.$message.success(file.raw.name + '上传成功'); + if (!multiFlag) { + analyseappinfo.short = this.short; + } const loading = this.$loading({ lock: true, - text: '应用入库中，请耐心等待', + text: `应用 ${analyseappinfo.appname} 入库中，请耐心等待`, spinner: 'el-icon-loading', - // background: 'rgba(0, 0, 0, 0.7)' }); analyseApps(data => { if (data.code === 1000) { - let app_uuid = this.analyseappinfo.app_uuid; + if (!multiFlag) { + this.closeUpload(); + this.$router.push({name: 'FirAppInfostimeline', params: {id: analyseappinfo.app_uuid}}); + } else { + this.$message.success(analyseappinfo.appname + ' 入库成功'); + } + } + loading.close(); + const start = this.multiFileList.indexOf(file); + if (start > -1) { + delete this.multiFileList[start] + } + if (this.multiFileList && this.multiFileList.filter(function (val) { + return val + }).length === 0) { this.closeUpload(); - this.$router.push({name: 'FirAppInfostimeline', params: {id: app_uuid}}); + this.searchFun(); } - loading.close() - }, {'methods': 'PUT', 'data': this.analyseappinfo}); + resolve() + }, {'methods': 'PUT', 'data': analyseappinfo}); } }, - uploadtostorage(file, certinfo) { - - if (this.analyseappinfo.storage === 1) { + uploadtostorage(file, analyseappinfo, multiFlag, binaryFlag, resolve) { + let upload_key = analyseappinfo.png_key; + let upload_token = analyseappinfo.png_token; + let rawfile = file; + let process_key = ''; + if (binaryFlag) { + upload_key = analyseappinfo.upload_key; + upload_token = analyseappinfo.upload_token; + process_key = this.uploadprocessList[this.multiFileList.indexOf(file)]; + rawfile = file.raw + } + let certinfo = { + 'upload_key': upload_key, + 'upload_token': upload_token + }; + if (analyseappinfo.storage === 1) { // eslint-disable-next-line no-unused-vars,no-unreachable - uploadqiniuoss(file, certinfo, this, res => { - this.updateappinfo(file) + uploadqiniuoss(rawfile, certinfo, this, res => { + this.updateappinfo(file, analyseappinfo, multiFlag, binaryFlag, resolve) }, process => { - if (this.uploadsuccess === 1) { - this.uploadprocess = process; + if (binaryFlag && process_key) { + this.uploadprocess[process_key] = {process, analyseappinfo}; } }) - } else if (this.analyseappinfo.storage === 2) { + } else if (analyseappinfo.storage === 2) { // eslint-disable-next-line no-unused-vars - uploadaliyunoss(file, certinfo, this, res => { - this.updateappinfo(file) - + uploadaliyunoss(rawfile, certinfo, this, res => { + this.updateappinfo(file, analyseappinfo, multiFlag, binaryFlag, resolve) }, process => { - if (this.uploadsuccess === 1) { - this.uploadprocess = process; + if (binaryFlag && process_key) { + this.uploadprocess[process_key] = { + process, + short: analyseappinfo.short, + appname: analyseappinfo.appname + }; } }); } else { //本地 - if (this.analyseappinfo.domain_name) { - certinfo.upload_url = getuploadurl(this.analyseappinfo.domain_name) + if (analyseappinfo.domain_name) { + certinfo.upload_url = getuploadurl(analyseappinfo.domain_name) } else { certinfo.upload_url = getuploadurl(); } certinfo.ftype = 'app'; - certinfo.app_id = this.analyseappinfo.app_uuid; + certinfo.app_id = analyseappinfo.app_uuid; // eslint-disable-next-line no-unused-vars,no-unreachable - uploadlocalstorage(file, certinfo, this, res => { - this.updateappinfo(file) + uploadlocalstorage(rawfile, certinfo, this, res => { + this.updateappinfo(file, analyseappinfo, multiFlag, binaryFlag, resolve) }, process => { - if (this.uploadsuccess === 1) { - this.uploadprocess = process; + if (binaryFlag && process_key) { + this.uploadprocess[process_key] = {process, analyseappinfo}; } }) } }, - getuploadtoken(loading) { - analyseApps(data => { - if (data.code === 1000) { - this.short = data.data.short; - for (let name of Object.keys(data.data)) { - this.analyseappinfo[name] = data.data[name] - } - this.willuploadApp = true; - } else { - this.$message.error("上传token获取失败，请刷新重试") - } - loading.close(); - }, { - 'methods': 'POST', - 'data': {"bundleid": this.analyseappinfo.bundleid, "type": this.analyseappinfo.type} - }) - }, - uploadcloud() { - if (this.analyseappinfo.binary_url !== '') { - - this.$confirm(`该应用存在第三方下载链接 ${this.analyseappinfo.binary_url} 更新之后，将不会自动跳转第三方下载；若您还需要第三方跳转，请在第三方平台更新该应用。`, '确定更新应用？', { + uploadcloud(analyseappinfo, binary_file, multiFlag, resolve) { + if (analyseappinfo.binary_url !== '') { + this.$confirm(`该应用 ${analyseappinfo.appname} 存在第三方下载链接 ${analyseappinfo.binary_url} 更新之后，将不会自动跳转第三方下载；若您还需要第三方跳转，请在第三方平台更新该应用。`, '确定更新应用？', { confirmButtonText: '确定', cancelButtonText: '取消', dangerouslyUseHTMLString: true, @@ -678,52 +837,52 @@ }).then(() => { this.$message({ type: 'success', - message: '开始更新' + message: '确定更新' }); - this.uploadstorage() + this.uploadstorage(analyseappinfo, binary_file, multiFlag, resolve) }).catch(() => { this.$message({ type: 'info', - message: '已取消更新' + message: `应用 ${analyseappinfo.appname} 已取消更新` }); - this.closeUpload(); + if (!multiFlag) { + this.closeUpload(); + } else { + const start = this.multiFileList.indexOf(binary_file); + if (start > -1) { + delete this.multiFileList[start] + } + resolve() + } }); } else { - this.uploadstorage() + this.uploadstorage(analyseappinfo, binary_file, multiFlag, resolve) } }, - uploadstorage() { - this.uploadflag = true; - this.uploading = true; - // eslint-disable-next-line no-unused-vars - // this.timmer = setTimeout(data => { - // let canvas = this.$refs.canvas; - // show_beautpic(this, canvas, 888, 0.6); - // }, 100); - - let file = dataURLtoFile(this.analyseappinfo.icon, this.analyseappinfo.png_key); - - this.uploadtostorage(file, { - 'upload_key': this.analyseappinfo.png_key, - 'upload_token': this.analyseappinfo.png_token - }); - - file = this.currentfile; - this.uploadtostorage(file, { - 'upload_key': this.analyseappinfo.upload_key, - 'upload_token': this.analyseappinfo.upload_token - }); + uploadstorage(analyseappinfo, binary_file, multiFlag, resolve) { + if (!multiFlag) { + this.uploadflag = true; + this.uploading = true; + } + let file = dataURLtoFile(analyseappinfo.icon, analyseappinfo.png_key); + this.uploadtostorage(file, analyseappinfo, multiFlag, false, resolve); + this.uploadtostorage(binary_file, analyseappinfo, multiFlag, true, resolve); }, closeUpload() { - this.uploadsuccess = 0; - this.uploadprocess = 0; this.uploadflag = false; this.uploading = false; this.willuploadApp = false; - this.currentfile = null; this.uploadflag = false; this.analyseappinfo = {}; + + this.multiupload = false; + this.multiuploaddisable = false; + this.multiFileList = []; + this.$refs.upload.clearFiles(); + this.$refs.upload.abort(); + this.uploadprocess = deepCopy(fiveProcess); + this.uploadprocessList = fiveProcessList; }, searchFun() { @@ -819,28 +978,19 @@ }, parms); }, - beforeAvatarUpload(file) { - const loading = this.$loading({ - lock: true, - text: '应用解析中', - spinner: 'el-icon-loading', - // background: 'rgba(0, 0, 0, 0.7)' - }); - getappinfo(file, appinfo => { - if (appinfo.bundleid) { - this.analyseappinfo = appinfo; - this.getuploadtoken(loading); - this.currentfile = file; - } else { - this.$message.error("应用解析失败,请检查是否为APP应用") + onUploadChange(file, fileList) { + if (fileList && fileList.length > 1) { + this.multiupload = true; + } + this.multiFileList = fileList; + // eslint-disable-next-line no-unused-vars + this.timer = setTimeout(data => { + if (fileList && fileList.length === 1) { + this.currentfile = this.multiFileList[0]; + this.multiuploadFun(); } - }, err => { - loading.close(); - this.$message.error("应用解析失败,请检查是否为APP应用"); - // eslint-disable-next-line no-console - console.log('Error ', err); - }); - return false; + clearTimeout(this.timer); + }, 300); }, delApp() { let loadingobj = this.$loading({ @@ -891,6 +1041,7 @@ }, }, filters: { + diskSize, formatMoney: function (money) { return format_money(money, 19); }, @@ -1049,6 +1200,10 @@ margin-top: -43px; } + .appdownload /deep/ .el-upload-list__item { + font-size: 17px; + line-height: 1; + } .page-apps .card.app .action a, .page-apps .card.app .appname, .page-apps .card.app table tr td, .upload-modal .state-form .release-body .input-addon { font-family: 'Open Sans', sans-serif diff --git a/fir_client/src/utils/index.js b/fir_client/src/utils/index.js index 91616dc..1b42fa0 100644 --- a/fir_client/src/utils/index.js +++ b/fir_client/src/utils/index.js @@ -573,3 +573,36 @@ export function getUserInfoFun(self) { } }, {"methods": "GET"}) } + +function getChar(n) { + let SL = []; + for (let i = 65; i <= n + 65; i++) { + SL.push(String.fromCharCode(i)) + } + return SL +} + +export function makeFiveC() { + let SL = []; + for (const i of getChar(10)) { + for (const j of getChar(5)) { + SL.push(i + j) + } + } + return SL +} + +export function diskSize(num) { + if (num === 0) return '0 B'; + let k = 1024; //设定基础容量大小 + let sizeStr = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; //容量单位 + let i = 0; //单位下标和次幂 + for (let l = 0; l < 8; l++) { //因为只有8个单位所以循环八次 + if (num / Math.pow(k, l) < 1) { //判断传入数值 除以 基础大小的次幂 是否小于1，这里小于1 就代表已经当前下标的单位已经不合适了所以跳出循环 + break; //小于1跳出循环 + } + i = l; //不小于1的话这个单位就合适或者还要大于这个单位 接着循环 + } + return (num / Math.pow(k, i)).toFixed(1) + ' ' + sizeStr[i]; //循环结束 或 条件成立 返回字符 + +}