From e9fb83a052fc60865a020d80a96432119541f6e7 Mon Sep 17 00:00:00 2001
From: xzx <xzx@tsz.com>
Date: Sun, 28 Jun 2020 09:35:14 +0800
Subject: [PATCH 1/3] [VersionBeta] V.1.0.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Adds]
1.历史文件操作限制，操作提示
---
 src/views/main_web/workspace.vue | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue
index 4001e567..f3aafd08 100644
--- a/src/views/main_web/workspace.vue
+++ b/src/views/main_web/workspace.vue
@@ -4233,6 +4233,18 @@ export default {
      * 设置历史文件界面
      */
     showFileMilestone: function(file) {
+      if(file.status == 1 && file.modifyUserID != sessionStorage.userId)
+      {
+        this.$notify({
+              title: "温馨提示",
+              message: "其他人编辑中，不能设置历史文件",
+              type: "warning",
+              offset: 100,
+              duration: 5000
+            });
+        return;        
+      }
+
       this.dialogFileHistory = true;
       this.loadFileMilestones(file);
       this.currentArchID = file.archID;
@@ -4275,6 +4287,17 @@ export default {
       if (this.isCreating) {
         return;
       }
+      if(file.status == 1 && file.modifyUserID != sessionStorage.userId)
+      {
+        this.$notify({
+              title: "温馨提示",
+              message: "其他人编辑中，不能设置历史文件",
+              type: "warning",
+              offset: 100,
+              duration: 5000
+            });
+        return;        
+      }
       this.isCreating = true;
       var thisApp = this;
       this.$axios({

From 9cfbefa69316c98fc4fc28aa0837ea968d034778 Mon Sep 17 00:00:00 2001
From: dhj <dhj@123.com>
Date: Sun, 28 Jun 2020 16:10:03 +0800
Subject: [PATCH 2/3] [Version] V.3.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Adds]
1.工作空间底部窗口fudongbug
---
 static/css/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/css/main.css b/static/css/main.css
index 3494019a..479c4320 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -7506,7 +7506,7 @@ li.secondMenu ul li:hover {
 	border-radius: 16px 16px 0 0;
 	box-shadow: 0 -3px 11px 1px rgba(0,0,0,0.06);
 	overflow-y: auto;
-	position: absolute;
+	position: fixed;
 	bottom: 0;
 	width: 100%;
 	box-sizing: border-box;

From 904cae4855a102c674fe5da852fc42b66778d031 Mon Sep 17 00:00:00 2001
From: xzx <xzx@tsz.com>
Date: Sun, 28 Jun 2020 16:17:51 +0800
Subject: [PATCH 3/3] [VersionBeta] V.1.0.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Adds]
1.客户端新建文件添加userid参数
---
 src/views/main_web/workspace.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue
index f3aafd08..6f7647a8 100644
--- a/src/views/main_web/workspace.vue
+++ b/src/views/main_web/workspace.vue
@@ -2059,7 +2059,7 @@ export default {
       dialogNewSuperMapVisible: false,
       newSuperMap: { showName: "", description: "" },
       mapAddress: "北京天安门",
-      isClient: true, // 是否是客户端
+      isClient: false, // 是否是客户端
 
       /**新建文件分组 start*/
       dialogNewFolderGroup: false, //新建文件分组组弹窗
@@ -3685,7 +3685,7 @@ export default {
     clientUpload() {
       if (this.isClient) {
         this.isShowNewFiledialog = false;
-        back.uploadFile(this.listUserFolders[this.nowFolderIndex].folderID);
+        back.uploadFile(this.listUserFolders[this.nowFolderIndex].folderID,sessionStorage.userId);
       }
     },
     /**
@@ -5216,7 +5216,7 @@ export default {
             var file=response.data.data;
             if(this.isClient)
             {
-              thisApp.clientDownLoad(file,1);
+              this.clientDownLoad(file,1);
             }
           } else {
             this.$notify({