yiyun-fe
/
yiyunjianzhu-vue
4
0
Förgrening 0
Kod Pull-förfrågningar 0 Släpp 0 Aktiviteter
Bläddra i källkod

[VersionBeta] V.1.0.0.0 

[Adds]
1.Merge
new-cli
xzx 4 år sedan
förälder
030cc47582 215f30b28d
incheckning
f98170d733
3 ändrade filer med 128 tillägg och 66 borttagningar
Delad Vy
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -3
      config/index.js
  2. +8
    -0
      config/prod.env.js
  3. +117
    -63
      src/views/main_web/workspace.vue

+ 3
- 3
config/index.js Visa fil

@@ -20,7 +20,7 @@ module.exports = {
assetsPublicPath: '/',
proxyTable: {
'/api/**': {
target: 'http://192.168.5.32:9003',
target: 'http://192.168.5.25:9003',
changeOrigin: true,
secure: false,
}
@@ -48,7 +48,7 @@ module.exports = {

// https://webpack.js.org/configuration/devtool/#development
// devtool: 'cheap-module-eval-source-map',
devtool: 'none',
devtool: 'none',

// If you have problems debugging vue-files in devtools,
// set this to false - it *may* help
@@ -74,7 +74,7 @@ module.exports = {
productionSourceMap: false,
// https://webpack.js.org/configuration/devtool/#production
// devtool: '#source-map',
devtool:'none',
devtool: 'none',

// Gzip off by default as many popular static hosts such as
// Surge or Netlify already gzip all static assets for you.


+ 8
- 0
config/prod.env.js Visa fil

@@ -5,9 +5,17 @@ module.exports = {
// API_WEB:'"https://tszcloud.com/"',
// OFFICE_WEB:'"https://office.tszcloud.com"'

<<<<<<< HEAD
API_HOST:'"https://bapi.tszcloud.com/api/"',
API_WEB:'"https://beta.tszcloud.com/"',
OFFICE_WEB:'"https://office.tszcloud.com"'
// API_HOST:'"http://192.168.5.32:9003/api/"',
// API_WEB:'"http://192.168.5.32:9099/"',
=======
API_HOST: '"https://bapi.tszcloud.com/api/"',
API_WEB: '"https://beta.tszcloud.com/"',
OFFICE_WEB: '"https://office.tszcloud.com"'
//API_HOST:'"http://192.168.5.25:9003/api/"',
// API_WEB:'"http://192.168.5.25:9099/"',
>>>>>>> 215f30b28d4a387a4f9e47fa6f4c39f34e00f6ed
}

+ 117
- 63
src/views/main_web/workspace.vue Visa fil

@@ -221,24 +221,24 @@
>{{item.title}}</span>
<!--文件分组面包屑-->
<span v-if="isShowBread" class="yiyun_text-title-workspace mr-20">
<a
class="yywenjiantitle-text"
v-if="currentPageType==0"
href="javascript:;"
@click="breadNodeClickEvent(currentPageType,true)"
>
我的文件
<i class="el-icon-arrow-left"></i>
</a>
<a
class="yywenjiantitle-text"
v-if="currentPageType==1"
href="javascript:;"
@click="breadNodeClickEvent(currentPageType,true)"
>
工作文件
<i class="el-icon-arrow-left"></i>
</a>
<draggable group="group" id="bread1-0" :list="myFileBreadNodeData">
<a
class="yywenjiantitle_text1"
v-if="currentPageType==0"
href="javascript:;"
@click="breadNodeClickEvent(currentPageType,true)"
>我的文件</a>
<i class="el-icon-arrow-left youbian"></i>
<a
class="yywenjiantitle-text"
v-if="currentPageType==1"
href="javascript:;"
@click="breadNodeClickEvent(currentPageType,true)"
>
工作文件
<i class="el-icon-arrow-left"></i>
</a>
</draggable>
<draggable
class="list-group"
:list="folderGroupBreads"
@@ -265,14 +265,16 @@
<span class="yywenjiantitle" :class="{yyactive:true}" v-if="isShowWorkt">工作文件</span>
<!--文件分组面包屑-->
<span v-if="isShowBread" class="yiyun_text-title-workspace mr-20">
<a
class="yywenjiantitle-text"
href="javascript:;"
@click="breadNodeClickEvent(currentPageType,true)"
>
工作文件
<i class="el-icon-arrow-left"></i>
</a>
<draggable group="group" id="bread2-0" :list="myFileBreadNodeData">
<a
class="yywenjiantitle-text"
href="javascript:;"
@click="breadNodeClickEvent(currentPageType,true)"
>
工作文件
<i class="el-icon-arrow-left"></i>
</a>
</draggable>
<draggable
class="list-group"
:list="folderGroupBreads"
@@ -2155,7 +2157,23 @@ export default {
timer: {}, //文件计时器对象
isShowMenuFoldergroup: true, //右键分组菜单项-显隐
isShowMenuFile: true, //右键文件菜单项-显隐
isShowMenuItemCreateFoldergroup: true //右键分组"新建文件夹"菜单项-显隐
isShowMenuItemCreateFoldergroup: true, //右键分组"新建文件夹"菜单项-显隐
myFileBreadNodeData: [
{
archID: null,
childCount: 0,
createTime: "",
createUserID: "",
deleted: 0,
folderGroupID: "myFile",
folderGroupName: "我的文件",
folderID: "",
levelID: "",
modifyTime: "",
modifyUserID: "",
superID: ""
}
]
/**新建文件分组 end*/
};
},
@@ -2903,8 +2921,6 @@ export default {
console.log(error);
});
} else {
this.fileindex = 0;
this.curactive = 0;
this.$axios({
method: "get",
url: encodeURI(
@@ -2918,26 +2934,6 @@ export default {
})
.then(response => {
thisApp.folderFileList = response.data;
// if (folderPerm == 0) {
// thisApp.myFilesList = thisApp.folderFileList.listAllFiles;
// // 加载我的文件夹 zxm+
// thisApp.myListFolderGroups =
// thisApp.folderFileList.listFolderGroups;
// } else {
// if (this.currentPageType == 0) {
// // 加载我的文件
// thisApp.myFilesList = thisApp.folderFileList.listMyFiles;
// // 加载我的文件夹 zxm+
// thisApp.myListFolderGroups =
// thisApp.folderFileList.listFolderGroups;
// } else {
// // 加载工作文件
// thisApp.myFilesList = thisApp.folderFileList.listOtherFiles;
// // 加载工作文件分组 zxm+
// thisApp.myListFolderGroups =
// thisApp.folderFileList.listOtherFolderGroups;
// }
// }
if (this.currentPageType == 0) {
// 加载我的文件
thisApp.myFilesList = thisApp.folderFileList.listMyFiles;
@@ -2950,8 +2946,12 @@ export default {
// 加载工作文件分组 zxm+
thisApp.myListFolderGroups =
thisApp.folderFileList.listOtherFolderGroups;
}
if(thisApp.curactive==0){
thisApp.listCollaborationFiles();
}else if(thisApp.curactive==1){
thisApp.loadListCommonFiles();
}
thisApp.listCollaborationFiles();
})
.catch(error => {
console.log(error);
@@ -3010,7 +3010,7 @@ export default {
*/
loadListCommonFiles: function() {
var thisApp = this;
thisApp.myPublicFilesList = [];
//thisApp.myPublicFilesList = [];
this.$axios({
method: "get",
url: encodeURI(
@@ -3863,7 +3863,13 @@ export default {
offset: 100,
duration: 2500
});
thisApp.listFolders();
if(thisApp.dbClickSelectedFolderGroupData==null
|| JSON.stringify(thisApp.dbClickSelectedFolderGroupData)=='{}'){
//thisApp.listFolders();
thisApp.listFiles()
}else{
thisApp.intoFoldergroup(thisApp.dbClickSelectedFolderGroupData)
}
})
.catch(function(error) {
console.log(error);
@@ -4388,12 +4394,25 @@ export default {
"archives/milestone/" +
file.archID +
"/" +
sessionStorage.userId
)
sessionStorage.userId +
"/" +
this.dbClickSelectedFolderGroupData.folderGroupID
),
data:{
archid: file.archID,
userid: sessionStorage.userId,
foldergroupid: this.dbClickSelectedFolderGroupData.folderGroupID
}
})
.then(response => {
if (response.data.state == 1) {
thisApp.listFiles();
//thisApp.listFiles();
if(this.dbClickSelectedFolderGroupData!=null
&& JSON.stringify(this.dbClickSelectedFolderGroupData)!='{}'){
this.intoFoldergroup(this.dbClickSelectedFolderGroupData);
}else{
this.listFiles();
}
this.$notify({
title: "恭喜您",
message: response.data.message,
@@ -4508,18 +4527,21 @@ export default {
*/
copyFile: function(file) {
var thisApp = this;
this.$axios({
thisApp.$axios({
method: "get",
url: encodeURI(
process.env.API_HOST +
"archives/copy/" +
"archives/copydup/" +
file.archID +
"/" +
sessionStorage.userId
sessionStorage.userId +
"/" +
thisApp.dbClickSelectedFolderGroupData.folderGroupID
),
data: {
archid: file.archID,
userid: sessionStorage.userId
userid: sessionStorage.userId,
foldergroupid: thisApp.dbClickSelectedFolderGroupData.folderGroupID
}
})
.then(response => {
@@ -4889,7 +4911,12 @@ export default {
goFolder: function(index) {
this.nowFolderIndex = index;
this.nowFolder = this.listUserFolders[this.nowFolderIndex];
this.listFiles();
if(this.dbClickSelectedFolderGroupData!=null
&& JSON.stringify(this.dbClickSelectedFolderGroupData)!='{}'){
this.intoFoldergroup(this.dbClickSelectedFolderGroupData);
}else{
this.listFiles();
}
this.closeAppManagePain();
sessionStorage.nowFolderIndex = index;
},
@@ -5367,8 +5394,6 @@ export default {
const offsetWidth = this.$el.offsetWidth; // container width
const maxLeft = offsetWidth - menuMinWidth; // left boundary
const left = e.clientX - offsetLeft; // 15: margin right
console.log(e.clientX);
console.log(offsetLeft);
if (left > maxLeft) {
this.left = maxLeft;
} else {
@@ -5380,6 +5405,7 @@ export default {
} else {
this.top = e.clientY; // fix 位置bug
}

if (type == 2 || type == 3) {
//工作文件下 指定显示某些菜单项
if (this.currentPageType == 1) {
@@ -5410,6 +5436,12 @@ export default {
//点击空白处只显示“新建文件夹”
if (file == "新建文件夹") {
this.isShowMenuItemCreateFoldergroup = true;
//"新建文件夹"的位置
if (e.clientY < document.body.clientHeight / 2) {
this.top = e.clientY - 120; // fix 位置bug
} else {
this.top = e.clientY - 80; // fix 位置bug
}
} else {
this.isShowMenuItemCreateFoldergroup = false;
}
@@ -5598,7 +5630,7 @@ export default {
if (foldergroup == null || JSON.stringify(foldergroup) == "{}") {
this.$notify({
title: "温馨提示",
message: "请选中文件夹或新建文件夹",
message: "请选中文件或新建文件夹",
type: "info",
offset: 100,
duration: 2500
@@ -5912,6 +5944,9 @@ export default {
var thisApp = this;
var sourceData = evt.draggedContext.element;
var targetData = evt.relatedContext.element;
if (targetData.folderGroupID == "myFile") {
targetData.folderID = this.nowFolder.folderID;
}
var draggableData = {};
if (sourceData.archID != null) {
//把文件拖拽到文件分组
@@ -5936,6 +5971,16 @@ export default {
*/
draggableEnd: function(evt) {
var thisApp = this;
if (thisApp.currentPageType == 1) {
thisApp.$notify({
title: "温馨提示",
message: "工作文件下不能进行拖拽！",
type: "info",
offset: 100,
duration: 2500
});
return;
}
thisApp
.$axios({
method: "post",
@@ -6055,4 +6100,13 @@ export default {
position: absolute;
left: 0;
}
.yywenjiantitle_text1 {
position: relative;
top: 2px;
}
.youbian {
color: #a7a8b7;
position: relative;
top: 2px;
}
</style>

Skriv Förhandsgranska
Laddar…
Avbryt
Spara