From a5a2b0b473cf0753c681b721f80c003e33286fda Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 27 May 2021 18:01:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=A7=92=E8=89=B2=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notice/service/NoticeService.java         |   4 +-
 .../io/metersphere/service/UserService.java   |   8 +-
 backend/src/main/java/io/metersphere/xpack    |   2 +-
 .../environment/EnvironmentEdit.vue           |   2 +-
 .../common/components/MsAsideItem.vue         | 110 +++++++++---------
 .../settings/operatinglog/LogDetail.vue       |  22 +++-
 frontend/src/business/components/xpack        |   2 +-
 7 files changed, 86 insertions(+), 64 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/notice/service/NoticeService.java b/backend/src/main/java/io/metersphere/notice/service/NoticeService.java
index 411a083772..fe775e475c 100644
--- a/backend/src/main/java/io/metersphere/notice/service/NoticeService.java
+++ b/backend/src/main/java/io/metersphere/notice/service/NoticeService.java
@@ -14,6 +14,7 @@ import io.metersphere.i18n.Translator;
 import io.metersphere.log.utils.ReflexObjectUtil;
 import io.metersphere.log.vo.DetailColumn;
 import io.metersphere.log.vo.OperatingLogDetails;
+import io.metersphere.log.vo.StatusReference;
 import io.metersphere.log.vo.system.SystemReference;
 import io.metersphere.notice.domain.MessageDetail;
 import org.apache.commons.collections.CollectionUtils;
@@ -224,7 +225,8 @@ public class NoticeService {
         }
         if (task != null) {
             List<DetailColumn> columns = ReflexObjectUtil.getColumns(task, SystemReference.messageColumns);
-            OperatingLogDetails details = new OperatingLogDetails(JSON.toJSONString(task.getId()), null, task.getTaskType(), task.getUserId(), columns);
+            OperatingLogDetails details = new OperatingLogDetails(JSON.toJSONString(task.getId()), null,
+                    StatusReference.statusMap.containsKey(task.getTaskType()) ? StatusReference.statusMap.get(task.getTaskType()) : task.getTaskType(), task.getUserId(), columns);
             return JSON.toJSONString(details);
         }
         return null;
diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java
index e46bbbf2af..294055eb60 100644
--- a/backend/src/main/java/io/metersphere/service/UserService.java
+++ b/backend/src/main/java/io/metersphere/service/UserService.java
@@ -1202,6 +1202,12 @@ public class UserService {
                 if (CollectionUtils.isNotEmpty(workspaces)) {
                     names = workspaces.stream().map(Workspace::getName).collect(Collectors.toList());
                 }
+                ProjectExample projectExample = new ProjectExample();
+                projectExample.createCriteria().andIdIn((List<String>) map.get("ids"));
+                List<Project> projects = projectMapper.selectByExample(projectExample);
+                if (CollectionUtils.isNotEmpty(projects)) {
+                    names = projects.stream().map(Project::getName).collect(Collectors.toList());
+                }
                 StringBuilder nameBuff = new StringBuilder();
                 Group group = groupMapper.selectByPrimaryKey(id);
                 if (group != null && CollectionUtils.isNotEmpty(names)) {
@@ -1210,7 +1216,7 @@ public class UserService {
                 colNames.add(nameBuff.toString());
             }
         }
-        return String.join("\n", colNames);
+        return String.join(",", colNames);
     }
 
     public String getLogDetails(UserBatchProcessRequest request) {
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 8c27caa18d..87b900d9c5 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 8c27caa18dd0ce5e5d81c0efdbc5ab0b16e923e7
+Subproject commit 87b900d9c55591b1a3a6044172ef02c0bf5b145c
diff --git a/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue b/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue
index 353de14958..6e2c4d5d65 100644
--- a/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue
+++ b/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-main v-loading="result.loading" class="environment-edit">
+  <el-main v-loading="result.loading" class="environment-edit" style="margin-left: 0px">
     <el-form :model="environment" :rules="rules" ref="environment">
 
       <span>{{$t('api_test.environment.name')}}</span>
diff --git a/frontend/src/business/components/common/components/MsAsideItem.vue b/frontend/src/business/components/common/components/MsAsideItem.vue
index c899457d22..939605b832 100644
--- a/frontend/src/business/components/common/components/MsAsideItem.vue
+++ b/frontend/src/business/components/common/components/MsAsideItem.vue
@@ -1,5 +1,5 @@
 <template>
-  <ms-aside-container :enable-aside-hidden="false" :width="width + 'px'">
+  <el-aside :enable-aside-hidden="false" :width="width + 'px'">
     <div class="title-bar" :style="{'height': titleBarHeight + 'px'}">
       <slot name="title">
         <span :style="{'line-height': titleBarHeight - 10 + 'px'}" class="title-left">
@@ -13,69 +13,71 @@
     <slot name="content">
       <div :style="{'height': itemBarHeight + 'px'}" v-for="(item, index) in data" :key="index" class="item-bar"
            @click="itemSelected(index, item)" :class="{'item-selected' : index == selectIndex}">
-        <input class="item-input"
-               :style="{'height': itemBarHeight - 12 + 'px', 'line-height': itemBarHeight - 12 + 'px', 'width': width - 90 + 'px'}"
-               v-model="item.name" :placeholder="$t('commons.input_content')"/>
+        <el-tooltip :content="item.name">
+          <input class="item-input"
+                 :style="{'height': itemBarHeight - 12 + 'px', 'line-height': itemBarHeight - 12 + 'px', 'width': width - 90 + 'px'}"
+                 v-model="item.name" :placeholder="$t('commons.input_content')"/>
+        </el-tooltip>
         <span :style="{'line-height': itemBarHeight - 10 + 'px'}" class="item-right">
           <i v-for="(operator, operatorIndex) in itemOperators" :key="operatorIndex" :class="operator.icon"
-           @click.stop="operator.func(item, index)"/>
+             @click.stop="operator.func(item, index)"/>
       </span>
       </div>
     </slot>
-  </ms-aside-container>
+  </el-aside>
 </template>
 
 <script>
-    import MsAsideContainer from "./MsAsideContainer";
+  import MsAsideContainer from "./MsAsideContainer";
 
-    export default {
-      name: "MsAsideItem",
-      components: {MsAsideContainer},
-      data() {
-        return {
-          selectIndex: -1
+  export default {
+    name: "MsAsideItem",
+    components: {MsAsideContainer},
+    data() {
+      return {
+        selectIndex: -1
+      }
+    },
+    props: {
+      width: {
+        type: Number,
+        default: 200
+      },
+      titleBarHeight: {
+        type: Number,
+        default: 40
+      },
+      itemBarHeight: {
+        type: Number,
+        default: 35
+      },
+      title: String,
+      data: Array,
+      deleteFuc: Function,
+      addFuc: Function,
+      itemOperators: {
+        type: Array,
+        default() {
+          return [
+            {
+              icon: 'el-icon-delete',
+              func: this.deleteFuc
+            }
+          ];
         }
       },
-      props: {
-        width: {
-          type: Number,
-          default: 200
-        },
-        titleBarHeight: {
-          type: Number,
-          default: 40
-        },
-        itemBarHeight: {
-          type: Number,
-          default: 35
-        },
-        title: String,
-        data: Array,
-        deleteFuc: Function,
-        addFuc: Function,
-        itemOperators: {
-          type: Array,
-          default() {
-            return [
-              {
-                icon: 'el-icon-delete',
-                func: this.deleteFuc
-              }
-            ];
-          }
-        },
-        enableAsideHidden: {
-          type: Boolean,
-          default: true
-        },
+      enableAsideHidden: {
+        type: Boolean,
+        default: true
       },
-      methods: {
-        itemSelected(index, item) {
-          this.selectIndex = index;
-          this.$emit('itemSelected', item);
-        }
+    },
+    methods: {
+      itemSelected(index, item) {
+        this.selectIndex = index;
+        this.$emit('itemSelected', item);
       }
     }
+  }
 </script>
 
 <style scoped>
@@ -103,7 +105,7 @@
     visibility: visible;
   }
 
-  .title-right,.item-right {
+  .title-right, .item-right {
     float: right;
   }
 
@@ -132,11 +134,11 @@
   .item-input {
     border: hidden;
     display: inline;
-    background-color:rgba(0,0,0,0);
+    background-color: rgba(0, 0, 0, 0);
   }
 
-  .item-input:focus{
-    outline:none;
+  .item-input:focus {
+    outline: none;
   }
 
 </style>
diff --git a/frontend/src/business/components/settings/operatinglog/LogDetail.vue b/frontend/src/business/components/settings/operatinglog/LogDetail.vue
index e96a1bd2df..e9dad0bf37 100644
--- a/frontend/src/business/components/settings/operatinglog/LogDetail.vue
+++ b/frontend/src/business/components/settings/operatinglog/LogDetail.vue
@@ -37,7 +37,10 @@
             <div v-if="timeDates.indexOf(n.columnName)!==-1">
               {{n.columnTitle}}：{{ n.originalValue | timestampFormatDate }}
             </div>
-            <div style="overflow: auto" v-else>
+            <div v-else-if="isJson(n.originalValue)">
+              {{n.columnTitle}}：<pre>{{n.originalValue}}</pre>
+            </div>
+            <div style="margin-top: 10px" v-else>
               {{n.columnTitle}}：{{n.originalValue}}
             </div>
           </span>
@@ -116,6 +119,19 @@
       }
     },
     methods: {
+      isJson(jsonStr) {
+        try {
+          let numRe = new RegExp("^[0-9]*$");
+          if (!jsonStr || "null" === jsonStr || numRe.test(jsonStr)) {
+            return false;
+          } else {
+            JSON.parse(jsonStr);
+            return true;
+          }
+        } catch (e) {
+          return false;
+        }
+      },
       handleClose() {
         this.infoVisible = false;
       },
@@ -127,10 +143,6 @@
         this.result = this.$get("/operating/log/get/" + id, response => {
           let data = response.data;
           this.detail = data;
-          //let delta = jsondiffpatch.diff(this.d1, this.d2);/
-          //document.getElementById('visual').innerHTML = formattersHtml.format(delta, this.d1);
-          // self-explained json
-          //document.getElementById('annotated').innerHTML = jsondiffpatch.formatters.annotated.format(delta, this.d1);
         })
       },
       open(id) {
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index c85bda6f2f..0af67efb33 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit c85bda6f2fa74e0e696e9f9170742834a7519319
+Subproject commit 0af67efb336b3f5f6718c7b2684de4d4985c0aee