You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by mj...@apache.org on 2018/10/31 10:18:39 UTC

[incubator-dubbo-ops] branch develop updated: Uniform page styles

This is an automated email from the ASF dual-hosted git repository.

mjk pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git


The following commit(s) were added to refs/heads/develop by this push:
     new c4a0459  Uniform page styles
c4a0459 is described below

commit c4a04594b4231334080d39e1404ae05093805639
Author: Ma.Jinkai <ma...@vip.qq.com>
AuthorDate: Wed Oct 31 18:18:04 2018 +0800

    Uniform page styles
---
 .../src/components/ServiceSearch.vue               | 44 +++++++++++-----------
 .../src/components/governance/AccessControl.vue    |  2 +-
 .../src/components/governance/LoadBalance.vue      | 12 ++----
 .../src/components/governance/Overrides.vue        | 10 ++---
 .../src/components/governance/RoutingRule.vue      | 10 ++---
 .../src/components/governance/WeightAdjust.vue     | 10 ++---
 6 files changed, 35 insertions(+), 53 deletions(-)

diff --git a/dubbo-admin-frontend/src/components/ServiceSearch.vue b/dubbo-admin-frontend/src/components/ServiceSearch.vue
index 64e3830..23bb44d 100644
--- a/dubbo-admin-frontend/src/components/ServiceSearch.vue
+++ b/dubbo-admin-frontend/src/components/ServiceSearch.vue
@@ -55,32 +55,29 @@
 
     <v-flex lg12>
       <v-card>
-        <v-toolbar card dense color="transparent">
+        <v-toolbar flat color="transparent" class="elevation-0">
           <v-toolbar-title><span class="headline">Search Result</span></v-toolbar-title>
           <v-spacer></v-spacer>
-          <v-btn icon>
-            <v-icon>more_vert</v-icon>
-          </v-btn>
         </v-toolbar>
 
-      <v-card-text class="pa-0">
-        <template>
-          <v-data-table
-            hide-actions
-            class="elevation-0 table-striped"
-            :headers="headers"
-            :items="services"
-          >
-            <template slot="items" slot-scope="props">
-              <td>{{props.item.service}}</td>
-              <td>{{props.item.group}}</td>
-              <td>{{props.item.appName}}</td>
-              <td><v-btn small color='primary' :href='getHref(props.item.service, props.item.appName)'>Detail</v-btn></td>
-            </template>
-          </v-data-table>
-        </template>
-        <v-divider></v-divider>
-      </v-card-text>
+        <v-card-text class="pa-0">
+          <template>
+            <v-data-table
+              hide-actions
+              class="elevation-0 table-striped"
+              :headers="headers"
+              :items="services"
+            >
+              <template slot="items" slot-scope="props">
+                <td>{{props.item.service}}</td>
+                <td>{{props.item.group}}</td>
+                <td>{{props.item.appName}}</td>
+                <td class="text-xs-center px-0"><v-btn small color='primary' :href='getHref(props.item.service, props.item.appName)'>Detail</v-btn></td>
+              </template>
+            </v-data-table>
+          </template>
+          <v-divider></v-divider>
+        </v-card-text>
       </v-card>
     </v-flex>
   </v-container>
@@ -115,7 +112,8 @@
         {
           text: 'Operation',
           value: 'operation',
-          sortable: false
+          sortable: false,
+          width: '110px'
         }
       ]
     }),
diff --git a/dubbo-admin-frontend/src/components/governance/AccessControl.vue b/dubbo-admin-frontend/src/components/governance/AccessControl.vue
index 57e1cc8..265dcc8 100644
--- a/dubbo-admin-frontend/src/components/governance/AccessControl.vue
+++ b/dubbo-admin-frontend/src/components/governance/AccessControl.vue
@@ -23,7 +23,7 @@
       <v-flex xs12>
         <search v-model="filter"
                 :submit="search"
-                label="Search Access Controls by service name"></search>
+                label="Search Access Control by service name"></search>
       </v-flex>
     </v-layout>
 
diff --git a/dubbo-admin-frontend/src/components/governance/LoadBalance.vue b/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
index dfe84b1..868cb71 100644
--- a/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
+++ b/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
@@ -19,7 +19,7 @@
   <v-container grid-list-xl fluid >
     <v-layout row wrap>
       <v-flex xs12 >
-        <search v-model="filter" :submit="submit" label="Search LoadBalance by service Name"></search>
+        <search v-model="filter" :submit="submit" label="Search Load Balance by service Name"></search>
 
       </v-flex>
     </v-layout>
@@ -28,11 +28,6 @@
       <v-card>
         <v-toolbar flat color="transparent" class="elevation-0">
           <v-toolbar-title><span class="headline">Search Result</span></v-toolbar-title>
-          <v-divider
-            class="mx-2"
-            inset
-            vertical
-          ></v-divider>
           <v-spacer></v-spacer>
           <v-btn outline color="primary" @click.stop="openDialog" class="mb-2">CREATE</v-btn>
         </v-toolbar>
