Skip to content

B
bkunyun
Commit cac0bab4 authored by chenshouchao's avatar chenshouchao
Browse files
Options

Merge branch 'feat-20220608-projectdata' of… 

Merge branch 'feat-20220608-projectdata' of http://120.77.149.83/sunyihao/bkunyun into feat-20220608-projectdata
parents 52c4ccf2 b219876e
Hide whitespace changes
Inline Side-by-side
Showing with 564 additions and 455 deletions
src/api/fileserver/raysyncApi.ts
View file @ cac0bab4
...@@ -110,7 +110,7 @@ const ZONEID = (params: string) => { ...@@ -110,7 +110,7 @@ const ZONEID = (params: string) => {
}; };
const urlToken = (filetoken: string, projectId: string) => { const urlToken = (filetoken: string, projectId: string) => {
let token = getLoaclStorageOfKey("token_key").access_token; let token = getLoaclStorageOfKey("token").access_token;
return `?username=${projectId}&token=${token}&filetoken=${encodeURIComponent( return `?username=${projectId}&token=${token}&filetoken=${encodeURIComponent(
filetoken filetoken
)}&share=false&project=true`; )}&share=false&project=true`;
......
src/hooks/useDeepEffect.ts 0 → 100644
View file @ cac0bab4
/*
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-06-14 17:22:15
* @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
* @LastEditTime: 2022-06-14 17:22:56
* @FilePath: /bkunyun/src/hooks/useDeepEffect.ts
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
import { useEffect, useRef } from 'react';
import _ from 'lodash';
export default function useDeepEffect(effectFunc: Function, deps: any[]) {
const isFirstRef = useRef(true);
const preDeps = useRef(deps);
useEffect(() => {
const isSame = preDeps.current.every((obj, index) => {
return _.isEqual(obj, deps[index]);
});
if (isFirstRef.current || !isSame) {
effectFunc();
}
isFirstRef.current = false;
preDeps.current = deps;
}, [deps]);
}
src/store/index.ts
View file @ cac0bab4
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-06-09 20:41:05 * @Date: 2022-06-09 20:41:05
* @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
* @LastEditTime: 2022-06-14 10:16:23 * @LastEditTime: 2022-06-14 20:55:22
* @FilePath: /bkunyun/src/store/index.ts * @FilePath: /bkunyun/src/store/index.ts
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
...@@ -11,11 +11,11 @@ import { configure } from "mobx"; ...@@ -11,11 +11,11 @@ import { configure } from "mobx";
import permissionStore from "./modules/permission"; import permissionStore from "./modules/permission";
import menuStore from "./modules/menu"; import menuStore from "./modules/menu";
import currentProjectStore from "./modules/currentProject"; import currentProjectStore from "./modules/currentProject";
import fileList from "./modules/fileList"; import fileListStore from "./modules/fileList";
configure({ enforceActions: "always" }); configure({ enforceActions: "always" });
export const stores = { permissionStore, menuStore, currentProjectStore, fileList }; export const stores = { permissionStore, menuStore, currentProjectStore, fileListStore };
/** Store类型 */ /** Store类型 */
export type Stores = typeof stores; export type Stores = typeof stores;
......
src/store/modules/fileList.ts
View file @ cac0bab4
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-06-13 17:00:19 * @Date: 2022-06-13 17:00:19
* @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
* @LastEditTime: 2022-06-14 11:06:13 * @LastEditTime: 2022-06-14 21:47:28
* @FilePath: /bkunyun/src/store/modules/upload.ts * @FilePath: /bkunyun/src/store/modules/upload.ts
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
import { makeAutoObservable } from "mobx"; import { makeAutoObservable, observable, action } from "mobx";
interface IUploadInfo { interface IUploadInfo {
id: string, id: string,
...@@ -25,14 +25,29 @@ class FileList { ...@@ -25,14 +25,29 @@ class FileList {
/** 文件上传列表 */ /** 文件上传列表 */
fileList: IUploadInfo[] = []; fileList: IUploadInfo[] = [];
setFileList (val: IUploadInfo[]) {
this.fileList = val // setFileList (val: IUploadInfo[]) {
// this.fileList = val
// }
/** 新需要上传的文件列表 */
newFileList: IUploadInfo[] = [];
/** 设置最新需要上传的文件列表 */
setNewFileList (val: IUploadInfo[]) {
this.fileList = this.fileList.concat(val)
this.newFileList = val
} }
/** 设置文件上传信息 */ /** 设置文件上传信息 */
setUploadInfo(id: string, val: IUploadInfo) { setUploadInfo(id: string, val: IUploadInfo) {
console.log(val,id,'22222')
const newFileList = this.fileList?.map((item)=>{ const newFileList = this.fileList?.map((item)=>{
if(item.id === id){ if(item.id === id){
console.log('3333',item)
return val return val
} return item } return item
}) })
...@@ -65,8 +80,9 @@ class FileList { ...@@ -65,8 +80,9 @@ class FileList {
} return item } return item
}) })
this.fileList = newFileList this.fileList = newFileList
} }
} }
const fileListStore = new FileList()
export default new FileList(); export default fileListStore
src/utils/Upload/tusUpload.js
View file @ cac0bab4
import React from "react"; import React, { useEffect, useState } from "react";
import * as tus from "tus-js-client"; import * as tus from "tus-js-client";
import { import {
verifyLettersNumbersCertainChars4, verifyLettersNumbersCertainChars4,
verifyLettersNumbersCertainChars5, verifyLettersNumbersCertainChars5,
} from "../helper"; } from "../helper";
import { getDataFileToken } from "@/api/project_api";
import useMyRequest from "@/hooks/useMyRequest";
import { getTokenInfo } from "@/utils/util";
import ConsoleLayout from "@/views/ConsoleLayout";
const UseTusUpload = (props) => { const UseTusUpload = (props) => {
const { fileList: uploadInfoStore } = props; const { fileListStore: uploadInfoStore, currentProjectStore } = props;
console.log(uploadInfoStore, 222);
const uploadInfoList = uploadInfoStore?.uploadInfo?.list || [];
const uploadInfoIsPermanence =
uploadInfoStore?.uploadInfo?.isPermanence || [];
const uploadInfoOpen = uploadInfoStore?.uploadInfo?.open || [];
const uploadFile = (id, file, url, filepath, callBack) => { /** 文件token */
const [fileToken, setFileToken] = useState("");
/** token信息 */
let tokenInfo = getTokenInfo();
/** 获取文件token请求 */
const { run: getDataFileTokenRun } = useMyRequest(getDataFileToken, {
onSuccess: (res) => {
setFileToken(res.data);
},
});
useEffect(() => {
getDataFileTokenRun({
id: currentProjectStore?.currentProjectInfo.id,
});
}, []);
const uploadFile = (item, file, url, filepath, callBack) => {
for (let i in localStorage) { for (let i in localStorage) {
if (i.indexOf("tus::tus-br") > -1) { if (i.indexOf("tus::tus-br") > -1) {
localStorage.removeItem(i); localStorage.removeItem(i);
} }
} }
uploadInfoStore?.setUploadInfoIsPermanence(id, false); uploadInfoStore?.setUploadInfoIsPermanence(item.id, false);
if (!verifyLettersNumbersCertainChars4(file.name)) { if (!verifyLettersNumbersCertainChars4(file.name)) {
let json1 = uploadInfoStore?.uploadInfo?.list.concat({ let json1 = uploadInfoStore?.uploadInfo?.list.concat({
...@@ -38,7 +55,7 @@ const UseTusUpload = (props) => { ...@@ -38,7 +55,7 @@ const UseTusUpload = (props) => {
statusMsgDetail: statusMsgDetail:
"上传失败，文件或文件夹的命名长度不超过127字节，不支持特殊符号、空格。", "上传失败，文件或文件夹的命名长度不超过127字节，不支持特殊符号、空格。",
}); });
uploadInfoStore?.setUploadInfo(id, { uploadInfoStore?.setUploadInfo(item.id, {
open: true, open: true,
list: json1, list: json1,
isPermanence: false, isPermanence: false,
...@@ -48,9 +65,9 @@ const UseTusUpload = (props) => { ...@@ -48,9 +65,9 @@ const UseTusUpload = (props) => {
// Create a new tus upload // Create a new tus upload
let timeId = new Date().getTime(); let timeId = new Date().getTime();
let headers = { let headers = {
username: "", username: currentProjectStore?.currentProjectInfo.id,
token: "", token: tokenInfo?.access_token || "",
filetoken: "", filetoken: fileToken,
share: false, share: false,
}; };
let upload = new tus.Upload(file, { let upload = new tus.Upload(file, {
...@@ -67,10 +84,10 @@ const UseTusUpload = (props) => { ...@@ -67,10 +84,10 @@ const UseTusUpload = (props) => {
}, },
onProgress: function (bytesUploaded, bytesTotal, a) { onProgress: function (bytesUploaded, bytesTotal, a) {
var percentage = ((bytesUploaded / bytesTotal) * 100).toFixed(2); var percentage = ((bytesUploaded / bytesTotal) * 100).toFixed(2);
let fliterJson = uploadInfoList?.filter((item) => item.id === timeId); let fliterJson = item.list?.filter((item) => item.id === timeId);
let json = []; let json = [];
if (fliterJson.length === 0) { if (fliterJson.length === 0) {
json = uploadInfoList.concat({ json = item.list.concat({
name: upload.file.name, name: upload.file.name,
bytesUploaded: bytesUploaded, bytesUploaded: bytesUploaded,
bytesTotal: bytesTotal, bytesTotal: bytesTotal,
...@@ -83,13 +100,13 @@ const UseTusUpload = (props) => { ...@@ -83,13 +100,13 @@ const UseTusUpload = (props) => {
upload, upload,
dir: "/home/cloudam/", dir: "/home/cloudam/",
}); });
uploadInfoStore?.setUploadInfo(id, { uploadInfoStore?.setUploadInfo(item.id, {
open: true, open: true,
list: json, list: json,
isPermanence: uploadInfoStore?.uploadInfo?.isPermanence, isPermanence: uploadInfoStore?.uploadInfo?.isPermanence,
}); });
} else { } else {
let a = uploadInfoList; let a = item.list;
let time = new Date().getTime(); let time = new Date().getTime();
a.map((element) => { a.map((element) => {
if (element.id === timeId) { if (element.id === timeId) {
...@@ -108,18 +125,20 @@ const UseTusUpload = (props) => { ...@@ -108,18 +125,20 @@ const UseTusUpload = (props) => {
: element["endTime"]; : element["endTime"];
} }
}); });
uploadInfoStore?.setUploadInfo(id, { uploadInfoStore?.setUploadInfo(item.id, {
open: true, open: true,
list: a.concat([]), list: a.concat([]),
isPermanence: uploadInfoIsPermanence, isPermanence: item.isPermanence,
}); });
} }
}, },
onSuccess: function () { onSuccess: function () {
let fliterJson = uploadInfoList.filter((item) => item.id === timeId); let fliterJson = item.list.filter((item) => item.id === timeId);
console.log(upload.file, "9999999");
if (fliterJson.length === 0 && upload.file["size"] === 0) { if (fliterJson.length === 0 && upload.file["size"] === 0) {
console.log("000011111");
let json = []; let json = [];
json = uploadInfoList.concat({ json = item.list.concat({
name: upload.file.name, name: upload.file.name,
bytesUploaded: 0, bytesUploaded: 0,
bytesTotal: 0, bytesTotal: 0,
...@@ -131,21 +150,22 @@ const UseTusUpload = (props) => { ...@@ -131,21 +150,22 @@ const UseTusUpload = (props) => {
statusMsg: "上传成功", statusMsg: "上传成功",
upload, upload,
}); });
uploadInfoStore?.setUploadInfo(id, { uploadInfoStore?.setUploadInfo(item.id, {
open: true, open: true,
list: json, list: json,
isPermanence: uploadInfoIsPermanence, isPermanence: item.isPermanence,
}); });
} else { } else {
uploadInfoList.map((item) => { console.log(item.list, "000022222");
item.list.map((item) => {
if (item.id === timeId) { if (item.id === timeId) {
item["statusMsg"] = "上传成功"; item["statusMsg"] = "上传成功";
} }
}); });
uploadInfoStore?.setUploadInfo(id, { uploadInfoStore?.setUploadInfo(item.id, {
open: true, open: true,
list: uploadInfoList, list: item.list,
isPermanence: uploadInfoIsPermanence, isPermanence: item.isPermanence,
}); });
} }
callBack && callBack(upload, filepath); callBack && callBack(upload, filepath);
...@@ -155,391 +175,391 @@ const UseTusUpload = (props) => { ...@@ -155,391 +175,391 @@ const UseTusUpload = (props) => {
upload.start(); upload.start();
}; };
const uploadFileCallBack = (file, url, filepath, callBack) => { // const uploadFileCallBack = (file, url, filepath, callBack) => {
if (!verifyLettersNumbersCertainChars4(file.name)) { // if (!verifyLettersNumbersCertainChars4(file.name)) {
let json1 = uploadInfoList.concat({ // let json1 = uploadInfoList.concat({
name: file.name, // name: file.name,
bytesUploaded: 0, // bytesUploaded: 0,
bytesTotal: 0, // bytesTotal: 0,
percentage: 0, // percentage: 0,
startTime: new Date().getTime(), // startTime: new Date().getTime(),
endTime: new Date().getTime() + 1000, // endTime: new Date().getTime() + 1000,
bytesUploaded2: 0, // bytesUploaded2: 0,
fileIsCn: true, // fileIsCn: true,
id: new Date().getTime, // id: new Date().getTime,
statusMsg: "上传失败", // statusMsg: "上传失败",
upload: null, // upload: null,
statusMsgDetail: // statusMsgDetail:
"上传失败，文件或文件夹的命名长度不超过127字节，不支持特殊符号、空格。", // "上传失败，文件或文件夹的命名长度不超过127字节，不支持特殊符号、空格。",
}); // });
uploadInfoStore?.setUploadInfo({ // uploadInfoStore?.setUploadInfo({
open: true, // open: true,
list: json1, // list: json1,
isPermanence: false, // isPermanence: false,
}); // });
return; // return;
} // }
for (let i in localStorage) { // for (let i in localStorage) {
if (i.indexOf("tus::tus-br") > -1) { // if (i.indexOf("tus::tus-br") > -1) {
localStorage.removeItem(i); // localStorage.removeItem(i);
} // }
} // }
uploadInfoStore?.setUploadInfoIsPermanence(false); // uploadInfoStore?.setUploadInfoIsPermanence(false);
// Create a new tus upload // // Create a new tus upload
let timeId = new Date().getTime(); // let timeId = new Date().getTime();
let headers = { // let headers = {
username: "", // username: "",
token: "", // token: "",
filetoken: "", // filetoken: "",
share: false, // share: false,
}; // };
let upload = new tus.Upload(file, { // let upload = new tus.Upload(file, {
endpoint: url, // endpoint: url,
parallelUploads: 1, // parallelUploads: 1,
chunkSize: 5242880, // chunkSize: 5242880,
metadata: { // metadata: {
filepath: filepath, // filepath: filepath,
}, // },
retryDelays: [0, 3000, 5000, 10000, 20000], // retryDelays: [0, 3000, 5000, 10000, 20000],
headers: headers, // headers: headers,
onError: function (error) { // onError: function (error) {
console.log("Failed because: " + error); // console.log("Failed because: " + error);
}, // },
onProgress: function (bytesUploaded, bytesTotal, a) { // onProgress: function (bytesUploaded, bytesTotal, a) {
var percentage = ((bytesUploaded / bytesTotal) * 100).toFixed(2); // var percentage = ((bytesUploaded / bytesTotal) * 100).toFixed(2);
let fliterJson = uploadInfoList.filter((item) => item.id === timeId); // let fliterJson = uploadInfoList.filter((item) => item.id === timeId);
let json = []; // let json = [];
if (fliterJson.length === 0) { // if (fliterJson.length === 0) {
json = uploadInfoList.concat({ // json = uploadInfoList.concat({
name: upload.file.name, // name: upload.file.name,
bytesUploaded: bytesUploaded, // bytesUploaded: bytesUploaded,
bytesTotal: bytesTotal, // bytesTotal: bytesTotal,
percentage: percentage, // percentage: percentage,
startTime: new Date().getTime(), // startTime: new Date().getTime(),
endTime: new Date().getTime() + 1000, // endTime: new Date().getTime() + 1000,
bytesUploaded2: bytesUploaded, // bytesUploaded2: bytesUploaded,
id: timeId, // id: timeId,
statusMsg: "正在上传", // statusMsg: "正在上传",
upload, // upload,
dir: "/home/cloudam/", // dir: "/home/cloudam/",
}); // });
uploadInfoStore?.setUploadInfo({ // uploadInfoStore?.setUploadInfo({
open: true, // open: true,
list: json, // list: json,
isPermanence: uploadInfoIsPermanence, // isPermanence: uploadInfoIsPermanence,
}); // });
} else { // } else {
let a = uploadInfoList; // let a = uploadInfoList;
let time = new Date().getTime(); // let time = new Date().getTime();
a.map((element) => { // a.map((element) => {
if (element.id === timeId) { // if (element.id === timeId) {
element["bytesUploaded"] = bytesUploaded; // element["bytesUploaded"] = bytesUploaded;
element["bytesTotal"] = bytesTotal; // element["bytesTotal"] = bytesTotal;
element["percentage"] = percentage; // element["percentage"] = percentage;
element["bytesUploaded2"] = // element["bytesUploaded2"] =
parseInt((parseInt(time) - parseInt(element.endTime)) / 1000) >= // parseInt((parseInt(time) - parseInt(element.endTime)) / 1000) >=
2 // 2
? bytesUploaded // ? bytesUploaded
: element["bytesUploaded2"]; // : element["bytesUploaded2"];
element["endTime"] = // element["endTime"] =
parseInt((parseInt(time) - parseInt(element.endTime)) / 1000) >= // parseInt((parseInt(time) - parseInt(element.endTime)) / 1000) >=
2 // 2
? time // ? time
: element["endTime"]; // : element["endTime"];
} // }
}); // });
uploadInfoStore?.setUploadInfo({ // uploadInfoStore?.setUploadInfo({
open: true, // open: true,
list: a.concat([]), // list: a.concat([]),
isPermanence: uploadInfoIsPermanence, // isPermanence: uploadInfoIsPermanence,
}); // });
} // }
}, // },
onSuccess: function () { // onSuccess: function () {
let fliterJson = uploadInfoList.filter((item) => item.id === timeId); // let fliterJson = uploadInfoList.filter((item) => item.id === timeId);
if (fliterJson.length === 0 && upload.file["size"] === 0) { // if (fliterJson.length === 0 && upload.file["size"] === 0) {
let json = []; // let json = [];
json = uploadInfoList.concat({ // json = uploadInfoList.concat({
name: upload.file.name, // name: upload.file.name,
bytesUploaded: 0, // bytesUploaded: 0,
bytesTotal: 0, // bytesTotal: 0,
id: timeId, // id: timeId,
percentage: 100, // percentage: 100,
startTime: new Date().getTime(), // startTime: new Date().getTime(),
endTime: new Date().getTime() + 1000, // endTime: new Date().getTime() + 1000,
bytesUploaded2: 0, // bytesUploaded2: 0,
statusMsg: "上传成功", // statusMsg: "上传成功",
upload, // upload,
}); // });
uploadInfoStore?.setUploadInfo({ // uploadInfoStore?.setUploadInfo({
open: true, // open: true,
list: json, // list: json,
isPermanence: uploadInfoIsPermanence, // isPermanence: uploadInfoIsPermanence,
}); // });
} else { // } else {
uploadInfoList.map((item) => { // uploadInfoList.map((item) => {
if (item.id === timeId) { // if (item.id === timeId) {
item["statusMsg"] = "上传成功"; // item["statusMsg"] = "上传成功";
} // }
}); // });
uploadInfoStore?.setUploadInfo({ // uploadInfoStore?.setUploadInfo({
open: true, // open: true,
list: uploadInfoList, // list: uploadInfoList,
isPermanence: uploadInfoIsPermanence, // isPermanence: uploadInfoIsPermanence,
}); // });
} // }
callBack && callBack(upload); // callBack && callBack(upload);
}, // },
}); // });
// Start the upload // // Start the upload
upload.start(); // upload.start();
}; // };
const uploadFileFunc = ( // const uploadFileFunc = (
file, // file,
url, // url,
filepath, // filepath,
page, // page,
length, // length,
allFile, // allFile,
path, // path,
timeId, // timeId,
callBack // callBack
) => { // ) => {
// Create a new tus upload // // Create a new tus upload
for (let i in localStorage) { // for (let i in localStorage) {
if (i.indexOf("tus::tus-br") > -1) { // if (i.indexOf("tus::tus-br") > -1) {
localStorage.removeItem(i); // localStorage.removeItem(i);
} // }
} // }
let timeIdFile = new Date().getTime(); // let timeIdFile = new Date().getTime();
let headers = { // let headers = {
username: "", // username: "",
token: "", // token: "",
filetoken: "", // filetoken: "",
share: false, // share: false,
}; // };
let uploads = new tus.Upload(file, { // let uploads = new tus.Upload(file, {
endpoint: url, // endpoint: url,
parallelUploads: 1, // parallelUploads: 1,
chunkSize: 5242880, // chunkSize: 5242880,
metadata: { // metadata: {
filepath: filepath, // filepath: filepath,
}, // },
retryDelays: [0, 3000, 5000, 10000, 20000], // retryDelays: [0, 3000, 5000, 10000, 20000],
headers: headers, // headers: headers,
onError: function (error) { // onError: function (error) {
console.log("Failed because: " + error); // console.log("Failed because: " + error);
}, // },
onProgress: function (bytesUploaded, bytesTotal, percentage) { // onProgress: function (bytesUploaded, bytesTotal, percentage) {
// console.log("正在上传的文件名:" + uploads['file']['name'], 'onProgress') // // console.log("正在上传的文件名:" + uploads['file']['name'], 'onProgress')
if ( // if (
uploadInfoList.filter((item) => item.id === timeId) && // uploadInfoList.filter((item) => item.id === timeId) &&
uploadInfoList.filter((item) => item.id === timeId).length > 0 // uploadInfoList.filter((item) => item.id === timeId).length > 0
) { // ) {
let k = uploadInfoList; // let k = uploadInfoList;
k.map((item) => { // k.map((item) => {
if (item.id === timeId) { // if (item.id === timeId) {
item["upload"] = uploads; // item["upload"] = uploads;
} // }
}); // });
uploadInfoStore?.setUploadInfo({ // uploadInfoStore?.setUploadInfo({
open: true, // open: true,
list: k, // list: k,
isPermanence: uploadInfoIsPermanence, // isPermanence: uploadInfoIsPermanence,
}); // });
return; // return;
} // }
let json = uploadInfoList.concat({ // let json = uploadInfoList.concat({
name: allFile[page]["path"].split("/")[0], // name: allFile[page]["path"].split("/")[0],
bytesUploaded: page + 1, // bytesUploaded: page + 1,
statusMsg: "正在上传", // statusMsg: "正在上传",
bytesTotal: length, // bytesTotal: length,
upload: uploads, // upload: uploads,
ids: timeIdFile, // ids: timeIdFile,
percentage: ((page + 1) / length) * 100, // percentage: ((page + 1) / length) * 100,
type: "folder", // type: "folder",
id: timeId, // id: timeId,
}); // });
uploadInfoStore?.setUploadInfo({ // uploadInfoStore?.setUploadInfo({
open: true, // open: true,
list: json, // list: json,
isPermanence: uploadInfoIsPermanence, // isPermanence: uploadInfoIsPermanence,
}); // });
}, // },
onSuccess: function (bytesUploaded, bytesTotal, percentage) { // onSuccess: function (bytesUploaded, bytesTotal, percentage) {
++page; // ++page;
// 每次成功 page累加 当page 与 总上传文件长度 进行比较 判断是否上传文件夹是否成功。 // // 每次成功 page累加 当page 与 总上传文件长度 进行比较 判断是否上传文件夹是否成功。
if (page >= length) { // if (page >= length) {
uploadInfoList.map((item) => { // uploadInfoList.map((item) => {
if (item.id === timeId) { // if (item.id === timeId) {
item["statusMsg"] = "上传成功"; // item["statusMsg"] = "上传成功";
item["bytesUploaded"] = length; // item["bytesUploaded"] = length;
item["bytesTotal"] = length; // item["bytesTotal"] = length;
item["percentage"] = 100; // item["percentage"] = 100;
} // }
}); // });
uploadInfoStore?.setUploadInfo({ // uploadInfoStore?.setUploadInfo({
open: uploadInfoOpen, // open: uploadInfoOpen,
list: uploadInfoList, // list: uploadInfoList,
isPermanence: uploadInfoIsPermanence, // isPermanence: uploadInfoIsPermanence,
}); // });
// 上传文件夹成功 回调 页面 刷新 列表 重新请求数据 // // 上传文件夹成功 回调 页面 刷新 列表 重新请求数据
callBack && callBack(true); // callBack && callBack(true);
return; // return;
} else { // } else {
// 判断 传输列表中是否有 有该 id 的任务 // // 判断 传输列表中是否有 有该 id 的任务
// 进度 判断: 成功一个文件 page 累加 redux // // 进度 判断: 成功一个文件 page 累加 redux
if ( // if (
uploadInfoList((item) => item.id === timeId) && // uploadInfoList((item) => item.id === timeId) &&
uploadInfoList((item) => item.id === timeId).length > 0 // uploadInfoList((item) => item.id === timeId).length > 0
) { // ) {
let newList = uploadInfoList; // let newList = uploadInfoList;
newList.forEach((items) => { // newList.forEach((items) => {
if (items.id === timeId) { // if (items.id === timeId) {
items["name"] = allFile[page]["path"].split("/")[0]; // items["name"] = allFile[page]["path"].split("/")[0];
items["bytesUploaded"] = page + 1; // items["bytesUploaded"] = page + 1;
items["bytesTotal"] = length; // items["bytesTotal"] = length;
items["statusMsg"] = "正在上传"; // items["statusMsg"] = "正在上传";
items["percentage"] = ((page + 1) / length) * 100; // items["percentage"] = ((page + 1) / length) * 100;
} // }
}); // });
uploadInfoStore?.setUploadInfo({ // uploadInfoStore?.setUploadInfo({
open: true, // open: true,
list: newList.concat([]), // list: newList.concat([]),
isPermanence: uploadInfoIsPermanence, // isPermanence: uploadInfoIsPermanence,
}); // });
} // }
uploadFileFunc( // uploadFileFunc(
allFile[page], // allFile[page],
url, // url,
path === "/" // path === "/"
? path + allFile[page]["path"] // ? path + allFile[page]["path"]
: path + "/" + allFile[page]["path"], // : path + "/" + allFile[page]["path"],
page, // page,
allFile.length, // allFile.length,
allFile, // allFile,
path, // path,
timeId, // timeId,
callBack // callBack
); // );
} // }
}, // },
}); // });
// 每次调用 把 任务 重新赋值给 该上传任务 以便于 文件夹暂停下载功能实现 // // 每次调用 把 任务 重新赋值给 该上传任务 以便于 文件夹暂停下载功能实现
if ( // if (
uploadInfoList.filter((item) => item.id === timeId) && // uploadInfoList.filter((item) => item.id === timeId) &&
uploadInfoList.filter((item) => item.id === timeId).length > 0 // uploadInfoList.filter((item) => item.id === timeId).length > 0
) { // ) {
let k = uploadInfoList; // let k = uploadInfoList;
k.map((item) => { // k.map((item) => {
if (item.id === timeId) { // if (item.id === timeId) {
item["upload"] = uploads; // item["upload"] = uploads;
} // }
}); // });
uploadInfoStore?.setUploadInfo({ // uploadInfoStore?.setUploadInfo({
open: true, // open: true,
list: k, // list: k,
isPermanence: uploadInfoIsPermanence, // isPermanence: uploadInfoIsPermanence,
}); // });
} // }
uploads.start(); // uploads.start();
}; // };
const uploadFolder = (file, url, filepath, callBack) => { // const uploadFolder = (file, url, filepath, callBack) => {
// tus 上传会设置 缓存 清除缓存设置 // // tus 上传会设置 缓存 清除缓存设置
for (let i in localStorage) { // for (let i in localStorage) {
if (i.indexOf("tus::tus-br") > -1) { // if (i.indexOf("tus::tus-br") > -1) {
localStorage.removeItem(i); // localStorage.removeItem(i);
} // }
} // }
// 打开传输列表 // // 打开传输列表
uploadInfoStore?.setUploadInfoIsPermanence(false); // uploadInfoStore?.setUploadInfoIsPermanence(false);
// 判断 文件夹中 是否中 是否 全部是中文 不是 过滤 文件路径中文或者特殊符号 含有任务的 // // 判断 文件夹中 是否中 是否 全部是中文 不是 过滤 文件路径中文或者特殊符号 含有任务的
let filterFileJson = []; // let filterFileJson = [];
if (file && file.length > 0) { // if (file && file.length > 0) {
filterFileJson = file.filter((item) => // filterFileJson = file.filter((item) =>
verifyLettersNumbersCertainChars5(item.path) // verifyLettersNumbersCertainChars5(item.path)
); // );
} // }
if (filterFileJson && filterFileJson.length === 0) { // if (filterFileJson && filterFileJson.length === 0) {
let json1 = uploadInfoList.concat({ // let json1 = uploadInfoList.concat({
name: file[0]["path"].split("/")[0], // name: file[0]["path"].split("/")[0],
bytesUploaded: 0, // bytesUploaded: 0,
bytesTotal: 0, // bytesTotal: 0,
percentage: 0, // percentage: 0,
startTime: new Date().getTime(), // startTime: new Date().getTime(),
endTime: new Date().getTime() + 1000, // endTime: new Date().getTime() + 1000,
bytesUploaded2: 0, // bytesUploaded2: 0,
fileIsCn: true, // fileIsCn: true,
statusMsg: "上传失败", // statusMsg: "上传失败",
type: true, // type: true,
statusMsgDetail: // statusMsgDetail:
"上传失败，文件或文件夹的命名长度不超过127字节，不支持特殊符号、空格。", // "上传失败，文件或文件夹的命名长度不超过127字节，不支持特殊符号、空格。",
// 已自动过滤掉命名包含中文、特殊符号、空格的文件及文件夹 // // 已自动过滤掉命名包含中文、特殊符号、空格的文件及文件夹
upload: null, // upload: null,
id: new Date().getTime(), // id: new Date().getTime(),
dir: "/home/cloudam/", // dir: "/home/cloudam/",
}); // });
uploadInfoStore?.setUploadInfo({ // uploadInfoStore?.setUploadInfo({
open: true, // open: true,
list: json1, // list: json1,
isPermanence: false, // isPermanence: false,
}); // });
return; // return;
} // }
let timeId = new Date().getTime(); // let timeId = new Date().getTime();
if (filterFileJson && filterFileJson.length < file.length) { // if (filterFileJson && filterFileJson.length < file.length) {
let json1 = uploadInfoList.concat({ // let json1 = uploadInfoList.concat({
name: file[0]["path"].split("/")[0], // name: file[0]["path"].split("/")[0],
bytesUploaded: 0, // bytesUploaded: 0,
bytesTotal: filterFileJson.length, // bytesTotal: filterFileJson.length,
percentage: 0, // percentage: 0,
startTime: new Date().getTime(), // startTime: new Date().getTime(),
endTime: new Date().getTime() + 1000, // endTime: new Date().getTime() + 1000,
id: timeId, // id: timeId,
type: true, // type: true,
statusMsg: "正在上传", // statusMsg: "正在上传",
statusMsgDetail: "已自动过滤掉命名包含特殊符号、空格的文件及文件夹", // statusMsgDetail: "已自动过滤掉命名包含特殊符号、空格的文件及文件夹",
}); // });
uploadInfoStore?.setUploadInfo({ // uploadInfoStore?.setUploadInfo({
open: true, // open: true,
list: json1, // list: json1,
isPermanence: false, // isPermanence: false,
}); // });
} // }
let page = 0; // let page = 0;
file = filterFileJson; // file = filterFileJson;
uploadFileFunc( // uploadFileFunc(
file[page], // file[page],
url, // url,
filepath === "/" // filepath === "/"
? filepath + file[page]["path"] // ? filepath + file[page]["path"]
: filepath + "/" + file[page]["path"], // : filepath + "/" + file[page]["path"],
page, // page,
file.length, // file.length,
file, // file,
filepath, // filepath,
timeId, // timeId,
callBack // callBack
); // );
return file; // return file;
// Start the upload // // Start the upload
}; // };
return { return {
uploadFile, uploadFile,
uploadFileCallBack, // uploadFileCallBack,
uploadFolder, // uploadFolder,
uploadFileFunc, // uploadFileFunc,
}; };
}; };
......
src/utils/util.ts
View file @ cac0bab4
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-06-07 18:37:53 * @Date: 2022-06-07 18:37:53
* @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
* @LastEditTime: 2022-06-14 10:32:54 * @LastEditTime: 2022-06-14 17:21:52
* @FilePath: /bkunyun/src/utils/util.ts * @FilePath: /bkunyun/src/utils/util.ts
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
...@@ -29,19 +29,30 @@ export const isProjectOwner = (name: string) => { ...@@ -29,19 +29,30 @@ export const isProjectOwner = (name: string) => {
return pwd; return pwd;
}; };
// 获取用户token 信息 // 获取用户信息
export const getUserInfo = () => { export const getUserInfo = () => {
let val: any; let val: any;
try { try {
val = JSON.parse(localStorage.getItem("userInfo") || "{}") val = JSON.parse(localStorage.getItem("userInfo") || "{}")
} }
catch { catch {
console.error("获取用户信息token 出错"); console.error("获取用户信息 出错");
}
return val
}
// 获取token信息
export const getTokenInfo = () => {
let val: any;
try {
val = JSON.parse(localStorage.getItem("token") || "{}")
}
catch {
console.error("获取token信息 出错");
} }
return val return val
} }
const IsNumberLetterChineseReg = new RegExp("^[A-Za-z0-9\u4e00-\u9fa5]+$"); const IsNumberLetterChineseReg = new RegExp("^[A-Za-z0-9\u4e00-\u9fa5]+$");
...@@ -52,4 +63,4 @@ export const checkIsNumberLetterChinese = (string: string) => { ...@@ -52,4 +63,4 @@ export const checkIsNumberLetterChinese = (string: string) => {
export const getMbfromB = (b: number) => { export const getMbfromB = (b: number) => {
return Math.floor(b / 1048576); return Math.floor(b / 1048576);
}; };
\ No newline at end of file
src/views/ConsoleLayout/components/FileItem/index.tsx
View file @ cac0bab4
import { useEffect } from "react";
import useGlobalStore from "@/hooks/useGlobalStore";
import { observer } from "mobx-react-lite"; import { observer } from "mobx-react-lite";
import { toJS } from "mobx"; // import { any } from "@/store/modules/fileList";
import UseTusUpload from "@/utils/Upload/tusUpload";
// toJS(currentProjectStore.currentProjectInfo.id); // toJS(currentProjectStore.currentProjectInfo.id);
/* /*
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-06-11 15:46:42 * @Date: 2022-06-11 15:46:42
* @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
* @LastEditTime: 2022-06-14 11:07:55 * @LastEditTime: 2022-06-14 21:35:09
* @FilePath: /bkunyun/src/views/ConsoleLayout/components/FileItem/index.tsx * @FilePath: /bkunyun/src/views/ConsoleLayout/components/FileItem/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
const FileItem = observer(() => {
const fileList = toJS(useGlobalStore("fileList"));
const { uploadFile } = UseTusUpload(fileList?.fileList); interface IProps {
useEffect(() => { fileItemInfo: any;
fileList?.fileList?.forEach((item) => { }
uploadFile( const FileItem = (props: IProps) => {
item.id, const { fileItemInfo } = props;
item.list, console.log(fileItemInfo, 2222);
"/",
"/",
(upload: any, filepath: string) => console.log(upload, filepath, 1111)
);
});
console.log(fileList?.fileList, 1111);
}, [fileList.fileList, uploadFile]);
return <div>dd</div>; return <div>dd</div>;
}); };
export default FileItem; export default FileItem;
src/views/ConsoleLayout/components/TransferList/index.tsx
View file @ cac0bab4
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-06-10 18:05:21 * @Date: 2022-06-10 18:05:21
* @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
* @LastEditTime: 2022-06-11 18:08:27 * @LastEditTime: 2022-06-14 21:00:46
* @FilePath: /bkunyun/src/views/ConsoleLayout/components/TransferList/index.tsx * @FilePath: /bkunyun/src/views/ConsoleLayout/components/TransferList/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
...@@ -12,8 +12,11 @@ import { memo } from "react"; ...@@ -12,8 +12,11 @@ import { memo } from "react";
import MySelect from "@/components/mui/MySelect"; import MySelect from "@/components/mui/MySelect";
import MyTitle from "@/components/mui/MyTitle"; import MyTitle from "@/components/mui/MyTitle";
import FileItem from "../FileItem"; import FileItem from "../FileItem";
import useGlobalStore from "@/hooks/useGlobalStore";
import { observer } from "mobx-react-lite";
const TranSferList = () => { const TranSferList = observer(() => {
const fileList = useGlobalStore("fileListStore");
return ( return (
<Box style={{ width: 520, padding: 20 }}> <Box style={{ width: 520, padding: 20 }}>
<MyTitle title="传输列表" /> <MyTitle title="传输列表" />
...@@ -42,10 +45,12 @@ const TranSferList = () => { ...@@ -42,10 +45,12 @@ const TranSferList = () => {
/> />
</Box> </Box>
<Box> <Box>
<FileItem /> {fileList?.fileList.map((item) => {
return <FileItem fileItemInfo={item} />;
})}
</Box> </Box>
</Box> </Box>
); );
}; });
export default memo(TranSferList); export default memo(TranSferList);
src/views/ConsoleLayout/index.tsx
View file @ cac0bab4
...@@ -16,6 +16,13 @@ import MyPopover from "@/components/mui/MyPopover"; ...@@ -16,6 +16,13 @@ import MyPopover from "@/components/mui/MyPopover";
import TranSferList from "./components/TransferList"; import TranSferList from "./components/TransferList";
import style from "./index.module.css"; import style from "./index.module.css";
import useGlobalStore from "@/hooks/useGlobalStore";
import { toJS } from "mobx";
import { urlToken } from "@/api/fileserver/raysyncApi";
import UseTusUpload from "@/utils/Upload/tusUpload";
import useMyRequest from "@/hooks/useMyRequest";
import { getDataFileToken } from "@/api/project_api";
import useDeepEffect from "@/hooks/useDeepEffect";
const ConsoleLayout = observer(() => { const ConsoleLayout = observer(() => {
const { const {
...@@ -36,6 +43,42 @@ const ConsoleLayout = observer(() => { ...@@ -36,6 +43,42 @@ const ConsoleLayout = observer(() => {
permissionStore.setSidebarRouters(location.pathname); permissionStore.setSidebarRouters(location.pathname);
}, [location, permissionStore]); }, [location, permissionStore]);
const fileList = toJS(useGlobalStore("fileListStore"));
const currentProjectStore = toJS(useGlobalStore("currentProjectStore"));
const { uploadFile } = UseTusUpload({
fileListStore: fileList,
currentProjectStore,
});
/** 获取文件token请求 */
const { run: getDataFileTokenRun } = useMyRequest(getDataFileToken, {
onSuccess: (res: any) => {
let url =
"https://fileserver.cloudam.cn/parallelupload/" +
urlToken(
res?.data || "",
currentProjectStore?.currentProjectInfo?.id as string
);
fileList?.newFileList?.forEach((item: any) => {
uploadFile(
item,
item?.list,
url,
"/",
(upload: any, filepath: string) => console.log(upload, filepath, 1111)
);
});
},
});
useDeepEffect(() => {
if (fileList?.newFileList?.length) {
getDataFileTokenRun({
id: currentProjectStore?.currentProjectInfo.id || "",
});
}
}, [fileList?.newFileList]);
return ( return (
<Box> <Box>
<Box className={style.topApp}> <Box className={style.topApp}>
......
src/views/Project/ProjectData/UpLoaderFile/index.tsx
View file @ cac0bab4
...@@ -12,11 +12,12 @@ import noFile from "@/assets/project/noFile.svg"; ...@@ -12,11 +12,12 @@ import noFile from "@/assets/project/noFile.svg";
import uploaderIcon from "@/assets/project/uploaderIcon.svg"; import uploaderIcon from "@/assets/project/uploaderIcon.svg";
import classnames from "classnames"; import classnames from "classnames";
import { getMbfromB } from "@/utils/util"; import { getMbfromB } from "@/utils/util";
import { observer } from "mobx-react-lite"; import { observer } from "mobx-react";
import useGlobalStore from "@/hooks/useGlobalStore"; import { useStores } from "@/store";
import { toJS } from "mobx";
const UpLoaderFile = observer((props: any) => { const UpLoaderFile = observer((props: any) => {
const uploadInfoStore = useGlobalStore("fileList"); const { fileListStore } = useStores();
const message = useMessage(); const message = useMessage();
const [fileList, setFileList] = useState<any>([]); const [fileList, setFileList] = useState<any>([]);
// list 是项目数据table的数据 // list 是项目数据table的数据
...@@ -58,17 +59,17 @@ const UpLoaderFile = observer((props: any) => { ...@@ -58,17 +59,17 @@ const UpLoaderFile = observer((props: any) => {
let dialogRef: any = React.createRef(); let dialogRef: any = React.createRef();
const handleSubmit = () => { const handleSubmit = () => {
const newFileList = fileList?.map((item: any) => { const newFileList =
return { fileList?.map((item: any) => {
id: uuid(), return {
open: false, id: uuid(),
list: item, open: false,
isPermanence: true, list: item,
}; isPermanence: true,
}); };
uploadInfoStore.setFileList(newFileList); }) || [];
console.log(newFileList);
console.log("handleSubmit"); toJS(fileListStore?.setNewFileList)(newFileList);
}; };
const showDialog = () => { const showDialog = () => {
......
src/views/Project/ProjectSetting/BaseInfo/index.tsx
View file @ cac0bab4
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-05-31 10:18:13 * @Date: 2022-05-31 10:18:13
* @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
* @LastEditTime: 2022-06-01 09:15:10 * @LastEditTime: 2022-06-14 15:40:27
* @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx * @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment