diff --git a/Readme.md b/Readme.md index 7bd1b62a4..69481fa7b 100644 --- a/Readme.md +++ b/Readme.md @@ -29,7 +29,7 @@ Using npm: npm install dao-style --save ``` -Using a script tag for global use: +Using html tag: ```html diff --git a/examples/plugins/codemirror/index.js b/examples/plugins/codemirror/index.js index f013ba2bd..591e49074 100644 --- a/examples/plugins/codemirror/index.js +++ b/examples/plugins/codemirror/index.js @@ -3,6 +3,7 @@ import VueCodemirror from 'vue-codemirror'; /* eslint-disable */ import 'codemirror/mode/vue/vue'; import 'codemirror/mode/javascript/javascript'; +import 'codemirror/mode/css/css'; import 'codemirror/lib/codemirror.css'; import 'codemirror/theme/monokai.css'; diff --git a/examples/plugins/i18n/en.js b/examples/plugins/i18n/en.js index 8953a1ef4..d3762e6eb 100644 --- a/examples/plugins/i18n/en.js +++ b/examples/plugins/i18n/en.js @@ -47,11 +47,16 @@ export default { method_name: 'Method Name', event_name: 'Event Name', slot_name: 'Slot Name', - show_more: 'Show More', + show_more: 'Load More...', index: { desc: 'A high quality UI Toolkit built on Vue.js.', cr: 'Build and Maintained Open‑Source by {company}', }, + installationPage: { + use_npm: 'Using npm', + use_html: 'Using HTML tag', + usage: 'Usage', + }, status: { component: 'Component', available: 'Available', diff --git a/examples/plugins/i18n/zh.js b/examples/plugins/i18n/zh.js index 3d15b00b6..ab38ab213 100644 --- a/examples/plugins/i18n/zh.js +++ b/examples/plugins/i18n/zh.js @@ -27,7 +27,7 @@ export default { steps: 'Steps 步骤条', svg: 'Svg 图标', 'editable-list': 'Editable List 可编辑列表', - switch: 'Switch 开光', + switch: 'Switch 开关', tab: 'Tab 标签页', table: 'Table 表格', tooltip: 'Tooltip 提示', @@ -47,11 +47,16 @@ export default { method_name: '方法名', event_name: '事件名', slot_name: '插槽名', - show_more: '查看更多', + show_more: '加载更多...', index: { desc: '基于 Vue.js 构建的高质量 UI 工具包', cr: '由 {company} 打造和维护', }, + installationPage: { + use_npm: '使用 npm 安装', + use_html: '使用 HTML 标签引入', + usage: '使用', + }, status: { component: '组件', available: '可用', diff --git a/examples/view/components/code-block/index.vue b/examples/view/components/code-block/index.vue index 438adc5fc..d6f5322d5 100644 --- a/examples/view/components/code-block/index.vue +++ b/examples/view/components/code-block/index.vue @@ -44,6 +44,9 @@ export default { case 'javascript': o.mode = 'text/javascript'; break; + case 'scss': + o.mode = 'text/css'; + break; default: o.mode = 'text/x-vue'; break; @@ -66,7 +69,7 @@ export default { .code-block{ .CodeMirror{ height: auto; - padding: 10px 20px; + padding: 6px 20px; } .CodeMirror-line { font-family: SF Mono,Monaco,Inconsolata,Fira Mono,Droid Sans Mono,Source Code Pro,monospace !important; diff --git a/examples/view/components/docs-section/index.vue b/examples/view/components/docs-section/index.vue index 1311e8974..7fb1b36a9 100644 --- a/examples/view/components/docs-section/index.vue +++ b/examples/view/components/docs-section/index.vue @@ -28,6 +28,7 @@ export default { } &>.content{ padding: 20px 0; + overflow: auto; } } diff --git a/examples/view/components/docs-table/index.vue b/examples/view/components/docs-table/index.vue index 90588f055..f77e50672 100644 --- a/examples/view/components/docs-table/index.vue +++ b/examples/view/components/docs-table/index.vue @@ -14,26 +14,26 @@ - +
{{row.name}} - +
- +
{{getTypes(row.type)}} - +
- - {{row.options.join('、')}} - - - +
{{row.options.join('、')}}
+
-
- +
{{row.default}} - - - +
+
-
{{row.parameter}} @@ -42,11 +42,13 @@ {{row.return}} - - - - - - +
+ + +
@@ -137,5 +139,10 @@ export default { .type{ color: $blue; } + .option{ + width: 300px; + overflow: hidden; + text-overflow: ellipsis; + } } diff --git a/examples/view/demos/button/demo-1.vue b/examples/view/demos/button/demo-1.vue index 33a0ab9de..464ba5f25 100644 --- a/examples/view/demos/button/demo-1.vue +++ b/examples/view/demos/button/demo-1.vue @@ -1,7 +1,7 @@ + \ No newline at end of file diff --git a/examples/view/demos/button/demo-3.vue b/examples/view/demos/button/demo-3.vue index 58685a064..3a1eeecba 100644 --- a/examples/view/demos/button/demo-3.vue +++ b/examples/view/demos/button/demo-3.vue @@ -7,4 +7,4 @@ - + \ No newline at end of file diff --git a/examples/view/demos/button/demo-4.vue b/examples/view/demos/button/demo-4.vue index 4310e4056..26f9339fb 100644 --- a/examples/view/demos/button/demo-4.vue +++ b/examples/view/demos/button/demo-4.vue @@ -7,4 +7,4 @@ - + \ No newline at end of file diff --git a/examples/view/demos/button/demo-5.vue b/examples/view/demos/button/demo-5.vue index 19384f6c9..cb00c3721 100644 --- a/examples/view/demos/button/demo-5.vue +++ b/examples/view/demos/button/demo-5.vue @@ -21,4 +21,4 @@ - + \ No newline at end of file diff --git a/examples/view/demos/button/demo-6.vue b/examples/view/demos/button/demo-6.vue index 5a89c49e6..e0c920a84 100644 --- a/examples/view/demos/button/demo-6.vue +++ b/examples/view/demos/button/demo-6.vue @@ -31,4 +31,4 @@
- + \ No newline at end of file diff --git a/examples/view/demos/checkbox/demo-1.vue b/examples/view/demos/checkbox/demo-1.vue index b8ddcd872..36152f066 100644 --- a/examples/view/demos/checkbox/demo-1.vue +++ b/examples/view/demos/checkbox/demo-1.vue @@ -1,36 +1,24 @@ - - + \ No newline at end of file diff --git a/examples/view/demos/checkbox/demo-2.vue b/examples/view/demos/checkbox/demo-2.vue index 16176f3e6..606cbe94b 100644 --- a/examples/view/demos/checkbox/demo-2.vue +++ b/examples/view/demos/checkbox/demo-2.vue @@ -1,35 +1,24 @@ - + \ No newline at end of file diff --git a/examples/view/demos/color/demo-1.vue b/examples/view/demos/color/demo-1.vue index fbc35e28a..e52062b0c 100644 --- a/examples/view/demos/color/demo-1.vue +++ b/examples/view/demos/color/demo-1.vue @@ -10,7 +10,6 @@ - + \ No newline at end of file diff --git a/examples/view/demos/editable-list/demo-1.vue b/examples/view/demos/editable-list/demo-1.vue index 6f0e00aa5..9eea3edc4 100644 --- a/examples/view/demos/editable-list/demo-1.vue +++ b/examples/view/demos/editable-list/demo-1.vue @@ -1,7 +1,12 @@ + \ No newline at end of file diff --git a/examples/view/demos/numeric-badge/demo-2.vue b/examples/view/demos/numeric-badge/demo-2.vue index e331bc896..ccb65fe8c 100644 --- a/examples/view/demos/numeric-badge/demo-2.vue +++ b/examples/view/demos/numeric-badge/demo-2.vue @@ -15,4 +15,4 @@ }; }, }; - + \ No newline at end of file diff --git a/examples/view/demos/progress/demo-1.vue b/examples/view/demos/progress/demo-1.vue index 557488bd7..5ef42754f 100644 --- a/examples/view/demos/progress/demo-1.vue +++ b/examples/view/demos/progress/demo-1.vue @@ -13,4 +13,4 @@ 错误 - + \ No newline at end of file diff --git a/examples/view/demos/progress/demo-2.vue b/examples/view/demos/progress/demo-2.vue index 66200bcb7..67244b700 100644 --- a/examples/view/demos/progress/demo-2.vue +++ b/examples/view/demos/progress/demo-2.vue @@ -18,7 +18,6 @@ + \ No newline at end of file diff --git a/examples/view/demos/progress/demo-3.vue b/examples/view/demos/progress/demo-3.vue index 982d39086..cb06bc28a 100644 --- a/examples/view/demos/progress/demo-3.vue +++ b/examples/view/demos/progress/demo-3.vue @@ -12,7 +12,6 @@ + \ No newline at end of file diff --git a/examples/view/demos/setting-layout/demo-1.vue b/examples/view/demos/setting-layout/demo-1.vue index 8d3d86e53..7d0c97926 100644 --- a/examples/view/demos/setting-layout/demo-1.vue +++ b/examples/view/demos/setting-layout/demo-1.vue @@ -1,37 +1,35 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/examples/view/demos/setting-layout/demo-2.vue b/examples/view/demos/setting-layout/demo-2.vue index e7fc26788..58508054f 100644 --- a/examples/view/demos/setting-layout/demo-2.vue +++ b/examples/view/demos/setting-layout/demo-2.vue @@ -1,28 +1,26 @@ diff --git a/examples/view/demos/svg/demo-1.vue b/examples/view/demos/svg/demo-1.vue index bb29505f2..24e866491 100644 --- a/examples/view/demos/svg/demo-1.vue +++ b/examples/view/demos/svg/demo-1.vue @@ -28,5 +28,4 @@ export default { .icon{ margin: 4px; } - - + \ No newline at end of file diff --git a/examples/view/demos/switch/demo-1.vue b/examples/view/demos/switch/demo-1.vue index bdc8085b1..e073ad224 100644 --- a/examples/view/demos/switch/demo-1.vue +++ b/examples/view/demos/switch/demo-1.vue @@ -23,4 +23,4 @@ export default { .demo1 p { margin-top: 20px; } - + \ No newline at end of file diff --git a/examples/view/demos/switch/demo-3.vue b/examples/view/demos/switch/demo-3.vue index 1289dd097..a27d38198 100644 --- a/examples/view/demos/switch/demo-3.vue +++ b/examples/view/demos/switch/demo-3.vue @@ -24,4 +24,4 @@ export default { .demo3 p { margin-top: 20px; } - + \ No newline at end of file diff --git a/examples/view/demos/switch/demo-5.vue b/examples/view/demos/switch/demo-5.vue index bae0e611d..34a3c560e 100644 --- a/examples/view/demos/switch/demo-5.vue +++ b/examples/view/demos/switch/demo-5.vue @@ -19,7 +19,7 @@ export default { }, methods: { onChange(data) { - alert(data); + this.$daoAlert('daostyle', `changed:${data}`).show(); }, }, }; diff --git a/examples/view/demos/table/demo-1.vue b/examples/view/demos/table/demo-1.vue index 9544d8eac..f132b07e0 100644 --- a/examples/view/demos/table/demo-1.vue +++ b/examples/view/demos/table/demo-1.vue @@ -106,4 +106,4 @@ export default { margin-left: 0px !important; } } - + \ No newline at end of file diff --git a/examples/view/demos/table/demo-2.vue b/examples/view/demos/table/demo-2.vue index 242d458df..fcb179580 100644 --- a/examples/view/demos/table/demo-2.vue +++ b/examples/view/demos/table/demo-2.vue @@ -47,5 +47,4 @@ export default { }; }, }; - - + \ No newline at end of file diff --git a/examples/view/demos/table/demo-3.vue b/examples/view/demos/table/demo-3.vue index 19d903c88..d2efa5391 100644 --- a/examples/view/demos/table/demo-3.vue +++ b/examples/view/demos/table/demo-3.vue @@ -47,4 +47,4 @@ export default { }; }, }; - + \ No newline at end of file diff --git a/examples/view/page/components/color/index.vue b/examples/view/page/components/color/index.vue index 88c57b834..b356a37c2 100644 --- a/examples/view/page/components/color/index.vue +++ b/examples/view/page/components/color/index.vue @@ -41,7 +41,7 @@

Grey

-
+

@@ -59,8 +59,8 @@

Color Palette

点击颜色块可以直接复制代码
- - +
+
-
-          @function generate-color($base-color, $level) {
-            @if $level == -3 {
-              @return desaturate(lighten($base-color, 36), 15);
-            } @else if $level == -2 {
-              @return desaturate(lighten($base-color, 25), 25);
-            } @else if $level == -1 {
-              @return lighten($base-color, 4);
-            } @else if $level == 1 {
-              @return desaturate(darken($base-color, 7), 11);
-            } @else if $level == 2 {
-              @return desaturate(darken($base-color, 13), 7);
-            } @else if $level == 3 {
-              @return desaturate(darken($base-color, 19), 9);
-            } @else {
-              @return $base-color;
-            }
-          }
@@ -194,7 +176,7 @@ $greys: ( 'black-dark': $black-dark, 'black-darker': $black-darker, 'black-light .color-demo-block { margin-bottom: 30px; float: left; - width: 180px; + width: 150px; .color-block { display: block; width: 60px; @@ -309,16 +291,6 @@ $greys: ( 'black-dark': $black-dark, 'black-darker': $black-darker, 'black-light } } } - -pre.scss { - font-size: 14px; - line-height: 2; - padding: 30px; - color: $black-dark; - border: 1px solid $grey-light; - background-color: $white-light; -} - diff --git a/examples/view/page/components/editable-list/index.vue b/examples/view/page/components/editable-list/index.vue index 34a184f2e..6d26795dc 100644 --- a/examples/view/page/components/editable-list/index.vue +++ b/examples/view/page/components/editable-list/index.vue @@ -8,25 +8,25 @@ - ``dao-editable-list`` 是个几乎只有纯样式的组件。 + `dao-editable-list` 是个几乎只有纯样式的组件。 - +
diff --git a/examples/view/page/components/index.vue b/examples/view/page/components/index.vue index 5d92e3853..ab45c61fb 100644 --- a/examples/view/page/components/index.vue +++ b/examples/view/page/components/index.vue @@ -24,7 +24,7 @@
-
+
@@ -36,6 +36,9 @@ export default { name: 'Components', + created() { + console.log(this.$route); + }, }; @@ -94,20 +97,22 @@ export default { height: 100%; overflow: auto; width: 100%; - padding: 40px 10px; + padding: 20px 10px; .view-wrap{ @media (max-width: 768px) { padding: 10px; } @media (min-width: 768px) { - padding: 0px 30px; - } - @media (min-width: 900px) { - padding: 0px 50px; + padding: 0px 40px; } + @media (min-width: 1100px) { - padding: 0px 80px; + &.not-component{ + width: 800px; + margin: 0 auto; + } } + margin: 0 auto; color: #5e6d82; } diff --git a/examples/view/page/components/numeric-badge/index.vue b/examples/view/page/components/numeric-badge/index.vue index 01d8bb488..7472ab3d2 100644 --- a/examples/view/page/components/numeric-badge/index.vue +++ b/examples/view/page/components/numeric-badge/index.vue @@ -35,7 +35,7 @@