全局css

This commit is contained in:
Captain.B 2020-04-09 15:04:56 +08:00
parent e9f53de76c
commit 0b62e3aa2c
40 changed files with 167 additions and 204 deletions

View File

@ -48,14 +48,6 @@
}
</script>
<style>
body {
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
font-size: 14px;
margin: 0;
}
</style>
<style scoped>
#header-top {
width: 100%;

View File

@ -51,7 +51,7 @@
<script>
import {checkoutCurrentWorkspace} from "../../../../common/utils";
import {checkoutCurrentWorkspace} from "../../../../common/js/utils";
import MsRecentList from "../../common/head/RecentList";
import MsShowAll from "../../common/head/ShowAll";
import MsCreateButton from "../../common/head/CreateButton";
@ -126,22 +126,6 @@
</script>
<style>
.header-menu.el-menu--horizontal > li {
height: 39px;
line-height: 40px;
color: dimgray;
}
.header-menu.el-menu--horizontal > li.el-submenu > * {
height: 39px;
line-height: 40px;
color: dimgray;
}
</style>
<style scoped>
.el-divider--horizontal {
margin: 0;

View File

@ -13,8 +13,8 @@
<script>
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/constants";
import {hasRoles} from "../../../../common/utils";
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/js/constants";
import {hasRoles} from "../../../../common/js/utils";
export default {
name: "ApiRecentProject",

View File

@ -12,7 +12,7 @@
</template>
<script>
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/constants";
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/js/constants";
export default {
name: "ApiRecentReport",

View File

@ -11,8 +11,8 @@
</template>
<script>
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/constants";
import {hasRoles} from "../../../../common/utils";
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/js/constants";
import {hasRoles} from "../../../../common/js/utils";
export default {
name: "ApiRecentTest",

View File

@ -49,23 +49,6 @@
}
}
</script>
<style>
.header-top-menus.el-menu--horizontal > li {
height: 40px;
line-height: 40px;
color: inherit;
}
.header-top-menus.el-menu--horizontal > li.el-submenu > * {
height: 39px;
line-height: 40px;
color: inherit;
}
.header-top-menus.el-menu--horizontal > li.is-active {
background: #595591 !important;
}
</style>
<style scoped>
</style>

View File

@ -43,8 +43,15 @@
</template>
<script>
import {ROLE_ORG_ADMIN, ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER, TokenKey, WORKSPACE_ID} from '../../../../common/constants';
import {hasRoles} from "../../../../common/utils";
import {
ROLE_ORG_ADMIN,
ROLE_TEST_MANAGER,
ROLE_TEST_USER,
ROLE_TEST_VIEWER,
TokenKey,
WORKSPACE_ID
} from '../../../../common/js/constants';
import {hasRoles} from "../../../../common/js/utils";
export default {
name: "MsUser",
@ -147,13 +154,7 @@
}
}
</script>
<style>
.header-user-menu.el-menu--horizontal > li.el-submenu > * {
height: 40px;
line-height: 40px;
color: inherit;
}
</style>
<style scoped>
.dropdown-link {
cursor: pointer;

View File

@ -12,8 +12,8 @@
</template>
<script>
import {hasRoles} from "../../../../common/utils";
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/constants";
import {hasRoles} from "../../../../common/js/utils";
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/js/constants";
export default {
name: "MsRecentList",

View File

@ -1,60 +1,64 @@
<template>
<div id="menu-bar" v-if="isRouterAlive">
<el-menu class="header-menu" :unique-opened="true" mode="horizontal" router
:default-active='$route.path'>
<el-menu-item :index="'/performance/home'">
{{ $t("i18n.home") }}
</el-menu-item>
<el-row type="flex">
<el-col :span="8">
<el-menu class="header-menu" :unique-opened="true" mode="horizontal" router
:default-active='$route.path'>
<el-menu-item :index="'/performance/home'">
{{ $t("i18n.home") }}
</el-menu-item>
<el-submenu v-if="isCurrentWorkspaceUser"
index="3" popper-class="submenu" v-permission="['test_manager']" >
<template v-slot:title>{{$t('commons.project')}}</template>
<performance-recent-project/>
<el-divider/>
<el-menu-item :index="'/performance/project/all'">
<font-awesome-icon :icon="['fa', 'list-ul']"/>
<span style="padding-left: 5px;">{{$t('commons.show_all')}}</span>
</el-menu-item>
<el-menu-item :index="'/performance/project/create'">
<el-button type="text">{{$t('project.create')}}</el-button>
</el-menu-item>
</el-submenu>
<el-submenu v-if="isCurrentWorkspaceUser"
index="3" popper-class="submenu" v-permission="['test_manager']">
<template v-slot:title>{{$t('commons.project')}}</template>
<performance-recent-project/>
<el-divider/>
<el-menu-item :index="'/performance/project/all'">
<font-awesome-icon :icon="['fa', 'list-ul']"/>
<span style="padding-left: 5px;">{{$t('commons.show_all')}}</span>
</el-menu-item>
<el-menu-item :index="'/performance/project/create'">
<el-button type="text">{{$t('project.create')}}</el-button>
</el-menu-item>
</el-submenu>
<el-submenu v-if="isCurrentWorkspaceUser"
index="4" popper-class="submenu" v-permission="['test_manager', 'test_user']">
<template v-slot:title>{{$t('commons.test')}}</template>
<performance-recent-test-plan/>
<el-divider/>
<el-menu-item :index="'/performance/test/all'">
<font-awesome-icon :icon="['fa', 'list-ul']"/>
<span style="padding-left: 5px;">{{$t('commons.show_all')}}</span>
</el-menu-item>
<el-menu-item :index="'/performance/test/create'">
<el-button type="text">{{$t('load_test.create')}}</el-button>
</el-menu-item>
<el-menu-item :index="testCaseProjectPath" class="blank_item"></el-menu-item>
<el-menu-item :index="testEditPath" class="blank_item"></el-menu-item>
</el-submenu>
<el-submenu v-if="isCurrentWorkspaceUser"
index="4" popper-class="submenu" v-permission="['test_manager', 'test_user']">
<template v-slot:title>{{$t('commons.test')}}</template>
<performance-recent-test-plan/>
<el-divider/>
<el-menu-item :index="'/performance/test/all'">
<font-awesome-icon :icon="['fa', 'list-ul']"/>
<span style="padding-left: 5px;">{{$t('commons.show_all')}}</span>
</el-menu-item>
<el-menu-item :index="'/performance/test/create'">
<el-button type="text">{{$t('load_test.create')}}</el-button>
</el-menu-item>
<el-menu-item :index="testCaseProjectPath" class="blank_item"></el-menu-item>
<el-menu-item :index="testEditPath" class="blank_item"></el-menu-item>
</el-submenu>
<el-submenu v-if="isCurrentWorkspaceUser"
index="5" popper-class="submenu" v-permission="['test_manager', 'test_user', 'test_viewer']">
<template v-slot:title>{{$t('commons.report')}}</template>
<performance-recent-report/>
<el-divider/>
<el-menu-item :index="'/performance/report/all'">
<font-awesome-icon :icon="['fa', 'list-ul']"/>
<span style="padding-left: 5px;">{{$t('commons.show_all')}}</span>
</el-menu-item>
<el-menu-item :index="reportViewPath" class="blank_item"></el-menu-item>
</el-submenu>
<router-link v-if="isCurrentWorkspaceUser"
class="header-bottom" :to="'/performance/test/create'" v-permission="['test_user','test_manager']">
<el-button type="primary" size="small">{{$t('load_test.create')}}</el-button>
</router-link>
</el-menu>
<el-submenu v-if="isCurrentWorkspaceUser"
index="5" popper-class="submenu" v-permission="['test_manager', 'test_user', 'test_viewer']">
<template v-slot:title>{{$t('commons.report')}}</template>
<performance-recent-report/>
<el-divider/>
<el-menu-item :index="'/performance/report/all'">
<font-awesome-icon :icon="['fa', 'list-ul']"/>
<span style="padding-left: 5px;">{{$t('commons.show_all')}}</span>
</el-menu-item>
<el-menu-item :index="reportViewPath" class="blank_item"></el-menu-item>
</el-submenu>
</el-menu>
</el-col>
<el-col :span="8">
<el-row type="flex" justify="center">
<ms-create-test :show="isCurrentWorkspaceUser" :to="'/performance/test/create'"/>
</el-row>
</el-col>
<el-col :span="8"/>
</el-row>
</div>
</template>
@ -64,11 +68,12 @@
import PerformanceRecentTestPlan from "../../performance/test/PerformanceRecentTestPlan";
import PerformanceRecentProject from "../../performance/project/PerformanceRecentProject";
import PerformanceRecentReport from "../../performance/report/PerformanceRecentReport";
import {checkoutCurrentWorkspace} from "../../../../common/utils";
import {checkoutCurrentWorkspace} from "../../../../common/js/utils";
import MsCreateTest from "../../common/head/CreateTest";
export default {
name: "PerformanceHeaderMenus",
components: {PerformanceRecentReport, PerformanceRecentTestPlan, PerformanceRecentProject},
components: {PerformanceRecentReport, PerformanceRecentTestPlan, PerformanceRecentProject, MsCreateTest},
data() {
return {
isCurrentWorkspaceUser: false,
@ -85,22 +90,22 @@
'$route'(to, from) {
let path = to.path;
//
if (path.indexOf("/performance/test/") >= 0){
if (path.indexOf("/performance/test/") >= 0) {
this.testCaseProjectPath = '/performance/test/' + this.$route.params.projectId;
this.reload();
}
if (path.indexOf("/performance/test/edit/") >= 0){
if (path.indexOf("/performance/test/edit/") >= 0) {
this.testEditPath = '/performance/test/edit/' + this.$route.params.testId;
this.reload();
}
if (path.indexOf("/performance/report/view/") >= 0){
if (path.indexOf("/performance/report/view/") >= 0) {
this.reportViewPath = '/performance/report/view/' + this.$route.params.reportId;
this.reload();
}
}
},
methods: {
reload () {
reload() {
this.isRouterAlive = false;
this.$nextTick(function () {
this.isRouterAlive = true;
@ -111,33 +116,18 @@
</script>
<style>
.header-menu.el-menu--horizontal > li {
height: 39px;
line-height: 40px;
color: dimgray;
}
.header-menu.el-menu--horizontal > li.el-submenu > * {
height: 39px;
line-height: 40px;
color: dimgray;
}
.header-bottom {
line-height: 40px;
margin-left: 20%;
}
</style>
<style scoped>
.el-divider--horizontal {
margin: 0;
}
.el-menu.el-menu--horizontal {
border-bottom: none;
}
#menu-bar {
border-bottom: 1px solid #E6E6E6;
background-color: #FFF;
}
.blank_item {

View File

@ -14,8 +14,8 @@
<script>
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/constants";
import {hasRoles} from "../../../../common/utils";
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/js/constants";
import {hasRoles} from "../../../../common/js/utils";
export default {
name: "PerformanceRecentProject",

View File

@ -12,8 +12,8 @@
</template>
<script>
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/constants";
import {hasRoles} from "../../../../common/utils";
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/js/constants";
import {hasRoles} from "../../../../common/js/utils";
export default {
name: "PerformanceRecentReport",

View File

@ -11,7 +11,7 @@
</template>
<script>
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/constants";
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/js/constants";
export default {
name: "PerformanceRecentTestPlan",

View File

@ -67,7 +67,7 @@
<script>
import MsCreateBox from "../settings/CreateBox";
import {Message} from "element-ui";
import {TokenKey} from "../../../common/constants";
import {TokenKey} from "../../../common/js/constants";
export default {
name: "MsProject",

View File

@ -6,7 +6,7 @@
</template>
<script>
import {TokenKey} from "../../../common/constants";
import {TokenKey} from "../../../common/js/constants";
export default {
name: "MsCurrentUser",

View File

@ -51,14 +51,3 @@
}
</style>
<style>
.main-content span.title {
font-size: 16px;
font-weight: 500;
margin-top: 0;
text-overflow: ellipsis;
overflow: hidden;
word-wrap: break-word;
white-space: nowrap;
}
</style>

View File

@ -42,7 +42,7 @@
</template>
<script>
import {checkoutCurrentOrganization, checkoutCurrentWorkspace} from "../../../common/utils";
import {checkoutCurrentOrganization, checkoutCurrentWorkspace} from "../../../common/js/utils";
export default {
name: "MsSettingMenu",

View File

@ -120,7 +120,7 @@
<script>
import MsCreateBox from "../CreateBox";
import {TokenKey} from "../../../../common/constants";
import {TokenKey} from "../../../../common/js/constants";
export default {
name: "MsOrganizationMember",

View File

@ -188,7 +188,7 @@
<script>
import MsCreateBox from "../CreateBox";
import {Message} from "element-ui";
import {TokenKey} from "../../../../common/constants";
import {TokenKey} from "../../../../common/js/constants";
export default {
name: "MsOrganizationWorkspace",

View File

@ -54,7 +54,7 @@
</template>
<script>
import {TokenKey} from "../../../../common/constants";
import {TokenKey} from "../../../../common/js/constants";
export default {
data() {

View File

@ -120,7 +120,7 @@
<script>
import MsCreateBox from "../CreateBox";
import {TokenKey} from "../../../../common/constants";
import {TokenKey} from "../../../../common/js/constants";
export default {
name: "MsMember",

View File

@ -51,7 +51,7 @@
import NodeTree from './components/NodeTree';
import TestCaseEdit from './components/TestCaseEdit';
import {WORKSPACE_ID,CURRENT_PROJECT} from '../../../../common/constants';
import {CURRENT_PROJECT, WORKSPACE_ID} from '../../../../common/js/constants';
import TestCaseList from "./components/TestCaseList";
export default {

View File

@ -68,7 +68,7 @@
<script>
import {CURRENT_PROJECT} from '../../../../../common/constants';
import {CURRENT_PROJECT} from '../../../../../common/js/constants';
export default {
name: "NodeTree",

View File

@ -12,7 +12,7 @@
</template>
<script>
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../../common/constants";
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../../common/js/constants";
export default {
name: "RecentTestCase",

View File

@ -188,7 +188,7 @@
<script>
import {CURRENT_PROJECT} from '../../../../../common/constants';
import {CURRENT_PROJECT} from '../../../../../common/js/constants';
export default {
name: "TestCaseEdit",

View File

@ -115,7 +115,6 @@
</template>
<script>
import {CURRENT_PROJECT} from '../../../../../common/constants';
export default {
name: "TestCaseList",

View File

@ -8,7 +8,7 @@
</el-menu-item>
<el-submenu v-if="isCurrentWorkspaceUser"
index="3" popper-class="submenu" v-permission="['test_manager']" >
index="3" popper-class="submenu" v-permission="['test_manager']">
<template v-slot:title>{{$t('commons.project')}}</template>
<track-recent-project/>
<el-divider/>
@ -54,7 +54,7 @@
</template>
<script>
import {checkoutCurrentWorkspace} from "../../../../common/utils";
import {checkoutCurrentWorkspace} from "../../../../common/js/utils";
import TrackRecentProject from "../../track/project/TrackRecentProject";
import RecentTestCase from "../case/components/RecentTestCase";
import RecentTestPlan from "../plan/components/RecentTestPlan";
@ -73,11 +73,11 @@
watch: {
'$route'(to, from) {
let path = to.path;
if (path.indexOf("/track/plan/view") >= 0){
if (path.indexOf("/track/plan/view") >= 0) {
this.testPlanViewPath = '/track/plan/view/' + this.$route.params.planId;
this.reload();
}
if (path.indexOf("/track/case/edit") >= 0){
if (path.indexOf("/track/case/edit") >= 0) {
this.testCaseEditPath = '/track/case/edit/' + this.$route.params.caseId;
this.reload();
}
@ -87,7 +87,7 @@
this.isCurrentWorkspaceUser = checkoutCurrentWorkspace();
},
methods: {
reload () {
reload() {
this.isRouterAlive = false;
this.$nextTick(function () {
this.isRouterAlive = true;
@ -98,34 +98,11 @@
</script>
<style>
.header-menu.el-menu--horizontal > li {
height: 39px;
line-height: 40px;
color: dimgray;
}
.header-menu.el-menu--horizontal > li.el-submenu > * {
height: 39px;
line-height: 40px;
color: dimgray;
}
.header-bottom {
line-height: 40px;
margin-left: 20%;
}
</style>
<style scoped>
.el-divider--horizontal {
margin: 0;
}
#menu-bar {
border-bottom: 1px solid #E6E6E6;
}

View File

@ -12,7 +12,7 @@
</template>
<script>
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../../common/constants";
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../../common/js/constants";
export default {
name: "RecentTestPlan",

View File

@ -99,7 +99,7 @@
<script>
import {WORKSPACE_ID} from '../../../../../common/constants';
import {WORKSPACE_ID} from '../../../../../common/js/constants';
export default {
name: "TestPlanEdit",

View File

@ -13,8 +13,8 @@
</template>
<script>
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER, CURRENT_PROJECT} from "../../../../common/constants";
import {hasRoles} from "../../../../common/utils";
import {CURRENT_PROJECT, ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/js/constants";
import {hasRoles} from "../../../../common/js/utils";
export default {
name: "TrackRecentProject",

View File

@ -1,16 +1,17 @@
import Vue from 'vue';
import ElementUI from 'element-ui';
import 'element-ui/lib/theme-chalk/index.css';
import icon from "../common/icon";
import filters from "../common/filter";
import ajax from "../common/ajax";
import icon from "../common/js/icon";
import filters from "../common/js/filter";
import ajax from "../common/js/ajax";
import App from './App.vue';
import router from "./components/common/router/router";
import './permission' // permission control
import i18n from "../i18n/i18n";
import store from "./store";
import {permission} from './permission'
import chart from "../common/chart";
import chart from "../common/js/chart";
import '../common/css/menu-header.css';
Vue.config.productionTip = false;
Vue.use(icon);

View File

@ -1,5 +1,5 @@
import router from './components/common/router/router'
import {TokenKey} from '../common/constants';
import {TokenKey} from '../common/js/constants';
const whiteList = ['/login']; // no redirect whitelist

View File

@ -0,0 +1,47 @@
.header-menu.el-menu--horizontal > li {
height: 39px;
line-height: 40px;
color: dimgray;
}
.header-menu.el-menu--horizontal > li.el-submenu > * {
height: 39px;
line-height: 40px;
color: dimgray;
}
.header-user-menu.el-menu--horizontal > li.el-submenu > * {
height: 40px;
line-height: 40px;
color: inherit;
}
body {
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
font-size: 14px;
margin: 0;
}
.main-content span.title {
font-size: 16px;
font-weight: 500;
margin-top: 0;
text-overflow: ellipsis;
overflow: hidden;
word-wrap: break-word;
white-space: nowrap;
}
.header-top-menus.el-menu--horizontal > li {
height: 40px;
line-height: 40px;
color: inherit;
}
.header-top-menus.el-menu--horizontal > li.el-submenu > * {
height: 39px;
line-height: 40px;
color: inherit;
}
.header-top-menus.el-menu--horizontal > li.is-active {
background: #595591 !important;
}

View File

@ -41,7 +41,7 @@
</template>
<script>
import {TokenKey} from '../common/constants';
import {TokenKey} from '../common/js/constants';
export default {

View File

@ -2,7 +2,7 @@ import Vue from 'vue';
import ElementUI, {Button, Col, Form, FormItem, Input, Row} from 'element-ui';
import 'element-ui/lib/theme-chalk/index.css';
import Login from "./Login.vue";
import Ajax from "../common/ajax";
import Ajax from "../common/js/ajax";
import i18n from "../i18n/i18n";
Vue.config.productionTip = false;