Merge pull request #1984 from WeBankPartners/bug_fix

Bug fix

wecube-portal/src/pages/admin/user-role-management.vue

@@ -5,7 +5,9 @@
         <Card>
           <p slot="title">
             {{ $t('user') }}
-            <Button icon="ios-add" type="dashed" size="small" @click="openAddUserModal">{{ $t('add_user') }}</Button>
+            <Button icon="ios-add" type="success" ghost size="small" @click="openAddUserModal">{{
+              $t('add_user')
+            }}</Button>
           </p>
           <div class="tagContainers">
             <div class="role-item" v-for="item in users" :key="item.id">
@@ -21,8 +23,8 @@
                   {{ ` ${item.username} ` }}
                 </span>
               </Tag>
-              <Button icon="md-trash" type="dashed" size="small" @click="removeRole(item)">{{
-                $t('remove_user')
+              <Button icon="md-trash" type="error" ghost size="small" @click="removeRole(item)">{{
+                $t('delete')
               }}</Button>
             </div>
           </div>
@@ -32,7 +34,9 @@
         <Card>
           <p slot="title">
             {{ $t('role') }}
-            <Button icon="ios-add" type="dashed" size="small" @click="openAddRoleModal">{{ $t('add_role') }}</Button>
+            <Button icon="ios-add" type="success" ghost size="small" @click="openAddRoleModal">{{
+              $t('add_role')
+            }}</Button>
           </p>
           <div class="tagContainers">
             <div class="role-item" v-for="item in roles" :key="item.id">
@@ -46,7 +50,7 @@
               >
                 <span :title="item.displayName">{{ item.name + '(' + item.displayName + ')' }}</span>
               </Tag>
-              <Button icon="ios-person" type="dashed" size="small" @click="openUserManageModal(item.id)">{{
+              <Button icon="ios-person" type="primary" ghost size="small" @click="openUserManageModal(item.id)">{{
                 $t('user')
               }}</Button>
             </div>

wecube-portal/src/pages/collaboration/components/plugin-register.vue

@@ -3,7 +3,7 @@
     <Row>
       <Col span="6" style="border-right: 1px solid #e8eaec">
         <div v-if="plugins.length < 1">{{ $t('no_plugin') }}</div>
-        <div style="min-height: calc(100vh - 180px);overflow:auto;">
+        <div style="height: calc(100vh - 180px);overflow-y:auto;">
           <Menu theme="light" :active-name="currentPlugin" @on-select="selectPlugin" style="width: 100%;z-index:10">
             <Submenu
               v-for="(plugin, index) in plugins"
@@ -73,7 +73,7 @@
               </FormItem>
             </Col>
           </Row>
-          <div style="height: calc(100vh - 275px);overflow:auto" id="paramsContainer">
+          <div style="height: calc(100vh - 300px);overflow:auto" id="paramsContainer">
             <Collapse v-model="activePanel" accordion>
               <Panel
                 v-for="(inter, index) in currentPluginObj.interfaces"
@@ -302,7 +302,7 @@
               </Panel>
             </Collapse>
           </div>
-          <Row v-if="currentPluginObjKeysLength > 1" style="margin:20px auto;margin-bottom:0;">
+          <Row v-if="currentPluginObjKeysLength > 1" style="margin:45px auto;margin-bottom:0;">
             <Col span="9" offset="8">
               <Button type="primary" ghost v-if="currentPluginObj.status === 'DISABLED'" @click="pluginSave">{{
                 $t('save')