diff --git a/example/app.json b/example/app.json index 5705f003..7121e6d0 100644 --- a/example/app.json +++ b/example/app.json @@ -12,7 +12,6 @@ "pages/helper/index", "pages/icon/index", "pages/layout/index", - "pages/loadmore/index", "pages/noticebar/index", "pages/panel/index", "pages/popup/index", diff --git a/example/components/doc-page/index.js b/example/components/doc-page/index.js index 187df4be..ea94b4e7 100644 --- a/example/components/doc-page/index.js +++ b/example/components/doc-page/index.js @@ -3,6 +3,10 @@ Component({ title: { type: String, value: '' + }, + + withoutPadding: { + type: Boolean } } }); diff --git a/example/components/doc-page/index.wxml b/example/components/doc-page/index.wxml index 5a21e4ae..47677f72 100644 --- a/example/components/doc-page/index.wxml +++ b/example/components/doc-page/index.wxml @@ -1,6 +1,6 @@ {{ title }} - + diff --git a/example/components/doc-page/index.wxss b/example/components/doc-page/index.wxss index 9b186794..4c5c6404 100644 --- a/example/components/doc-page/index.wxss +++ b/example/components/doc-page/index.wxss @@ -21,3 +21,7 @@ overflow: hidden; color: #666; } + +.doc-content--without-pd { + padding: 15px 0; +} diff --git a/example/pages/capsule/index.json b/example/pages/capsule/index.json index c459bae4..707b2637 100644 --- a/example/pages/capsule/index.json +++ b/example/pages/capsule/index.json @@ -1,7 +1,8 @@ { "navigationBarTitleText": "Capsule 胶囊", "usingComponents": { - "zan-panel": "/packages/panel/index", - "zan-capsule": "/packages/capsule/index" + "zan-panel": "../../dist/panel/index", + "zan-capsule": "../../dist/capsule/index", + "doc-page": "../../components/doc-page/index" } } diff --git a/example/pages/capsule/index.wxml b/example/pages/capsule/index.wxml index cbe06edf..4b4f9cc2 100644 --- a/example/pages/capsule/index.wxml +++ b/example/pages/capsule/index.wxml @@ -1,16 +1,15 @@ - - - - - CAPSULE + - - + + + + - + + + - - + diff --git a/example/pages/capsule/index.wxss b/example/pages/capsule/index.wxss index 1141c678..2d6b3fd2 100644 --- a/example/pages/capsule/index.wxss +++ b/example/pages/capsule/index.wxss @@ -1,3 +1,7 @@ +.capsule-demo { + padding: 15px 0; +} + .zan-capsule + .zan-capsule { margin-left: 10px; } diff --git a/example/pages/card/index.json b/example/pages/card/index.json index 1fca605a..f90b0bd1 100644 --- a/example/pages/card/index.json +++ b/example/pages/card/index.json @@ -1,6 +1,8 @@ { "navigationBarTitleText": "Card 卡片", "usingComponents": { - "zan-card": "../../dist/card/index" + "zan-card": "../../dist/card/index", + "zan-panel": "../../dist/panel/index", + "doc-page": "../../components/doc-page/index" } } diff --git a/example/pages/card/index.wxml b/example/pages/card/index.wxml index 94ddd073..3f6d71d9 100644 --- a/example/pages/card/index.wxml +++ b/example/pages/card/index.wxml @@ -1,8 +1,6 @@ - + - CARD - - + - + - 使用slot - - + - - - - - x 2 - - 我是标题 - - - - ¥ 111 - + 我是自定义内容区域 - - + + diff --git a/example/pages/cell/index.json b/example/pages/cell/index.json index a23e9052..522c020c 100644 --- a/example/pages/cell/index.json +++ b/example/pages/cell/index.json @@ -3,6 +3,8 @@ "usingComponents": { "zan-cell": "../../dist/cell/index", "zan-icon": "../../dist/icon/index", - "zan-cell-group": "../../dist/cell-group/index" + "zan-panel": "../../dist/panel/index", + "zan-cell-group": "../../dist/cell-group/index", + "doc-page": "../../components/doc-page/index" } } diff --git a/example/pages/cell/index.wxml b/example/pages/cell/index.wxml index 5654f366..681d9829 100644 --- a/example/pages/cell/index.wxml +++ b/example/pages/cell/index.wxml @@ -1,43 +1,36 @@ - + - - - CELL - - + - + - + - + - + - + - 带 icon 的 cell - + - + + + + - 带箭头的 cell - - - + + + - - - - cell 组 - + - - - + + + @@ -46,5 +39,5 @@ - - + + diff --git a/example/pages/cell/index.wxss b/example/pages/cell/index.wxss new file mode 100644 index 00000000..8f5622b7 --- /dev/null +++ b/example/pages/cell/index.wxss @@ -0,0 +1,4 @@ +.cell-panel-demo { + display: block; + margin-top: 15px; +} \ No newline at end of file diff --git a/example/pages/dashboard/config.js b/example/pages/dashboard/config.js index 10377da9..07958639 100644 --- a/example/pages/dashboard/config.js +++ b/example/pages/dashboard/config.js @@ -26,9 +26,6 @@ export default { }, { name: 'Layout 布局', path: '/pages/layout/index' - }, { - name: 'Loadmore 加载', - path: '/pages/loadmore/index' }, { name: 'Noticebar 通告栏', path: '/pages/noticebar/index' diff --git a/example/pages/dashboard/index.json b/example/pages/dashboard/index.json new file mode 100644 index 00000000..f9b0ac60 --- /dev/null +++ b/example/pages/dashboard/index.json @@ -0,0 +1,8 @@ +{ + "navigationBarTitleText": "ZanUI-WeApp", + "usingComponents": { + "zan-panel": "../../dist/panel/index", + "zan-cell": "../../dist/cell/index", + "zan-cell-group": "../../dist/cell-group/index" + } +} diff --git a/example/pages/dashboard/index.wxml b/example/pages/dashboard/index.wxml index 369dba4e..d9b1e79d 100644 --- a/example/pages/dashboard/index.wxml +++ b/example/pages/dashboard/index.wxml @@ -3,13 +3,17 @@ - {{ group.title }} - - - {{ item.name }} - - - + + + + + diff --git a/example/pages/helper/index.json b/example/pages/helper/index.json index cdee37ee..9d900d28 100644 --- a/example/pages/helper/index.json +++ b/example/pages/helper/index.json @@ -1,3 +1,9 @@ { - "navigationBarTitleText": "Helper 基础样式" + "navigationBarTitleText": "Helper 基础样式", + "usingComponents": { + "zan-cell": "../../dist/cell/index", + "zan-panel": "../../dist/panel/index", + "zan-cell-group": "../../dist/cell-group/index", + "doc-page": "../../components/doc-page/index" + } } diff --git a/example/pages/helper/index.wxml b/example/pages/helper/index.wxml index a40f3a54..295a60d4 100644 --- a/example/pages/helper/index.wxml +++ b/example/pages/helper/index.wxml @@ -1,76 +1,59 @@ - - + - - - zan-pull-right: 往右靠 - - + + zan-pull-right: 往右靠 + - - - zan-text-deleted：被删除的效果 - - + + zan-text-deleted：被删除的效果 + - - - - zan-font-12：字号12 - zan-font-bold：再来个加粗 - + + + zan-font-12：字号12 + zan-font-bold：再来个加粗 - + - - - - zan-font-16：字号16 - zan-font-bold：再来个加粗 - + + + zan-font-16：字号16 + zan-font-bold：再来个加粗 - + - - - - 字体颜色 - zan-c-red: 红色 - zan-c-gray: 灰色 - zan-c-gray-dark: 再灰一点点 - zan-c-gray-darker: 更深的灰色 - zan-c-black: 黑色 - zan-c-blue: 蓝色 - zan-c-green: 绿色 - + + + 字体颜色 + zan-c-red: 红色 + zan-c-gray: 灰色 + zan-c-gray-dark: 再灰一点点 + zan-c-gray-darker: 更深的灰色 + zan-c-black: 黑色 + zan-c-blue: 蓝色 + zan-c-green: 绿色 - + - - - zan-arrow：箭头 - - - + + zan-arrow：箭头 + + - - - - zan-ellipsis：单行点点点 - ->我是占位的字符我是占位的字符我是占位的字符我是占位的字符我是占位的字符我是占位的字符 - + + + zan-ellipsis：单行点点点 + ->我是占位的字符我是占位的字符我是占位的字符我是占位的字符我是占位的字符我是占位的字符 - + - - - - zan-ellipsis--l2：单行点点点 - ->我是占位的字符我是占位的字符我是占位的字符我是占位的字符我是占位的字符我是占位的字符 - + + + zan-ellipsis--l2：单行点点点 + ->我是占位的字符我是占位的字符我是占位的字符我是占位的字符我是占位的字符我是占位的字符 - + - + diff --git a/example/pages/layout/index.json b/example/pages/layout/index.json index 9a651ebb..368b703f 100644 --- a/example/pages/layout/index.json +++ b/example/pages/layout/index.json @@ -1,6 +1,8 @@ { "usingComponents": { "zan-row": "../../dist/row/index", - "zan-col": "../../dist/col/index" + "zan-col": "../../dist/col/index", + "zan-panel": "../../dist/panel/index", + "doc-page": "../../components/doc-page/index" } } diff --git a/example/pages/layout/index.wxml b/example/pages/layout/index.wxml index baef8874..24ca7110 100644 --- a/example/pages/layout/index.wxml +++ b/example/pages/layout/index.wxml @@ -1,20 +1,14 @@ - + - LAYOUT - - 基础用法 - Layout 组件提供了24列栅格，添加 zan-col-x 可以设置元素所占宽度 - + span: 8 span: 8 span: 8 - + - offset - 添加 zan-col-offset-x 类可以设置列的偏移宽度，计算方式与 span 相同 - + span: 4 offset: 4, span: 10 @@ -22,6 +16,6 @@ offset: 12, span: 12 - + - + diff --git a/example/pages/loadmore/index.js b/example/pages/loadmore_bak/index.js similarity index 100% rename from example/pages/loadmore/index.js rename to example/pages/loadmore_bak/index.js diff --git a/example/pages/loadmore/index.json b/example/pages/loadmore_bak/index.json similarity index 100% rename from example/pages/loadmore/index.json rename to example/pages/loadmore_bak/index.json diff --git a/example/pages/loadmore/index.wxml b/example/pages/loadmore_bak/index.wxml similarity index 100% rename from example/pages/loadmore/index.wxml rename to example/pages/loadmore_bak/index.wxml diff --git a/example/pages/noticebar/index.json b/example/pages/noticebar/index.json index bd20212f..a1a7c61e 100644 --- a/example/pages/noticebar/index.json +++ b/example/pages/noticebar/index.json @@ -1,6 +1,8 @@ { "navigationBarTitleText": "Noticebar 通告栏", "usingComponents": { - "zan-noticebar": "../../dist/noticebar/index" + "zan-noticebar": "../../dist/noticebar/index", + "zan-panel": "../../dist/panel/index", + "doc-page": "../../components/doc-page/index" } } diff --git a/example/pages/noticebar/index.wxml b/example/pages/noticebar/index.wxml index 2cb79e51..e2cb5b0d 100644 --- a/example/pages/noticebar/index.wxml +++ b/example/pages/noticebar/index.wxml @@ -1,63 +1,54 @@ - + - NOTICEBAR - - 滚动通告栏 - + - + - 延时滚动通告栏 - + - + - 初始速度低滚动通告栏 - + - + - 改变颜色通告栏 - + - + - 静止通告栏 - + - + - 带icon公告 - + - + - 可关闭公告 - + - + - \ No newline at end of file + diff --git a/example/pages/panel/index.json b/example/pages/panel/index.json index ac111a79..f495ed85 100644 --- a/example/pages/panel/index.json +++ b/example/pages/panel/index.json @@ -1,3 +1,7 @@ { - "navigationBarTitleText": "Panel 面板" + "navigationBarTitleText": "Panel 面板", + "usingComponents": { + "zan-panel": "../../dist/panel/index", + "doc-page": "../../components/doc-page/index" + } } diff --git a/example/pages/panel/index.wxml b/example/pages/panel/index.wxml index 7487d109..83df0b2f 100644 --- a/example/pages/panel/index.wxml +++ b/example/pages/panel/index.wxml @@ -1,22 +1,15 @@ - + - PANEL + + PANEL 内容区域 + - 标题 - - 内容 - + + 带有标题的 PANEL + - - 内容 - - - + 无边框的panel - + - - 内容 - - - + diff --git a/example/pages/panel/index.wxss b/example/pages/panel/index.wxss new file mode 100644 index 00000000..1d35f5af --- /dev/null +++ b/example/pages/panel/index.wxss @@ -0,0 +1,4 @@ +.panel-example { + display: block; + margin-top: 15px; +} diff --git a/example/pages/popup/index.json b/example/pages/popup/index.json index f61f05c8..5a6d5b1a 100644 --- a/example/pages/popup/index.json +++ b/example/pages/popup/index.json @@ -2,7 +2,8 @@ "navigationBarTitleText": "Popup 弹出层", "usingComponents": { "doc-page": "../../components/doc-page/index", - "zan-popup": "../../dist/popup/index" + "zan-popup": "../../dist/popup/index", + "zan-button": "../../dist/btn/index" } } diff --git a/example/pages/popup/index.wxml b/example/pages/popup/index.wxml index 28ec446e..433dbd88 100644 --- a/example/pages/popup/index.wxml +++ b/example/pages/popup/index.wxml @@ -1,20 +1,20 @@ - - - - - + diff --git a/packages/card/README.md b/packages/card/README.md index e286a000..700621bb 100644 --- a/packages/card/README.md +++ b/packages/card/README.md @@ -33,26 +33,11 @@ ```html - - - - - x 2 - - 我是标题 - - - - ¥ 111 - + 我是标题 ``` @@ -67,5 +52,4 @@ | desc | 商品描述 | String | - | num | 商品数量 | Number | - | status | 商品状态 | String | - -| useThumbSlot | 是否使用thumb-slot（true时需要添加对应slot） | Boolean | `false` | useDetailSlot | 是否使用detail-slot（true时需要添加对应slot） | Boolean | `false` diff --git a/packages/card/index.wxml b/packages/card/index.wxml index b5b32b83..98e26788 100644 --- a/packages/card/index.wxml +++ b/packages/card/index.wxml @@ -1,31 +1,33 @@ - - + + - - - - ¥ {{ price }} - - {{ title }} + + + + + ¥ {{ price }} + + {{ title }} + - - - x {{ num }} - - {{ desc }} + + x {{ num }} + + {{ desc }} + - - - {{ status }} - + + {{ status }} + + diff --git a/packages/cell/README.md b/packages/cell/README.md index 85df35f2..0c1965ed 100644 --- a/packages/cell/README.md +++ b/packages/cell/README.md @@ -9,8 +9,9 @@ | title | String | 否 | 无 | 左侧标题 | | label | Boolean | 否 | false | 标题下方的描述信息 | | value | String | 否 | 取消 | 右侧内容 | -| isLink | Number | 否 | 55 | 链接，用于导航，如果是 `Boolean` 型值则只显示链接样式，`String` 类型值才做导航，但是组件不检查路径正确性 | -| linkType | String | 否 | 无 | 链接跳转类型，可选值为 `navigateTo`，`redirectTo`，`switchTab`，`reLaunch` | +| isLink | Boolean | 否 | false | 是否展示右侧箭头并开启尝试以 url 跳转 | +| url | String | 否 | - | 当 isLink 设置为 true 时，点击 cell 会尝试跳转到该路径 | +| linkType | String | 否 | navigateTo | 链接跳转类型，可选值为 `navigateTo`，`redirectTo`，`switchTab`，`reLaunch` | | onlyTapFooter | Boolean | 否 | false | 只有点击 footer 区域才触发 tab 事件 | | bindtap | EventHandle | 否 | 无 | 点击 cell 时触发，`onlyTapFooter` 为 `true` 时点击 footer 区域触发 | diff --git a/packages/cell/index.js b/packages/cell/index.js index 80a94957..92b62534 100644 --- a/packages/cell/index.js +++ b/packages/cell/index.js @@ -32,12 +32,16 @@ Component({ isLink: { type: null, value: '', - description: '链接，用于导航，如果是 Boolean 型值则只显示链接样式，String 类型值才做导航，但是组件不检查路径正确性' + description: '是否展示右侧箭头并开启尝试以 url 跳转' }, linkType: { type: String, value: 'navigateTo', description: '链接类型，可选值为 navigateTo，redirectTo，switchTab，reLaunch' + }, + url: { + type: String, + value: '' } }, data: { @@ -45,12 +49,12 @@ Component({ }, methods: { navigateTo () { - let url = this.data.isLink.toString() - let type = typeof this.data.isLink + const url = this.data.url + const type = typeof this.data.isLink this.triggerEvent('tap', {}) - if (!this.data.isLink || url === 'true' || url === 'false') return; + if (!this.data.isLink || !url || url === 'true' || url === 'false') return; if (type !== 'boolean' && type !== 'string') { warn('isLink 属性值必须是一个字符串或布尔值', this.data.isLink) diff --git a/packages/helper/index.pcss b/packages/helper/index.pcss index 791ebcff..9059b028 100644 --- a/packages/helper/index.pcss +++ b/packages/helper/index.pcss @@ -1,4 +1,5 @@ @import "../common/_mixins"; +@import "../common/_var"; .zan-pull-left { float: left; @@ -105,6 +106,36 @@ clear: both; } +.zan-c { + &-red { + color: $red; + } + + &-black { + color: $black; + } + + &-green { + color: $green; + } + + &-blue { + color: $blue; + } + + &-gray { + color: $gray; + } + + &-gray-dark { + color: $gray-dark; + } + + &-gray-darker { + color: $gray-darker; + } +} + /* 超细边框 */ .zan-hairline { &, diff --git a/packages/panel/README.md b/packages/panel/README.md index a4006317..f6b4f1c0 100644 --- a/packages/panel/README.md +++ b/packages/panel/README.md @@ -20,7 +20,6 @@ Panel 提供了一块白色的展示区域，使用方式如下 | 参数 | 说明 | 类型 | 默认值 | 必须 | |-----------|-----------|-----------|-------------|-------------| | title | panel的标题 | String | - | | -| hide-top | 隐藏顶部边框 | Boolean | - | | | hide-border | 内容区隐藏边框 | Boolean | - | | diff --git a/packages/panel/index.js b/packages/panel/index.js index 9c724814..32c20610 100644 --- a/packages/panel/index.js +++ b/packages/panel/index.js @@ -7,7 +7,7 @@ Component({ // 标题 title: { type: String, - value: '标题' + value: '' }, // 内容区顶部是否取消10像素的间距 hideTop :{ diff --git a/packages/panel/index.pcss b/packages/panel/index.pcss index b50505e9..f0ac4e35 100644 --- a/packages/panel/index.pcss +++ b/packages/panel/index.pcss @@ -2,7 +2,7 @@ .zan-panel { position: relative; - margin-top: 10px; + overflow: hidden; } .zan-panel__title { @@ -13,6 +13,7 @@ } .zan-panel__content { + position: relative; background: #fff; overflow: hidden; &::after { @@ -22,10 +23,6 @@ } } -.zan-panel--without-margin-top { - margin-top: 0; -} - .zan-panel--without-border { &::after { border: 0 none; diff --git a/packages/panel/index.wxml b/packages/panel/index.wxml index 9cb5a19f..196eeebd 100644 --- a/packages/panel/index.wxml +++ b/packages/panel/index.wxml @@ -1,4 +1,4 @@ - + {{ title }}