Explorar el Código

workspace update

dev
zhengzhou hace 4 años
padre
commit
a07eba9ff1
Se han modificado 4 ficheros con 71 adiciones y 3 borrados
  1. +1
    -1
      src/components/app-header/app-header.vue
  2. +11
    -0
      src/views/main_web/workspace/components/archive-view/index.vue
  3. +1
    -0
      src/views/main_web/workspace/components/file-explorer/index.vue
  4. +58
    -2
      src/views/main_web/workspace/index.vue

+ 1
- 1
src/components/app-header/app-header.vue Ver fichero

@@ -107,7 +107,7 @@ export default {
},
isOnLine() {
return this.$store.state.gatewayState;
}
},
},
watch: {
isMaxWindowSize(val) {


+ 11
- 0
src/views/main_web/workspace/components/archive-view/index.vue Ver fichero

@@ -56,6 +56,11 @@
@click.stop="authModalVisible = true"
>
交付并认证</el-button>
<el-button
class="view-left-button"
@click.stop="cancelArchive"
>
取消交付</el-button>
</div>

</div>
@@ -247,6 +252,8 @@ export default {
this.fetchFolderFiles();
// 2. 查询历史提交记录
this.fetchArchiveHistory();

this.fetchReceiverInfo();
},
watch: {
authModalVisible(v) {
@@ -261,6 +268,9 @@ export default {
},
},
methods: {
cancelArchive() {
this.$emit('cancel');
},
isChildrenAllChecked(node) {
return recursionEvery(node.children, this.selectedKeyMap);
},
@@ -385,6 +395,7 @@ export default {
);
wrapErrorHint(res);
this.receiverInfo = firstCharToLowerCase(res.Data || {});
this.$emit('on-query-receiver-info', this.receiverInfo);
},
},
};


+ 1
- 0
src/views/main_web/workspace/components/file-explorer/index.vue Ver fichero

@@ -861,6 +861,7 @@ export default {
if (v) {
this.selectedFileIdList = [];
}
this.$emit('select-mode-change', v);
},
isShowCommitJudgeWindow(val) {
// this.lookCoopTarget();


+ 58
- 2
src/views/main_web/workspace/index.vue Ver fichero

@@ -11,7 +11,27 @@
:showRecycleBin="!workFlowVisible"
:onBackBtnClick="appHeaderBackBtnClick"
>
<template #center>
<template v-if="viewType === 'archive-view' || selectMode" #left>
<div class="app-header-left-content no-drag">
<span v-if="selectMode">
<span class="left-content-title">{{currentNodeFolder.folderName}}成果交付至</span>
<span
v-for="tempNode in currentNodeFolder.listsShareFrom[0]"
:key="tempNode.id"
class="button-like">
{{tempNode.nodeName}}
</span>
</span>
<span v-if="viewType === 'archive-view'">
<span class="left-content-title">{{projectName}}成果交付至</span>
<span class="button-like">
{{ `${receiverInfo.tempName || ''} ${receiverInfo.folderName || ''}` }}
</span>
</span>
</div>
</template>
<template v-else #center>
<!-- 工作链 -->
<header-flow-tabs
v-if="currentNodeFolder"
@@ -22,7 +42,7 @@
@showWorkFlow="workFlowVisible = true"
/>
<span v-show="workFlowVisible">{{projectName}}</span>
<span v-show="viewType === 'archive-view'">交付模板成果</span>
<!-- <span v-show="viewType === 'archive-view'">交付模板成果</span> -->
</template>
<template #right>
<search-bar
@@ -51,12 +71,15 @@
:searchContent="searchKeywords"
:nodeFolders="nodeFolders"
@showAchieveView="viewType = 'archive-view'"
@select-mode-change="onSelectModeChange"
/>
<archive-view
v-show="!workFlowVisible"
v-if="viewType === 'archive-view'"
:currentNodeFolder="currentNodeFolder"
:projectId="projectId"
@cancel="viewType = 'file-explorer'"
@on-query-receiver-info="onQueryReceiverInfo"
/>
</template>

@@ -88,8 +111,15 @@ export default {
viewType: 'file-explorer', // computed: file-explorer || archive-view
// 搜索关键字
searchKeywords: "",
selectMode: false,
receiverInfo: {},
};
},
watch: {
currentNodeFolder(data) {
console.log(data)
}
},
computed: {
appHeaderTitle() {
return this.workFlowVisible
@@ -118,6 +148,12 @@ export default {
this.fetchNodeFolders();
},
methods: {
onSelectModeChange(v) {
this.selectMode = v;
},
onQueryReceiverInfo(data) {
this.receiverInfo = data;
},
closeWorkFlow() {
this.workFlowVisible = false;
},
@@ -371,6 +407,26 @@ export default {
text-align: center;
}
}

.app-header-left-content {
.left-content-title {
color: rgba(0, 0, 0, 1);
font-size: 20px;
margin-right: 24px;
}
.button-like {
position: relative;
top: -6px;
padding: 6px 8px;
margin-right: 16px;
color: rgba(143, 143, 143, 100);
font-size: 14px;
border-radius: 8px;
background-color: rgba(255, 255, 255, 1);
}
}


</style>
<style lang="scss">
.temp-file-dialog {


Cargando…
Cancelar
Guardar