更新utils

build.dev.js

@@ -49,7 +49,7 @@ function fixImport(str) {
   return str
     .replace(/import '([\w-/_.]*)'/g, 'import "$1.js"')
     .replace(
-      /import ([\w\s,{}]*) from '([a-z0-9\/\.\-_]*)'/g,
+      /import ([\w\s,{}$]*) from '([a-z0-9\/\.\-_]*)'/g,
       'import $1 from "$2.js"'
     )
 }

build.prod.js

@@ -49,7 +49,7 @@ function fixImport(str) {
   return str
     .replace(/import '([\w-/_.]*)'/g, 'import "$1.js"')
     .replace(
-      /import ([\w\s,{}]*) from '([a-z0-9\/\.\-_]*)'/g,
+      /import ([\w\s,{}$]*) from '([a-z0-9\/\.\-_]*)'/g,
       'import $1 from "$2.js"'
     )
 }

src/drag/core.js

@@ -6,7 +6,7 @@
 
 'use strict'
 
-import { bind, unbind } from '../utils'
+import $ from '../utils'
 
 const DEF_OPT = {
   axis: '', // x | y | xy 拖拽方向
@@ -41,10 +41,10 @@ export default class Drag {
     // 鼠标状态图标
     node.style.cursor = 'move'
 
-    this._handleResize = bind(window, 'resize', this._init.bind(this))
+    this._handleResize = $.bind(window, 'resize', this._init.bind(this))
 
     // let
-    this._handleMousedown = bind(node, 'mousedown', ev => {
+    this._handleMousedown = $.bind(node, 'mousedown', ev => {
       if (this.disabled) {
         return
       }
@@ -74,7 +74,7 @@ export default class Drag {
         limit = [pbcr.top, pbcr.right - tw, pbcr.bottom - th, pbcr.left]
       }
 
-      let handleMove = bind(document, 'mousemove', ev => {
+      let handleMove = $.bind(document, 'mousemove', ev => {
         // 防止拖动到边缘时导致页面滚动
         ev.preventDefault()
 
@@ -119,7 +119,7 @@ export default class Drag {
         this.$elem.style.transform = `translate(${_x}px, ${_y}px)`
       })
 
-      let handleUp = bind(document, 'mouseup', ev => {
+      let handleUp = $.bind(document, 'mouseup', ev => {
         this.$elem.dispatchEvent(
           new CustomEvent('dragged', {
             detail: {
@@ -131,8 +131,8 @@ export default class Drag {
             }
           })
         )
-        unbind(document, 'mousemove', handleMove)
+        $.unbind(document, 'mousemove', handleMove)
-        unbind(document, 'mouseup', handleUp)
+        $.unbind(document, 'mouseup', handleUp)
       })
     })
 
@@ -143,16 +143,16 @@ export default class Drag {
     if (!name || typeof cb !== 'function') {
       return
     }
-    return bind(this, name, cb)
+    return $.bind(this, name, cb)
   }
 
   off(name, cb) {
-    unbind(this, name, cb)
+    $.unbind(this, name, cb)
   }
 
   destroy() {
-    unbind(window, 'resize', this._handleResize)
+    $.unbind(window, 'resize', this._handleResize)
-    unbind(this.$drag, 'mousedown', this._handleMousedown)
+    $.unbind(this.$drag, 'mousedown', this._handleMousedown)
 
     delete this.$elem
     delete this.$drag

src/form/button.wc

@@ -249,6 +249,8 @@
 
 <script>
 import '../icon/index'
+import $ from '../utils'
+
 const IS_FIREFOX = !!window.sidebar
 
 export default class Button {
@@ -313,19 +315,17 @@ export default class Button {
   }
 
   mounted() {
-    this._handleClick = ev => {
+    // 阻止事件冒泡, 避免用户自己绑定click事件不受这2个值的限制
+    this._handleClick = $.catch(this.__BTN__, 'click', ev => {
       if (this.props.loading || this.props.disabled) {
-        // 阻止事件冒泡, 避免用户自己绑定click事件不受这2个值的限制
-        ev.stopPropagation()
         return
       }
       this.dispatchEvent(new CustomEvent('active'))
-    }
+    })
-    this.__BTN__.addEventListener('click', this._handleClick, false)
   }
 
   unmount() {
-    this.__BTN__.removeEventListener('click', this._handleClick)
+    $.unbind(this.__BTN__, 'click', this._handleClick)
   }
 
   watch() {

src/form/checkbox.wc

@@ -142,7 +142,7 @@
 
 <script>
 import '../icon/index'
-import { bind, unbind } from '../utils'
+import $ from '../utils'
 
 export default class Checkbox {
   props = {
@@ -237,7 +237,7 @@ export default class Checkbox {
   }
 
   mounted() {
-    this._handlClick = bind(this, 'click', ev => {
+    this._handlClick = $.bind(this, 'click', ev => {
       ev.preventDefault()
 
       if (!this.disabled && !this.readonly) {
@@ -248,7 +248,7 @@ export default class Checkbox {
   }
 
   unmount() {
-    unbind(this, 'click', this._handlClick)
+    $.unbind(this, 'click', this._handlClick)
   }
 
   watch() {

src/form/input.wc

@@ -231,7 +231,7 @@ li {
 <script>
 import '../scroll/index'
 import '../icon/index'
-import { ebind, bind, unbind, clickOutside } from '../utils'
+import $ from '../utils'
 
 const TYPES = ['text', 'textarea', 'password']
 const INPUTS = {
@@ -398,7 +398,7 @@ export default class Input {
     var { type } = this.props
 
     // 键盘事件
-    this._handleSubmit = ebind(this.__INPUT__, 'keydown', ev => {
+    this._handleSubmit = $.catch(this.__INPUT__, 'keydown', ev => {
       if (this.disabled || this.readonly) {
         return
       }
@@ -433,7 +433,7 @@ export default class Input {
     // 非textarea, 可做输入建议功能
     if (type === 'text') {
       // 输入状态事件
-      this._handleChange = bind(this.__INPUT__, 'input', ev => {
+      this._handleChange = $.bind(this.__INPUT__, 'input', ev => {
         ev.preventDefault()
         this.dispatchEvent(
           new CustomEvent('fetch-suggest', {
@@ -449,7 +449,7 @@ export default class Input {
       })
 
       // 渲染建议列表
-      this._parseSuggestion = bind(this.__INPUT__, 'click', ev => {
+      this._parseSuggestion = $.bind(this.__INPUT__, 'click', ev => {
         var { list } = this.props
         let { x, y, width } = this.getBoundingClientRect()
         if (list && list.length) {
@@ -465,28 +465,28 @@ export default class Input {
         }
       })
 
-      this._inactiveFn = clickOutside(this, ev => {
+      this._inactiveFn = $.outside(this, ev => {
         this.__LIST__.classList.remove('show')
       })
 
       // 选择建议
-      this._handleSelect = bind(this.__LIST__, 'click', ev => {
+      this._handleSelect = $.bind(this.__LIST__, 'click', ev => {
         if (ev.target.tagName === 'LI') {
           this._fetchSelect(ev.target.dataset.idx, ev)
           this.dispatchEvent(new CustomEvent('input'))
         }
       })
     } else {
-      this._handleWheel = ebind(this.__INPUT__, 'wheel')
+      this._handleWheel = $.catch(this.__INPUT__, 'wheel')
     }
   }
 
   unmount() {
-    unbind(this.__INPUT__, 'wheel', this._handleWheel)
+    $.unbind(this.__INPUT__, 'wheel', this._handleWheel)
-    unbind(this.__INPUT__, 'keydown', this._handleSubmit)
+    $.unbind(this.__INPUT__, 'keydown', this._handleSubmit)
-    unbind(this.__INPUT__, 'input', this._handleChange)
+    $.unbind(this.__INPUT__, 'input', this._handleChange)
-    unbind(document, 'mousedown', this._inactiveFn)
+    $.unbind(this.__LIST__, 'click', this._handleSelect)
-    unbind(this.__LIST__, 'click', this._handleSelect)
+    $.clearOutside(this._inactiveFn)
   }
 
   watch() {

src/form/number.wc

@@ -173,7 +173,7 @@
 <script>
 import '../scroll/index'
 import '../icon/index'
-import { ebind, bind, unbind } from '../utils'
+import $ from '../utils'
 
 export default class Number {
   props = {
@@ -283,7 +283,7 @@ export default class Number {
 
   mounted() {
     // 键盘事件
-    this._handleSubmit = ebind(this.__INPUT__, 'keydown', ev => {
+    this._handleSubmit = $.catch(this.__INPUT__, 'keydown', ev => {
       if (this.disabled || this.readonly) {
         return
       }
@@ -304,7 +304,7 @@ export default class Number {
       }
     })
 
-    this._handleChange = ebind(this.__INPUT__, 'change', ev => {
+    this._handleChange = $.catch(this.__INPUT__, 'change', ev => {
       if (isFinite(this.__INPUT__.value)) {
         this.props.value = +this.__INPUT__.value
         if (!this.__INPUT__.value.endsWith('.')) {
@@ -316,7 +316,7 @@ export default class Number {
       this.dispatchEvent(new CustomEvent('input'))
     })
 
-    this._handleAction = bind(this.__OUTER__, 'click', ev => {
+    this._handleAction = $.bind(this.__OUTER__, 'click', ev => {
       if (this.disabled || this.readonly) {
         return
       }
@@ -331,7 +331,7 @@ export default class Number {
   }
 
   unmount() {
-    unbind(this.__INPUT__, 'keydown', this._handleSubmit)
+    $.unbind(this.__INPUT__, 'keydown', this._handleSubmit)
   }
 
   watch() {

src/form/radio.wc

@@ -159,7 +159,7 @@
 </style>
 
 <script>
-import { bind, unbind } from '../utils'
+import $ from '../utils'
 
 export default class Radio {
   props = {
@@ -230,7 +230,7 @@ export default class Radio {
   }
 
   mounted() {
-    this._handleClick = bind(this, 'click', ev => {
+    this._handleClick = $.bind(this, 'click', ev => {
       if (!this.disabled && !this.readonly && !this.checked) {
         this.checked = true
         this.dispatchEvent(new CustomEvent('input'))
@@ -239,7 +239,7 @@ export default class Radio {
   }
 
   unmount() {
-    unbind(this, 'click', this._handleClick)
+    $.unbind(this, 'click', this._handleClick)
   }
 
   watch() {

src/form/select.wc

@@ -224,7 +224,7 @@
 <script>
 import '../scroll/index'
 import '../icon/index'
-import { ebind, bind, unbind, clickOutside } from '../utils'
+import $ from '../utils'
 
 function parseOptions(arr, props) {
   let html = ''
@@ -423,7 +423,7 @@ export default class Select {
     /* ---------------------------------------------------- */
 
     // 键盘事件
-    this._handleKeydown = ebind(this.__INPUT__, 'keydown', ev => {
+    this._handleKeydown = $.catch(this.__INPUT__, 'keydown', ev => {
       if (this.disabled || this.readonly) {
         return
       }
@@ -445,7 +445,7 @@ export default class Select {
     })
 
     // 渲染列表
-    this._activeFn = bind(this.__INPUT__, 'click', ev => {
+    this._activeFn = $.bind(this.__INPUT__, 'click', ev => {
       var { options } = this.props
 
       initPos.call(this)
@@ -453,14 +453,14 @@ export default class Select {
     })
 
     // 选择选项
-    this._handleSelect = bind(this.__OPTG__, 'click', ev => {
+    this._handleSelect = $.bind(this.__OPTG__, 'click', ev => {
       if (ev.target.tagName === 'DD' && !ev.target.hasAttribute('disabled')) {
         this._fetchSelect(+ev.target.dataset.idx, true)
         this.dispatchEvent(new CustomEvent('input'))
       }
     })
 
-    this._inactiveFn = clickOutside(this, ev => {
+    this._inactiveFn = $.outside(this, ev => {
       this.__OPTG__.classList.toggle('show', false)
       this.props.active = false
     })
@@ -495,10 +495,10 @@ export default class Select {
   }
 
   unmount() {
-    unbind(this.__INPUT__, 'keydown', this._handleKeydown)
+    $.unbind(this.__INPUT__, 'keydown', this._handleKeydown)
-    unbind(this.__INPUT__, 'click', this._activeFn)
+    $.unbind(this.__INPUT__, 'click', this._activeFn)
-    unbind(document, 'mousedown', this._inactiveFn)
+    $.unbind(this.__OPTG__, 'click', this._handleSelect)
-    unbind(this.__OPTG__, 'click', this._handleSelect)
+    $.clearOutside(this._inactiveFn)
   }
 }
 </script>

src/form/star.wc

@@ -87,7 +87,7 @@ label {
 </style>
 
 <script>
-import { ebind, bind, unbind } from '../utils'
+import $ from '../utils'
 
 export default class Star {
   props = {
@@ -186,7 +186,7 @@ export default class Star {
   }
 
   mounted() {
-    ebind(this.__BOX__, 'mousemove', ev => {
+    $.catch(this.__BOX__, 'mousemove', ev => {
       if (this.props.disabled) {
         return
       }
@@ -196,7 +196,7 @@ export default class Star {
       }
     })
 
-    ebind(this.__BOX__, 'click', ev => {
+    $.catch(this.__BOX__, 'click', ev => {
       var { tmp, disabled } = this.props
       if (disabled) {
         return
@@ -207,7 +207,7 @@ export default class Star {
       }
     })
 
-    ebind(this.__BOX__, 'mouseleave', ev => {
+    $.catch(this.__BOX__, 'mouseleave', ev => {
       if (this.props.disabled) {
         return
       }

src/form/switch.wc

@@ -108,7 +108,7 @@
 </style>
 
 <script>
-import { bind, unbind } from '../utils'
+import $ from '../utils'
 export default class Switch {
   props = {
     'active-text': null,
@@ -159,7 +159,7 @@ export default class Switch {
   }
 
   mounted() {
-    this._handleClick = bind(this, 'click', ev => {
+    this._handleClick = $.bind(this, 'click', ev => {
       if (this.disabled) {
         return
       }
@@ -178,7 +178,7 @@ export default class Switch {
   }
 
   unmount() {
-    unbind(this, 'click', this._handleClick)
+    $.unbind(this, 'click', this._handleClick)
   }
 
   watch() {

src/layer/index.wc

@@ -239,7 +239,7 @@
 import '../form/input'
 import Drag from '../drag/core'
 
-import { nextTick, bind, unbind, clickOutside } from '../utils'
+import $ from '../utils'
 
 const LANGUAGES = {
   en: {
@@ -456,7 +456,7 @@ class Layer {
     this.type = this.props.type
     this.title = this.props.title
 
-    this._handleBtnClick = bind(this.__CTRL__, 'click', ev => {
+    this._handleBtnClick = $.bind(this.__CTRL__, 'click', ev => {
       if (ev.target.tagName === 'BUTTON') {
         var idx = +ev.target.dataset.idx
         var { type } = this.props
@@ -487,7 +487,7 @@ class Layer {
 
     if (this.props.type === 'prompt') {
       this.__INPUT__ = this.__BODY__.firstElementChild.assignedNodes().pop()
-      this._handleSubmit = bind(this.__INPUT__, 'submit', ev => {
+      this._handleSubmit = $.bind(this.__INPUT__, 'submit', ev => {
         this._intercept(ev.detail)
       })
     }
@@ -502,7 +502,7 @@ class Layer {
     /* ----    额外的样式     --- */
     /* ------------------------ */
     if (this.props.mask) {
-      this._handlMask = clickOutside(this.root.children[1], ev => {
+      this._handlMask = $.outside(this.root.children[1], ev => {
         // 只作用于当前wc-layer
         if (ev.target !== this) {
           return
@@ -572,7 +572,7 @@ class Layer {
     }
 
     if (this.props.type === 'notify') {
-      this._handleClose = bind(this.__TITLE__, 'click', ev => {
+      this._handleClose = $.bind(this.__TITLE__, 'click', ev => {
         if (ev.target.tagName === 'WC-ICON') {
           this.close()
         }
@@ -581,8 +581,8 @@ class Layer {
   }
 
   unmount() {
-    unbind(document, 'mousedown', this._handlMask)
+    $.clearOutside(this._handlMask)
-    unbind(this.__TITLE__, 'click', this._handleClose)
+    $.unbind(this.__TITLE__, 'click', this._handleClose)
   }
 
   watch() {

src/neditor/index.wc

@@ -225,7 +225,7 @@ wc-scroll {
 import ICONS from './svg'
 import '../form/input'
 import '../form/button'
-import { clickOutside, bind, ebind, unbind } from '../utils'
+import $ from '../utils'
 
 const ACTTION = {
   bold: 'bold',
@@ -371,7 +371,7 @@ export default class Neditor {
     const FILE_INPUT = this.__TOOLBAR__.querySelector('input')
 
     if (FILE_INPUT) {
-      bind(FILE_INPUT, 'change', ev => {
+      $.bind(FILE_INPUT, 'change', ev => {
         this._handleImage(FILE_INPUT.files[0])
       })
     }
@@ -379,7 +379,7 @@ export default class Neditor {
     /* ------------------------------ */
 
     // 工具栏点击事件
-    this._toolFn = bind(this.__TOOLBAR__, 'click', ev => {
+    this._toolFn = $.bind(this.__TOOLBAR__, 'click', ev => {
       this.restoreSelection()
       if (ev.target === ev.currentTarget) {
         return
@@ -436,7 +436,7 @@ export default class Neditor {
     })
 
     // 字体大小设置
-    this._fontFn = bind(this.__FONT__, 'click', ev => {
+    this._fontFn = $.bind(this.__FONT__, 'click', ev => {
       if (ev.target === ev.currentTarget) {
         return
       }
@@ -448,7 +448,7 @@ export default class Neditor {
     })
 
     // 颜色
-    this._colorFn = bind(this.__COLOR__, 'click', ev => {
+    this._colorFn = $.bind(this.__COLOR__, 'click', ev => {
       if (ev.target === ev.currentTarget) {
         return
       }
@@ -460,7 +460,7 @@ export default class Neditor {
     })
 
     // 超链接
-    this.__linkFn = bind(this.__LINK_BTN__, 'active', ev => {
+    this.__linkFn = $.bind(this.__LINK_BTN__, 'active', ev => {
       if (LINK_INPUT.value) {
         this.__LINK__.classList.remove('fadein')
         this.__EDITOR__.focus()
@@ -472,18 +472,18 @@ export default class Neditor {
     })
 
     //监听鼠标事件的,以缓存选中状态
-    this.__mouseFn = bind(this.__EDITOR__, 'mouseleave', ev => {
+    this.__mouseFn = $.bind(this.__EDITOR__, 'mouseleave', ev => {
       this.saveSelection()
     })
 
-    clickOutside(this, ev => {
+    $.outside(this, ev => {
       this.__FONT__.classList.remove('fadein')
       this.__COLOR__.classList.remove('fadein')
       this.__LINK__.classList.remove('fadein')
     })
 
     //  粘贴板事件
-    this.__pasteFn = bind(this.__EDITOR__, 'paste', ev => {
+    this.__pasteFn = $.bind(this.__EDITOR__, 'paste', ev => {
       ev.preventDefault()
 
       var html = ev.clipboardData.getData('text/html')
@@ -539,12 +539,12 @@ export default class Neditor {
   }
 
   unmount() {
-    unbind(this.__TOOLBAR__, 'click', this.__toolFn)
+    $.unbind(this.__TOOLBAR__, 'click', this.__toolFn)
-    unbind(this.__FONT__, 'click', this.__fontFn)
+    $.unbind(this.__FONT__, 'click', this.__fontFn)
-    unbind(this.__COLOR__, 'click', this.__colorFn)
+    $.unbind(this.__COLOR__, 'click', this.__colorFn)
-    unbind(this.__LINK_BTN__, 'click', this.__linkFn)
+    $.unbind(this.__LINK_BTN__, 'click', this.__linkFn)
-    unbind(this.__EDITOR__, 'mouseleave', this.__mouseFn)
+    $.unbind(this.__EDITOR__, 'mouseleave', this.__mouseFn)
-    unbind(this.__EDITOR__, 'paste', this.__pasteFn)
+    $.unbind(this.__EDITOR__, 'paste', this.__pasteFn)
     this.__observer.disconnect()
   }
 

src/pager/index.wc

@@ -88,6 +88,8 @@
 </style>
 
 <script>
+import $ from '../utils'
+
 // 计算页码
 function calculate(curr, total, simple) {
   var arr = []
@@ -167,50 +169,46 @@ export default class Pager {
 
     this.update()
 
-    this.__LAYOUT__.addEventListener(
+    $.bind(this.__LAYOUT__, 'click', ev => {
-      'click',
+      if (ev.target.tagName === 'BUTTON') {
-      ev => {
+        var { curr, totalpage } = this.props
-        if (ev.target.tagName === 'BUTTON') {
+        var page = ev.target.dataset.page
-          var { curr, totalpage } = this.props
+        var num = +page
-          var page = ev.target.dataset.page
+        if (num === num) {
-          var num = +page
+          if (num === curr) {
-          if (num === num) {
+            return
-            if (num === curr) {
+          }
-              return
+        } else {
-            }
+          switch (page) {
-          } else {
+            case 'prev':
-            switch (page) {
+              num = curr - 1
-              case 'prev':
+              if (num < 1) {
-                num = curr - 1
+                return
-                if (num < 1) {
+              }
-                  return
+              break
-                }
+            case 'next':
-                break
+              num = curr + 1
-              case 'next':
+              if (num > totalpage) {
-                num = curr + 1
+                return
-                if (num > totalpage) {
+              }
-                  return
+              break
-                }
+            case 'end':
-                break
+              if (totalpage === curr) {
-              case 'end':
+                return
-                if (totalpage === curr) {
+              }
-                  return
+              num = totalpage
-                }
+              break
-                num = totalpage
-                break
-            }
           }
-          this.props.curr = num
-          this.update()
-          this.dispatchEvent(
-            new CustomEvent('pick', {
-              detail: num
-            })
-          )
         }
-      },
+        this.props.curr = num
-      false
+        this.update()
-    )
+        this.dispatchEvent(
+          new CustomEvent('pick', {
+            detail: num
+          })
+        )
+      }
+    })
   }
 
   watch() {

src/picker/date.wc

@@ -224,7 +224,7 @@
 
 <script>
 import '../icon/index'
-import { nextTick, each, ebind, bind, unbind, clickOutside } from '../utils'
+import $ from '../utils'
 
 const today = new Date()
 
@@ -382,7 +382,7 @@ export default class DatePicker {
       this.props.calendar = { ...last, list: [] }
     }
     this._renderCalendar()
-    nextTick(_ => this.dispatchEvent(new CustomEvent('input')))
+    $.nextTick(_ => this.dispatchEvent(new CustomEvent('input')))
   }
 
   get readonly() {
@@ -499,7 +499,7 @@ export default class DatePicker {
 
     if (needUpdateStyle) {
       var list = this.props.calendar.list
-      each(this.__DAYS__.children, (el, i) => {
+      $.each(this.__DAYS__.children, (el, i) => {
         if (this.props.last.day === list[i].day) {
           list[i].picked = true
           el.setAttribute('picked', '')
@@ -541,7 +541,7 @@ export default class DatePicker {
 
     this._fixedRenderDate()
 
-    this._activeFn = bind(this.__INPUT__, 'click', ev => {
+    this._activeFn = $.bind(this.__INPUT__, 'click', ev => {
       if (this.props.disabled || this.props.readonly) {
         return
       }
@@ -553,12 +553,12 @@ export default class DatePicker {
       this.__CALENDAR__.classList.toggle('show')
     })
 
-    this._inactiveFn = clickOutside(this, ev => {
+    this._inactiveFn = $.outside(this, ev => {
       this.__CALENDAR__.classList.toggle('show', false)
       this.props.active = false
     })
 
-    this._ctrlFn = bind(this.__CTRL__, 'click', ev => {
+    this._ctrlFn = $.bind(this.__CTRL__, 'click', ev => {
       let {
         calendar: { year, month },
         max,
@@ -598,7 +598,7 @@ export default class DatePicker {
       }
     })
 
-    this._pickFn = bind(this.__DAYS__, 'click', ev => {
+    this._pickFn = $.bind(this.__DAYS__, 'click', ev => {
       if (ev.target.tagName === 'SPAN') {
         let { calendar, last } = this.props
         let item = calendar.list[ev.target.dataset.idx]
@@ -617,7 +617,7 @@ export default class DatePicker {
         }
 
         this._updateValue(item._, true)
-        nextTick(_ => this.dispatchEvent(new CustomEvent('input')))
+        $.nextTick(_ => this.dispatchEvent(new CustomEvent('input')))
         this.dispatchEvent(
           new CustomEvent('pick', {
             detail: { value: this.value, _: item._ }
@@ -629,10 +629,10 @@ export default class DatePicker {
   }
 
   unmount() {
-    unbind(this.__INPUT__, 'click', this._activeFn)
+    $.unbind(this.__INPUT__, 'click', this._activeFn)
-    unbind(document, 'mousedown', this._inactiveFn)
+    $.unbind(this.__DAYS__, 'click', this._pickFn)
-    unbind(this.__CTRL__, 'click', this._ctrlFn)
+    $.unbind(this.__CTRL__, 'click', this._ctrlFn)
-    unbind(this.__DAYS__, 'click', this._pickFn)
+    $.clearOutside(this._inactiveFn)
   }
 
   watch() {

src/scroll/index.wc

@@ -76,7 +76,7 @@
 </style>
 
 <script>
-import { bind, ebind, unbind } from '../utils'
+import $ from '../utils'
 // 是否火狐浏览器
 const IS_FF = !!window.sidebar
 
@@ -157,7 +157,7 @@ export default class Scroll {
 
   mounted() {
     // 初始化滚动条的位置和长度
-    this._initFn = bind(this.__BOX__, 'mouseenter', ev => {
+    this._initFn = $.bind(this.__BOX__, 'mouseenter', ev => {
       var ow = this.__BOX__.offsetWidth
       var sw = this.__BOX__.scrollWidth
       var oh = this.__BOX__.offsetHeight
@@ -193,7 +193,7 @@ export default class Scroll {
     })
 
     // 鼠标滚动事件
-    this._wheelFn = ebind(this.__BOX__, 'wheel', ev => {
+    this._wheelFn = $.catch(this.__BOX__, 'wheel', ev => {
       ev.preventDefault()
       var { sh, oh, yh, sw, ow, xw } = this.props
 
@@ -261,26 +261,26 @@ export default class Scroll {
         startY = null
         this.props.thumbX = moveX
         this.props.thumbY = moveY
-        unbind(document, 'mousemove', mousemoveFn)
+        $.unbind(document, 'mousemove', mousemoveFn)
-        unbind(document, 'mouseup', mouseupFn)
+        $.unbind(document, 'mouseup', mouseupFn)
       }
 
-    bind(this.__Y__, 'mousedown', ev => {
+    $.bind(this.__Y__, 'mousedown', ev => {
       startY = ev.pageY
       if (!this.props.thumbY) {
         this.props.thumbY = 0
       }
-      bind(document, 'mousemove', mousemoveFn)
+      $.bind(document, 'mousemove', mousemoveFn)
-      bind(document, 'mouseup', mouseupFn)
+      $.bind(document, 'mouseup', mouseupFn)
     })
 
-    bind(this.__X__, 'mousedown', ev => {
+    $.bind(this.__X__, 'mousedown', ev => {
       startX = ev.pageX
       if (!this.props.thumbX) {
         this.props.thumbX = 0
       }
-      bind(document, 'mousemove', mousemoveFn)
+      $.bind(document, 'mousemove', mousemoveFn)
-      bind(document, 'mouseup', mouseupFn)
+      $.bind(document, 'mouseup', mouseupFn)
     })
 
     this.__observer = new MutationObserver(this._initFn)
@@ -293,8 +293,8 @@ export default class Scroll {
 
   unmount() {
     this.__observer.disconnect()
-    unbind(this.__BOX__, 'mouseenter', this._initFn)
+    $.unbind(this.__BOX__, 'mouseenter', this._initFn)
-    unbind(this.__BOX__, 'wheel', this._wheelFn)
+    $.unbind(this.__BOX__, 'wheel', this._wheelFn)
   }
 }
 </script>

src/utils.js

@@ -6,108 +6,113 @@
 
 function noop() {}
 
-/**
+export default {
- * 异步回调
+  /**
- */
+   * 异步回调
-export const nextTick = (function() {
+   */
-  let queue = []
+  nextTick: (function() {
-  function callback() {
+    let queue = []
-    let n = queue.length
+    function callback() {
-    for (let i = 0; i < n; i++) {
+      let n = queue.length
-      queue[i]()
+      for (let i = 0; i < n; i++) {
-    }
+        queue[i]()
-    queue = queue.slice(n)
-  }
-
-  let node = document.createTextNode('<!-- -->')
-  new MutationObserver(callback).observe(node, { characterData: true })
-
-  let bool = false
-  return function(fn) {
-    queue.push(fn)
-    bool = !bool
-    node.data = bool
-  }
-})()
-
-/**
- * 对象/数组遍历
- * 支持跳出
- */
-export const each = function(obj, fn) {
-  if (obj) {
-    if (Array.isArray(obj)) {
-      for (let i = 0, it; (it = obj[i++]); ) {
-        if (fn(it, i - 1) === false) {
-          break
-        }
-      }
-    } else {
-      for (let i in obj) {
-        if (obj.hasOwnProperty(i) && fn(obj[i], i) === false) {
-          break
-        }
       }
+      queue = queue.slice(n)
     }
-  }
-}
 
-/**
+    let node = document.createTextNode('<!-- -->')
- * 事件绑定
+    new MutationObserver(callback).observe(node, { characterData: true })
- */
-export const bind = function(dom, type, fn = noop, phase = false) {
-  let events = type.split(',')
-  each(events, function(t) {
-    t = t.trim()
-    dom.addEventListener(t, fn, phase)
-  })
-  return fn
-}
 
-/**
+    let bool = false
- * 事件绑定(默认不冒泡)
+    return function(fn) {
- */
+      queue.push(fn)
-export const ebind = function(dom, type, fn, phase) {
+      bool = !bool
-  function fn2(ev) {
+      node.data = bool
-    ev.stopPropagation()
+    }
-    fn && fn(ev)
+  })(),
-  }
-  return bind(dom, type, fn2, phase)
-}
 
-/**
+  /**
- * 解除事件绑定
+   * 对象/数组遍历
- */
+   * 支持跳出
-export const unbind = function(dom, type, fn = noop, phase = false) {
+   */
-  let events = type.split(',')
+  each(obj, fn) {
-  each(events, function(t) {
+    if (obj) {
-    t = t.trim()
+      if (Array.isArray(obj)) {
-    dom.removeEventListener(t, fn, phase)
+        for (let i = 0, it; (it = obj[i++]); ) {
-  })
+          if (fn(it, i - 1) === false) {
-}
+            break
-
-// 指定节点外点击(最高不能超过body层)
-export const clickOutside = function(dom, fn = noop) {
-  return bind(document, 'mousedown', ev => {
-    if (ev) {
-      if (ev.path) {
-        var path = ev.path.concat()
-        while (path.length > 3) {
-          if (path.shift() === dom) {
-            return
           }
         }
       } else {
-        var target = ev.explicitOriginalTarget || ev.target
+        for (let i in obj) {
-        if (
+          if (obj.hasOwnProperty(i) && fn(obj[i], i) === false) {
-          dom === target ||
+            break
-          dom.contains(target) ||
+          }
-          (dom.root && dom.root.contains(target))
-        ) {
-          return
         }
       }
     }
-    fn(ev)
+  },
-  })
+
+  /**
+   * 事件绑定
+   */
+  bind(dom, type, fn = noop, phase = false) {
+    let events = type.split(',')
+    this.each(events, function(t) {
+      t = t.trim()
+      dom.addEventListener(t, fn, phase)
+    })
+    return fn
+  },
+
+  /**
+   * 事件绑定(默认不冒泡)
+   */
+  catch(dom, type, fn, phase) {
+    function fn2(ev) {
+      ev.stopPropagation()
+      fn && fn(ev)
+    }
+    return this.bind(dom, type, fn2, phase)
+  },
+
+  /**
+   * 解除事件绑定
+   */
+  unbind(dom, type, fn = noop, phase = false) {
+    let events = type.split(',')
+    this.each(events, function(t) {
+      t = t.trim()
+      dom.removeEventListener(t, fn, phase)
+    })
+  },
+
+  // 指定节点外点击(最高不能超过body层)
+  outside(dom, fn = noop) {
+    return this.bind(document, 'mousedown', ev => {
+      if (ev) {
+        if (ev.path) {
+          var path = ev.path.concat()
+          while (path.length > 3) {
+            if (path.shift() === dom) {
+              return
+            }
+          }
+        } else {
+          var target = ev.explicitOriginalTarget || ev.target
+          if (
+            dom === target ||
+            dom.contains(target) ||
+            (dom.root && dom.root.contains(target))
+          ) {
+            return
+          }
+        }
+      }
+      fn(ev)
+    })
+  },
+  clearOutside(fn = noop) {
+    this.unbind(document, 'mousedown', fn)
+  }
 }