From 4bad992d9b98af7d5dc3c6380cac8193cbaf02a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E4=BB=AA=E5=BC=8F?= <854085467@qq.com> Date: Thu, 30 Sep 2021 23:49:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=87=E6=A1=A3]=20=E6=96=B0=E5=A2=9E=20col?= =?UTF-8?q?or=20=E6=96=87=E6=A1=A3,=20=E4=BF=AE=E6=AD=A3=20lay-block=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/docs/zh-CN/components/block.md | 19 ++++++ docs/docs/zh-CN/components/button.md | 9 ++- docs/docs/zh-CN/components/color.md | 87 ++++++++++++++++++++++++++++ docs/docs/zh-CN/components/grid.md | 27 +++++++++ docs/docs/zh-CN/components/icon.md | 4 ++ docs/src/layouts/Layout.vue | 2 +- docs/src/router/zh-CN.ts | 8 ++- docs/src/styles/markdown.css | 13 ----- src/css/all.css | 11 ---- src/css/layui.css | 1 - src/index.ts | 1 - src/module/breadcrumb/index.vue | 1 - src/module/count/index.ts | 9 +++ src/module/count/index.vue | 9 +++ 14 files changed, 171 insertions(+), 30 deletions(-) create mode 100644 docs/docs/zh-CN/components/color.md delete mode 100644 src/css/all.css create mode 100644 src/module/count/index.ts create mode 100644 src/module/count/index.vue diff --git a/docs/docs/zh-CN/components/block.md b/docs/docs/zh-CN/components/block.md index d6487b87..42227c8d 100644 --- a/docs/docs/zh-CN/components/block.md +++ b/docs/docs/zh-CN/components/block.md @@ -2,6 +2,25 @@ + + + +::: + +::: demo + + diff --git a/docs/docs/zh-CN/components/button.md b/docs/docs/zh-CN/components/button.md index c650c10e..abd6d64b 100644 --- a/docs/docs/zh-CN/components/button.md +++ b/docs/docs/zh-CN/components/button.md @@ -150,4 +150,11 @@ export default { } -::: \ No newline at end of file +::: + +| | | | +|--|--|--| +| type | 主题 | `primary` `normal` `warm` `danger` `disabled`| +| size | 尺寸 | `lg` `sm` `xs` | +| fluid | 最大化 | `true` `false` | +| radius | 圆角 | `true` `false` | \ No newline at end of file diff --git a/docs/docs/zh-CN/components/color.md b/docs/docs/zh-CN/components/color.md new file mode 100644 index 00000000..30df20fb --- /dev/null +++ b/docs/docs/zh-CN/components/color.md @@ -0,0 +1,87 @@ +::: demo + + + + +::: + +::: demo + + + + +::: diff --git a/docs/docs/zh-CN/components/grid.md b/docs/docs/zh-CN/components/grid.md index a710882b..859d7295 100644 --- a/docs/docs/zh-CN/components/grid.md +++ b/docs/docs/zh-CN/components/grid.md @@ -22,6 +22,20 @@ export default { } + + ::: ::: demo @@ -44,6 +58,19 @@ export default { } + ::: ::: demo diff --git a/docs/docs/zh-CN/components/icon.md b/docs/docs/zh-CN/components/icon.md index 20f760ab..1d13e6f9 100644 --- a/docs/docs/zh-CN/components/icon.md +++ b/docs/docs/zh-CN/components/icon.md @@ -17,3 +17,7 @@ export default { ::: + +| | | | +|--|--|--| +| type | 图标 | `layui-icon-home` `layui-icon-template`... | diff --git a/docs/src/layouts/Layout.vue b/docs/src/layouts/Layout.vue index 676e016b..16ed1d39 100644 --- a/docs/src/layouts/Layout.vue +++ b/docs/src/layouts/Layout.vue @@ -48,7 +48,6 @@ - @@ -79,6 +78,7 @@ export default { { id: 17, title: '面包屑',subTitle:"breadcrumb" ,path: '/zh-CN/components/breadcrumb' }, { id: 18, title: '进度',subTitle:"progress" ,path: '/zh-CN/components/progress' }, { id: 19, title: '时间线',subTitle:"timeline" ,path: '/zh-CN/components/timeline' }, + { id: 20, title: '颜色',subTitle:"color" ,path: '/zh-CN/components/color' }, ] const selected = ref(1) diff --git a/docs/src/router/zh-CN.ts b/docs/src/router/zh-CN.ts index fff543f8..2254b5ad 100644 --- a/docs/src/router/zh-CN.ts +++ b/docs/src/router/zh-CN.ts @@ -33,7 +33,13 @@ const zhCN = [ path: '/zh-CN/components/layout', component: () => import('../../docs/zh-CN/components/layout.md'), meta: { title: '布局' }, - }, { + }, + { + path: '/zh-CN/components/color', + component: () => import('../../docs/zh-CN/components/color.md'), + meta: { title: '颜色' }, + }, + { path: '/zh-CN/components/container', component: () => import('../../docs/zh-CN/components/container.md'), meta: { title: '容器' }, diff --git a/docs/src/styles/markdown.css b/docs/src/styles/markdown.css index 7397fe02..6314f94d 100644 --- a/docs/src/styles/markdown.css +++ b/docs/src/styles/markdown.css @@ -120,7 +120,6 @@ ul { } p { - color: #454d64 !important; margin-top: 20px !important; font-size: 14px !important; } @@ -178,18 +177,6 @@ li > ol { margin: 0; } -blockquote { - margin: 1rem 0; - border-left: 0.2rem solid #dfe2e5; - padding: 0.25rem 0 0.25rem 1rem; - font-size: 1rem; - color: #999; -} - -blockquote > p { - margin: 0; -} - form { margin: 0; } diff --git a/src/css/all.css b/src/css/all.css deleted file mode 100644 index 3f96b330..00000000 --- a/src/css/all.css +++ /dev/null @@ -1,11 +0,0 @@ -.grid-demo-bg1 { - background-color: #63BA79; -} -.grid-demo { - padding: 10px; - line-height: 50px; - border-radius: 4px; - text-align: center; - background-color: #79C48C; - color: #fff; -} \ No newline at end of file diff --git a/src/css/layui.css b/src/css/layui.css index 5d7d9030..f4b9160f 100644 --- a/src/css/layui.css +++ b/src/css/layui.css @@ -66,7 +66,6 @@ img { white-space: nowrap } -blockquote, body, button, dd, diff --git a/src/index.ts b/src/index.ts index fddff23a..c8b7841c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,7 +2,6 @@ import type { App } from 'vue' import type { IDefineComponent, InstallOptions } from './module/type/index' import "./css/layui.css" -import "./css/all.css" import LayRadio from './module/radio/index' import LayButton from './module/button/index' import LayButtonContainer from './module/buttonContainer/index' diff --git a/src/module/breadcrumb/index.vue b/src/module/breadcrumb/index.vue index b357a606..fcbd620f 100644 --- a/src/module/breadcrumb/index.vue +++ b/src/module/breadcrumb/index.vue @@ -5,6 +5,5 @@ diff --git a/src/module/count/index.ts b/src/module/count/index.ts new file mode 100644 index 00000000..bc29f2c9 --- /dev/null +++ b/src/module/count/index.ts @@ -0,0 +1,9 @@ +import type { App } from 'vue' +import Component from './index.vue' +import type { IDefineComponent } from '../type/index' + +Component.install = (app: App) => { + app.component(Component.name || 'LayCount', Component) +} + +export default Component as IDefineComponent \ No newline at end of file diff --git a/src/module/count/index.vue b/src/module/count/index.vue new file mode 100644 index 00000000..9d278477 --- /dev/null +++ b/src/module/count/index.vue @@ -0,0 +1,9 @@ + + +