From 90e4d4320d4d0e22841e3fcd86ad6ef8bc8a2ed3 Mon Sep 17 00:00:00 2001 From: summer Date: Fri, 4 Aug 2017 18:01:59 +0800 Subject: [PATCH 01/87] =?UTF-8?q?misk:jira#KJDS-59474=20=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=A4=BA=E4=BE=8B=E6=96=87=E6=A1=A3=E7=9A=84=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/source/demo.wrap/index.js | 20 ++++++ doc/source/doc.js | 63 +++++++++++------- doc/themes/nekui/layout/page.ejs | 79 ++++++++++++++++++++++- doc/themes/nekui/source/css/_common.styl | 49 ++++++++++++-- doc/themes/nekui/source/css/page.styl | 2 +- src/js/components/form/KLButton/index.md | 27 ++++++-- src/js/components/layout/KLTable/index.md | 66 +++++++++---------- 7 files changed, 238 insertions(+), 68 deletions(-) create mode 100644 doc/source/demo.wrap/index.js diff --git a/doc/source/demo.wrap/index.js b/doc/source/demo.wrap/index.js new file mode 100644 index 00000000..084a9163 --- /dev/null +++ b/doc/source/demo.wrap/index.js @@ -0,0 +1,20 @@ +/* + demowrap组件，用来包裹组件demo的显示，实现组件代码展开和收缩 + by：wangtan@corp.netease.com +*/ +const DemoWrap = Regular.extend({ + template: '\ +
\ +
\ +
\ +
', + name: 'demo-wrap', + data: { + htmlTpl: '', + showScript: false, + }, + toggle() { + this.data.showScript = !this.data.showScript; + }, +}); +demo \ No newline at end of file diff --git a/doc/source/doc.js b/doc/source/doc.js index c8b2c579..cdb675aa 100644 --- a/doc/source/doc.js +++ b/doc/source/doc.js @@ -3,7 +3,7 @@ * 1、增加头部信息，用于渲染左侧多级菜单 * 2、把组件内的 jsdoc 注释转为 MD 追加到尾部，用于生成 API 文档 * 3、把 DEMO 代码实例化为组件 - * + * * author: Cody Chan 2017-02-08 */ @@ -14,7 +14,7 @@ const jsdoc2md = require('jsdoc-to-markdown'); // 分类的顺序跟下面保持一致，每个分类下的组件顺序不作保证 const CATES = [ - { cate: 'layout', name: '布局' , startOrder: 100 }, + { cate: 'layout', name: '布局', startOrder: 100 }, { cate: 'form', name: '表单', startOrder: 200 }, { cate: 'notice', name: '通知', startOrder: 300 }, { cate: 'navigation', name: '导航', startOrder: 400 }, @@ -25,33 +25,31 @@ const DOC_PATH = __dirname; const COMPONENTS_PATH = path.join(__dirname, '../../src/js/components'); const COMPONENTS_DEST = path.join(DOC_PATH, 'components'); -const getComponents = cate => { +const getComponents = (cate) => { const fullPath = path.join(COMPONENTS_PATH, cate); - return fs.readdirSync(fullPath).filter(f => { - return fs.statSync(path.join(fullPath, f)).isDirectory() - }) -} + return fs.readdirSync(fullPath).filter(f => fs.statSync(path.join(fullPath, f)).isDirectory()); +}; -const getDemoCode = demo => { +const getDemoCode = (demo) => { const rglMatch = /(```(xml|html))([\s\S]*?)(```)/g.exec(demo); const jsMatch = /(```javascript)([\s\S]*?)(```)/g.exec(demo); return { rgl: rglMatch ? rglMatch[3] : '', js: jsMatch ? jsMatch[2] : 'var component = new NEKUI.Component({template: template});', }; -} +}; -const injectComponents = md => { +const injectComponents = (md) => { const demos = []; const reg = /()([\s\S]*?)()/g; let match = reg.exec(md); while (match) { - demos.push(getDemoCode(match[2])) + demos.push(getDemoCode(match[2])); match = reg.exec(md); } if (demos.length === 0) return md; let demosScript = '\n{% raw %}\n\n{% endraw %}'; return md + demosScript; -} +}; const injectAPI = (md, source) => { const docs = jsdoc2md.renderSync({ @@ -72,20 +89,20 @@ const injectAPI = (md, source) => { 'no-cache': true, configure: path.join(__dirname, 'jsdoc.json'), }); - return md + '\n## API\n' + docs; -} + return `${md}\n## API\n${docs}`; +}; const doc = (isDev, callback) => { // 其它文档 if (!isDev) { const mds = glob.sync(path.join(DOC_PATH, '**/*.md')); - mds.forEach(md => { - fs.writeFileSync(md, injectComponents(fs.readFileSync(md, 'utf8'))) - }) + mds.forEach((md) => { + fs.writeFileSync(md, injectComponents(fs.readFileSync(md, 'utf8'))); + }); } // 组件文档 - CATES.forEach(c => { - const components = getComponents(c.cate).filter(comp => { + CATES.forEach((c) => { + const components = getComponents(c.cate).filter((comp) => { const mdPath = path.join(COMPONENTS_PATH, c.cate, comp, 'index.md'); if (fs.existsSync(mdPath)) return true; return false; @@ -104,11 +121,11 @@ const doc = (isDev, callback) => { md = injectAPI(md, fs.readFileSync(jsPath, 'utf8')); } // 插入实例化组件的脚本 - md = injectComponents(md) + md = injectComponents(md); fs.writeFileSync(path.join(COMPONENTS_DEST, `${c.cate}_${comp}_.md`), md); - }) + }); }); callback && callback(); -} +}; module.exports = doc; diff --git a/doc/themes/nekui/layout/page.ejs b/doc/themes/nekui/layout/page.ejs index 375a5c54..d0258a5c 100644 --- a/doc/themes/nekui/layout/page.ejs +++ b/doc/themes/nekui/layout/page.ejs @@ -7,7 +7,23 @@ <% } %> -
+
+ <% if(page.masonry) { %> + + <% } %> <%- page.content %>
<% site.pages.find({ type: page.type, order: page.order - 1 }).each(function (page) { %> @@ -23,4 +39,65 @@ 来 GitHub 提个 PR 吧！
+ <% if(page.masonry) { %> + + <% } %> +
diff --git a/doc/themes/nekui/source/css/_common.styl b/doc/themes/nekui/source/css/_common.styl index 0efacd2a..96ac4b63 100644 --- a/doc/themes/nekui/source/css/_common.styl +++ b/doc/themes/nekui/source/css/_common.styl @@ -180,8 +180,49 @@ a.button border-left 4px solid transparent border-right 4px solid transparent border-top 5px solid #ccc - +.grid-item + width: auto; + border: 1px solid #E1E6EC; + margin: 20px 10px; + border-radius: 4px; .m-example - border 1px dashed #eee - margin 5px - padding 5px \ No newline at end of file + padding: 10px 10px 30px 10px; +.m-code + .highlight + background-color: #fff; +.m-demowrap + border-top: 1px solid #e1e6ec; + .m-iconLine + position: relative; + text-align: center; + color: #B2BFCF; + top: -10px; + .revert + transform: rotate(180deg); + -ms-transform: rotate(180deg); + -webkit-transform: rotate(180deg); + -o-transform: rotate(180deg); + -moz-transform: rotate(180deg); + color: #E31436; + border: 1px solid #E31436; + .m-iconOuter + display: inline-block; + width: 17px; + height: 17px; + line-height: 20px; + border: 1px solid #B2BFCF; + border-radius: 9px; + background-color: #fff; + transition: transform 0.5s; + -ms-transition: transform 0.5s; + -webkit-transition: transform 0.5s; + -o-transition: transform 0.5s; + -moz-transition: transform 0.5s; + &:hover + color: #E31436; + border: 1px solid #E31436; + .m-codeBlock + overflow: hidden; + .wrap + height: 10px; + \ No newline at end of file diff --git a/doc/themes/nekui/source/css/page.styl b/doc/themes/nekui/source/css/page.styl index ebcdcef3..6480bcfb 100644 --- a/doc/themes/nekui/source/css/page.styl +++ b/doc/themes/nekui/source/css/page.styl @@ -9,7 +9,7 @@ .content position relative padding 2.2em 0 - max-width 800px + max-width 1000px margin 0 auto &.api > a:first-of-type > h2 diff --git a/src/js/components/form/KLButton/index.md b/src/js/components/form/KLButton/index.md index 8eb06623..eefdb96b 100644 --- a/src/js/components/form/KLButton/index.md +++ b/src/js/components/form/KLButton/index.md @@ -1,12 +1,16 @@ --- title: 按钮 +masonry: true --- ## 代码演示 -### 基本形式 +
+ +### 基本形式 +
```xml @@ -34,11 +38,13 @@ var component = new NEKUI.Component({ template: template }); ``` + + + ### 常用的button类型 -
```xml @@ -68,11 +74,13 @@ var component = new NEKUI.Component({
``` + + + ### 圆角的图标按钮 -
```xml @@ -84,11 +92,13 @@ var component = new NEKUI.Component({ ``` + + + ### 图标按钮 -
```xml @@ -100,11 +110,13 @@ var component = new NEKUI.Component({ ``` + + + ### 加载中的按钮 -
```xml @@ -112,11 +124,13 @@ var component = new NEKUI.Component({ ``` + + + ### buttonGroup -
```xml @@ -127,4 +141,5 @@ var component = new NEKUI.Component({ ``` + diff --git a/src/js/components/layout/KLTable/index.md b/src/js/components/layout/KLTable/index.md index add2eb01..793fa8e5 100644 --- a/src/js/components/layout/KLTable/index.md +++ b/src/js/components/layout/KLTable/index.md @@ -4,9 +4,9 @@ title: 表格 ## 代码演示 + ### 基本 -
```xml @@ -37,13 +37,12 @@ var component = new NEKUI.Component({ ``` + ### 显示配置项 1. 无条纹：`strip={false}` 2. 占位符：默认`placeholder="-"` 3. 对齐：默认 `align="center"` - -
```xml @@ -77,11 +76,11 @@ var component = new NEKUI.Component({ ``` + ### 过滤器 `filter` 接收一个 `function`，依次可以取得参数 `val`，`item`，`itemIndex`。 -
```xml @@ -118,9 +117,9 @@ var component = new NEKUI.Component({ ``` + ### 多级表头 -
```xml @@ -160,13 +159,13 @@ var component = new NEKUI.Component({ ``` + ### 悬浮表头和底部 控制表头和底部的悬浮需要对 `scroll` 事件进行监听，在默认的情况下，监听对象是 `window`，即页面的滚动。 如果页面布局比较特殊，需要指定监听的对象，则可以通过 `scrollParent` 指定会发生滚动的容器，如 `scrollParent="#example"`。 -
```xml @@ -202,9 +201,9 @@ var component = new NEKUI.Component({ ``` + ### 表头固定在表格顶部 -
```xml @@ -235,9 +234,9 @@ var component = new NEKUI.Component({ ``` + ### 固定列 -
```xml @@ -270,6 +269,7 @@ var component = new NEKUI.Component({ ``` + ### 自定义模版与filter 通过 `kl-table-template` 组件定义单元格和表头的模版，可以将模版内嵌到组件中，也可以将模版注入到组件的 `template` 属性。 @@ -284,7 +284,6 @@ var component = new NEKUI.Component({ `kl-table-col`上亦可以直接传入对应的模版属性， `template`，`headerTemplate`，`formatter`，`headerFormatter`，`format`，`headerFormat`。 -
```xml @@ -354,11 +353,11 @@ var component = new NEKUI.Component({ ``` + ### 自定义行样式 通过设置 `item.rowClass` 或 `item.rowStyle` 修改每一行的样式。 -
```xml @@ -391,11 +390,11 @@ var component = new NEKUI.Component({ ``` + ### 排序 没有实际的排序效果，请查看 console 打印的事件对象。 -
```xml @@ -433,10 +432,11 @@ var component = new NEKUI.Component({ ``` + ### 分页 分页的配置参考 [分页 Pager](/components/navigation_pager_.html) 。 - +
```xml @@ -475,11 +475,11 @@ var component = new NEKUI.Component({ ``` + ### 多选 通过 `enableCheckAll` -
```xml @@ -514,6 +514,7 @@ var component = new NEKUI.Component({ ``` + ### 数据配置 在进行数据配置时，模版的配置方式更为灵活。 @@ -524,7 +525,6 @@ var component = new NEKUI.Component({ 加上前缀 `header` 成为 `headerTemplate`，`headerFormat`，`headerFormatter`，可作为表头的模版。 -
```xml @@ -598,10 +598,9 @@ var component = new NEKUI.Component({ ``` - + ### 空数据 -
```xml @@ -622,9 +621,9 @@ var component = new NEKUI.Component({ ``` + ### 加载中 -
```xml @@ -645,28 +644,13 @@ var component = new NEKUI.Component({ ``` -### 特殊 - -由于组件内部有部分模版是使用字符串形式存储，只有在使用时才是进行解析，因此当页面对 `Regular` 的插值符号进行修改时，需要进行特殊处理。 - -为了向组件内部传递新修改的插值，需要在 `Regular` 下挂载两个新的属性 `_BEGIN_`， `_END_`。 - -```javascript -Regular._BEGIN_ = '{{'; -Regular._END_ = '}}'; -Regular.config({ - BEGIN: Regular._BEGIN_, - END: Regular._END_ -}); -``` - + ### 模版中获取外部数据的方法 由于组件的设计结构比较特殊，表格中表头和内容分别是两个独立的组件，因此　`kl-table` 上挂载的属性无法直接传递到表头和内容当中。 如有需要取得外部的数据，则需要通过 `this.$table.data` 或者 `this.$tableData` 去获取。 -
```xml @@ -705,3 +689,19 @@ var component = new NEKUI.Component({ ``` +### 特殊 + +由于组件内部有部分模版是使用字符串形式存储，只有在使用时才是进行解析，因此当页面对 `Regular` 的插值符号进行修改时，需要进行特殊处理。 + +为了向组件内部传递新修改的插值，需要在 `Regular` 下挂载两个新的属性 `_BEGIN_`， `_END_`。 + + +```javascript +Regular._BEGIN_ = '{{'; +Regular._END_ = '}}'; +Regular.config({ + BEGIN: Regular._BEGIN_, + END: Regular._END_ +}); +``` + From e2e7ccc84312b26250bc933f9c555c05d64199e3 Mon Sep 17 00:00:00 2001 From: summer Date: Mon, 7 Aug 2017 16:26:00 +0800 Subject: [PATCH 02/87] =?UTF-8?q?misk:jira#KJDS-59474=20=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=A4=BA=E4=BE=8B=E6=96=87=E6=A1=A3=E7=9A=84=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/package.json | 2 +- doc/source/demo.wrap/index.js | 13 +++++++------ doc/themes/nekui/layout/layout.ejs | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/package.json b/doc/package.json index f371e4ff..51889102 100644 --- a/doc/package.json +++ b/doc/package.json @@ -12,4 +12,4 @@ "hexo-renderer-stylus": "^0.3.1", "hexo-server": "^0.2.0" } -} \ No newline at end of file +} diff --git a/doc/source/demo.wrap/index.js b/doc/source/demo.wrap/index.js index 084a9163..c4f7440b 100644 --- a/doc/source/demo.wrap/index.js +++ b/doc/source/demo.wrap/index.js @@ -2,12 +2,14 @@ demowrap组件，用来包裹组件demo的显示，实现组件代码展开和收缩 by：wangtan@corp.netease.com */ +/* eslint no-unused-vars: 0 */ +/* eslint no-undef: 0 */ const DemoWrap = Regular.extend({ - template: '\ -
\ -
\ -
\ -
', + template: ` +
+
+
+
`, name: 'demo-wrap', data: { htmlTpl: '', @@ -17,4 +19,3 @@ const DemoWrap = Regular.extend({ this.data.showScript = !this.data.showScript; }, }); -demo \ No newline at end of file diff --git a/doc/themes/nekui/layout/layout.ejs b/doc/themes/nekui/layout/layout.ejs index 2431e6f7..abc2bbfb 100644 --- a/doc/themes/nekui/layout/layout.ejs +++ b/doc/themes/nekui/layout/layout.ejs @@ -24,6 +24,7 @@ +
> From 150be10df02f4a107e44b1cbb04257480b0747ca Mon Sep 17 00:00:00 2001 From: LzxHahaha Date: Tue, 8 Aug 2017 14:37:48 +0800 Subject: [PATCH 03/87] update footer --- doc/themes/nekui/layout/page.ejs | 12 ++++- doc/themes/nekui/source/css/_settings.styl | 3 ++ doc/themes/nekui/source/css/page.styl | 43 +++++++++++++++--- doc/themes/nekui/source/images/pager-left.png | Bin 0 -> 357 bytes .../nekui/source/images/pager-right.png | Bin 0 -> 359 bytes 5 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 doc/themes/nekui/source/images/pager-left.png create mode 100644 doc/themes/nekui/source/images/pager-right.png diff --git a/doc/themes/nekui/layout/page.ejs b/doc/themes/nekui/layout/page.ejs index d0258a5c..b3e7ab23 100644 --- a/doc/themes/nekui/layout/page.ejs +++ b/doc/themes/nekui/layout/page.ejs @@ -27,10 +27,18 @@ <%- page.content %>
<% site.pages.find({ type: page.type, order: page.order - 1 }).each(function (page) { %> - ← <%- page.title %> + + + <%- page.title %> + + <% }) %> <% site.pages.find({ type: page.type, order: page.order + 1 }).each(function (page) { %> - <%- page.title %> → + + + <%- page.title %> + + <% }) %>
diff --git a/doc/themes/nekui/source/css/_settings.styl b/doc/themes/nekui/source/css/_settings.styl index d18ecc7e..3f2d2d23 100644 --- a/doc/themes/nekui/source/css/_settings.styl +++ b/doc/themes/nekui/source/css/_settings.styl @@ -18,6 +18,9 @@ $grey = #ccc $red = #ff6666 $blue = #2973b7 +$theme = #E31436 +$link = #0398FF + $radius = 2px $content-padding-top = 30px $header-inner-height = 41px diff --git a/doc/themes/nekui/source/css/page.styl b/doc/themes/nekui/source/css/page.styl index 6480bcfb..390ee71e 100644 --- a/doc/themes/nekui/source/css/page.styl +++ b/doc/themes/nekui/source/css/page.styl @@ -54,7 +54,7 @@ z-index: -1 &:after content "#" - color $green + color $theme position absolute left -0.7em bottom -2px @@ -63,12 +63,12 @@ figure margin 1.2em 0 a - color $green + color $link font-weight 400 blockquote margin 2em 0 padding-left 20px - border-left 4px solid $green + border-left 4px solid $theme p font-weight 600 margin-left 0 @@ -83,7 +83,7 @@ td background-color: lighten($codebg, 60%) th - background-color: $green + background-color: $theme color: #fff text-align left tbody @@ -122,11 +122,40 @@ .guide-links margin-top 2em - height 1em + padding 2em 0 + border-top 1px solid #e5e5e5 + display flex + flex-direction column + + .pager-left + align-self flex-start + + .pager-right + align-self flex-end + + .pager-btn + display flex + + .icon + display inline-block + width 18px + height 18px + border-radius 50% + border 1px solid #ccc + background-position center center + background-repeat no-repeat + background-size 10px + + .icon-left + background-image url(../images/pager-left.png) + margin-right 5px + + .icon-right + background-image url(../images/pager-right.png) + margin-left 5px .footer color $light - margin-top 2em padding-top 2em border-top 1px solid #e5e5e5 font-size .9em @@ -162,7 +191,7 @@ .nav-link padding-bottom 1px &:hover, &.current - border-bottom 2px solid $green + border-bottom 2px solid $theme #mobile-bar display block #main diff --git a/doc/themes/nekui/source/images/pager-left.png b/doc/themes/nekui/source/images/pager-left.png new file mode 100644 index 0000000000000000000000000000000000000000..76dff77b38cf52dbd27794a1b993503bbf92de46 GIT binary patch literal 357 zcmV-r0h<1aP)Px$A4x<(R5%gMlQ9m0KoCWRXyE~YgB4SGcTBeX9~ zDmqXmZVFW<{sc;3cHGi5?P8>MsMFWiZl8c+vEVGrdN8@3*#{WE~U z%e081Xeu7i-IX5?z&ZY|6%MHYoZ-OrSHJ{m3Rfl;>6*Z`z)g~CgH7Q^U=z48_yrFz zElZjfTm#JcmGt^z=eTa*?lE>Wf)muXj^kvU=V#gz=@qEpJx#G000000NkvXXu0mjf DnPQiV literal 0 HcmV?d00001 diff --git a/doc/themes/nekui/source/images/pager-right.png b/doc/themes/nekui/source/images/pager-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b2d81d41ad034c295e9a406f5cffe58ced86c81f GIT binary patch literal 359 zcmV-t0hs=YP)Px$AxT6*R5%gM)jdsp5LwD`898z<0ohXfLK|j&0k1)ZJ6g)xwmd ziZ{ZlxDc#@3&XOw6wJeMup`8q=BmLhw`v002lB$$hQ_HB(e$a$MvEP2y7oM8ikv0o zp#&>{K?xUvWl&$g=FNiW1JPW6QFhQ50=4zek;}%2oVD`vI}?u^|!Zg}VR%002ovPDHLk FV1m(vq@4f& literal 0 HcmV?d00001 From 16d5992d622f2e3b7758490adf5bc9e9ab5063ae Mon Sep 17 00:00:00 2001 From: LzxHahaha Date: Tue, 8 Aug 2017 19:14:05 +0800 Subject: [PATCH 04/87] update styles --- doc/themes/nekui/layout/page.ejs | 28 +++++++++++----------- doc/themes/nekui/source/css/_common.styl | 2 +- doc/themes/nekui/source/css/_header.styl | 8 +++++-- doc/themes/nekui/source/css/_settings.styl | 1 + doc/themes/nekui/source/css/_sidebar.styl | 15 ++++++------ doc/themes/nekui/source/css/page.styl | 7 +++--- 6 files changed, 34 insertions(+), 27 deletions(-) diff --git a/doc/themes/nekui/layout/page.ejs b/doc/themes/nekui/layout/page.ejs index b3e7ab23..5341eaad 100644 --- a/doc/themes/nekui/layout/page.ejs +++ b/doc/themes/nekui/layout/page.ejs @@ -24,23 +24,23 @@ } <% } %> + <%- page.content %> -
- <% site.pages.find({ type: page.type, order: page.order - 1 }).each(function (page) { %> - - - <%- page.title %> + + <% if (site.pages.find({ type: page.type }).length > 1) { %> +
+ <% site.pages.find({ type: page.type, order: page.order - 1 }).each(function (page) { %> + + <%- page.title %> - - <% }) %> - <% site.pages.find({ type: page.type, order: page.order + 1 }).each(function (page) { %> - - - <%- page.title %> + <% }) %> + <% site.pages.find({ type: page.type, order: page.order + 1 }).each(function (page) { %> + + <%- page.title %> - - <% }) %> -
+ <% }) %> +
+ <% } %>
想让文档更完善？ diff --git a/doc/themes/nekui/source/css/_common.styl b/doc/themes/nekui/source/css/_common.styl index 96ac4b63..70730264 100644 --- a/doc/themes/nekui/source/css/_common.styl +++ b/doc/themes/nekui/source/css/_common.styl @@ -168,7 +168,7 @@ a.button font-size .9em display block &:hover - color $green + color $theme .arrow display inline-block vertical-align middle diff --git a/doc/themes/nekui/source/css/_header.styl b/doc/themes/nekui/source/css/_header.styl index d5244829..3e7cf54b 100644 --- a/doc/themes/nekui/source/css/_header.styl +++ b/doc/themes/nekui/source/css/_header.styl @@ -31,10 +31,14 @@ body.docs position relative margin 0 .6em + a:hover + color $theme + .nav-link padding-bottom 3px &:hover, &.current - border-bottom 3px solid $green + color $theme + border-bottom 3px solid $theme .search-query height 30px @@ -50,7 +54,7 @@ body.docs background-size 20px vertical-align middle !important &:focus - border-color $green + border-color $theme #logo display inline-block diff --git a/doc/themes/nekui/source/css/_settings.styl b/doc/themes/nekui/source/css/_settings.styl index 3f2d2d23..f289bc16 100644 --- a/doc/themes/nekui/source/css/_settings.styl +++ b/doc/themes/nekui/source/css/_settings.styl @@ -20,6 +20,7 @@ $blue = #2973b7 $theme = #E31436 $link = #0398FF +$border-color = #E3E8ED $radius = 2px $content-padding-top = 30px diff --git a/doc/themes/nekui/source/css/_sidebar.styl b/doc/themes/nekui/source/css/_sidebar.styl index f2f5d7b8..3cdc1ccc 100644 --- a/doc/themes/nekui/source/css/_sidebar.styl +++ b/doc/themes/nekui/source/css/_sidebar.styl @@ -3,16 +3,17 @@ .sidebar position absolute z-index 10 - top $header-height + top $header-height + 3px left 0 bottom 0 padding $content-padding-top + 10px 0 $content-padding-top 60px - width 260px + width 180px margin-right 20px overflow-x hidden overflow-y auto -webkit-overflow-scrolling touch -ms-overflow-style none + border-right 1px $border-color solid h2 margin-top .2em ul @@ -31,7 +32,7 @@ color $light &.current font-weight 600 - color $green + color $theme &.new &:after content "NEW" @@ -63,11 +64,11 @@ position relative top -1px &:hover - border-bottom 2px solid $green + border-bottom 2px solid $theme .section-link &.active font-weight bold - color $green + color $theme .main-menu margin-bottom 20px display none @@ -81,10 +82,10 @@ width 125px display inline-block .become-backer - border 1px solid $green + border 1px solid $theme border-radius 2em display inline-block - color $green + color $theme font-size .8em width 125px padding 4px 0 diff --git a/doc/themes/nekui/source/css/page.styl b/doc/themes/nekui/source/css/page.styl index 390ee71e..ac66252b 100644 --- a/doc/themes/nekui/source/css/page.styl +++ b/doc/themes/nekui/source/css/page.styl @@ -133,11 +133,12 @@ .pager-right align-self flex-end - .pager-btn - display flex + .pager + span + display inline-block + vertical-align middle .icon - display inline-block width 18px height 18px border-radius 50% From 83c5cf90022d3b1c602b2a624ee3e7a4c3bce0f1 Mon Sep 17 00:00:00 2001 From: LzxHahaha Date: Tue, 8 Aug 2017 19:47:15 +0800 Subject: [PATCH 05/87] update filename --- doc/themes/nekui/source/css/page.styl | 4 ++-- .../images/{pager-left.png => arrow-left.png} | Bin .../images/{pager-right.png => arrow-right.png} | Bin 3 files changed, 2 insertions(+), 2 deletions(-) rename doc/themes/nekui/source/images/{pager-left.png => arrow-left.png} (100%) rename doc/themes/nekui/source/images/{pager-right.png => arrow-right.png} (100%) diff --git a/doc/themes/nekui/source/css/page.styl b/doc/themes/nekui/source/css/page.styl index ac66252b..8c7848e2 100644 --- a/doc/themes/nekui/source/css/page.styl +++ b/doc/themes/nekui/source/css/page.styl @@ -148,11 +148,11 @@ background-size 10px .icon-left - background-image url(../images/pager-left.png) + background-image url(../images/arrow-left.png) margin-right 5px .icon-right - background-image url(../images/pager-right.png) + background-image url(../images/arrow-right.png) margin-left 5px .footer diff --git a/doc/themes/nekui/source/images/pager-left.png b/doc/themes/nekui/source/images/arrow-left.png similarity index 100% rename from doc/themes/nekui/source/images/pager-left.png rename to doc/themes/nekui/source/images/arrow-left.png diff --git a/doc/themes/nekui/source/images/pager-right.png b/doc/themes/nekui/source/images/arrow-right.png similarity index 100% rename from doc/themes/nekui/source/images/pager-right.png rename to doc/themes/nekui/source/images/arrow-right.png From f604d023382bfb70501f530cfc770eac1822a1dd Mon Sep 17 00:00:00 2001 From: LzxHahaha Date: Wed, 9 Aug 2017 14:58:17 +0800 Subject: [PATCH 06/87] bug fixed --- doc/themes/nekui/layout/page.ejs | 27 +++++++++++++-------------- doc/themes/nekui/source/css/page.styl | 11 ++++------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/doc/themes/nekui/layout/page.ejs b/doc/themes/nekui/layout/page.ejs index 5341eaad..12c9cb43 100644 --- a/doc/themes/nekui/layout/page.ejs +++ b/doc/themes/nekui/layout/page.ejs @@ -27,20 +27,19 @@ <%- page.content %> - <% if (site.pages.find({ type: page.type }).length > 1) { %> -
- <% site.pages.find({ type: page.type, order: page.order - 1 }).each(function (page) { %> - - <%- page.title %> - - <% }) %> - <% site.pages.find({ type: page.type, order: page.order + 1 }).each(function (page) { %> - - <%- page.title %> - - <% }) %> -
- <% } %> +
+ <% site.pages.find({ type: page.type, order: page.order - 1 }).each(function (page) { %> + + <%- page.title %> + + <% }) %> + + <% site.pages.find({ type: page.type, order: page.order + 1 }).each(function (page) { %> + + <%- page.title %> + + <% }) %> +
想让文档更完善？ diff --git a/doc/themes/nekui/source/css/page.styl b/doc/themes/nekui/source/css/page.styl index 8c7848e2..97b280bc 100644 --- a/doc/themes/nekui/source/css/page.styl +++ b/doc/themes/nekui/source/css/page.styl @@ -122,18 +122,15 @@ .guide-links margin-top 2em - padding 2em 0 border-top 1px solid #e5e5e5 display flex - flex-direction column - .pager-left - align-self flex-start - - .pager-right - align-self flex-end + .placeholder + flex: 1 .pager + margin 2em 0 + span display inline-block vertical-align middle From 03be64ec7c4fcebb204d4eb3d62199452fba04a2 Mon Sep 17 00:00:00 2001 From: LzxHahaha Date: Wed, 9 Aug 2017 17:03:05 +0800 Subject: [PATCH 07/87] change header border --- doc/themes/nekui/source/css/page.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/themes/nekui/source/css/page.styl b/doc/themes/nekui/source/css/page.styl index 97b280bc..ef6c45c7 100644 --- a/doc/themes/nekui/source/css/page.styl +++ b/doc/themes/nekui/source/css/page.styl @@ -3,7 +3,7 @@ @import "_sidebar" #header - box-shadow 0 0 1px rgba(0,0,0,.25) + border-bottom 1px $border-color solid transition background-color .3s ease-in-out .content From 36436b5205217dcf01249bbc290cf6221ac65027 Mon Sep 17 00:00:00 2001 From: LzxHahaha Date: Wed, 9 Aug 2017 17:09:26 +0800 Subject: [PATCH 08/87] update side bar --- doc/themes/nekui/layout/partials/sidebar.ejs | 56 ++++++++++++++-- doc/themes/nekui/source/css/_sidebar.styl | 70 ++++++++++++++++++-- 2 files changed, 113 insertions(+), 13 deletions(-) diff --git a/doc/themes/nekui/layout/partials/sidebar.ejs b/doc/themes/nekui/layout/partials/sidebar.ejs index 4181d6a6..1bc3bf97 100644 --- a/doc/themes/nekui/layout/partials/sidebar.ejs +++ b/doc/themes/nekui/layout/partials/sidebar.ejs @@ -5,14 +5,56 @@
diff --git a/doc/themes/nekui/source/css/_sidebar.styl b/doc/themes/nekui/source/css/_sidebar.styl index 3cdc1ccc..2a14ad0b 100644 --- a/doc/themes/nekui/source/css/_sidebar.styl +++ b/doc/themes/nekui/source/css/_sidebar.styl @@ -3,11 +3,10 @@ .sidebar position absolute z-index 10 - top $header-height + 3px + top $header-height + 4px left 0 bottom 0 - padding $content-padding-top + 10px 0 $content-padding-top 60px - width 180px + width 260px margin-right 20px overflow-x hidden overflow-y auto @@ -20,12 +19,31 @@ list-style-type none margin 0 line-height 1.8em - padding-left 1em + .menu-root + padding-left 0 + margin-left 0 + &>li + box-sizing border-box + border-bottom 1px $border-color solid + background-color white + &>li.current + background-color #F6F9FC + .submenu-title + font-weight 700 + padding 12px 0 11px 40px + font-size 14px + .u-icon + margin-left -14px + margin-right 8px + font-size 14px + .submenu + &>li + margin-bottom 15px + font-size 12px + .version-select vertical-align middle margin-left 5px - .menu-root - padding-left 0 .menu-sub font-size .85em .sidebar-link @@ -96,6 +114,24 @@ font-weight normal margin: 0 +@media screen and (min-width: 901px) + .sidebar + .menu-root + a:before + content: '' + display inline-block + width 2px + height 10px + background-color transparent + a:hover + color $theme + a:hover::before + background-color $theme + a.current + color $theme + a.current:before + background-color $theme + @media screen and (max-width: 900px) .sidebar position fixed @@ -118,3 +154,25 @@ &.open -webkit-transform translate(0, 0) transform translate(0, 0) + + .menu-root + li, li.current + background-color transparent + border-bottom 0 + margin-bottom 20px + .submenu-title + padding 0 + font-size 16px + .u-icon + display none + a + border-bottom 2px transparent solid + a:hover + color $theme + border-bottom-color $theme + + .submenu + margin-left -40px + &>li + margin-bottom: 0 + font-size 14px \ No newline at end of file From 34c17cf128e8a7e6979b1f9a51eb8db52e808485 Mon Sep 17 00:00:00 2001 From: summer Date: Wed, 9 Aug 2017 17:12:46 +0800 Subject: [PATCH 09/87] =?UTF-8?q?jira#KJDS-59474:=E3=80=90NEKUI=E3=80=91?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E8=A7=86=E8=A7=89=E9=87=8D=E6=9E=84=20form?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/package-lock.json | 435 +++++++++++++++++- doc/package.json | 5 +- doc/source/demo.wrap/index.js | 17 +- doc/source/doc.js | 10 +- doc/themes/nekui/source/css/_common.styl | 34 +- doc/themes/nekui/source/css/page.styl | 48 +- package.json | 2 +- src/js/components/form/KLButton/index.js | 4 +- src/js/components/form/KLButton/index.md | 10 +- src/js/components/form/KLCheck/index.js | 23 +- src/js/components/form/KLCheck/index.md | 15 +- src/js/components/form/KLCheckGroup/index.js | 5 +- src/js/components/form/KLCheckGroup/index.md | 20 +- src/js/components/form/KLDatePicker/index.js | 2 +- src/js/components/form/KLDatePicker/index.md | 20 +- src/js/components/form/KLForm/index.md | 18 +- src/js/components/form/KLInput/index.js | 2 +- src/js/components/form/KLInput/index.md | 26 +- src/js/components/form/KLMultiSelect/index.md | 15 +- src/js/components/form/KLRadioGroup/index.js | 2 +- src/js/components/form/KLRadioGroup/index.md | 20 +- src/js/components/form/KLSelect/index.md | 42 +- src/js/components/form/KLText/index.md | 39 +- src/js/components/form/KLTextArea/index.md | 17 +- src/js/components/form/KLUpload/index.md | 27 +- src/js/components/layout/KLTable/index.js | 2 +- src/js/components/layout/KLTable/index.md | 36 +- 27 files changed, 687 insertions(+), 209 deletions(-) diff --git a/doc/package-lock.json b/doc/package-lock.json index 6b9c9d91..98d774b5 100644 --- a/doc/package-lock.json +++ b/doc/package-lock.json @@ -29,6 +29,18 @@ "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=", "optional": true }, + "acorn-jsx": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", + "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", + "dependencies": { + "acorn": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=" + } + } + }, "ajv": { "version": "4.11.8", "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", @@ -40,6 +52,11 @@ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, + "ansi-escape-sequences": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-3.0.0.tgz", + "integrity": "sha1-HBg5S2r5t2/5pjUJ+kl2af0s5T4=" + }, "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", @@ -55,6 +72,11 @@ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz", "integrity": "sha1-o+Uvo5FoyCX/V7AkgSbOWo/5VQc=" }, + "app-usage-stats": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/app-usage-stats/-/app-usage-stats-0.5.1.tgz", + "integrity": "sha1-ZUfF25urCqX1ssVg6syK8g0KsTs=" + }, "archy": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", @@ -75,6 +97,11 @@ "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz", "integrity": "sha1-onTthawIhJtr14R8RYB0XcUa37E=" }, + "array-back": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz", + "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=" + }, "array-unique": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", @@ -191,6 +218,18 @@ "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.3.0.tgz", "integrity": "sha1-1baAoWW2IBc5rLYRVCqrwtjOsHA=" }, + "cache-point": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/cache-point/-/cache-point-0.4.1.tgz", + "integrity": "sha512-4TgWfe9SF+bUy5cCql8gWHqKNrviufNwSYxLjf2utB0pY4+bdcuFwMmY1hDB+67Gz/L1vmhFNhePAjJTFBtV+Q==", + "dependencies": { + "array-back": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz", + "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==" + } + } + }, "camel-case": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", @@ -207,6 +246,11 @@ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", "optional": true }, + "catharsis": { + "version": "0.8.9", + "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz", + "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=" + }, "chalk": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", @@ -238,6 +282,11 @@ "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, + "collect-all": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/collect-all/-/collect-all-1.0.3.tgz", + "integrity": "sha512-0y0rBgoX8IzIjBAUnO73SEtSb4Mhk3IoceWJq5zZSxb9mWORhWH8xLYo4EDSOE1jRBk1LhmfjqWFFt10h/+MEA==" + }, "combined-stream": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", @@ -248,6 +297,38 @@ "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.2.tgz", "integrity": "sha1-EoGcZPr5VEbsCuB/5sr7brNwiyI=" }, + "command-line-args": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-4.0.6.tgz", + "integrity": "sha1-D/h6HdFZiQ3K6yoAWr2uceVQWfw=" + }, + "command-line-tool": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/command-line-tool/-/command-line-tool-0.7.0.tgz", + "integrity": "sha1-yoB5KuIGnPfKpWLAy8LNEYERIqA=" + }, + "command-line-usage": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-4.0.1.tgz", + "integrity": "sha512-IqYzZuXizukrdhnbdUj2hh4iceycow+Jn10mER4lwU4IapYvl5ZzoRPsj5Yraew5oRk4yfFKMuULGvAfb5o29w==", + "dependencies": { + "ansi-escape-sequences": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-4.0.0.tgz", + "integrity": "sha512-v+0wW9Wezwsyb0uF4aBVCjmSqit3Ru7PZFziGF0o2KwTvN2zWfTi3BRLq9EkJFdg3eBbyERXGTntVpBxH1J68Q==" + }, + "array-back": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz", + "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==" + } + } + }, + "common-sequence": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/common-sequence/-/common-sequence-1.0.2.tgz", + "integrity": "sha1-MOB/P49vf5s97oVPILLTnu4Ibeg=" + }, "compressible": { "version": "2.0.10", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz", @@ -302,6 +383,11 @@ } } }, + "config-master": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/config-master/-/config-master-3.1.0.tgz", + "integrity": "sha1-ZnZjWQUFooO/JqSE1oSJ10xUhdo=" + }, "connect": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz", @@ -400,12 +486,22 @@ "resolved": "https://registry.npmjs.org/deep-assign/-/deep-assign-2.0.0.tgz", "integrity": "sha1-6+BrHwfwja5ZdiDj3RYi83GhxXI=" }, + "deep-extend": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.0.tgz", + "integrity": "sha1-bvSgmwX5iw41jW2T1Mo8rsZnKAM=" + }, "deep-is": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", "optional": true }, + "defer-promise": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/defer-promise/-/defer-promise-1.0.1.tgz", + "integrity": "sha1-HKb/7dvO8XFd16riXHYW+a4iky8=" + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -421,6 +517,18 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, + "dmd": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/dmd/-/dmd-3.0.6.tgz", + "integrity": "sha1-lMDg+4jRy2uCg3WVBT3nkZx1PCU=", + "dependencies": { + "walk-back": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/walk-back/-/walk-back-3.0.0.tgz", + "integrity": "sha1-I1h4ejXakQMtrV6S+AsSNw2HlcU=" + } + } + }, "dom-serializer": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", @@ -496,6 +604,18 @@ "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", "optional": true }, + "espree": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.1.7.tgz", + "integrity": "sha1-/V3ux2qXpRIKnNOnyxF3oJI7EdI=", + "dependencies": { + "acorn": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=" + } + } + }, "esprima": { "version": "2.7.3", "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", @@ -551,6 +671,23 @@ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "optional": true }, + "feature-detect-es6": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/feature-detect-es6/-/feature-detect-es6-1.3.1.tgz", + "integrity": "sha1-+IhzavnLDJH1VmO/pHYuuW7nBH8=" + }, + "file-set": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/file-set/-/file-set-1.1.1.tgz", + "integrity": "sha1-0+xwwIDsjxjyBLod4QZ4DJBWkms=", + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==" + } + } + }, "filename-regex": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", @@ -573,6 +710,11 @@ } } }, + "find-replace": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-1.0.3.tgz", + "integrity": "sha1-uI5zZNLZyVlVnziMZmcNYTBEH6A=" + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -600,6 +742,16 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz", "integrity": "sha1-9HTKXmqSRtb9jglTz6m5yAWvp44=" }, + "fs-extra": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.1.tgz", + "integrity": "sha1-f8DGyJV/mD9X8waiTlud3Y0N2IA=" + }, + "fs-then-native": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fs-then-native/-/fs-then-native-2.0.0.tgz", + "integrity": "sha1-GaEk2U2QwiyOBF8ujdbr6jbUjGc=" + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -1200,10 +1352,9 @@ } }, "glob": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", - "optional": true + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==" }, "glob-base": { "version": "0.3.0", @@ -1220,6 +1371,38 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" }, + "handlebars": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-3.0.3.tgz", + "integrity": "sha1-DgllGi8Ps8lJFgWDcQ1VH5Lm0q0=", + "dependencies": { + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=" + }, + "uglify-js": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz", + "integrity": "sha1-+gmEdwtCi3qbKoBY9GNV0U/vIRo=", + "optional": true, + "dependencies": { + "optimist": { + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", + "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=", + "optional": true + } + } + }, + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "optional": true + } + } + }, "har-schema": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", @@ -1349,6 +1532,11 @@ "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" }, + "home-path": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.5.tgz", + "integrity": "sha1-eIspgVsS1Tus9XVkhHbm+QQdEz8=" + }, "html-entities": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", @@ -1510,12 +1698,49 @@ } } }, + "js2xmlparser": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-1.0.0.tgz", + "integrity": "sha1-WhcPLo1kds5FQF4EgjJCUTeC/jA=" + }, "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", "optional": true }, + "jsdoc-75lb": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jsdoc-75lb/-/jsdoc-75lb-3.6.0.tgz", + "integrity": "sha1-qAcRlSi0AJzLyrSbdSL2P+xs0L0=", + "dependencies": { + "bluebird": { + "version": "3.4.7", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz", + "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=" + } + } + }, + "jsdoc-api": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/jsdoc-api/-/jsdoc-api-3.0.0.tgz", + "integrity": "sha1-DVJwAjX4Zb1Ki61evB77Vi/IrSo=" + }, + "jsdoc-parse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/jsdoc-parse/-/jsdoc-parse-3.0.0.tgz", + "integrity": "sha1-JxUx2I8Z3yUgsWMqf2yYlEGof94=" + }, + "jsdoc-to-markdown": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/jsdoc-to-markdown/-/jsdoc-to-markdown-3.0.0.tgz", + "integrity": "sha1-zIqU8fQSrB2kusFldHWwl17oFho=" + }, + "jsdoc2md-stats": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/jsdoc2md-stats/-/jsdoc2md-stats-2.0.1.tgz", + "integrity": "sha1-vYNDc0z+aeqAUKF5MSUSk/DZBHs=" + }, "jsdom": { "version": "7.2.2", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz", @@ -1540,6 +1765,11 @@ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "optional": true }, + "jsonfile": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", + "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=" + }, "jsonify": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", @@ -1575,6 +1805,11 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=" }, + "klaw": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", + "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=" + }, "lcid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", @@ -1591,6 +1826,21 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" }, + "lodash.omit": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz", + "integrity": "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=" + }, + "lodash.padend": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz", + "integrity": "sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4=" + }, + "lodash.pick": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", + "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=" + }, "lower-case": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", @@ -1653,6 +1903,11 @@ } } }, + "mkdirp2": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/mkdirp2/-/mkdirp2-1.0.3.tgz", + "integrity": "sha1-zI3YJl8fBuLY9bELblL04FC+0hs=" + }, "moment": { "version": "2.13.0", "resolved": "https://registry.npmjs.org/moment/-/moment-2.13.0.tgz", @@ -1753,6 +2008,16 @@ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, + "object-get": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/object-get/-/object-get-2.1.0.tgz", + "integrity": "sha1-ciu9tgA576R8rTxtws5RqFwCxa4=" + }, + "object-to-spawn-args": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-to-spawn-args/-/object-to-spawn-args-1.1.1.tgz", + "integrity": "sha1-d9qIJ/Bz0BHJ4bFz+JV4FHAkZ4U=" + }, "object.omit": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", @@ -1931,6 +2196,33 @@ } } }, + "reduce-extract": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/reduce-extract/-/reduce-extract-1.0.0.tgz", + "integrity": "sha1-Z/I4W+2mUGG19fQxJmLosIDKFSU=", + "dependencies": { + "test-value": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/test-value/-/test-value-1.1.0.tgz", + "integrity": "sha1-oJE29y7AQ9J8iTcHwrFZv6196T8=" + } + } + }, + "reduce-flatten": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz", + "integrity": "sha1-JYx479FT3fk8tWEjf2EYTzaW4yc=" + }, + "reduce-unique": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/reduce-unique/-/reduce-unique-1.0.0.tgz", + "integrity": "sha1-flhrz4ek4ytter2Cd/rWzeyfSAM=" + }, + "reduce-without": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/reduce-without/-/reduce-without-1.0.1.tgz", + "integrity": "sha1-aK0OrRGFXJo31OglbBW7+Hly/Iw=" + }, "regex-cache": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", @@ -1951,12 +2243,36 @@ "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" }, + "req-then": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/req-then/-/req-then-0.6.4.tgz", + "integrity": "sha512-Uf7xsK1qPqPUetESHemNQ7nGtgOxngSFtlcAOOkx0lDAo+XRZpEA9QDrGBdyOfGq4b+a0z/D5gR2VJ+pp/dzBA==", + "dependencies": { + "array-back": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz", + "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==" + } + } + }, "request": { "version": "2.81.0", "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", "optional": true }, + "requizzle": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz", + "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=", + "dependencies": { + "underscore": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", + "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=" + } + } + }, "rimraf": { "version": "2.4.5", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", @@ -2023,6 +2339,11 @@ "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", "optional": true }, + "sort-array": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sort-array/-/sort-array-1.1.2.tgz", + "integrity": "sha1-uImGBTwBcKf53mPxiknsecJMPmQ=" + }, "source-map": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", @@ -2058,6 +2379,21 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=" }, + "stream-connect": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/stream-connect/-/stream-connect-1.0.2.tgz", + "integrity": "sha1-GLyB8u2zW4tdmoAJIAqYUxRCipc=" + }, + "stream-read-all": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/stream-read-all/-/stream-read-all-0.1.1.tgz", + "integrity": "sha512-1bjIXLwe3idAFSWfIyGbChKt0G/pCJDsbKVMeuRseU/anV9VdF2Aq47LpKUzrWV5+60PJJ1Xljo8ea/9X7NFtw==" + }, + "stream-via": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/stream-via/-/stream-via-1.0.4.tgz", + "integrity": "sha512-DBp0lSvX5G9KGRDTkR/R+a29H+Wk2xItOF+MpZLLNDWbEV9tGPnqLPxHEYjmiz8xGtJHRIqmI+hCjmNzqoA4nQ==" + }, "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", @@ -2084,6 +2420,11 @@ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=" }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + }, "striptags": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/striptags/-/striptags-2.2.1.tgz", @@ -2132,6 +2473,38 @@ "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=", "optional": true }, + "table-layout": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-0.4.1.tgz", + "integrity": "sha512-OZALgNy+ra8FSBfmGIcHvJhfC5kLIz6PI08+7FTW+RmB8OlOKlz1q0WM9nToIVzGi1jpQ87DoF8tZkEmuFSgNA==", + "dependencies": { + "array-back": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz", + "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==" + } + } + }, + "taffydb": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz", + "integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg=" + }, + "temp-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/temp-path/-/temp-path-1.0.0.tgz", + "integrity": "sha1-JLFUOXOrRCiW2a02fdnL2/r+kYs=" + }, + "test-runner": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/test-runner/-/test-runner-0.4.0.tgz", + "integrity": "sha512-9mYw9ccaZs6X+31KarOdblFsqclqQjHJnltE0IfuwLqtPg9Fx4kSQkpFCyiOf3+xpSocDfpRmO6fPvai0/HLRQ==" + }, + "test-value": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz", + "integrity": "sha1-Edpv9nDzRxpztiXKTz/c97t0gpE=" + }, "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -2185,6 +2558,11 @@ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, + "typical": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz", + "integrity": "sha1-XAgOXWYcu+OCWdLnCjxyU+hziB0=" + }, "uglify-js": { "version": "2.4.24", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz", @@ -2222,6 +2600,28 @@ "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=" }, + "underscore": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", + "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=" + }, + "underscore-contrib": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz", + "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=", + "dependencies": { + "underscore": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", + "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=" + } + } + }, + "universalify": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz", + "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=" + }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -2232,6 +2632,23 @@ "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=" }, + "usage-stats": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/usage-stats/-/usage-stats-0.9.4.tgz", + "integrity": "sha512-u94pT+UDv+ZcjA5PT4KuMR67JL6VqeaQU6RN83Gf7yTqGrD/WqgCwhaj1DAKETR/KrteWXL0XZwlkDJuLJdtkg==", + "dependencies": { + "array-back": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz", + "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==" + }, + "uuid": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", + "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==" + } + } + }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -2259,6 +2676,11 @@ "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=", "optional": true }, + "walk-back": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/walk-back/-/walk-back-2.0.1.tgz", + "integrity": "sha1-VU4qnYdPrEeoywBr9EwvDEmYoKQ=" + }, "warehouse": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/warehouse/-/warehouse-2.2.0.tgz", @@ -2292,6 +2714,11 @@ "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", "optional": true }, + "wordwrapjs": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-2.0.0.tgz", + "integrity": "sha1-q1X2leYRjak4WP3XDAU9HF4BrCA=" + }, "wrap-ansi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", diff --git a/doc/package.json b/doc/package.json index 51889102..33c51e0f 100644 --- a/doc/package.json +++ b/doc/package.json @@ -4,12 +4,15 @@ "version": "3.3.7" }, "dependencies": { + "fs-extra": "^4.0.1", + "glob": "^7.1.2", "hexo": "3.3.7", "hexo-deployer-git": "0.1.0", "hexo-generator-index": "^0.2.0", "hexo-renderer-ejs": "^0.2.0", "hexo-renderer-marked": "^0.2.10", "hexo-renderer-stylus": "^0.3.1", - "hexo-server": "^0.2.0" + "hexo-server": "^0.2.0", + "jsdoc-to-markdown": "^3.0.0" } } diff --git a/doc/source/demo.wrap/index.js b/doc/source/demo.wrap/index.js index c4f7440b..adbb4e07 100644 --- a/doc/source/demo.wrap/index.js +++ b/doc/source/demo.wrap/index.js @@ -8,14 +8,29 @@ const DemoWrap = Regular.extend({ template: `
-
+
+ +
+
`, name: 'demo-wrap', data: { htmlTpl: '', showScript: false, + htmlcode: '', + jsCode: '', }, toggle() { this.data.showScript = !this.data.showScript; }, + copy($event) { + const copyForm = document.createElement('textarea'); + copyForm.textContent = this.data.htmlCode + this.data.jsCode; + body = document.getElementsByTagName('body')[0]; + body.appendChild(copyForm); + copyForm.select(); + document.execCommand('copy'); + body.removeChild(copyForm); + NEKUI.KLNotify.success('复制成功'); + }, }); diff --git a/doc/source/doc.js b/doc/source/doc.js index cdb675aa..8f5e0e9d 100644 --- a/doc/source/doc.js +++ b/doc/source/doc.js @@ -6,7 +6,7 @@ * * author: Cody Chan 2017-02-08 */ - +/* eslint no-param-reassign: 0 */ const fs = require('fs-extra'); const path = require('path'); const glob = require('glob'); @@ -69,7 +69,9 @@ const injectComponents = (md) => { gridItem.appendChild(codeDemo); var codeComponent = new DemoWrap({ data: { - htmlTpl: codeDemo.innerHTML, + htmlTpl: codeDemo.innerHTML, + htmlCode: \`${demo.rgl}\`, + jsCode: \`${demo.js}\` } }); codeDemo.innerHTML = ''; @@ -77,7 +79,7 @@ const injectComponents = (md) => { })(index++); `; }); - md = md.replace(//gim, '
'); + md = md.replace(//gim, '
'); md = md.replace(//gim, '
'); demosScript += '\n\n{% endraw %}'; return md + demosScript; @@ -89,7 +91,7 @@ const injectAPI = (md, source) => { 'no-cache': true, configure: path.join(__dirname, 'jsdoc.json'), }); - return `${md}\n## API\n${docs}`; + return `${md}\n# API\n${docs}`; }; const doc = (isDev, callback) => { diff --git a/doc/themes/nekui/source/css/_common.styl b/doc/themes/nekui/source/css/_common.styl index 96ac4b63..a8bd5e82 100644 --- a/doc/themes/nekui/source/css/_common.styl +++ b/doc/themes/nekui/source/css/_common.styl @@ -39,7 +39,7 @@ h1, h2, h3, h4, strong code, pre font-family $code-font font-size $code-font-size - background-color $codebg + background-color #fff -webkit-font-smoothing initial -moz-osx-font-smoothing initial @@ -49,6 +49,7 @@ code margin 0 2px border-radius 2px white-space nowrap + background-color rgba(255,255,255,0) em color $light @@ -71,7 +72,7 @@ a.button overflow-x auto position relative padding 0 - background-color $codebg + background-color #fff padding .8em .8em .4em line-height 1.1em border-radius $radius @@ -182,14 +183,29 @@ a.button border-top 5px solid #ccc .grid-item width: auto; - border: 1px solid #E1E6EC; - margin: 20px 10px; + border: 1px solid #e1e6ec; + margin: 0px 0px 20px 22px; border-radius: 4px; + padding: 16px 24px; + font-family: PingFangTC-Regular; + font-size: 12px; + color: #999999; + em + padding-bottom: 8px; + color: #333; + display: block; + font-family: PingFangTC-Medium; + font-size: 12px; + line-height: 17px; .m-example - padding: 10px 10px 30px 10px; + padding: 8px 0px 20px; .m-code + margin: 0px -24px; .highlight background-color: #fff; + figure + margin: 0px; + padding: 0em 0.8em; .m-demowrap border-top: 1px solid #e1e6ec; .m-iconLine @@ -205,6 +221,11 @@ a.button -moz-transform: rotate(180deg); color: #E31436; border: 1px solid #E31436; + .m-copyCode + position:absolute; + top: 0px; + right: 20px; + z-index: 1; .m-iconOuter display: inline-block; width: 17px; @@ -223,6 +244,7 @@ a.button border: 1px solid #E31436; .m-codeBlock overflow: hidden; + position: relative; .wrap - height: 10px; + height: 0px; \ No newline at end of file diff --git a/doc/themes/nekui/source/css/page.styl b/doc/themes/nekui/source/css/page.styl index 6480bcfb..73312517 100644 --- a/doc/themes/nekui/source/css/page.styl +++ b/doc/themes/nekui/source/css/page.styl @@ -11,6 +11,7 @@ padding 2.2em 0 max-width 1000px margin 0 auto + font-size 12px &.api > a:first-of-type > h2 margin-top 0 @@ -36,6 +37,12 @@ margin-left 20px h1 margin 0 0 1em + > h1 + font-family: PingFangTC-Medium; + font-size: 20px; + color: #333; + border-bottom: 1px solid #E1E6EC; + margin: 40px 0px; h2, h3 &:before content '' @@ -43,6 +50,20 @@ margin-top -1 * $heading-link-padding-top height $heading-link-padding-top visibility hidden + a>h2 + &:before + margin-top: 0px; + height: 0px; + z-index: -1; + font-family: PingFangTC-Medium; + font-size: 16px; + color: #333333; + line-height: 22px; + height: 22px; + border-left: 3px solid #333; + border-bottom: none; + padding: 0px 8px; + margin: 23px 0px; h2 margin $h2-margin-top 0 .8em padding-bottom .7em @@ -52,9 +73,11 @@ margin $h3-margin-top 0 1.2em position relative z-index: -1 + font-size: 12px; + margin: 0px 22px; &:after content "#" - color $green + color #0398FF position absolute left -0.7em bottom -2px @@ -63,7 +86,7 @@ figure margin 1.2em 0 a - color $green + color #0398FF font-weight 400 blockquote margin 2em 0 @@ -75,20 +98,28 @@ iframe margin 1em 0 > table + margin: 0px 22px; border 2px solid $white td, th line-height 1.6em padding .5em 1.4em border none + tr + &:nth-child(2n-1) + background: #fff; + &:nth-child(2n) + background: #f6f9fc; td - background-color: lighten($codebg, 60%) + border-bottom: 1px solid #ecf2f9; th - background-color: $green - color: #fff + background-color: #eef1f4 + border-bottom: 1px solid #ecf2f9; + color: #666666 text-align left - tbody - code - background-color #efefef + > p + margin: 0px 22px; + > dl + margin: 0px 22px; p.tip padding 12px 24px 12px 30px margin 2em 0 @@ -119,7 +150,6 @@ em color $medium - .guide-links margin-top 2em height 1em diff --git a/package.json b/package.json index dc367903..6a5bd41f 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "eslint": "^3.19.0", "eslint-config-airbnb-base": "^11.2.0", "eslint-plugin-import": "^2.6.1", - "fs-extra": "^2.0.0", + "fs-extra": "^2.1.2", "glob": "^7.1.1", "gulp": "^3.9.1", "gulp-all": "^1.1.0", diff --git a/src/js/components/form/KLButton/index.js b/src/js/components/form/KLButton/index.js index f172436f..e32b0854 100644 --- a/src/js/components/form/KLButton/index.js +++ b/src/js/components/form/KLButton/index.js @@ -1,7 +1,7 @@ /** * ------------------------------------------------------------ - * KLButton 按钮 - * @author Cody Chan + * KLButton 按钮 + * @author Cody Chan * ------------------------------------------------------------ */ diff --git a/src/js/components/form/KLButton/index.md b/src/js/components/form/KLButton/index.md index eefdb96b..2a0bbffe 100644 --- a/src/js/components/form/KLButton/index.md +++ b/src/js/components/form/KLButton/index.md @@ -9,7 +9,7 @@ masonry: true -### 基本形式 +*基本形式*
@@ -43,7 +43,7 @@ var component = new NEKUI.Component({ -### 常用的button类型 +*常用的button类型*
@@ -79,7 +79,7 @@ var component = new NEKUI.Component({ -### 圆角的图标按钮 +*圆角的图标按钮*
@@ -97,7 +97,7 @@ var component = new NEKUI.Component({ -### 图标按钮 +*图标按钮*
@@ -115,7 +115,7 @@ var component = new NEKUI.Component({ -### 加载中的按钮 +*加载中的按钮*
diff --git a/src/js/components/form/KLCheck/index.js b/src/js/components/form/KLCheck/index.js index 21162d56..af02e095 100644 --- a/src/js/components/form/KLCheck/index.js +++ b/src/js/components/form/KLCheck/index.js @@ -1,7 +1,7 @@ /** * ------------------------------------------------------------ - * KLCheck 多选按钮 - * @author sensen(rainforest92@126.com) + * KLCheck 多选按钮 + * @author sensen * ------------------------------------------------------------ */ @@ -24,9 +24,6 @@ const _ = require('../../../ui-base/_'); const KLCheck = Component.extend({ name: 'kl-check', template, - /** - * @protected - */ config() { _.extend(this.data, { name: '', @@ -39,10 +36,10 @@ const KLCheck = Component.extend({ if (oldValue === undefined) return; /** - * @event change 选中状态改变时触发 - * @property {object} sender 事件发送对象 - * @property {object} date 改变后的选中状态 - */ + * @event change 选中状态改变时触发 + * @property {object} sender 事件发送对象 + * @property {object} date 改变后的选中状态 + */ this.$emit('change', { sender: this, checked: newValue, @@ -63,10 +60,10 @@ const KLCheck = Component.extend({ this.data.checked = checked; /** - * @event check 改变选中状态时触发 - * @property {object} sender 事件发送对象 - * @property {boolean} checked 选中状态 - */ + * @event check 改变选中状态时触发 + * @property {object} sender 事件发送对象 + * @property {boolean} checked 选中状态 + */ this.$emit('check', { sender: this, checked, diff --git a/src/js/components/form/KLCheck/index.md b/src/js/components/form/KLCheck/index.md index d7aa6824..ed918828 100644 --- a/src/js/components/form/KLCheck/index.md +++ b/src/js/components/form/KLCheck/index.md @@ -1,12 +1,14 @@ --- title: 复选框 +masonry: true --- ## 代码演示 -### 基本形式 +
+*基本形式*
```xml @@ -14,11 +16,8 @@ title: 复选框 ``` -### 表单项 - -在表单中使用 - +*在表单中使用*
```xml @@ -31,9 +30,8 @@ title: 复选框 ``` -### 半选状态 - +*半选状态*
```xml @@ -50,9 +48,8 @@ var component = new NEKUI.Component({ ``` -### 禁用组件 - +*禁用组件*
```xml diff --git a/src/js/components/form/KLCheckGroup/index.js b/src/js/components/form/KLCheckGroup/index.js index 3aff4ce7..b7e8335d 100644 --- a/src/js/components/form/KLCheckGroup/index.js +++ b/src/js/components/form/KLCheckGroup/index.js @@ -1,7 +1,7 @@ /** * ------------------------------------------------------------ * KLCheckGroup 输入扩展 - * @author sensen(rainforest92@126.com) + * @author sensen * ------------------------------------------------------------ */ @@ -34,9 +34,6 @@ const validationMixin = require('../../../util/validationMixin'); const KLCheckGroup = SourceComponent.extend({ name: 'kl-check-group', template, - /** - * @protected - */ config() { this.defaults({ // @inherited source: [], diff --git a/src/js/components/form/KLCheckGroup/index.md b/src/js/components/form/KLCheckGroup/index.md index 26db9af9..384cdb10 100644 --- a/src/js/components/form/KLCheckGroup/index.md +++ b/src/js/components/form/KLCheckGroup/index.md @@ -1,12 +1,14 @@ --- title: 复选组 +masonry: true --- ## 代码演示 -### 基本形式 +
+*基本形式*
```xml @@ -30,11 +32,11 @@ var component = new NEKUI.Component({ ``` -### 表单项 + +*表单项* 在表单中使用 -
```xml @@ -62,9 +64,8 @@ var component = new NEKUI.Component({ ``` -### 禁用组件 - +*禁用组件*
```xml @@ -88,9 +89,8 @@ var component = new NEKUI.Component({ ``` -### 多行 - +*多行*
```xml @@ -114,9 +114,8 @@ var component = new NEKUI.Component({ ``` -### 远程数据 - +*远程数据*
```xml @@ -141,9 +140,8 @@ var component = new NEKUI.Component({ ``` -### 全选 - +*全选*
```xml diff --git a/src/js/components/form/KLDatePicker/index.js b/src/js/components/form/KLDatePicker/index.js index 8733c8b4..f071d9e7 100644 --- a/src/js/components/form/KLDatePicker/index.js +++ b/src/js/components/form/KLDatePicker/index.js @@ -1,7 +1,7 @@ /** * ------------------------------------------------------------ * KLDatePicker 日期选择 - * @author sensen(rainforest92@126.com) + * @author sensen * ------------------------------------------------------------ */ diff --git a/src/js/components/form/KLDatePicker/index.md b/src/js/components/form/KLDatePicker/index.md index d2a6735a..c616e613 100644 --- a/src/js/components/form/KLDatePicker/index.md +++ b/src/js/components/form/KLDatePicker/index.md @@ -1,12 +1,14 @@ --- title: 日期选择 +masonry: true --- ## 代码演示 -### 基本形式 +
+*基本形式*
```xml @@ -21,9 +23,8 @@ title: 日期选择 ``` -### 日期时间选择 - +*日期时间选择*
```xml @@ -50,9 +51,8 @@ var component = new NEKUI.Component({ ``` -### 禁用组件 - +*禁用组件*
```xml @@ -60,9 +60,8 @@ var component = new NEKUI.Component({ ``` -### 日期范围 - +*日期范围*
```xml @@ -83,9 +82,8 @@ var component = new NEKUI.Component({ ``` -### 数据绑定 - +*数据绑定*
```xml @@ -97,11 +95,11 @@ var component = new NEKUI.Component({ ``` -### 事件 + +*事件* 请打开浏览器的控制台查看结果。 -
```xml diff --git a/src/js/components/form/KLForm/index.md b/src/js/components/form/KLForm/index.md index 4294617b..944144d2 100644 --- a/src/js/components/form/KLForm/index.md +++ b/src/js/components/form/KLForm/index.md @@ -1,13 +1,15 @@ --- title: 表单 +masonry: true --- ## 代码演示 -### 基本形式 -required写在kl-form-item上和写在表单元素上验证效果是一样的, 但是如果label要显示红色星号,kl-form-item上必须要有required属性 +
+*基本形式* +required写在kl-form-item上和写在表单元素上验证效果是一样的, 但是如果label要显示红色星号,kl-form-item上必须要有required属性
```xml @@ -33,11 +35,8 @@ var component = new NEKUI.Component({ ``` -## 代码演示 - -### inline排列 - +*inline排列*
```xml @@ -59,9 +58,8 @@ var component = new NEKUI.Component({ ``` -### 获取select数据接口 - +*获取select数据接口*
```xml @@ -87,9 +85,9 @@ var component = new NEKUI.Component({ ``` -### 验证示例 - +*验证示例* + 如果不想使用Form标签
diff --git a/src/js/components/form/KLInput/index.js b/src/js/components/form/KLInput/index.js index 8b545021..cdc37f74 100644 --- a/src/js/components/form/KLInput/index.js +++ b/src/js/components/form/KLInput/index.js @@ -1,7 +1,7 @@ /** * ------------------------------------------------------------ * KLInput 输入扩展 - * @author sensen(rainforest92@126.com) + * @author sensen * ------------------------------------------------------------ */ diff --git a/src/js/components/form/KLInput/index.md b/src/js/components/form/KLInput/index.md index 5f56ab99..48ba1c75 100644 --- a/src/js/components/form/KLInput/index.md +++ b/src/js/components/form/KLInput/index.md @@ -1,14 +1,17 @@ --- title: 输入框 +masonry: true --- ## 代码演示 -### 基本形式 +
+ + +*基本形式* 大部分属性的用法与``一致。 -
```xml @@ -16,11 +19,11 @@ title: 输入框 ``` -### 表单项 + +*表单项* 在表单中使用 -
```xml @@ -35,9 +38,9 @@ title: 输入框 ``` -### 单位 - +*单位* +
```xml @@ -45,9 +48,8 @@ title: 输入框 ``` -### 搜索(打开console,查看输出) - +*搜索(打开console,查看输出)*
```xml @@ -64,9 +66,9 @@ var component = new NEKUI.Component({ ``` -### type=int/float, 固定输入小数位 - +*type=int/float, 固定输入小数位* +
```xml @@ -83,9 +85,9 @@ var component = new NEKUI.Component({ ``` -### 验证 - +*验证* +
```xml diff --git a/src/js/components/form/KLMultiSelect/index.md b/src/js/components/form/KLMultiSelect/index.md index 8481f1cc..3449272f 100644 --- a/src/js/components/form/KLMultiSelect/index.md +++ b/src/js/components/form/KLMultiSelect/index.md @@ -1,12 +1,14 @@ --- title: 多级选择 +masonry: true --- ## 代码演示 -### 基本形式 +
+*基本形式*
```xml @@ -50,10 +52,11 @@ var component = new NEKUI.Component({ ``` -### 允许勾选非末级（仅支持单选场景） -#### 选择非末级时点击文本，如果只是想展开下一级请点击右侧箭头 - +*允许勾选非末级（仅支持单选场景）* + +选择非末级时点击文本，如果只是想展开下一级请点击右侧箭头 +
```xml @@ -98,10 +101,8 @@ var component = new NEKUI.Component({ ``` - -### 多选 - +*多选*
```xml diff --git a/src/js/components/form/KLRadioGroup/index.js b/src/js/components/form/KLRadioGroup/index.js index 8d6faf22..c8ef877f 100644 --- a/src/js/components/form/KLRadioGroup/index.js +++ b/src/js/components/form/KLRadioGroup/index.js @@ -1,7 +1,7 @@ /** * ------------------------------------------------------------ * KLRadioGroup 输入扩展 - * @author sensen(rainforest92@126.com) + * @author sensen * ------------------------------------------------------------ */ diff --git a/src/js/components/form/KLRadioGroup/index.md b/src/js/components/form/KLRadioGroup/index.md index 3743928f..9cf2f36c 100644 --- a/src/js/components/form/KLRadioGroup/index.md +++ b/src/js/components/form/KLRadioGroup/index.md @@ -1,12 +1,14 @@ --- title: 单选组 +masonry: true --- ## 代码演示 -### 基本形式 +
+*基本形式*
```xml @@ -30,9 +32,8 @@ var component = new NEKUI.Component({ ``` -### 数据绑定 - +*数据绑定*
```xml @@ -55,11 +56,11 @@ var component = new NEKUI.Component({ ``` -### 表单项 + +*表单项* 在表单中使用 -
```xml @@ -87,9 +88,8 @@ var component = new NEKUI.Component({ ``` -### 禁用组件 - +*禁用组件*
```xml @@ -113,9 +113,8 @@ var component = new NEKUI.Component({ ``` -### 远程数据 - +*远程数据*
```xml @@ -140,9 +139,8 @@ var component = new NEKUI.Component({ ``` -### 多行 - +*多行*
```xml diff --git a/src/js/components/form/KLSelect/index.md b/src/js/components/form/KLSelect/index.md index 17e83503..235ddee3 100644 --- a/src/js/components/form/KLSelect/index.md +++ b/src/js/components/form/KLSelect/index.md @@ -1,12 +1,14 @@ --- title: 下拉选择 +masonry: true --- ## 代码演示 -### 基本形式 +
+*基本形式*
```xml @@ -27,11 +29,11 @@ var component = new NEKUI.Component({ ``` -### 表单项 + -在表单中使用 +*表单项* - +在表单中使用
```xml @@ -43,13 +45,13 @@ var component = new NEKUI.Component({ ``` -### selected, value和key + +*selected, value和key* `selected`表示当前选择项，`value`表示当前选择值。`key`表示数据项的键，默认为`'id'`。 它们三者的关系如下：`selected[key] == value`。其中`selected`和`value`是联动的，当一项变化时会同时改变另一项。 -
```xml @@ -83,10 +85,11 @@ var component = new NEKUI.Component({ ``` -### 禁用某一项，禁用组件 + +*禁用某一项，禁用组件* + `tip`表示禁用某一项时给出的提示，不给则无提示，`placement`表示给出提示的方向，具体参考文字提示组件Tooltip -
```xml @@ -116,9 +119,9 @@ var component = new NEKUI.Component({ ``` -### 分隔线 - +*分隔线* +
```xml @@ -144,11 +147,11 @@ var component = new NEKUI.Component({ ``` -### 设置或取消默认项 + +*设置或取消默认项* 如果`placeholder`为空，刚开始将会自动选中第一项。 -
```xml @@ -176,9 +179,8 @@ var component = new NEKUI.Component({ ``` -### 远程数据 - +*远程数据*
```xml @@ -205,9 +207,9 @@ var component = new NEKUI.Component({ ``` -### 数据绑定 - +*数据绑定* +
```xml @@ -228,11 +230,11 @@ var component = new NEKUI.Component({ ``` -### 事件 + +*事件* 请打开浏览器的控制台查看结果。 -
```xml @@ -256,9 +258,9 @@ var component = new NEKUI.Component({ ``` -### 综合示例 - +*综合示例* +
```xml diff --git a/src/js/components/form/KLText/index.md b/src/js/components/form/KLText/index.md index 81ae41e6..67d15d3d 100644 --- a/src/js/components/form/KLText/index.md +++ b/src/js/components/form/KLText/index.md @@ -1,13 +1,17 @@ --- title: 展示文本 +masonry: true --- -### 大小扩展 +## 代码演示 + +
+*大小扩展*
-```html +```xml 超小号文本 小号文本 正常文本 @@ -16,12 +20,11 @@ title: 展示文本 ``` -### 颜色扩展 - +*颜色扩展*
-```html +```xml Default Primary Success @@ -32,22 +35,20 @@ title: 展示文本 ``` -### 加粗 - +*加粗*
-```html +```xml
加粗文本
``` - - -### 文本对齐 + +*文本对齐*
-```html +```xml
左对齐
居中对齐
右对齐
@@ -55,28 +56,22 @@ title: 展示文本 ``` -### 垂直对齐 - +*垂直对齐*
-```html +```xml
顶部对齐
垂直居中
底部对齐
``` -*待完成……* - -### 文本省略和换行 - +*文本省略和换行*
-```html +```xml
这是一段很长很长的文字
``` - -*待完成……* \ No newline at end of file diff --git a/src/js/components/form/KLTextArea/index.md b/src/js/components/form/KLTextArea/index.md index aeea07f9..a31a3519 100644 --- a/src/js/components/form/KLTextArea/index.md +++ b/src/js/components/form/KLTextArea/index.md @@ -1,14 +1,17 @@ --- title: 文本输入 +masonry: true --- ## 代码演示 -### 基本形式 +
+ + +*基本形式* 大部分属性的用法与`