api field change

leeebai · Jun 30, 2020 · e35820f · e35820f
1 parent 264ea25
commit e35820f
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 21 deletions.
diff --git a/web/src/assets/styles/workspace.scss b/web/src/assets/styles/workspace.scss
@@ -52,6 +52,14 @@
   color: #39f;
 }
 
+.nodata-tips {
+  font-size: 12px;
+  margin: auto;
+  height: 70px;
+  line-height: 70px;
+  text-align: center;
+}
+
 .workspace-main {
   padding: 10px 25px;
   display: -webkit-box;

diff --git a/web/src/commonData/i18n/common/en.json b/web/src/commonData/i18n/common/en.json
@@ -1031,7 +1031,8 @@
                 "cancel": "Cancel",
                 "running": "running",
                 "stop": "disable",
-                "searchPlaceholder": "Search application"
+                "searchPlaceholder": "Search application",
+                "tips": "No data or no addition"
             }
         },
         "database": {

diff --git a/web/src/commonData/i18n/common/zh.json b/web/src/commonData/i18n/common/zh.json
@@ -1031,7 +1031,8 @@
                 "cancel": "取消",
                 "running": "运行中",
                 "stop": "不可用",
-                "searchPlaceholder": "搜索应用系统"
+                "searchPlaceholder": "搜索应用系统",
+                "tips": "没有数据或者未添加"
             }
         },
         "database": {

diff --git a/web/src/js/view/workspace/index.vue b/web/src/js/view/workspace/index.vue
@@ -16,11 +16,13 @@
           <span >{{this.$t('message.console.sideNavList.function.name')}}</span>
         </h3>
         <div class="app-list">
-          <div v-for="(item, index) in favoriteApps" :key="item.title" class="app-item-wrap" :class="{shadow:setting}" @click="setting?null:linkTo(item, item.url)">
-            <div v-if="setting" class="close-wrap" @click.stop="deleteFavoriteApp(item.favouritesId, index)"><i class="fi-cross1"></i></div>
+          <div class="nodata-tips" v-if="favoriteApps.length===0">{{$t('message.workSpace.home.tips')}}</div>
+          <div v-else v-for="(item, index) in favoriteApps" :key="item.title" class="app-item-wrap" :class="{shadow:setting}" @click="setting?null:linkTo(item, item.url)">
+            <div v-if="setting" class="close-wrap" @click.stop="deleteFavoriteApp(item.id, index)"><i class="fi-cross1"></i></div>
             <i class="app-icon" :class="iconSplit(item.icon)[0]" :style="`color: ${iconSplit(item.icon)[1]}`"></i>
             <span class="label">{{$t('message.workSpace.home.enter', {text: item.title})}}</span>
           </div>
+
 
           <div v-if="setting" class="app-item-add" @click="show = true">
             <i class="fi-plus add"></i>
@@ -39,23 +41,25 @@
 
 
       <Card class="right">
-        <h3 class="item-header">
+        <div class="nodata-tips" v-if="!adminApps.title">{{$t('message.workSpace.home.tips')}}</div>
+        <h3 v-if="adminApps.title" class="item-header">
           <span>{{adminApps.title}}</span>
         </h3>
-        <div class="app-list">
+        <div v-if="adminApps.title" class="app-list">
           <div v-for="item in adminApps.appInstances" :key="item.title" class="app-item-wrap" @click="navTo(item, item.accessButtonUrl)">
             <i class="app-icon" :class="iconSplit(item.icon)[0]" :style="`color: ${iconSplit(item.icon)[1]}`"></i>
             <span class="label">{{item.accessButton}}</span>
           </div>
         </div>
 
-        <Spin fix v-if="!adminApps.title"></Spin>
+       
       </Card>     
     </div>
 
     <div class="app-list-main">
       <div class="app-list-tabs" :class="{hideBar: search}">
-        <Tabs>
+        <div class="nodata-tips" v-if="tabsApplication.length===0">{{$t('message.workSpace.home.tips')}}</div>
+        <Tabs v-else>
           <Tab-pane v-for="(type, index) in tabsApplication" :label="type.title" :key="type.title">
             <div class="pane-wrap">
               <Card v-for="item in tabsApplication[index].appInstances" :key="item.name" class="pane-item">
@@ -123,7 +127,7 @@
         <FormItem :label="$t('message.workSpace.home.selectApp')"
           prop="selectApp"> 
           <Select v-model="formDynamic.selectApp">
-            <Option v-for="item in apps" :value="`${item.id}`" :key="`${item.id}`">{{ item.title }}</Option>
+            <Option v-for="item in apps" :value="`${item.id}`" :key="`${item.id}`" :disabled="item.had">{{ item.title }}</Option>
           </Select>
         </FormItem>
       </Form>
@@ -199,23 +203,23 @@ export default {
     init(){
     
       api.fetch(`/dss/workspaces/${this.workspaceId}`, 'get').then(data=>{
-        this.workspaceData = data;
+        this.workspaceData = data.workspace;
       })
 
       api.fetch(`/dss/workspaces/${this.workspaceId}/favorites`, 'get').then(data=>{
-        this.favoriteApps = data;
+        this.favoriteApps = data.favorites;
       })
 
       api.fetch(`/dss/workspaces/${this.workspaceId}/managements`, 'get').then(data=>{
-        this.adminApps = data.managements ? data.managements[0]: [];
+        this.adminApps = data.managements[0] ? data.managements[0]: {};
       })
 
       api.fetch(`/dss/workspaces/${this.workspaceId}/applications`, 'get').then(data=>{
-        this.applications = data.applications;
+        this.applications = data.applications || [];
       })
     },
     deleteFavoriteApp(favouritesId, index){
-      api.fetch(`/dss/workspaces/${this.workspaceId}/favorites`, 'delete').then(data=>{
+      api.fetch(`/dss/workspaces/${this.workspaceId}/favorites/${favouritesId}`, 'delete').then(data=>{
         this.favoriteApps.splice(index, 1);
       })
     },
@@ -225,12 +229,12 @@ export default {
         if (valid) {
           // this.addAppLoading = true;
           this.show = false;
-          api.fetch(`/dss/workspaces/${this.workspaceId}/favorites`, {applicationId: this.formDynamic.selectApp},'post').then(data=>{
+          api.fetch(`/dss/workspaces/${this.workspaceId}/favorites`, {menuApplicationId: parseInt(this.formDynamic.selectApp, 10)},'post').then(data=>{
             const app = this.findAppByApplicationId(this.formDynamic.selectApp)
             this.favoriteApps.push({
               ...app,
-              "favouritesId": data.favouritesId,
-              "applicationId": app.id, //application表里的id
+              "id": data.favouritesId,
+              "menuApplicationId": app.id, //application表里的id
             })
           })
         }
@@ -289,8 +293,14 @@ export default {
     },
     apps: function(){
       if(this.formDynamic.selectType){
-        const arr = this.applications.filter(item=>item.id==this.formDynamic.selectType);
-        return arr[0].appInstances;
+        const result = this.applications.find(item=>item.id==this.formDynamic.selectType);
+        result.appInstances.map(item=>{
+          item.had = false;
+          if(this.favoriteApps.find(fItem=>item.id===fItem.menuApplicationId)){
+            item.had = true;
+          }
+        })
+        return result.appInstances;
       }
       return [];
     },

diff --git a/web/vue.config.js b/web/vue.config.js
@@ -29,6 +29,9 @@ const getVersion = () => {
   return pkg.version;
 }
 
+const host = "0.0.0.0";
+const port = "9001";
+
 module.exports = {
   publicPath: './',
   outputDir: 'dist/dist',
@@ -42,15 +45,15 @@ module.exports = {
     },
     proxy: {    //代理转发
       '^/api/rest_j/v1': {
-        target: 'http://host:port',  //后端服务地址
+        target: `http://${host}:${port}`,  //后端服务地址
         ws: true,
         changeOrigin: true,
         pathRewrite: {
           '^/api/rest_j/v1': '/api/rest_j/v1'
         }
       },
       '^/ws/api': {    //websocket
-        target: 'ws://host:port',
+        target: `ws://${host}:${port}`,
         ws: true,
         secure: false,
       },