diff --git a/build/cooking.demo.js b/build/cooking.demo.js index dc03d815e..bf2253499 100644 --- a/build/cooking.demo.js +++ b/build/cooking.demo.js @@ -59,9 +59,10 @@ cooking.add('vueMarkdown', { if (tokens[idx].nesting === 1) { var description = (m && m.length > 1) ? m[1] : ''; var content = tokens[idx + 1].content; - var html = convert(striptags.strip(content, 'script')); + var html = convert(striptags.strip(content, ['script', 'style'])); var script = striptags.fetch(content, 'script'); - var jsfiddle = { html: html, script: script }; + var style = striptags.fetch(content, 'style'); + var jsfiddle = { html: html, script: script, style: style }; var descriptionHTML = description ? md.render(description) : ''; diff --git a/examples/components/demo-block.vue b/examples/components/demo-block.vue index f556f0d0b..c5231211b 100644 --- a/examples/components/demo-block.vue +++ b/examples/components/demo-block.vue @@ -167,12 +167,12 @@ methods: { goJsfiddle() { - const { script, html } = this.jsfiddle; + const { script, html, style } = this.jsfiddle; const resourcesTpl = '' + '\n'; let jsTpl = (script || '').replace(/export default/, 'var Main =').trim(); let htmlTpl = `${resourcesTpl}\n
\n${html.trim()}\n
`; - let cssTpl = '@import url("//unpkg.com/element-ui@next/lib/theme-default/index.css");'; + let cssTpl = `@import url("//unpkg.com/element-ui@next/lib/theme-default/index.css");\n${(style || '').trim()}\n`; jsTpl = jsTpl ? jsTpl + '\nvar Ctor = Vue.extend(Main)\nnew Ctor().$mount(\'#app\')' : 'new Vue().$mount(\'#app\')'; @@ -180,7 +180,8 @@ js: jsTpl, css: cssTpl, html: htmlTpl, - panel_js: 3 + panel_js: 3, + panel_css: 1 }; const form = document.createElement('form'); const node = document.createElement('textarea'); diff --git a/examples/docs/zh-CN/input.md b/examples/docs/zh-CN/input.md index 28123ab7e..14001811f 100644 --- a/examples/docs/zh-CN/input.md +++ b/examples/docs/zh-CN/input.md @@ -209,6 +209,16 @@ placeholder="请输入内容" v-model="input"> + + ``` ::: @@ -222,6 +232,16 @@ v-model="input1" :disabled="true"> + + ``` ::: @@ -237,6 +257,21 @@ v-model="input2" @click="handleIconClick"> + + ``` ::: @@ -252,6 +287,16 @@ placeholder="请输入内容" v-model="textarea"> + + ``` ::: @@ -261,20 +306,41 @@ ::: demo 可通过 slot 来指定在 input 中前置或者后置内容。 ```html - - - - - - - - - - - - - - + + + + + ``` ::: @@ -303,6 +369,19 @@ v-model="input9"> + + ``` ::: @@ -433,8 +512,29 @@ @select="handleSelect" > + + ``` ::: @@ -83,12 +95,24 @@ :::demo 只需要把`el-radio`元素换成`el-radio-button`元素即可，此外，Element 还提供了`size`属性给按钮组，支持`large`和`small`两种（如果不设定为默认）。 ```html - - - - - - + + + ``` :::