Преглед на файлове

editCommit 去掉CreateTime和ModifyTime; 修正fileHistoryList的页面更新;

dev
kim131 преди 4 години
родител
ревизия
1e5f8e0224
променени са 3 файла, в които са добавени 21 реда и са изтрити 11 реда
  1. +7
    -5
      src/services/system.js
  2. +11
    -3
      src/views/main_web/workspace/components/file-milestone.vue
  3. +3
    -3
      src/views/main_web/workspace/workspace.new.vue

+ 7
- 5
src/services/system.js Целия файл

@@ -666,14 +666,16 @@ const system = {
socket.on('message', (e) => {
if(e.data === '-1') {
notify.error('查询历史文件失败');
getData([]);
return;
}else{
const data = JSON.parse(e.data);
let dataArray = [];
for (let key in data) {
dataArray.push(data[key]);
}
console.log('wb', dataArray)
// let dataArray = [];
// for (let key in data) {
// dataArray.push(data[key]);
// }
// console.log('wb', dataArray)
const dataArray = Object.values(data);
getData(dataArray);
}
})


+ 11
- 3
src/views/main_web/workspace/components/file-milestone.vue Целия файл

@@ -134,6 +134,14 @@ export default {
default: () => ({}),
}
},
watch: {
fileHistoryList(...args){
// console.log('fileHistoryList: ', this.fileHistoryList, args);
this.getFileMilestoneList(this.fileHistoryList);
this.getFileNowVersion(this.fileHistoryList);
this.getFileOtherVersion();
}
},
mounted() {
// const userInfo = await getUserInfo(this.$store.state.accountId);
// this.user = userInfo;
@@ -145,9 +153,9 @@ export default {
// this.milestoneCheckRefEl && this.milestoneCheckRefEl.addEventListener('scroll', ()=>{
// this.toolboxShow = false;
// })
this.getFileMilestoneList(this.fileHistoryList);
this.getFileNowVersion(this.fileHistoryList);
this.getFileOtherVersion();
// this.getFileMilestoneList(this.fileHistoryList);
// this.getFileNowVersion(this.fileHistoryList);
// this.getFileOtherVersion();
},
data() {
return {


+ 3
- 3
src/views/main_web/workspace/workspace.new.vue Целия файл

@@ -832,11 +832,11 @@ export default {
const time = new Date().getTime();
const params = {
"ArchId": this.currentFile.id,
"CreateTime": historyFile.createTime,
// "CreateTime": historyFile.createTime,
"CreateUserId": historyFile.creator,
"CurrentIpfsCid": currentIpfsCid,
"Id": historyFile.currentHash,
"ModifyTime": time,
// "ModifyTime": time,
"ModifyUserId": sessionStorage.userId,
"PrevIpfsCid": historyFile.parentHash
}
@@ -2173,7 +2173,7 @@ export default {
this.fileMilestoneInfo.path = filePath;
const res = await services.queryProjArchiveHistory(file.id);
if(res.Code == 0){
this.fileMilestoneInfo.hash = res.Data.CurrentIpfsCid;
this.fileMilestoneInfo.hash = res.Data?.CurrentIpfsCid || '';
}
this.getHistoryFileList(this.fileMilestoneInfo);
this.currentFile = file;


Зареждане…
Отказ
Запис