yiyun-fe
/
yiyunjianzhuBeta
4
0
포크 0
코드 이슈 0 풀 리퀘스트 0 릴리즈 0 위키 활동
소스 검색

Merge branch 'master' of http://192.168.5.34:10101/r/YiYunJianZhuBeta

master
xzx 4 년 전
부모
e806c74352 1beafd32eb
커밋
295f49d356
6개의 변경된 파일과 92개의 추가작업 그리고 54개의 파일을 삭제
분할 보기
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      src/views/main_web/recycle.vue
  2. +49
    -20
      src/views/main_web/workspace.vue
  3. BIN
      static/img/appfiletapy.png
  4. BIN
      static/img/bgtupian.png
  5. BIN
      static/img/file_excel.png
  6. +42
    -33
      static/img/files/file_sample_xls.svg

+ 1
- 1
src/views/main_web/recycle.vue 파일 보기

@@ -85,7 +85,7 @@
<strong class="yiyunwenjian_name" >
{{foldergroup.folderGroupName}}
</strong>
<strong class="yiyunwenjian_name">{{foldergroup.childCount}}个项目</strong>
<!-- <strong class="yiyunwenjian_name">{{foldergroup.childCount}}个项目</strong> -->
</div>
<!--删除的文件分组 end-->
</div>


+ 49
- 20
src/views/main_web/workspace.vue 파일 보기

