From 4886cfcde9b7da3144ba3e0a0acf1467a27d95d7 Mon Sep 17 00:00:00 2001 From: pangxie Date: Sun, 8 Jul 2018 15:04:56 +0800 Subject: [PATCH] [build] 3.0.6 --- dist/search/index.js | 69 +++++++++++++++++++++++++++++ dist/search/index.json | 3 ++ dist/search/index.wxml | 40 +++++++++++++++++ dist/search/index.wxss | 1 + dist/toast/toast.js | 10 +++-- dist/tree-select/index.js | 87 +++++++++++++++++++++++++++++++++++++ dist/tree-select/index.json | 6 +++ dist/tree-select/index.wxml | 34 +++++++++++++++ dist/tree-select/index.wxss | 1 + 9 files changed, 248 insertions(+), 3 deletions(-) create mode 100644 dist/search/index.js create mode 100644 dist/search/index.json create mode 100644 dist/search/index.wxml create mode 100644 dist/search/index.wxss create mode 100644 dist/tree-select/index.js create mode 100644 dist/tree-select/index.json create mode 100644 dist/tree-select/index.wxml create mode 100644 dist/tree-select/index.wxss diff --git a/dist/search/index.js b/dist/search/index.js new file mode 100644 index 00000000..0a51765a --- /dev/null +++ b/dist/search/index.js @@ -0,0 +1,69 @@ +'use strict'; + +Component({ + externalClasses: ['search-class', 'input-class', 'cancel-class'], + properties: { + cancelText: { + type: String, + value: '取消' + }, + disabled: { + type: Boolean, + value: false + }, + focus: { + type: Boolean, + value: false + }, + keyword: { + type: String, + value: '' + }, + show: { + type: Array, + value: ['icon', 'cancel'] + }, + placeholder: { + type: String, + value: '请输入查询关键字', + observer: function observer(newVal) { + this.setData({ + inputWidth: newVal.length * 14 + 45 + 'px' + }); + } + }, + useCancel: { + type: Boolean + }, + searchStyle: String, + cancelStyle: String, + inputStyle: String + }, + data: { + inputWidth: 'auto' + }, + methods: { + blur: function blur() { + this.triggerEvent('blur'); + }, + clearInput: function clearInput() { + this.setData({ + focus: true + }); + this.triggerEvent('change', { value: '' }); + }, + cancelSearch: function cancelSearch() { + this.triggerEvent('cancel'); + }, + focus: function focus() { + this.triggerEvent('focus'); + }, + inputChange: function inputChange(e) { + this._inputvalue = e.detail.value; + this.triggerEvent('change', { value: e.detail.value }); + }, + search: function search(e) { + this.triggerEvent('search', { value: e.detail.value }); + } + } +}); \ No newline at end of file diff --git a/dist/search/index.json b/dist/search/index.json new file mode 100644 index 00000000..32640e0d --- /dev/null +++ b/dist/search/index.json @@ -0,0 +1,3 @@ +{ + "component": true +} \ No newline at end of file diff --git a/dist/search/index.wxml b/dist/search/index.wxml new file mode 100644 index 00000000..1eeafd04 --- /dev/null +++ b/dist/search/index.wxml @@ -0,0 +1,40 @@ + + + + + + + + {{cancelText || '取消'}} + + diff --git a/dist/search/index.wxss b/dist/search/index.wxss new file mode 100644 index 00000000..8ee8f24f --- /dev/null +++ b/dist/search/index.wxss @@ -0,0 +1 @@ +.zan-search{box-sizing:border-box;display:-webkit-box;display:flex;-webkit-box-pack:justify;justify-content:space-between;-webkit-box-align:center;align-items:center;background:0 0;padding:5px 10px}.zan-search.center-placeholder{background:#fff}.zan-search.center-placeholder .zan-search__form{margin-left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);border:none}.zan-search.zan-cell::after{display:none}.zan-search__form{display:-webkit-box;display:flex;-webkit-box-flex:1;flex:1;background:#fff;border-radius:4rpx;height:64rpx;line-height:56rpx;-webkit-box-pack:justify;justify-content:space-between;-webkit-box-align:center;align-items:center}.zan-search picker{display:-webkit-box;display:flex;-webkit-box-align:center;align-items:center;height:100%;padding-right:20rpx}.zan-search__form .picker{position:relative;width:110rpx;height:100%;color:#666;font-size:28rpx;margin-left:20rpx}.zan-search__form .picker::after{content:'';width:0;height:0;position:absolute;right:0;top:50%;margin-top:-6rpx;border-top:12rpx solid #333;border-right:8rpx solid transparent;border-left:8rpx solid transparent}.zan-search__form input{height:100%;-webkit-box-flex:1;flex:1;padding:0 20rpx;font-size:28rpx;color:#333}.zan-search__form icon{margin-left:20rpx;line-height:1}.zan-search__clear{padding:12rpx 20rpx}.zan-search__placeholder{font-size:28rpx;color:#cacaca}.zan-search__cancel{align-self:stretch;display:-webkit-inline-box;display:inline-flex;-webkit-box-align:center;align-items:center;padding-left:30rpx;font-size:28rpx;color:#38f} \ No newline at end of file diff --git a/dist/toast/toast.js b/dist/toast/toast.js index 6d3bd9d8..97596db0 100644 --- a/dist/toast/toast.js +++ b/dist/toast/toast.js @@ -54,9 +54,13 @@ function Toast(optionsOrMsg, pageCtx) { show: true })); - var timeoutId = setTimeout(function () { - toastCtx.clear(); - }, parsedOptions.timeout || 3000); + var timeoutId = 0; + + if (parsedOptions.timeout >= 0) { + timeoutId = setTimeout(function () { + toastCtx.clear(); + }, parsedOptions.timeout || 3000); + } timeoutData = { timeoutId: timeoutId, diff --git a/dist/tree-select/index.js b/dist/tree-select/index.js new file mode 100644 index 00000000..ed63b166 --- /dev/null +++ b/dist/tree-select/index.js @@ -0,0 +1,87 @@ +'use strict'; + +var ITEM_HEIGHT = 44; + +Component({ + properties: { + items: { + type: Array, + observer: function observer() { + this.updateSubItems(); + this.updateMainHeight(); + } + }, + mainActiveIndex: { + type: Number, + value: 0, + observer: function observer() { + this.updateSubItems(); + } + }, + activeId: { + type: Number, + value: 0 + }, + maxHeight: { + type: Number, + value: 300, + observer: function observer() { + this.updateItemHeight(); + this.updateMainHeight(); + } + } + }, + + data: { + subItems: [], + mainHeight: 0, + itemHeight: 0 + }, + + methods: { + // 当一个子项被选择时 + onItemSelect: function onItemSelect(_ref) { + var _ref$currentTarget = _ref.currentTarget, + currentTarget = _ref$currentTarget === undefined ? {} : _ref$currentTarget; + var _currentTarget$datase = currentTarget.dataset, + data = _currentTarget$datase === undefined ? {} : _currentTarget$datase; + + this.triggerEvent('itemclick', Object.assign({}, data.item || {})); + }, + + + // 当一个导航被点击时 + handleNavClick: function handleNavClick(_ref2) { + var _ref2$currentTarget = _ref2.currentTarget, + currentTarget = _ref2$currentTarget === undefined ? {} : _ref2$currentTarget; + var _currentTarget$datase2 = currentTarget.dataset, + data = _currentTarget$datase2 === undefined ? {} : _currentTarget$datase2; + + this.triggerEvent('navclick', { index: data.index }); + }, + + + // 更新子项列表 + updateSubItems: function updateSubItems() { + var selectedItem = this.data.items[this.data.mainActiveIndex] || {}; + + this.setData({ subItems: selectedItem.children || [] }); + + this.updateItemHeight(); + }, + + + // 更新组件整体高度，根据最大高度和当前组件需要展示的高度来决定 + updateMainHeight: function updateMainHeight() { + var maxHeight = Math.max(this.data.items.length * ITEM_HEIGHT, this.data.subItems.length * ITEM_HEIGHT); + + this.setData({ mainHeight: Math.min(maxHeight, this.data.maxHeight) }); + }, + + + // 更新子项列表高度，根据可展示的最大高度和当前子项列表的高度决定 + updateItemHeight: function updateItemHeight() { + this.setData({ itemHeight: Math.min(this.data.subItems.length * ITEM_HEIGHT, this.data.maxHeight) }); + } + } +}); \ No newline at end of file diff --git a/dist/tree-select/index.json b/dist/tree-select/index.json new file mode 100644 index 00000000..fc0d0bf9 --- /dev/null +++ b/dist/tree-select/index.json @@ -0,0 +1,6 @@ +{ + "component": true, + "usingComponents": { + "zan-icon": "../icon/index" + } +} diff --git a/dist/tree-select/index.wxml b/dist/tree-select/index.wxml new file mode 100644 index 00000000..caa6d584 --- /dev/null +++ b/dist/tree-select/index.wxml @@ -0,0 +1,34 @@ + + + + {{ item.text }} + + + + + {{ item.text }} + + + + diff --git a/dist/tree-select/index.wxss b/dist/tree-select/index.wxss new file mode 100644 index 00000000..8e5e7933 --- /dev/null +++ b/dist/tree-select/index.wxss @@ -0,0 +1 @@ +.zan-pull-left{float:left}.zan-pull-right{float:right}.zan-center{text-align:center}.zan-right{text-align:right}.zan-text-deleted{text-decoration:line-through}.zan-font-8{font-size:8px}.zan-font-10{font-size:10px}.zan-font-12{font-size:12px}.zan-font-14{font-size:14px}.zan-font-16{font-size:16px}.zan-font-18{font-size:18px}.zan-font-20{font-size:20px}.zan-font-22{font-size:22px}.zan-font-24{font-size:24px}.zan-font-26{font-size:26px}.zan-font-30{font-size:30px}.zan-font-bold{font-weight:700}.zan-arrow{position:absolute;right:15px;top:50%;display:inline-block;height:6px;width:6px;border-width:2px 2px 0 0;border-color:#c8c8c8;border-style:solid;-webkit-transform:translateY(-50%) matrix(.71,.71,-.71,.71,0,0);transform:translateY(-50%) matrix(.71,.71,-.71,.71,0,0)}.zan-ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-wrap:normal}.zan-ellipsis--l2{max-height:40px;line-height:20px;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}.zan-ellipsis--l3{max-height:60px;line-height:20px;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical}.zan-clearfix{zoom:1}.zan-clearfix::after{content:'';display:table;clear:both}.zan-c-red{color:#f44}.zan-c-black{color:#000}.zan-c-green{color:#06bf04}.zan-c-blue{color:#38f}.zan-c-gray{color:#c9c9c9}.zan-c-gray-dark{color:#999}.zan-c-gray-darker{color:#666}.zan-hairline,.zan-hairline--bottom,.zan-hairline--left,.zan-hairline--right,.zan-hairline--surround,.zan-hairline--top,.zan-hairline--top-bottom{position:relative}.zan-hairline--bottom::after,.zan-hairline--left::after,.zan-hairline--right::after,.zan-hairline--surround::after,.zan-hairline--top-bottom::after,.zan-hairline--top::after,.zan-hairline::after{content:'';position:absolute;top:0;left:0;width:200%;height:200%;-webkit-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;transform-origin:0 0;pointer-events:none;box-sizing:border-box;border:0 solid #e5e5e5}.zan-hairline--top::after{border-top-width:1px}.zan-hairline--left::after{border-left-width:1px}.zan-hairline--right::after{border-right-width:1px}.zan-hairline--bottom::after{border-bottom-width:1px}.zan-hairline--top-bottom::after{border-width:1px 0}.zan-hairline--surround::after{border-width:1px}.tree-select{-webkit-user-select:none;user-select:none;position:relative;font-size:16px}.tree-select__nav{width:143px;position:absolute;left:0;top:0;bottom:0;overflow:scroll;background-color:#fff;-webkit-overflow-scrolling:touch}.tree-select__nitem{line-height:44px;padding:0 15px;background-color:#fff}.tree-select__nitem--active{background-color:#f8f8f8}.tree-select__content{padding:0 15px;margin-left:143px;overflow:scroll;-webkit-overflow-scrolling:touch}.tree-select__item{position:relative;line-height:44px;padding-left:5px;padding-right:18px}.tree-select__item--active{color:#f44}.tree-select__selected{float:right;position:absolute;right:0;top:0;bottom:0;line-height:inherit} \ No newline at end of file