Update v-click-outside-x and use project wide directive
This commit is contained in:
parent
427b869297
commit
26369639b6
15 changed files with 15962 additions and 16013 deletions
2718
dist/iview.js
vendored
2718
dist/iview.js
vendored
File diff suppressed because one or more lines are too long
2
dist/iview.js.map
vendored
2
dist/iview.js.map
vendored
File diff suppressed because one or more lines are too long
4
dist/iview.min.js
vendored
4
dist/iview.min.js
vendored
File diff suppressed because one or more lines are too long
BIN
dist/iview.min.js.gz
vendored
BIN
dist/iview.min.js.gz
vendored
Binary file not shown.
2
dist/iview.min.js.map
vendored
2
dist/iview.min.js.map
vendored
File diff suppressed because one or more lines are too long
5264
package-lock.json
generated
5264
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -29,7 +29,7 @@
|
||||||
"lint": "eslint --fix --ext .js,.vue src",
|
"lint": "eslint --fix --ext .js,.vue src",
|
||||||
"unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run",
|
"unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run",
|
||||||
"test": "npm run lint && npm run unit",
|
"test": "npm run lint && npm run unit",
|
||||||
"prepublish": "npm run dist"
|
"prepare": "npm run dist"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
"lodash.throttle": "^4.1.1",
|
"lodash.throttle": "^4.1.1",
|
||||||
"popper.js": "^1.14.1",
|
"popper.js": "^1.14.1",
|
||||||
"tinycolor2": "^1.4.1",
|
"tinycolor2": "^1.4.1",
|
||||||
"v-click-outside-x": "^2.5.1"
|
"v-click-outside-x": "^3.0.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"vue": "^2.5.2"
|
"vue": "^2.5.2"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div :class="classes" v-clickoutside="handleClose">
|
<div :class="classes" v-click-outside="handleClose">
|
||||||
<div :class="[prefixCls + '-rel']" @click="toggleOpen" ref="reference">
|
<div :class="[prefixCls + '-rel']" @click="toggleOpen" ref="reference">
|
||||||
<input type="hidden" :name="name" :value="currentValue">
|
<input type="hidden" :name="name" :value="currentValue">
|
||||||
<slot>
|
<slot>
|
||||||
|
@ -57,7 +57,7 @@
|
||||||
import Drop from '../select/dropdown.vue';
|
import Drop from '../select/dropdown.vue';
|
||||||
import Icon from '../icon/icon.vue';
|
import Icon from '../icon/icon.vue';
|
||||||
import Caspanel from './caspanel.vue';
|
import Caspanel from './caspanel.vue';
|
||||||
import clickoutside from '../../directives/clickoutside';
|
import {directive as clickOutside} from 'v-click-outside-x';
|
||||||
import TransferDom from '../../directives/transfer-dom';
|
import TransferDom from '../../directives/transfer-dom';
|
||||||
import { oneOf } from '../../utils/assist';
|
import { oneOf } from '../../utils/assist';
|
||||||
import Emitter from '../../mixins/emitter';
|
import Emitter from '../../mixins/emitter';
|
||||||
|
@ -70,7 +70,7 @@
|
||||||
name: 'Cascader',
|
name: 'Cascader',
|
||||||
mixins: [ Emitter, Locale ],
|
mixins: [ Emitter, Locale ],
|
||||||
components: { iInput, Drop, Icon, Caspanel },
|
components: { iInput, Drop, Icon, Caspanel },
|
||||||
directives: { clickoutside, TransferDom },
|
directives: { clickOutside, TransferDom },
|
||||||
props: {
|
props: {
|
||||||
data: {
|
data: {
|
||||||
type: Array,
|
type: Array,
|
||||||
|
|
|
@ -112,7 +112,7 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import tinycolor from 'tinycolor2';
|
import tinycolor from 'tinycolor2';
|
||||||
import vClickOutside from 'v-click-outside-x';
|
import {directive as clickOutside} from 'v-click-outside-x';
|
||||||
import TransferDom from '../../directives/transfer-dom';
|
import TransferDom from '../../directives/transfer-dom';
|
||||||
import Drop from '../../components/select/dropdown.vue';
|
import Drop from '../../components/select/dropdown.vue';
|
||||||
import RecommendColors from './recommend-colors.vue';
|
import RecommendColors from './recommend-colors.vue';
|
||||||
|
@ -130,7 +130,7 @@ export default {
|
||||||
|
|
||||||
components: {Drop, RecommendColors, Saturation, Hue, Alpha},
|
components: {Drop, RecommendColors, Saturation, Hue, Alpha},
|
||||||
|
|
||||||
directives: {clickOutside: vClickOutside.directive, TransferDom},
|
directives: {clickOutside, TransferDom},
|
||||||
|
|
||||||
mixins: [Emitter, Locale, Prefixes],
|
mixins: [Emitter, Locale, Prefixes],
|
||||||
|
|
||||||
|
|
|
@ -78,7 +78,7 @@
|
||||||
|
|
||||||
import iInput from '../../components/input/input.vue';
|
import iInput from '../../components/input/input.vue';
|
||||||
import Drop from '../../components/select/dropdown.vue';
|
import Drop from '../../components/select/dropdown.vue';
|
||||||
import vClickOutside from 'v-click-outside-x';
|
import {directive as clickOutside} from 'v-click-outside-x';
|
||||||
import TransferDom from '../../directives/transfer-dom';
|
import TransferDom from '../../directives/transfer-dom';
|
||||||
import { oneOf } from '../../utils/assist';
|
import { oneOf } from '../../utils/assist';
|
||||||
import { DEFAULT_FORMATS, RANGE_SEPARATOR, TYPE_VALUE_RESOLVER_MAP, getDayCountOfMonth } from './util';
|
import { DEFAULT_FORMATS, RANGE_SEPARATOR, TYPE_VALUE_RESOLVER_MAP, getDayCountOfMonth } from './util';
|
||||||
|
@ -120,7 +120,7 @@
|
||||||
export default {
|
export default {
|
||||||
mixins: [ Emitter ],
|
mixins: [ Emitter ],
|
||||||
components: { iInput, Drop },
|
components: { iInput, Drop },
|
||||||
directives: { clickOutside: vClickOutside.directive, TransferDom },
|
directives: { clickOutside, TransferDom },
|
||||||
props: {
|
props: {
|
||||||
format: {
|
format: {
|
||||||
type: String
|
type: String
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<div
|
<div
|
||||||
:class="[prefixCls]"
|
:class="[prefixCls]"
|
||||||
v-clickoutside="onClickoutside"
|
v-click-outside="onClickoutside"
|
||||||
@mouseenter="handleMouseenter"
|
@mouseenter="handleMouseenter"
|
||||||
@mouseleave="handleMouseleave">
|
@mouseleave="handleMouseleave">
|
||||||
<div :class="[prefixCls + '-rel']" ref="reference" @click="handleClick"><slot></slot></div>
|
<div :class="[prefixCls + '-rel']" ref="reference" @click="handleClick"><slot></slot></div>
|
||||||
|
@ -20,7 +20,7 @@
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import Drop from '../select/dropdown.vue';
|
import Drop from '../select/dropdown.vue';
|
||||||
import clickoutside from '../../directives/clickoutside';
|
import {directive as clickOutside} from 'v-click-outside-x';
|
||||||
import TransferDom from '../../directives/transfer-dom';
|
import TransferDom from '../../directives/transfer-dom';
|
||||||
import { oneOf, findComponentUpward } from '../../utils/assist';
|
import { oneOf, findComponentUpward } from '../../utils/assist';
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'Dropdown',
|
name: 'Dropdown',
|
||||||
directives: { clickoutside, TransferDom },
|
directives: { clickOutside, TransferDom },
|
||||||
components: { Drop },
|
components: { Drop },
|
||||||
props: {
|
props: {
|
||||||
trigger: {
|
trigger: {
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
:class="classes"
|
:class="classes"
|
||||||
@mouseenter="handleMouseenter"
|
@mouseenter="handleMouseenter"
|
||||||
@mouseleave="handleMouseleave"
|
@mouseleave="handleMouseleave"
|
||||||
v-clickoutside="handleClose">
|
v-click-outside="handleClose">
|
||||||
<div
|
<div
|
||||||
:class="[prefixCls + '-rel']"
|
:class="[prefixCls + '-rel']"
|
||||||
ref="reference"
|
ref="reference"
|
||||||
|
@ -49,7 +49,7 @@
|
||||||
<script>
|
<script>
|
||||||
import Popper from '../base/popper';
|
import Popper from '../base/popper';
|
||||||
import iButton from '../button/button.vue';
|
import iButton from '../button/button.vue';
|
||||||
import clickoutside from '../../directives/clickoutside';
|
import {directive as clickOutside} from 'v-click-outside-x';
|
||||||
import TransferDom from '../../directives/transfer-dom';
|
import TransferDom from '../../directives/transfer-dom';
|
||||||
import { oneOf } from '../../utils/assist';
|
import { oneOf } from '../../utils/assist';
|
||||||
import Locale from '../../mixins/locale';
|
import Locale from '../../mixins/locale';
|
||||||
|
@ -59,7 +59,7 @@
|
||||||
export default {
|
export default {
|
||||||
name: 'Poptip',
|
name: 'Poptip',
|
||||||
mixins: [ Popper, Locale ],
|
mixins: [ Popper, Locale ],
|
||||||
directives: { clickoutside, TransferDom },
|
directives: { clickOutside, TransferDom },
|
||||||
components: { iButton },
|
components: { iButton },
|
||||||
props: {
|
props: {
|
||||||
trigger: {
|
trigger: {
|
||||||
|
|
|
@ -73,7 +73,7 @@
|
||||||
<script>
|
<script>
|
||||||
import Icon from '../icon';
|
import Icon from '../icon';
|
||||||
import Drop from './dropdown.vue';
|
import Drop from './dropdown.vue';
|
||||||
import vClickOutside from 'v-click-outside-x';
|
import {directive as clickOutside} from 'v-click-outside-x';
|
||||||
import TransferDom from '../../directives/transfer-dom';
|
import TransferDom from '../../directives/transfer-dom';
|
||||||
import { oneOf } from '../../utils/assist';
|
import { oneOf } from '../../utils/assist';
|
||||||
import Emitter from '../../mixins/emitter';
|
import Emitter from '../../mixins/emitter';
|
||||||
|
@ -142,7 +142,7 @@
|
||||||
name: 'iSelect',
|
name: 'iSelect',
|
||||||
mixins: [ Emitter, Locale ],
|
mixins: [ Emitter, Locale ],
|
||||||
components: { FunctionalOptions, Drop, Icon, SelectHead },
|
components: { FunctionalOptions, Drop, Icon, SelectHead },
|
||||||
directives: { clickOutside: vClickOutside.directive, TransferDom },
|
directives: { clickOutside, TransferDom },
|
||||||
props: {
|
props: {
|
||||||
value: {
|
value: {
|
||||||
type: [String, Number, Array],
|
type: [String, Number, Array],
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
export default {
|
|
||||||
bind (el, binding, vnode) {
|
|
||||||
function documentHandler (e) {
|
|
||||||
if (el.contains(e.target)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (binding.expression) {
|
|
||||||
binding.value(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
el.__vueClickOutside__ = documentHandler;
|
|
||||||
document.addEventListener('click', documentHandler);
|
|
||||||
},
|
|
||||||
update () {
|
|
||||||
|
|
||||||
},
|
|
||||||
unbind (el, binding) {
|
|
||||||
document.removeEventListener('click', el.__vueClickOutside__);
|
|
||||||
delete el.__vueClickOutside__;
|
|
||||||
}
|
|
||||||
};
|
|
26
yarn.lock
26
yarn.lock
|
@ -361,8 +361,8 @@ ast-types@0.9.6:
|
||||||
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
|
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
|
||||||
|
|
||||||
ast-types@0.x.x:
|
ast-types@0.x.x:
|
||||||
version "0.11.4"
|
version "0.11.5"
|
||||||
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.4.tgz#76f930930e9571851ba282a9a0f6923f29f6be2f"
|
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.5.tgz#9890825d660c03c28339f315e9fa0a360e31ec28"
|
||||||
|
|
||||||
async-each@^1.0.0:
|
async-each@^1.0.0:
|
||||||
version "1.0.1"
|
version "1.0.1"
|
||||||
|
@ -421,8 +421,8 @@ autoprefixer@^6.0.2, autoprefixer@^6.3.1:
|
||||||
postcss-value-parser "^3.2.3"
|
postcss-value-parser "^3.2.3"
|
||||||
|
|
||||||
autoprefixer@^8.0.0:
|
autoprefixer@^8.0.0:
|
||||||
version "8.5.1"
|
version "8.5.2"
|
||||||
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.5.1.tgz#45b0271b0e634af66613d5a4f99d96f3dcd94474"
|
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.5.2.tgz#52d86a5ea51a6191024d843f88f2748ce3ab39e5"
|
||||||
dependencies:
|
dependencies:
|
||||||
browserslist "^3.2.8"
|
browserslist "^3.2.8"
|
||||||
caniuse-lite "^1.0.30000846"
|
caniuse-lite "^1.0.30000846"
|
||||||
|
@ -1281,8 +1281,8 @@ browserslist@^3.2.6, browserslist@^3.2.8:
|
||||||
electron-to-chromium "^1.3.47"
|
electron-to-chromium "^1.3.47"
|
||||||
|
|
||||||
buffer-from@^1.0.0:
|
buffer-from@^1.0.0:
|
||||||
version "1.0.0"
|
version "1.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
|
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04"
|
||||||
|
|
||||||
buffer-indexof@^1.0.0:
|
buffer-indexof@^1.0.0:
|
||||||
version "1.1.1"
|
version "1.1.1"
|
||||||
|
@ -2516,8 +2516,8 @@ es-to-primitive@^1.1.1:
|
||||||
is-symbol "^1.0.1"
|
is-symbol "^1.0.1"
|
||||||
|
|
||||||
es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
|
es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
|
||||||
version "0.10.43"
|
version "0.10.44"
|
||||||
resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.43.tgz#c705e645253210233a270869aa463a2333b7ca64"
|
resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.44.tgz#7a877e994bb190aebd4718aa2d62784a12e2ca20"
|
||||||
dependencies:
|
dependencies:
|
||||||
es6-iterator "~2.0.3"
|
es6-iterator "~2.0.3"
|
||||||
es6-symbol "~3.1.1"
|
es6-symbol "~3.1.1"
|
||||||
|
@ -7839,8 +7839,8 @@ uglify-js@2.6.x:
|
||||||
yargs "~3.10.0"
|
yargs "~3.10.0"
|
||||||
|
|
||||||
uglify-js@3.3.x:
|
uglify-js@3.3.x:
|
||||||
version "3.3.27"
|
version "3.3.28"
|
||||||
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.27.tgz#eb8c3c9429969f86ff5b0a2422ffc78c3cea8cc0"
|
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.28.tgz#0efb9a13850e11303361c1051f64d2ec68d9be06"
|
||||||
dependencies:
|
dependencies:
|
||||||
commander "~2.15.0"
|
commander "~2.15.0"
|
||||||
source-map "~0.6.1"
|
source-map "~0.6.1"
|
||||||
|
@ -8041,9 +8041,9 @@ uws@~9.14.0:
|
||||||
version "9.14.0"
|
version "9.14.0"
|
||||||
resolved "https://registry.yarnpkg.com/uws/-/uws-9.14.0.tgz#fac8386befc33a7a3705cbd58dc47b430ca4dd95"
|
resolved "https://registry.yarnpkg.com/uws/-/uws-9.14.0.tgz#fac8386befc33a7a3705cbd58dc47b430ca4dd95"
|
||||||
|
|
||||||
v-click-outside-x@^2.5.1:
|
v-click-outside-x@^3.0.0:
|
||||||
version "2.5.1"
|
version "3.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/v-click-outside-x/-/v-click-outside-x-2.5.1.tgz#c87b9899f1bd27d2dc66b6fde960600e95060254"
|
resolved "https://registry.yarnpkg.com/v-click-outside-x/-/v-click-outside-x-3.0.0.tgz#9ff15f4dcfe3f8c47f5f83f8587b84781f497130"
|
||||||
|
|
||||||
v8flags@^2.0.2, v8flags@^2.1.1:
|
v8flags@^2.0.2, v8flags@^2.1.1:
|
||||||
version "2.1.1"
|
version "2.1.1"
|
||||||
|
|
Loading…
Add table
Reference in a new issue