@@ -47,7 +42,7 @@
             <template slot="items" slot-scope="props">
               <td class="text-xs-left">{{ props.item.service }}</td>
               <td class="text-xs-left">{{ props.item.methodName }}</td>
-              <td class="justify-center px-0">
+              <td class="text-xs-center px-0">
                 <v-tooltip bottom v-for="op in operations" :key="op.id">
                   <v-icon small class="mr-2" slot="activator" @click="itemOperation(op.icon, props.item)">
                     {{op.icon}}
@@ -151,7 +146,8 @@
         {
           text: 'Operation',
           value: 'operation',
-          sortable: false
+          sortable: false,
+          width: '115px'
         }
       ]
     }),
diff --git a/dubbo-admin-frontend/src/components/governance/Overrides.vue b/dubbo-admin-frontend/src/components/governance/Overrides.vue
index be232e6..2481510 100644
--- a/dubbo-admin-frontend/src/components/governance/Overrides.vue
+++ b/dubbo-admin-frontend/src/components/governance/Overrides.vue
@@ -27,11 +27,6 @@
       <v-card>
         <v-toolbar flat color="transparent" class="elevation-0">
           <v-toolbar-title><span class="headline">Search Result</span></v-toolbar-title>
-          <v-divider
-            class="mx-2"
-            inset
-            vertical
-          ></v-divider>
           <v-spacer></v-spacer>
           <v-btn outline color="primary" @click.stop="openDialog" class="mb-2">CREATE</v-btn>
         </v-toolbar>
@@ -45,7 +40,7 @@
           >
             <template slot="items" slot-scope="props">
               <td class="text-xs-left">{{ props.item.service }}</td>
-              <td class="justify-center px-0">
+              <td class="text-xs-center px-0">
                 <v-tooltip bottom v-for="op in operations" :key="op.id">
                   <v-icon small class="mr-2" slot="activator" @click="itemOperation(op.icon(props.item), props.item)">
                     {{op.icon(props.item)}}
@@ -148,7 +143,8 @@
         {
           text: 'Operation',
           value: 'operation',
-          sortable: false
+          sortable: false,
+          width: '115px'
         }
       ]
     }),
diff --git a/dubbo-admin-frontend/src/components/governance/RoutingRule.vue b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
index 9247350..c4b7ba1 100644
--- a/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
+++ b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
@@ -27,11 +27,6 @@
       <v-card>
         <v-toolbar flat color="transparent" class="elevation-0">
           <v-toolbar-title><span class="headline">Search Result</span></v-toolbar-title>
-          <v-divider
-            class="mx-2"
-            inset
-            vertical
-          ></v-divider>
           <v-spacer></v-spacer>
           <v-btn outline color="primary" @click.stop="openDialog" class="mb-2">CREATE</v-btn>
         </v-toolbar>
@@ -48,7 +43,7 @@
               <td class="text-xs-left">{{ props.item.group }}</td>
               <td class="text-xs-left">{{ props.item.priority }}</td>
               <td class="text-xs-left">{{ props.item.enabled }}</td>
-              <td class="justify-center px-0">
+              <td class="text-xs-center px-0">
                 <v-tooltip bottom v-for="op in operations" :key="op.id">
                   <v-icon small class="mr-2" slot="activator" @click="itemOperation(op.icon(props.item), props.item)">
                     {{op.icon(props.item)}}
@@ -174,7 +169,8 @@
         {
           text: 'Operation',
           value: 'operation',
-          sortable: false
+          sortable: false,
+          width: '115px'
         }
       ]
     }),
diff --git a/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue b/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue
index 4cddb00..46d8056 100644
--- a/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue
+++ b/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue
@@ -28,11 +28,6 @@
       <v-card>
         <v-toolbar flat color="transparent" class="elevation-0">
           <v-toolbar-title><span class="headline">Search Result</span></v-toolbar-title>
-          <v-divider
-            class="mx-2"
-            inset
-            vertical
-          ></v-divider>
           <v-spacer></v-spacer>
           <v-btn outline color="primary" @click.stop="openDialog" class="mb-2">CREATE</v-btn>
         </v-toolbar>
@@ -47,7 +42,7 @@
             <template slot="items" slot-scope="props">
               <td class="text-xs-left">{{ props.item.service }}</td>
               <td class="text-xs-left">{{ props.item.method }}</td>
-              <td class="justify-center px-0">
+              <td class="text-xs-center px-0">
                 <v-tooltip bottom v-for="op in operations" :key="op.id">
                   <v-icon small class="mr-2" slot="activator" @click="itemOperation(op.icon, props.item)">
                     {{op.icon}}
@@ -154,7 +149,8 @@
         {
           text: 'Operation',
           value: 'operation',
-          sortable: false
+          sortable: false,
+          width: '115px'
         }
       ]
     }),