@@ -360,7 +360,6 @@
:move="draggableMove"
@end="draggableEnd"
>
<!-- @remove="draggableRemove"-->
<div
class="lisy-group-item"
v-for="file in myFilesList"
@@ -479,13 +478,25 @@
</el-dropdown-item>
<el-dropdown-item
@click.native="fileClick(file)"
v-if="isClient && file.downloadStatus == 2"
v-if="isClient && file.downloadStatus == 2 && isShowMenuFile==true"
>
<span>打开</span>
</el-dropdown-item>
<el-dropdown-item
@click.native="fileClick(file)"
v-else-if="isClient && file.downloadStatus == 2 && !isShowMenuFile==true"
>
<span>打开</span>
</el-dropdown-item>
<el-dropdown-item
@click.native="fileClickSelect(file)"
v-if="isClient && file.downloadStatus == 2"
v-if="isClient && file.downloadStatus == 2 && isShowMenuFile==true"
>
<span>打开方式</span>
</el-dropdown-item>
<el-dropdown-item
@click.native="fileClickSelect(file)"
v-else-if="isClient && file.downloadStatus == 2 && !isShowMenuFile==true"
>
<span>打开方式</span>
</el-dropdown-item>
@@ -498,40 +509,53 @@
</el-dropdown-item>
<el-dropdown-item
@click.native="setFileStatus(file, 0, '已开启文件协同',2)"
v-if="isUseShare && file.status == 3"
v-if="isUseShare && file.status == 3 && isShowMenuFile==true"
>
<span>开启协同</span>
</el-dropdown-item>
<el-dropdown-item
@click.native="setFileStatus(file, 0, '已开启文件协同',2)"
v-else-if="isUseShare && file.status == 3 && !isShowMenuFile==true"
>
<span>开启协同</span>
</el-dropdown-item>
<el-dropdown-item
@click.native="setFileStatus(file, 3, '文件已取消协同',1)"
v-if="isUseShare && file.status != 3"
v-if="isUseShare && file.status != 3 && isShowMenuFile==true"
>
<span>取消协同</span>
</el-dropdown-item>
<el-dropdown-item @click.native="createMilestone(file)" divided>
<el-dropdown-item
@click.native="setFileStatus(file, 3, '文件已取消协同',1)"
v-else-if="isUseShare && file.status != 3 && !isShowMenuFile==true"
>
<span>取消协同</span>
</el-dropdown-item>
<el-dropdown-item @click.native="createMilestone(file)" divided v-if="!isShowMenuFile==true">
<span>保存历史文件</span>
</el-dropdown-item>
<el-dropdown-item @click.native="showFileMilestone(file)">
<el-dropdown-item @click.native="showFileMilestone(file)" v-if="!isShowMenuFile==true">
<span>选择历史文件</span>
</el-dropdown-item>
<el-dropdown-item @click.native="copyFile(file)" divided>
<span>建立副本</span>
</el-dropdown-item>
<el-dropdown-item
v-if="isUseCommon && file.commonStatus == 0 && nowFolderName != '公共文件夹'"
v-if="isUseCommon && file.commonStatus == 0 && nowFolderName != '公共文件夹'
&& !isShowMenuFile==true"
@click.native="updateToPublicFile(file,0)"
divided
>
<span>提交至项目公共文件夹</span>
</el-dropdown-item>
<el-dropdown-item
v-if="isUseCommon && file.commonStatus == 1"
v-if="isUseCommon && file.commonStatus == 1 && !isShowMenuFile==true"
@click.native="updateToPublicFile(file,1)"
divided
>
<span>取消至项目公共文件夹</span>
</el-dropdown-item>
<el-dropdown-item @click.native="copyAndMoveFolder(file, 'move')">
<el-dropdown-item @click.native="copyAndMoveFolder(file, 'move')" v-if="!isShowMenuFile==true">
<span>转移至其他工作</span>
</el-dropdown-item>
<el-dropdown-item @click.native="copyAndMoveFolder(file, 'copy')">
@@ -545,15 +569,15 @@
<span>下载至本地</span>
</el-dropdown-item>
<el-dropdown-item
v-if="file.extension == 'svfzip' "
v-if="file.extension == 'svfzip' && !isShowMenuFile==true"
@click.native="shareMyFile(file)"
>
<span>分享</span>
</el-dropdown-item>
<el-dropdown-item @click.native="reNameyMyFile(file)">
<el-dropdown-item @click.native="reNameyMyFile(file)" v-if="!isShowMenuFile==true">
<span>重命名</span>
</el-dropdown-item>
<el-dropdown-item @click.native="delMyFile(file)">
<el-dropdown-item @click.native="delMyFile(file)" v-if="!isShowMenuFile==true">
<span>移到回收站</span>
</el-dropdown-item>
</el-dropdown-menu>
@@ -1243,11 +1267,19 @@
>在线查看</li>
<li
@click="fileClick(BtnRightFile)"
v-if="isClient && BtnRightFile.downloadStatus == 2 && isShowMenuFile"
v-if="isClient && BtnRightFile.downloadStatus == 2 && isShowMenuFile==true"
>打开</li>
<li
@click="fileClick(BtnRightFile)"
v-else-if="isClient && BtnRightFile.downloadStatus == 2 && !isShowMenuFile==true"
>打开</li>
<li
@click="fileClickSelect(BtnRightFile)"
v-if="isClient && BtnRightFile.downloadStatus == 2 && !isShowMenuFile"
v-if="isClient && BtnRightFile.downloadStatus == 2 && isShowMenuFile==true"
>打开方式</li>
<li
@click="fileClickSelect(BtnRightFile)"
v-else-if="isClient && BtnRightFile.downloadStatus == 2 && !isShowMenuFile==true"
>打开方式</li>
<div class="line" v-if="isClient"></div>
<li
@@ -1295,10 +1327,7 @@
>取消至项目公共文件夹</li>
<li @click="copyAndMoveFolder(BtnRightFile, 'move')" v-if="!isShowMenuFile">转移至其他工作</li>
<li @click="copyAndMoveFolder(BtnRightFile, 'copy')" v-if="isShowMenuFile==true">复制至其他工作</li>
<li
@click="copyAndMoveFolder(BtnRightFile, 'copy')"
v-else-if="!isShowMenuFile==true"
>复制至其他工作</li>
<li @click="copyAndMoveFolder(BtnRightFile, 'copy')" v-else-if="!isShowMenuFile==true">复制至其他工作</li>
<div class="line"></div>
<li
@click="downLoadMyFile(BtnRightFile)"
@@ -2279,7 +2308,6 @@ export default {
methods: {
downLoadStatus:function(){
var data =back.getProgress();
console.log(data);
},
listenBottomHeight(){
let oDivH= document.getElementById("bottomBox").offsetHeight;
@@ -5543,6 +5571,7 @@ export default {
this.top = this.top - 50;
}
}

this.rightMenuvisible = true;
this.showType = type;
this.BtnRightFile = file; //鼠标右击的文件


BIN
static/img/appfiletapy.png 파일 보기

Before After
Width: 1500  |  Height: 100  |  Size: 20 KiB Width: 1500  |  Height: 100  |  Size: 22 KiB

BIN
static/img/bgtupian.png 파일 보기

Before After
Width: 3799  |  Height: 352  |  Size: 171 KiB Width: 3799  |  Height: 352  |  Size: 172 KiB

BIN
static/img/file_excel.png 파일 보기

Before After
Width: 180  |  Height: 180  |  Size: 3.6 KiB Width: 180  |  Height: 180  |  Size: 4.3 KiB

+ 42
- 33
static/img/files/file_sample_xls.svg 파일 보기

@@ -1,33 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="104px" height="148px" viewBox="0 0 104 148" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
<title>模块/文件/定制/execl</title>
<desc>Created with Sketch.</desc>
<defs>
<polygon id="path-1" points="0 147.936 104 147.936 104 -2.84217094e-14 0 -2.84217094e-14"></polygon>
<filter x="-6.2%" y="-3.7%" width="112.5%" height="108.8%" filterUnits="objectBoundingBox" id="filter-2">
<feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
</defs>
<g id="模块/文件/定制/execl" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Fill-1">
<use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
<use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
</g>
<g id="编组" transform="translate(10.000000, 20.000000)" fill="#EFEFEF">
<polygon id="Fill-1" points="48 15 84 15 84 0 48 0"></polygon>
<polygon id="Fill-2" points="0 15 36 15 36 0 0 0"></polygon>
<polygon id="Fill-3" points="48 37 84 37 84 22 48 22"></polygon>
<polygon id="Fill-4" points="0 37 36 37 36 22 0 22"></polygon>
<polygon id="Fill-5" points="48 58 84 58 84 43 48 43"></polygon>
<polygon id="Fill-6" points="0 58 36 58 36 43 0 43"></polygon>
<polygon id="Fill-7" points="48 80 84 80 84 65 48 65"></polygon>
<polygon id="Fill-8" points="0 80 36 80 36 65 0 65"></polygon>
</g>
<text id="文件后缀" font-family="Helvetica-Bold, Helvetica" font-size="22" font-weight="bold" fill="#1E7145">
<tspan x="41.5078125" y="141">Execl</tspan>
</text>
</g>
</svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 104 148" style="enable-background:new 0 0 104 148;" xml:space="preserve">
<style type="text/css">
.st0{filter:url(#filter-2);}
.st1{fill-rule:evenodd;clip-rule:evenodd;}
.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#EFEFEF;}
.st4{fill:#1E7145;}
.st5{font-family:'Arial-BoldMT';}
.st6{font-size:22px;}
</style>
<filter filterUnits="objectBoundingBox" height="108.8%" id="filter-2" width="112.5%" x="-6.2%" y="-3.7%">
<feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="2"></feGaussianBlur>
<feColorMatrix in="shadowBlurOuter1" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"></feColorMatrix>
</filter>
<title>模块/文件/定制/execl</title>
<desc>Created with Sketch.</desc>
<g>
<g id="Fill-1">
<g class="st0">
<polygon id="path-1_1_" class="st1" points="0,147.9 104,147.9 104,0 0,0 "/>
</g>
<g>
<polygon class="st2" points="0,147.9 104,147.9 104,0 0,0 "/>
</g>
</g>
<g id="编组" transform="translate(10.000000, 20.000000)">
<polygon class="st3" points="48,15 84,15 84,0 48,0 "/>
<polygon id="Fill-2" class="st3" points="0,15 36,15 36,0 0,0 "/>
<polygon id="Fill-3" class="st3" points="48,37 84,37 84,22 48,22 "/>
<polygon id="Fill-4" class="st3" points="0,37 36,37 36,22 0,22 "/>
<polygon id="Fill-5" class="st3" points="48,58 84,58 84,43 48,43 "/>
<polygon id="Fill-6" class="st3" points="0,58 36,58 36,43 0,43 "/>
<polygon id="Fill-7" class="st3" points="48,80 84,80 84,65 48,65 "/>
<polygon id="Fill-8" class="st3" points="0,80 36,80 36,65 0,65 "/>
</g>
<text transform="matrix(1 0 0 1 41.5078 141)" class="st4 st5 st6">Excel</text>
</g>
</svg>