Merge pull request #199 from yuchenyao/dev-0.9.0

change project page

Author: Adamyuanyuan

web/src/commonData/i18n/common/en.json

@@ -22,7 +22,7 @@
         "project": {
             "projectName": "Project Name",
             "gotoScriptis": "Visit Scriptis",
-            "createProject": "Create Project",
+            "createproject": "Create Project",
             "editorProject": "Edit Project",
             "search": "Search Project",
             "deleteProject": "Delete Project",
@@ -81,9 +81,10 @@
             "publishSuccess": "Successfully published",
             "publishFailed": "Publish failed",
             "infoTitle": "Welcome",
-            "infoHeader": "Welcome to DataSphere Studio !",
+            "infoHeader": "Welcome to My Project !",
             "infoBodyFirstRow": "DataSphere Studio is a one-stop portal focusing on development and management of data application, as a part of WeDataSphere -- the big data platform of WeBank.",
             "infoBodySecondRow": "Based on Linkis computation middleware, it's able to easily integrate various data application systems, making the development of data application easier and simpler.",
+            "workspace": "Workspace",
             "appTitle": "Application Navigation",
             "applicationStudio": "Business Application Development",
             "applicationMore": "More Information",
@@ -104,6 +105,7 @@
             "noData": "No data please add"
         },
         "workspace": {
+          "infoHeader": "Welcome to DataSphere Studio !",
           "createWorkspace": "Create Workspace",
           "searchWorkspace": "Search Workspace",
           "workspaceList": "Workspace List",
@@ -130,8 +132,9 @@
           "HYP": "Change"
         },
         "workflow": {
+            "infoHeader": "Welcome to Workflow!",
             "workflow": "Workflow",
-            "createWorkflow": "Create workflow",
+            "createworkflow": "Create workflow",
             "gotoVisualis": "Enter Visualis",
             "publishProject": "Publish project",
             "searchWorkflow": "Search for workflow",

web/src/commonData/i18n/common/zh.json

@@ -23,7 +23,7 @@
         "project": {
             "projectName": "工程名",
             "gotoScriptis": "进入Scriptis",
-            "createProject": "创建工程",
+            "createproject": "创建工程",
             "editorProject": "修改工程",
             "search": "搜索工程",
             "deleteProject": "删除工程",
@@ -82,11 +82,11 @@
             "publishSuccess": "发布成功",
             "publishFailed": "发布失败",
             "infoTitle": "欢迎信息",
-            "infoHeader": "欢迎来到 DataSphere Studio !",
+            "infoHeader": "欢迎来到工作流开发首页！",
             "infoBodyFirstRow": "DataSphere Studio是微众银行大数据平台——WeDataSphere，自研的一站式数据应用开发管理门户。",
             "infoBodySecondRow": "基于Linkis计算中间件构建，可轻松整合上层各数据应用系统，让数据应用开发变得简洁又易用。",
             "appTitle": "应用导航",
-            "applicationStudio": "业务应用开发",
+            "workspace": "工作空间",
             "applicationMore": "了解更多",
             "applicationTipsFirst": "工程 > 工作流，是应用开发的基本组织结构。",
             "applictaionTipsSecond": "在工作流拖拽编辑页面，DataSphere Studio已集成的所有数据应用系统，都将以工作流节点的形式出现，让您能够以业务的视角将其编排串连起来，快速实现全部业务。",
@@ -105,6 +105,7 @@
             "noData": "暂无数据请添加"
         },
         "workspace": {
+          "infoHeader": "欢迎来到 DataSphere Studio !",
           "createWorkspace": "创建工作空间",
           "searchWorkspace": "搜索工作空间",
           "workspaceList": "工作空间列表",
@@ -131,8 +132,9 @@
           "HYP": "换一批"
         },
         "workflow": {
+            "infoHeader": "欢迎来到工作流！",
             "workflow": "工作流",
-            "createWorkflow": "创建工作流",
+            "createworkflow": "创建工作流",
             "gotoVisualis": "进入Visualis",
             "publishProject": "发布工程",
             "searchWorkflow": "搜索工作流",

web/src/js/component/workflowContentItem/index.scss

@@ -31,6 +31,14 @@
         margin: 15px;
         box-shadow: 0 2px 12px 0 rgba(0,0,0,.2);
         background: #fff;
+        .project-add {
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+          height: 100%;
+          cursor: pointer;
+        }
         .project-main {
             position: relative;
             height: 130px;

web/src/js/component/workflowContentItem/index.vue

@@ -5,8 +5,19 @@
     </h3>
     <slot></slot>
     <Row
-      v-if="dataList.length > 0"
       class="content-item">
+      <i-col
+        :xs="12" :sm="8" :md="6" :lg="4"
+        class="project-item ">
+        <div class="project-add" @click="add">
+          <Icon
+            type="ios-add"
+            class="icon-blod"
+            size="60"
+          ></Icon>
+          <span>{{$t(`message.${source}.create${source}`)}}</span>
+        </div>
+      </i-col>
       <i-col
         class="project-item"
         :xs="12" :sm="8" :md="6" :lg="4"
@@ -151,9 +162,9 @@
       </i-col>
 
     </Row>
-    <div
+    <!-- <div
       class="no-data"
-      v-else>{{$t('message.workflowItem.nodata')}}</div>
+      v-else>{{$t('message.workflowItem.nodata')}}</div> -->
     <Page
       v-if="dataList.length > 0 && pagination.size < dataList.length "
       class="page-bar"
@@ -200,6 +211,10 @@ export default {
     tagProp: {
       type: String,
       default: 'business',
+    },
+    source: {
+      type: String,
+      default: 'Project'
     }
   },
   data() {
@@ -221,12 +236,12 @@ export default {
         return (this.pagination.current - 1) * this.pagination.size <= index && index < this.pagination.current * this.pagination.size;
       });
     },
-    pageNumer() {
+    pageNumber() {
       return Math.ceil(this.dataList.length / this.pagination.size);
     },
   },
   watch: {
-    pageNumer(val) {
+    pageNumber(val) {
       if (val < this.pagination.current && val !== 0) {
         this.pagination.current = val;
       }
@@ -257,6 +272,9 @@ export default {
     publish(classifyId, project) {
       this.$emit('publish', classifyId, project);
     },
+    add() {
+      this.$emit('add');
+    },
     isPercent(id) {
       let flag = false;
       this.precentList.map((item) => {

web/src/js/module/project/feature.vue

@@ -3,13 +3,13 @@
     <div class="project-type-module">
       <div class="project-type-header">
         <svg t="1573033007700" viewBox="0 0 1025 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="113086" width="20" height="20"><path d="M451.310305 529.689024L50.690586 339.234666a72.444333 72.444333 0 0 1 0-135.09716L451.374302 13.619151a144.888665 144.888665 0 0 1 122.041821 0l400.491726 190.518355a72.444333 72.444333 0 0 1 0 135.033163L573.416123 529.753021c-38.71804 17.98309-83.387778 17.98309-122.041821 0z" fill="#5580EB" p-id="113087"></path><path d="M512.299218 784.460127c-29.118526 0-57.853071-6.655663-84.027747-19.519012l-392.940107-195.190119a54.333249 54.333249 0 1 1 48.18956-96.891095l392.556127 195.190119c22.91084 11.135436 49.597489 11.135436 72.444333 0l392.940107-195.190119a54.333249 54.333249 0 1 1 48.189561 96.891095l-393.324088 195.190119a189.43041 189.43041 0 0 1-84.027746 19.519012z m0 229.620375a189.43041 189.43041 0 0 1-84.027747-19.519012l-392.940107-195.190118a54.333249 54.333249 0 1 1 48.18956-96.891095l392.556127 195.190118c22.846843 11.26343 49.597489 11.26343 72.444333 0l392.940107-195.190118a54.333249 54.333249 0 1 1 48.189561 96.827098l-393.324088 195.190119a189.43041 189.43041 0 0 1-84.027746 19.583008z" fill="#5580EB" opacity=".5" p-id="113088"></path></svg>
-        <span class="project-type-header-label">{{$t('message.project.applicationStudio')}}</span>
+        <span class="project-type-header-label">{{$t('message.project.workspace')}}</span>
       </div>
       <div
         class="project-type-more"
         :class="{'en': isEnEnv, 'cn': !isEnEnv}">
       </div>
-      <div class="project-type-list">
+      <!-- <div class="project-type-list">
         <div class="project-type-list-item-wrap">
           <svg t="1572508997540" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3412" xmlns:xlink="http://www.w3.org/1999/xlink" width="30" height="30">
             <path d="M468.89187555 244.16003161L405.84786173 124.9330568H77.68240987v774.65170172h368.68449976c-9.0617679-19.02971259-16.44063605-38.96560197-21.8776968-59.54876049H133.6064632V303.7087921h782.03056989v197.15817876c7.24941431 6.47269136 15.01664395 12.03920592 21.74824296 19.15916642 12.81592889 13.72210569 23.81950419 28.60929581 34.04635654 44.14375507V244.16003161H468.89187555z m-335.28541235-59.67821433h239.74848791l31.45728 59.5487605H133.6064632v-59.5487605z m614.38786371 536.32720592h111.71865284v59.5487605h-111.71865284v119.22697482h-55.92405333v-119.22697482h-111.71865283v-59.5487605h111.71865283v-119.22697481h55.92405333v119.22697481z m-27.83257283-238.32449579c-138.77450272 0-251.39933235 120.00369778-251.39933235 268.09887606 0 148.09517827 112.49537581 268.22832987 251.26987852 268.22832986 138.90395653 0 251.39933235-120.00369778 251.39933234-268.09887605 0-71.07015111-26.40858075-139.29231803-73.52977383-189.64985678s-111.0713837-78.57847309-177.74010468-78.57847309z m-0.12945383 476.64899161c-107.83503803-0.25890765-195.21637136-93.4656632-195.34582519-208.55011555 0.12945383-115.21390617 87.51078717-208.42066173 195.47527902-208.67956939 52.16989235 0 101.36234667 21.74824297 138.2566874 61.10220642 37.02379457 39.35396347 57.21859161 91.78276347 57.21859161 147.57736297-0.12945383 115.21390617-87.64024098 208.55011555-195.60473284 208.55011555z" fill="#2d8cf0" p-id="3413"></path>
@@ -21,9 +21,9 @@
             <p class="project-type-list-item-title">{{$t('message.project.createProject')}}</p>
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <div class="project-type-module">
+    <!-- <div class="project-type-module">
       <div class="project-type-header">
         <svg t="1572509911758" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9923" xmlns:xlink="http://www.w3.org/1999/xlink" width="18" height="18">
           <path d="M447.7 62H94.1C76.4 62 62 74.6 62 90.1v478.1c0 15.5 14.4 28.1 32.1 28.1h353.6c17.8 0 32.1-12.6 32.1-28.1V90.1c0.1-15.5-14.3-28.1-32.1-28.1z m-32.1 478.1H126.3V118.3h289.3v421.8z" fill="#37B1C9" p-id="9924"></path><path d="M447.7 652.6H94.1c-17.8 0-32.1 12.6-32.1 28.1v253.1c0 15.5 14.4 28.1 32.1 28.1h353.6c17.8 0 32.1-12.6 32.1-28.1v-253c0.1-15.6-14.3-28.2-32.1-28.2z m-32.1 253.2H126.3V708.9h289.3v196.9zM929.9 62H576.3c-17.8 0-32.1 12.6-32.1 28.1v253.1c0 15.5 14.4 28.1 32.1 28.1h353.6c17.8 0 32.1-12.6 32.1-28.1V90.1c0-15.5-14.4-28.1-32.1-28.1z m-32.2 253.1H608.4V118.3h289.3v196.8z" fill="#9BD8E4" p-id="9925"></path><path d="M929.9 427.6H576.3c-17.8 0-32.1 12.6-32.1 28.1v478.1c0 15.5 14.4 28.1 32.1 28.1h353.6c17.8 0 32.1-12.6 32.1-28.1v-478c0-15.6-14.4-28.2-32.1-28.2z m-32.2 478.2H608.4V483.9h289.3v421.9z" fill="#37B1C9" p-id="9926"></path>
@@ -52,7 +52,7 @@
           </div>
         </div>
       </div>
-    </div>
+    </div> -->
   </div>
 </template>
 <script>
@@ -71,13 +71,13 @@ export default {
     }
   },
   methods: {
-    goto(type) {
-      console.log('--->', type)
-      this.gotoCommonIframe(type);
-    },
-    createProject() {
-      this.$emit('add-project');
-    },
+    // goto(type) {
+    //   console.log('--->', type)
+    //   this.gotoCommonIframe(type);
+    // },
+    // createProject() {
+    //   this.$emit('add-project');
+    // },
     linkTo() {
       const newTab = window.open('about:blank');
       setTimeout(() => {

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

@@ -3,10 +3,8 @@
     <div class="page-bgc-header">
       <div class="header-info">
         <h1>{{$t('message.project.infoHeader')}}</h1>
-        <p>{{$t('message.project.infoBodyFirstRow')}}</p>
-        <p>{{$t('message.project.infoBodySecondRow')}}</p>
       </div>
-      <feature @add-project="addProject"></feature>
+      <feature />
     </div>
     <template v-if="dataList.length > 0">
       <project-content-item
@@ -17,8 +15,10 @@
         :data-list="item.dssProjectList"
         :current-data="item"
         :precent-list="precentList"
+        source="project"
         tag-prop="business"
         @goto="gotoWorkflow"
+        @add="addProject"
         @modify="projectModify"
         @delete="deleteProject"
         @copy="copyProject"
@@ -158,6 +158,7 @@ export default {
       showResourceView: false, // 是否展示资源文件上传
       projectResources: [], // 工程级别资源文件
       activeItem: {},
+      workspaceId: 1 // 默认工作空间Id
     };
   },
   computed: {
@@ -171,7 +172,14 @@ export default {
       return this.$t('message.project.tips');
     }
   },
+  watch: {
+    $route() {
+      this.workspaceId = this.$route.query.workspaceId; //获取传来的参数
+      this.getclassListData();
+    }
+  },
   created() {
+    this.workspaceId = this.$route.query.workspaceId;
     // 获取所有分类和工程
     this.getclassListData();
   },
@@ -183,7 +191,7 @@ export default {
   methods: {
     getclassListData() {
       this.loading = true;
-      return api.fetch(`/dss/tree`, {}, 'get').then((res) => {
+      return api.fetch(`/dss/tree`, { workspaceId: this.workspaceId }, 'get').then((res) => {
         this.cacheData = res.data;
         this.dataList = this.cacheData;
         this.activeItem = this.dataList[0];
@@ -208,10 +216,11 @@ export default {
         return item.id === projectData.taxonomyID;
       });
       if (this.checkName(projectList[0].dssProjectList, projectData.name, projectData.id)) return this.$Message.warning(this.$t('message.project.nameUnrepeatable'));
+      projectData.workspaceId = this.workspaceId;
       this.loading = true;
       if (this.actionType === 'add') {
         api.fetch('/dss/addProject', projectData, 'post').then(() => {
-          this.$Message.success(`${this.$t('message.project.createProject')}${this.$t('message.newConst.success')}`);
+          this.$Message.success(`${this.$t('message.project.createproject')}${this.$t('message.newConst.success')}`);
           this.getclassListData().then((data) => {
             // 新建完工程进到工作流页
             const currentProject = data[0].dssProjectList.filter((project) => project.name === projectData.name)[0];
@@ -221,6 +230,7 @@ export default {
                 projectTaxonomyID: 1,
                 projectID: currentProject.latestVersion.projectID,
                 projectVersionID: currentProject.latestVersion.id,
+                workspaceId: this.workspaceId
               }
             });
           });
@@ -312,7 +322,7 @@ export default {
         projectID: subItem.id,
         projectVersionID: subItem.latestVersion.id,
         projectName: subItem.name,
-        workspaceId: this.$route.query.workspaceId
+        workspaceId: this.workspaceId
       }
       this.$router.push({
         name: 'Workflow',

web/src/js/module/project/module/projectForm.vue

@@ -16,15 +16,14 @@
         <Input
           v-model="projectDataCurrent.name"
           :placeholder="$t('message.newConst.enterName')"
-          :disabled="actionType === 'modify'"></Input>
+          :disabled="actionType === 'modify'"/>
       </FormItem>
       <FormItem
         :label="$t('message.project.product')"
         prop="product">
         <Input
           v-model="projectDataCurrent.product"
-          :placeholder="$t('message.newConst.enterName')">
-        </Input>
+          :placeholder="$t('message.newConst.enterName')"/>
       </FormItem>
       <FormItem
         :label="$t('message.project.appArea')"
@@ -54,7 +53,7 @@
         <Input
           v-model="projectDataCurrent.description"
           type="textarea"
-          :placeholder="$t('message.project.pleaseInputProjectDesc')"></Input>
+          :placeholder="$t('message.project.pleaseInputProjectDesc')"/>
       </FormItem>
     </Form>
     <div slot="footer">