Merge branch 'dev-0.9.0' of https://github.com/yuchenyao/DataSphereStudio into dev-0.9.0

Author: yuchenyao

db/dss_dml.sql

@@ -39,7 +39,7 @@ public interface WorkspaceMapper {
     List<OnestopMenuVo> getApplicationMenuEn();
 
     List<OnestopMenuAppInstanceVo> getMenuAppInstancesCn(Long id);
-    List<OnestopMenuAppInstanceVo> getMenuAppInstanceEn(Long id);
+    List<OnestopMenuAppInstanceVo> getMenuAppInstancesEn(Long id);
 
     List<WorkspaceFavoriteVo> getWorkspaceFavoritesCn(@Param("username") String username, @Param("workspaceId") Long workspaceId);
 

dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/WorkspaceMapper.java

@@ -31,7 +31,7 @@
     </sql>
     <sql id="menu_appInstances_en">
         m.`id`,m.`title_en` AS `title`, m.`desc_en` AS `description`,m.`labels_en` AS `labels`,
-        m.`access_button_en` AS `access_button`,m.`manual_button_en` AS `manualButton`,m.`is_active`
+        m.`access_button_en` AS `access_button`,m.`manual_button_en` AS `manualButton`,m.`is_active`,
         m.`manual_button_url`,m.`icon`,m.`order`,app.`homepage_url` AS `access_button_url`,app.project_url, app.`name`
     </sql>
 

dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/workspaceMapper.xml

@@ -94,7 +94,7 @@ public List<OnestopMenuVo> getWorkspaceManagements(Long workspaceId, String user
     private List<OnestopMenuVo> getMenuAppInstances(List<OnestopMenuVo> menuVos, boolean isChinese) {
         for (OnestopMenuVo menuVo : menuVos) {
             Long menuId = menuVo.getId();
-            List<OnestopMenuAppInstanceVo> menuAppInstanceVos = isChinese ? workspaceMapper.getMenuAppInstancesCn(menuId) : workspaceMapper.getMenuAppInstanceEn(menuId);
+            List<OnestopMenuAppInstanceVo> menuAppInstanceVos = isChinese ? workspaceMapper.getMenuAppInstancesCn(menuId) : workspaceMapper.getMenuAppInstancesEn(menuId);
             menuVo.setAppInstances(menuAppInstanceVos);
         }
         return menuVos;

dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSWorkspaceServiceImpl.java

@@ -209,7 +209,7 @@ export default {
       this.isNavMenuShow = false;
     },
     mouseover() {
-      this.isNavMenuShow = this.$route.path != '/project'
+      this.isNavMenuShow = (this.$route.path != '/project' && this.$route.path != '/newhome')
     },
     mouseleave() {
       this.isNavMenuShow = false

web/src/js/module/header/index.vue

@@ -45,8 +45,9 @@
             <h3 class="item-header">
               <span>{{ $t('message.workspace.workspaceList') }}</span>
             </h3>
-            <Row class="content-item" v-show="visual === 'card'">
+            <Row ref="row" class="content-item" v-show="visual === 'card'">
               <i-col
+                ref="col"
                 class="workspace-item"
                 :xs="12" :sm="8" :md="4" :lg="4"
                 v-for="item in originWorkspaceData"
@@ -158,13 +159,30 @@ export default {
       pageSize: 4,
       pageNum: 1,
       videosClick: 1,
-      videosMaxClick: null
+      videosMaxClick: null,
+      listWrap: 0,//屏幕宽度
     }
   },
   created() {
     this.getWorkspaces();
     this.getVideos();
   },
+  mounted(){
+    this.listWrap = this.$refs.row.$el.offsetWidth;
+    this.initWorkspace();
+    window.onresize = () => {
+      const that = this
+      return (() => {
+        that.listWrap = this.$refs.row.$el.offsetWidth;
+      })()
+    }
+  },
+  watch: {
+    'listWrap': function(val){ //监听容器宽度变化
+      this.pageSize = Math.floor(val / 252)
+      this.initWorkspace();
+    },
+  },
   methods: {
     getWorkspaces() {
       // 获取工作空间数据