+
-
+
+ {{item.title}}
- {{item.content}}
+ {{item.content}}
- 操作一
@@ -37,15 +38,15 @@ import AButton from 'vue-antd-ui/es/button/button'
import AIcon from 'vue-antd-ui/es/icon/icon'
const dataSource = []
-
-for (let i = 0; i < 11 ; i++) {
+dataSource.push(null)
+for (let i = 0; i < 11; i++) {
dataSource.push({
title: 'Alipay',
avatar: 'https://gw.alipayobjects.com/zos/rmsportal/WdGqmHpayyMjiEhcKoVE.png',
content: '在中台产品的研发过程中,会出现不同的设计规范和实现方式,但其中往往存在很多类似的页面和组件,这些类似的组件会被抽离成一套标准规范。'
})
}
-dataSource.push(null)
+
export default {
name: 'CardList',
components: {AIcon, AButton, AAvatar, ACardMeta, ACard, AListItem, AList},
@@ -91,4 +92,14 @@ export default {
width: 100%;
height: 188px;
}
+ .meta-content{
+ position: relative;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ height: 64px;
+ -webkit-line-clamp: 3;
+ -webkit-box-orient: vertical;
+ }
+
diff --git a/src/components/page/PageHeader.vue b/src/components/page/PageHeader.vue
index cbc2c2f..051603a 100644
--- a/src/components/page/PageHeader.vue
+++ b/src/components/page/PageHeader.vue
@@ -9,6 +9,7 @@
@@ -41,13 +42,24 @@ export default {
.breadcrumb{
margin-bottom: 16px;
}
- .title{
- font-size: 20px;
- font-weight: 500;
- color: rgba(0,0,0,.85);
- }
- .content{
- margin-bottom: 16px;
+ .detail{
+ display: flex;
+ .title{
+ font-size: 20px;
+ font-weight: 500;
+ color: rgba(0,0,0,.85);
+ }
+ .content{
+ margin-bottom: 16px;
+ flex: auto;
+ }
+ .extra
+ {
+ flex: 0 1 auto;
+ margin-left: 88px;
+ min-width: 450px;
+ float: right;
+ }
}
}
diff --git a/src/components/tool/HeadInfo.vue b/src/components/tool/HeadInfo.vue
index 7ae8456..620397d 100644
--- a/src/components/tool/HeadInfo.vue
+++ b/src/components/tool/HeadInfo.vue
@@ -17,6 +17,7 @@ export default {
.head-info{
position: relative;
text-align: center;
+ padding: 0 32px;
span{
color: rgba(0,0,0,.45);
display: inline-block;
diff --git a/src/router/index.js b/src/router/index.js
index 61b643c..8c69e62 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -5,7 +5,8 @@ import Exception from '@/components/exception/Exception'
import NotFound from '@/components/exception/404'
import NotPermit from '@/components/exception/403'
import ServerError from '@/components/exception/500'
-import PageLayout from '@/components/layout/PageLayout'
+import PageView from '@/components/layout/PageView'
+import RouteView from '@/components/layout/RouteView'
import BasicForm from '@/components/form/BasicForm'
import StepForm from '@/components/form/stepForm/StepForm'
import AdvancedForm from '@/components/form/advancedForm/AdvancedForm'
@@ -16,21 +17,37 @@ import StandardList from '@/components/list/StandardList'
import CardList from '@/components/list/CardList'
import SearchLayout from '@/components/list/SearchLayout'
import ArticleList from '@/components/list/ArticleList'
+import WorkPlace from '@/components/dashboard/WorkPlace'
Vue.use(Router)
export default new Router({
routes: [
{
- path: '/dashboard',
- name: 'Dashboard',
- component: Dashboard,
- icon: 'dashboard'
+ path: '/',
+ name: 'dashboard',
+ component: RouteView,
+ icon: 'dashboard',
+ children: [
+ {
+ path: '/workplace',
+ name: '工作台',
+ component: WorkPlace,
+ alias: '/',
+ icon: 'none'
+ },
+ {
+ path: '/dashboard',
+ name: '分析页',
+ component: Dashboard,
+ icon: 'none'
+ }
+ ]
},
{
path: '/form',
name: '表单页',
- component: PageLayout,
+ component: PageView,
icon: 'form',
children: [
{
@@ -56,7 +73,7 @@ export default new Router({
{
path: '/list',
name: '列表页',
- component: PageLayout,
+ component: PageView,
icon: 'table',
children: [
{
@@ -97,7 +114,7 @@ export default new Router({
path: '/detail',
name: '详情页',
icon: 'profile',
- component: PageLayout,
+ component: PageView,
children: [
{
path: '/detail/basic',
@@ -117,7 +134,7 @@ export default new Router({
path: '/result',
name: '结果页',
icon: 'check-circle-o',
- component: PageLayout,
+ component: PageView,
children: [
{
path: '/result/success',
diff --git a/yarn.lock b/yarn.lock
index fbce72a..2e159ce 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8027,9 +8027,9 @@ vm-browserify@0.0.4:
dependencies:
indexof "0.0.1"
-vue-antd-ui@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/vue-antd-ui/download/vue-antd-ui-1.0.0.tgz#b7fd61c3b3c9f3334f313a34a28e58e5a0e3ff8d"
+vue-antd-ui@^1.0.1:
+ version "1.0.1"
+ resolved "http://registry.npm.taobao.org/vue-antd-ui/download/vue-antd-ui-1.0.1.tgz#ac45c1121137b742a112cbfafa32444dc001d8b9"
dependencies:
add-dom-event-listener "^1.0.2"
array-tree-filter "^2.1.0"