diff --git a/example/docs/zh-CN/components/animation.md b/example/docs/zh-CN/components/animation.md index e50b1aa6..495869be 100644 --- a/example/docs/zh-CN/components/animation.md +++ b/example/docs/zh-CN/components/animation.md @@ -92,3 +92,6 @@ export default { | layui-anim-rotate layui-anim-loop | 循环动画 | `layui-anim layui-anim-rotate layui-anim-loop` | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/avatar.md b/example/docs/zh-CN/components/avatar.md index 4726a96f..618cd37c 100644 --- a/example/docs/zh-CN/components/avatar.md +++ b/example/docs/zh-CN/components/avatar.md @@ -92,3 +92,6 @@ export default { | radius | 圆形 | `true` `false` | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/badge.md b/example/docs/zh-CN/components/badge.md index 0f9abc2a..72cb6320 100644 --- a/example/docs/zh-CN/components/badge.md +++ b/example/docs/zh-CN/components/badge.md @@ -58,3 +58,6 @@ export default { | default | 默认 | 非 `dot` 可用 | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/block.md b/example/docs/zh-CN/components/block.md index 1d2500a4..043b8f51 100644 --- a/example/docs/zh-CN/components/block.md +++ b/example/docs/zh-CN/components/block.md @@ -57,3 +57,6 @@ export default { | nm | 灰色样式 | -- | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/breadcrumb.md b/example/docs/zh-CN/components/breadcrumb.md index 0dc7e11a..5cead785 100644 --- a/example/docs/zh-CN/components/breadcrumb.md +++ b/example/docs/zh-CN/components/breadcrumb.md @@ -100,3 +100,6 @@ export default { | default | 默认插槽 | `--` | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/button.md b/example/docs/zh-CN/components/button.md index 3e771d89..b1666915 100644 --- a/example/docs/zh-CN/components/button.md +++ b/example/docs/zh-CN/components/button.md @@ -305,3 +305,6 @@ export default { | click | 单击事件 | `--` | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/card.md b/example/docs/zh-CN/components/card.md index 6a85f720..020d1a9e 100644 --- a/example/docs/zh-CN/components/card.md +++ b/example/docs/zh-CN/components/card.md @@ -128,3 +128,6 @@ export default { | body | 内容插槽 | -- | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/carousel.md b/example/docs/zh-CN/components/carousel.md index b5b841f4..a513e16f 100644 --- a/example/docs/zh-CN/components/carousel.md +++ b/example/docs/zh-CN/components/carousel.md @@ -139,3 +139,6 @@ export default { | change | 切换回调 | id | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/checkbox.md b/example/docs/zh-CN/components/checkbox.md index 77e641ef..8376eeed 100644 --- a/example/docs/zh-CN/components/checkbox.md +++ b/example/docs/zh-CN/components/checkbox.md @@ -210,3 +210,6 @@ export default { | change | 切换事件 | isChecked : 当前状态 | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/collapse.md b/example/docs/zh-CN/components/collapse.md index 1fe5cabe..3de704bf 100644 --- a/example/docs/zh-CN/components/collapse.md +++ b/example/docs/zh-CN/components/collapse.md @@ -206,3 +206,6 @@ export default { | change | 折叠面板变化触发事件 | (`id`, `isShow`, activeValues)

`id`: (`number` / `string`)对应当前操作面板的值

`isShow`: (`boolean`)`true` -> 展开, `false` -> 折叠

`activeValues`: (`Array`)当前状态为展开的面板值集合| ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/color.md b/example/docs/zh-CN/components/color.md index 46a96638..f62e3ab6 100644 --- a/example/docs/zh-CN/components/color.md +++ b/example/docs/zh-CN/components/color.md @@ -160,3 +160,6 @@ export default { | layui-bg-black | 雅黑 | class="layui-bg-black" | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/colorPicker.md b/example/docs/zh-CN/components/colorPicker.md index cbb1b2dd..cf6176c7 100644 --- a/example/docs/zh-CN/components/colorPicker.md +++ b/example/docs/zh-CN/components/colorPicker.md @@ -28,3 +28,6 @@ export default { | showSearch | 启用搜索 | -- | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/confirm.md b/example/docs/zh-CN/components/confirm.md index 93c69c7b..ba92fcaf 100644 --- a/example/docs/zh-CN/components/confirm.md +++ b/example/docs/zh-CN/components/confirm.md @@ -72,4 +72,7 @@ layer.confirm(content, options) | content | 内容 | -- | | options | 选配属性 | { time: 加载时长, btn: 按钮组 } | +::: + +::: comment ::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/container.md b/example/docs/zh-CN/components/container.md index c6809bf2..eb146a36 100644 --- a/example/docs/zh-CN/components/container.md +++ b/example/docs/zh-CN/components/container.md @@ -75,3 +75,6 @@ export default { | fluid | 流模式 | `true` `false` | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/dropdown.md b/example/docs/zh-CN/components/dropdown.md index 7db551d8..930126cc 100644 --- a/example/docs/zh-CN/components/dropdown.md +++ b/example/docs/zh-CN/components/dropdown.md @@ -88,3 +88,6 @@ export default { | content | 下拉内容 | -- | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/empty.md b/example/docs/zh-CN/components/empty.md index beda3975..b877f41f 100644 --- a/example/docs/zh-CN/components/empty.md +++ b/example/docs/zh-CN/components/empty.md @@ -54,3 +54,6 @@ export default { | description | 描述信息 | -- | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/field.md b/example/docs/zh-CN/components/field.md index 13b3a49a..a4c73024 100644 --- a/example/docs/zh-CN/components/field.md +++ b/example/docs/zh-CN/components/field.md @@ -68,3 +68,6 @@ export default { | title | 标题 | -- | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/form.md b/example/docs/zh-CN/components/form.md index 289d40c4..f87c90eb 100644 --- a/example/docs/zh-CN/components/form.md +++ b/example/docs/zh-CN/components/form.md @@ -74,3 +74,6 @@ export default { | label | 标题名称 | -- | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/grid.md b/example/docs/zh-CN/components/grid.md index 9d366c56..d4dbd089 100644 --- a/example/docs/zh-CN/components/grid.md +++ b/example/docs/zh-CN/components/grid.md @@ -164,3 +164,6 @@ export default { | lg-offset | 偏移 - 大型屏幕 (桌面 ≥1200px) | 0 - 24 | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/icon.md b/example/docs/zh-CN/components/icon.md index 22e19ff2..f873c389 100644 --- a/example/docs/zh-CN/components/icon.md +++ b/example/docs/zh-CN/components/icon.md @@ -1127,3 +1127,6 @@ npm install @layui/icons-vue | size | 尺寸 | -- | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/iconPicker.md b/example/docs/zh-CN/components/iconPicker.md index e9d0b09b..f2536026 100644 --- a/example/docs/zh-CN/components/iconPicker.md +++ b/example/docs/zh-CN/components/iconPicker.md @@ -110,3 +110,6 @@ export default { | showSearch | 启用搜索 | -- | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/input.md b/example/docs/zh-CN/components/input.md index 46197f5b..53a4904c 100644 --- a/example/docs/zh-CN/components/input.md +++ b/example/docs/zh-CN/components/input.md @@ -129,3 +129,6 @@ export default { | blur | 原生 blur 事件 | -- | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/inputNumber.md b/example/docs/zh-CN/components/inputNumber.md new file mode 100644 index 00000000..12891786 --- /dev/null +++ b/example/docs/zh-CN/components/inputNumber.md @@ -0,0 +1,142 @@ +::: title 基础使用 +::: + +::: demo + + + + + +::: + +::: title 尺寸 +::: + +::: demo + + + + + +::: + +::: title 限制数字大小 +::: + +::: demo + + + + + +::: + +::: title 数字步数 +::: + +::: demo + + + + + +::: + +::: title 禁用 +::: + +::: demo + + + + + +::: + + +::: title input-number属性 +::: + +::: table + +| 属性 | 描述 | 类型 | 默认值 | +| -------- | ------------- | ------ | ------ | +| v-model | 值 | `number` | 0 | +| name | 原生属性`name` | `number` | 5 | +| disabledInput | 禁用输入框输入 | `boolean` | false | +| disabled | 禁用操作 | `boolean` | false | +| step | 数字增减的步数 | `number` | 1 | +| position | 控制按钮显示位置, 目前除了默认值,只有`right`可填 | `string` | -- | +| min | 最小可输入的数 | `number` | -- | +| max | 最大可输入的数 | `number` | -- | +| size | 尺寸, 可选值`md` / `sm` / `xs`| `string` | 默认为最大尺寸 | + +::: + +::: title 事件 +::: + +::: table + +| 属性 | 描述 | 回调参数 | +| -------- | -------- | ------ | +| change | 值更改触发事件 | (value: number) | + +::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/layer.md b/example/docs/zh-CN/components/layer.md new file mode 100644 index 00000000..e69de29b diff --git a/example/docs/zh-CN/components/layout.md b/example/docs/zh-CN/components/layout.md index 8d940cdc..3a3cc825 100644 --- a/example/docs/zh-CN/components/layout.md +++ b/example/docs/zh-CN/components/layout.md @@ -184,3 +184,6 @@ export default { | lay-footer | 底部 | -- | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/line.md b/example/docs/zh-CN/components/line.md index 19676f0a..5ac07d88 100644 --- a/example/docs/zh-CN/components/line.md +++ b/example/docs/zh-CN/components/line.md @@ -41,3 +41,6 @@ export default { | theme | 主题 | `orange` `green` `cyan` `blue` `black` `gray` | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/load.md b/example/docs/zh-CN/components/load.md index cb9067ff..d717a49b 100644 --- a/example/docs/zh-CN/components/load.md +++ b/example/docs/zh-CN/components/load.md @@ -122,4 +122,7 @@ layer.load(load, options) | load | 组件类型 | `1` `2` `3` | | options | 选配属性 | { time: 加载时长 } | +::: + +::: comment ::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/menu.md b/example/docs/zh-CN/components/menu.md index a8f7b7ea..26351f35 100644 --- a/example/docs/zh-CN/components/menu.md +++ b/example/docs/zh-CN/components/menu.md @@ -99,3 +99,6 @@ export default { | title | 菜单标题 | -- | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/modal.md b/example/docs/zh-CN/components/modal.md index 04ec7641..bf3fe7c0 100644 --- a/example/docs/zh-CN/components/modal.md +++ b/example/docs/zh-CN/components/modal.md @@ -6,6 +6,7 @@ @@ -38,6 +39,7 @@ export default { @@ -70,6 +72,7 @@ export default { @@ -102,6 +105,7 @@ export default { @@ -167,6 +171,7 @@ export default { @@ -203,7 +208,8 @@ export default { @@ -296,3 +302,6 @@ export default { | isOutAnim | 关闭动画 | `true` `false` | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/msg.md b/example/docs/zh-CN/components/msg.md index 2b2d507d..34e848a2 100644 --- a/example/docs/zh-CN/components/msg.md +++ b/example/docs/zh-CN/components/msg.md @@ -90,4 +90,7 @@ layer.msg(content, options) | content | 消息内容 | -- | | options | 选配属性 | { time: 加载时长, icon: 图标 } | +::: + +::: comment ::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/page.md b/example/docs/zh-CN/components/page.md index 5e8bb3c1..51f60a7c 100644 --- a/example/docs/zh-CN/components/page.md +++ b/example/docs/zh-CN/components/page.md @@ -232,3 +232,6 @@ export default { | next | 下一页 | 下一页 | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/panel.md b/example/docs/zh-CN/components/panel.md index bb65a5e4..218d95e1 100644 --- a/example/docs/zh-CN/components/panel.md +++ b/example/docs/zh-CN/components/panel.md @@ -31,3 +31,6 @@ export default { | default | 默认插槽 | -- | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/progress.md b/example/docs/zh-CN/components/progress.md index c94f64e1..e60d2f13 100644 --- a/example/docs/zh-CN/components/progress.md +++ b/example/docs/zh-CN/components/progress.md @@ -125,3 +125,6 @@ export default { | showText | 展示描述 | -- | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/radio.md b/example/docs/zh-CN/components/radio.md index e57707fd..eb260b6c 100644 --- a/example/docs/zh-CN/components/radio.md +++ b/example/docs/zh-CN/components/radio.md @@ -117,3 +117,6 @@ export default { | change | 切换事件 | current : 当前值 | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/rate.md b/example/docs/zh-CN/components/rate.md index ac5e645f..2ac0cd43 100644 --- a/example/docs/zh-CN/components/rate.md +++ b/example/docs/zh-CN/components/rate.md @@ -305,3 +305,6 @@ export default { | select | 选中之后触发事件 | (value: number) | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/select.md b/example/docs/zh-CN/components/select.md index 8765bf92..1e776edf 100644 --- a/example/docs/zh-CN/components/select.md +++ b/example/docs/zh-CN/components/select.md @@ -100,3 +100,6 @@ export default { | change | 切换事件 | value | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/slider.md b/example/docs/zh-CN/components/slider.md index 8f3e6c7a..d1565b09 100644 --- a/example/docs/zh-CN/components/slider.md +++ b/example/docs/zh-CN/components/slider.md @@ -1,7 +1,7 @@ ::: demo +::: + +::: comment ::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/switch.md b/example/docs/zh-CN/components/switch.md index 3ee8a871..9218ecf0 100644 --- a/example/docs/zh-CN/components/switch.md +++ b/example/docs/zh-CN/components/switch.md @@ -133,3 +133,6 @@ export default { | change | 切换事件 | current : 当前值 | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/tab.md b/example/docs/zh-CN/components/tab.md index 68bae84e..10707744 100644 --- a/example/docs/zh-CN/components/tab.md +++ b/example/docs/zh-CN/components/tab.md @@ -243,3 +243,6 @@ export default { | close | 关闭事件 | id | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/table.md b/example/docs/zh-CN/components/table.md index cbb312e7..d30dd32f 100644 --- a/example/docs/zh-CN/components/table.md +++ b/example/docs/zh-CN/components/table.md @@ -223,12 +223,12 @@ export default { { title:"账户", width:"200px", - slot:"username", + customSlot:"username", key:"username" },{ title:"密码", width: "180px", - slot:"password", + customSlot:"password", key:"password" },{ title:"年龄", @@ -248,11 +248,11 @@ export default { ] const rowClick = function(data) { - alert(JSON.stringify(data)) + console.log(JSON.stringify(data)) } const rowDoubleClick = function(data) { - alert(JSON.stringify(data)) + console.log(JSON.stringify(data)) } return { @@ -309,3 +309,19 @@ export default { | toolbar | 自定义工具栏 | -- | ::: + +::: title 列配置 +::: + +::: table + +| 插槽 | 描述 | 默认 | +| ------- | ------------ | ---- | +| title | 列标题 | -- | +| key | 数据字段 | -- | +| customSlot | 插槽名称 | -- | +| width | 宽度 | -- | +::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/textarea.md b/example/docs/zh-CN/components/textarea.md index cc3c8a31..ba43e165 100644 --- a/example/docs/zh-CN/components/textarea.md +++ b/example/docs/zh-CN/components/textarea.md @@ -108,3 +108,6 @@ export default { | blur | 原生 blur 事件 | -- | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/timeline.md b/example/docs/zh-CN/components/timeline.md index 43b50363..5fa7a8e2 100644 --- a/example/docs/zh-CN/components/timeline.md +++ b/example/docs/zh-CN/components/timeline.md @@ -83,3 +83,6 @@ export default { | title | 标题 | -- | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/tooltip.md b/example/docs/zh-CN/components/tooltip.md new file mode 100644 index 00000000..30889db2 --- /dev/null +++ b/example/docs/zh-CN/components/tooltip.md @@ -0,0 +1,130 @@ +::: title 基础使用 +::: + +::: demo + + + + +::: + +::: title 显示位置 +::: + +::: demo + + + + +::: + +::: title 浅色主题 +::: + +::: demo + + + + +::: + +::: title 是否禁用/动态属性 +::: + +::: demo + + + + + +::: + +::: title tooltip属性 +::: + +::: table + +| 属性 | 描述 | 可选值 | +| ----------- | -------- | -------------- | +| content | 显示内容 | -- | +| position | 显示位置 | `top`(默认值)、`bottom`、`left`、`right` | +| isDark | 是否为黑色主题 | `true`(默认值)、`false`(浅色) | +| disabled | 是否禁用 | `false`(默认值)、`true`(禁用) || +| visible | 控制是否显示 | `true`(默认值)、`false` || +| isCanHide | 控制是否可以隐藏,可参考`lay-slider`组件 | `true`(默认值)、`false` || + +::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/transfer.md b/example/docs/zh-CN/components/transfer.md index ba2f79a3..7a8843f5 100644 --- a/example/docs/zh-CN/components/transfer.md +++ b/example/docs/zh-CN/components/transfer.md @@ -106,3 +106,6 @@ export default { | item | 列表项 | { data } | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/components/tree.md b/example/docs/zh-CN/components/tree.md index acdd05eb..581d7f85 100644 --- a/example/docs/zh-CN/components/tree.md +++ b/example/docs/zh-CN/components/tree.md @@ -253,3 +253,6 @@ function handleClick(node) { | node-click | 节点 click 事件 | -- | ::: + +::: comment +::: \ No newline at end of file diff --git a/example/docs/zh-CN/guide/changelog.md b/example/docs/zh-CN/guide/changelog.md index ece7a912..2482ec4c 100644 --- a/example/docs/zh-CN/guide/changelog.md +++ b/example/docs/zh-CN/guide/changelog.md @@ -10,174 +10,38 @@ ::: demo diff --git a/example/docs/zh-CN/guide/contribution.md b/example/docs/zh-CN/guide/contribution.md deleted file mode 100644 index 54b084c5..00000000 --- a/example/docs/zh-CN/guide/contribution.md +++ /dev/null @@ -1,2 +0,0 @@ -::: title 贡献代码 -::: diff --git a/example/docs/zh-CN/guide/introduce.md b/example/docs/zh-CN/guide/introduce.md index 8e57741e..ba93d954 100644 --- a/example/docs/zh-CN/guide/introduce.md +++ b/example/docs/zh-CN/guide/introduce.md @@ -1,7 +1,11 @@ ::: title 基本介绍 ::: - +

+ + layui + +


diff --git a/example/docs/zh-CN/guide/member.md b/example/docs/zh-CN/guide/member.md new file mode 100644 index 00000000..13f0b5c8 --- /dev/null +++ b/example/docs/zh-CN/guide/member.md @@ -0,0 +1,10 @@ +::: title 贡献代码 +::: + + +::: describe + + +[![Giteye chart](https://chart.giteye.net/gitee/layui-vue/layui-vue/DBC9Z6HQ.png)](https://giteye.net/chart/DBC9Z6HQ) + +::: \ No newline at end of file diff --git a/example/docs/zh-CN/guide/problem.md b/example/docs/zh-CN/guide/problem.md index ddcf1b94..48a6c510 100644 --- a/example/docs/zh-CN/guide/problem.md +++ b/example/docs/zh-CN/guide/problem.md @@ -1,2 +1,2 @@ ::: title 常见问题 -::: +::: \ No newline at end of file diff --git a/example/src/assets/css/markdown.css b/example/src/assets/css/markdown.css index 72e2403f..db461523 100644 --- a/example/src/assets/css/markdown.css +++ b/example/src/assets/css/markdown.css @@ -1,3 +1,8 @@ +.utterances { + margin-top: 30px; + max-width: 100%; +} + html { line-height: 1.4; font-size: 16px; diff --git a/example/src/components/LayCode.vue b/example/src/components/LayCode.vue index ace7fd0c..3fa909b6 100644 --- a/example/src/components/LayCode.vue +++ b/example/src/components/LayCode.vue @@ -19,6 +19,7 @@ \ No newline at end of file diff --git a/example/src/components/LaySearch.vue b/example/src/components/LaySearch.vue index 0d8cb134..adb8080a 100644 --- a/example/src/components/LaySearch.vue +++ b/example/src/components/LaySearch.vue @@ -41,7 +41,7 @@ + + \ No newline at end of file diff --git a/src/module/button/index.less b/src/module/button/index.less index 74be8434..4d7ef9b0 100644 --- a/src/module/button/index.less +++ b/src/module/button/index.less @@ -1,6 +1,6 @@ .layui-btn { height: 38px; - line-height: 38px; + line-height: 36px; border: 1px solid transparent; padding: 0 18px; background-color: #009688; diff --git a/src/module/dropdown/index.vue b/src/module/dropdown/index.vue index 4eded2f2..8271c843 100644 --- a/src/module/dropdown/index.vue +++ b/src/module/dropdown/index.vue @@ -1,3 +1,49 @@ + + + + - - + \ No newline at end of file diff --git a/src/module/iconPicker/index.vue b/src/module/iconPicker/index.vue index d58d6143..b7b4afec 100644 --- a/src/module/iconPicker/index.vue +++ b/src/module/iconPicker/index.vue @@ -1,5 +1,5 @@