Skip to content

Commit e0d83fe

Browse files
dolymooddolymood
committed
build: package
1 parent 2ede963 commit e0d83fe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+3092
-2580
lines changed

‎lib/action-sheet/action-sheet.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/action-sheet/index.js‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2263,25 +2263,30 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
22632263
create: function create(config, renderFn, single) {
22642264
var ownerInstance = this;
22652265
var isInVueInstance = !!ownerInstance.$on;
2266-
var renderData = (0, _parseRenderData2.default)(config, events);
2267-
2268-
cancelWatchProps();
2269-
processProps();
2270-
processEvents();
2271-
process$();
22722266

22732267
if (typeof renderFn !== 'function' && single === undefined) {
22742268
single = renderFn;
22752269
renderFn = null;
22762270
}
22772271

2272+
cancelWatchProps();
2273+
22782274
var options = {
22792275
single: single
22802276
};
22812277
if (isInVueInstance) {
22822278
options.parent = ownerInstance;
2279+
if (!ownerInstance.__createAPI_watchers) {
2280+
ownerInstance.__createAPI_watchers = [];
2281+
}
22832282
}
22842283

2284+
var renderData = (0, _parseRenderData2.default)(config, events);
2285+
2286+
processProps();
2287+
processEvents();
2288+
process$();
2289+
22852290
var eventBeforeDestroy = 'hook:beforeDestroy';
22862291

22872292
var component = api.open(renderData, renderFn, options);
@@ -2325,15 +2330,15 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
23252330
}
23262331
});
23272332
if (isInVueInstance) {
2328-
ownerInstance.__createAPI_watcher = ownerInstance.$watch(function () {
2333+
ownerInstance.__createAPI_watchers.push(ownerInstance.$watch(function () {
23292334
var props = {};
23302335
watchKeys.forEach(function (key, i) {
23312336
props[key] = ownerInstance[watchPropKeys[i]];
23322337
});
23332338
return props;
23342339
}, function (newProps) {
23352340
component && component.$updateProps(newProps);
2336-
});
2341+
}));
23372342
}
23382343
}
23392344
}
@@ -2364,9 +2369,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
23642369
}
23652370

23662371
function cancelWatchProps() {
2367-
if (ownerInstance.__createAPI_watcher) {
2368-
ownerInstance.__createAPI_watcher();
2369-
ownerInstance.__createAPI_watcher = null;
2372+
if (ownerInstance.__createAPI_watchers) {
2373+
ownerInstance.__createAPI_watchers.forEach(function (watcher) {
2374+
watcher();
2375+
});
2376+
ownerInstance.__createAPI_watchers = null;
23702377
}
23712378
}
23722379
}
@@ -2675,11 +2682,19 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
26752682
}, [_c('div', {
26762683
staticClass: "cube-popup-mask",
26772684
on: {
2685+
"touchmove": function($event) {
2686+
$event.preventDefault();
2687+
},
26782688
"click": _vm.maskClick
26792689
}
26802690
}, [_vm._t("mask")], 2), _vm._v(" "), _c('div', {
26812691
staticClass: "cube-popup-container",
2682-
class: _vm.containerClass
2692+
class: _vm.containerClass,
2693+
on: {
2694+
"touchmove": function($event) {
2695+
$event.preventDefault();
2696+
}
2697+
}
26832698
}, [(_vm.$slots.default) ? _c('div', {
26842699
staticClass: "cube-popup-content"
26852700
}, [_vm._t("default")], 2) : _c('div', {
@@ -3026,9 +3041,6 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
30263041
"z-index": _vm.zIndex
30273042
},
30283043
on: {
3029-
"touchmove": function($event) {
3030-
$event.preventDefault();
3031-
},
30323044
"mask-click": _vm.maskClick
30333045
}
30343046
}, [_c('transition', {

‎lib/better-scroll/better-scroll.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/better-scroll/index.js‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
111111
"use strict";
112112
Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
113113
/*!
114-
* better-normal-scroll v1.12.4
114+
* better-normal-scroll v1.12.6
115115
* (c) 2016-2018 ustbhuangyi
116116
* Released under the MIT License.
117117
*/
@@ -1404,7 +1404,7 @@ function coreMixin(BScroll) {
14041404
// we scrolled less than 15 pixels
14051405
if (!this.moved) {
14061406
if (this.options.wheel) {
1407-
if (this.target && this.target.className === this.options.wheel.wheelWrapperClass) {
1407+
if (this.target && this.target.classList.contains(this.options.wheel.wheelWrapperClass)) {
14081408
var index = Math.abs(Math.round(this.y / this.itemHeight));
14091409
var _offset = Math.round((this.pointY + offsetToBody(this.wrapper).top - this.wrapperHeight / 2) / this.itemHeight);
14101410
this.target = this.items[index + _offset];
@@ -1674,7 +1674,7 @@ function coreMixin(BScroll) {
16741674
}
16751675
el = el.nodeType ? el : this.scroller.querySelector(el);
16761676

1677-
if (this.options.wheel && el.className !== this.options.wheel.wheelItemClass) {
1677+
if (this.options.wheel && !el.classList.contains(this.options.wheel.wheelItemClass)) {
16781678
return;
16791679
}
16801680

@@ -2729,6 +2729,7 @@ function mouseWheelMixin(BScroll) {
27292729

27302730
this.on('destroy', function () {
27312731
clearTimeout(_this.mouseWheelTimer);
2732+
clearTimeout(_this.mouseWheelEndTimer);
27322733
_this._handleMouseWheelEvent(removeEvent);
27332734
});
27342735

@@ -2854,11 +2855,21 @@ function mouseWheelMixin(BScroll) {
28542855
newY = this.maxScrollY;
28552856
}
28562857

2858+
var needTriggerEnd = this.y === newY;
28572859
this.scrollTo(newX, newY, easeTime, ease.swipe);
28582860
this.trigger('scroll', {
28592861
x: this.x,
28602862
y: this.y
28612863
});
2864+
clearTimeout(this.mouseWheelEndTimer);
2865+
if (needTriggerEnd) {
2866+
this.mouseWheelEndTimer = setTimeout(function () {
2867+
_this2.trigger('scrollEnd', {
2868+
x: _this2.x,
2869+
y: _this2.y
2870+
});
2871+
}, easeTime);
2872+
}
28622873
};
28632874
}
28642875

@@ -3146,6 +3157,7 @@ InfiniteScroller.prototype.maybeRequestContent = function () {
31463157
}
31473158
this.requestInProgress = true;
31483159
this.options.fetch(itemsNeeded).then(function (items) {
3160+
_this2.requestInProgress = false;
31493161
if (items) {
31503162
_this2.addContent(items);
31513163
} else {
@@ -3169,7 +3181,6 @@ InfiniteScroller.prototype.maybeRequestContent = function () {
31693181
};
31703182

31713183
InfiniteScroller.prototype.addContent = function (items) {
3172-
this.requestInProgress = false;
31733184
for (var i = 0; i < items.length; i++) {
31743185
if (this.items.length <= this.loadedItems) {
31753186
this._addItem();
@@ -3189,6 +3200,10 @@ InfiniteScroller.prototype.attachContent = function () {
31893200
this._setupAnimations(tombstoneAnimations, curPos);
31903201
};
31913202

3203+
InfiniteScroller.prototype.resetMore = function () {
3204+
this.hasMore = true;
3205+
};
3206+
31923207
InfiniteScroller.prototype._removeTombstones = function () {
31933208
var markIndex = void 0;
31943209
var tombstoneLen = 0;
@@ -3418,7 +3433,7 @@ mouseWheelMixin(BScroll);
34183433
zoomMixin(BScroll);
34193434
infiniteMixin(BScroll);
34203435

3421-
BScroll.Version = '1.12.4';
3436+
BScroll.Version = '1.12.6';
34223437

34233438
/* harmony default export */ __webpack_exports__["default"] = (BScroll);
34243439

‎lib/cascade-picker/cascade-picker.min.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/cascade-picker/index.js‎

Lines changed: 47 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2212,7 +2212,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
22122212
"use strict";
22132213
Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
22142214
/*!
2215-
* better-normal-scroll v1.12.4
2215+
* better-normal-scroll v1.12.6
22162216
* (c) 2016-2018 ustbhuangyi
22172217
* Released under the MIT License.
22182218
*/
@@ -3505,7 +3505,7 @@ function coreMixin(BScroll) {
35053505
// we scrolled less than 15 pixels
35063506
if (!this.moved) {
35073507
if (this.options.wheel) {
3508-
if (this.target && this.target.className === this.options.wheel.wheelWrapperClass) {
3508+
if (this.target && this.target.classList.contains(this.options.wheel.wheelWrapperClass)) {
35093509
var index = Math.abs(Math.round(this.y / this.itemHeight));
35103510
var _offset = Math.round((this.pointY + offsetToBody(this.wrapper).top - this.wrapperHeight / 2) / this.itemHeight);
35113511
this.target = this.items[index + _offset];
@@ -3775,7 +3775,7 @@ function coreMixin(BScroll) {
37753775
}
37763776
el = el.nodeType ? el : this.scroller.querySelector(el);
37773777

3778-
if (this.options.wheel && el.className !== this.options.wheel.wheelItemClass) {
3778+
if (this.options.wheel && !el.classList.contains(this.options.wheel.wheelItemClass)) {
37793779
return;
37803780
}
37813781

@@ -4830,6 +4830,7 @@ function mouseWheelMixin(BScroll) {
48304830

48314831
this.on('destroy', function () {
48324832
clearTimeout(_this.mouseWheelTimer);
4833+
clearTimeout(_this.mouseWheelEndTimer);
48334834
_this._handleMouseWheelEvent(removeEvent);
48344835
});
48354836

@@ -4955,11 +4956,21 @@ function mouseWheelMixin(BScroll) {
49554956
newY = this.maxScrollY;
49564957
}
49574958

4959+
var needTriggerEnd = this.y === newY;
49584960
this.scrollTo(newX, newY, easeTime, ease.swipe);
49594961
this.trigger('scroll', {
49604962
x: this.x,
49614963
y: this.y
49624964
});
4965+
clearTimeout(this.mouseWheelEndTimer);
4966+
if (needTriggerEnd) {
4967+
this.mouseWheelEndTimer = setTimeout(function () {
4968+
_this2.trigger('scrollEnd', {
4969+
x: _this2.x,
4970+
y: _this2.y
4971+
});
4972+
}, easeTime);
4973+
}
49634974
};
49644975
}
49654976

@@ -5247,6 +5258,7 @@ InfiniteScroller.prototype.maybeRequestContent = function () {
52475258
}
52485259
this.requestInProgress = true;
52495260
this.options.fetch(itemsNeeded).then(function (items) {
5261+
_this2.requestInProgress = false;
52505262
if (items) {
52515263
_this2.addContent(items);
52525264
} else {
@@ -5270,7 +5282,6 @@ InfiniteScroller.prototype.maybeRequestContent = function () {
52705282
};
52715283

52725284
InfiniteScroller.prototype.addContent = function (items) {
5273-
this.requestInProgress = false;
52745285
for (var i = 0; i < items.length; i++) {
52755286
if (this.items.length <= this.loadedItems) {
52765287
this._addItem();
@@ -5290,6 +5301,10 @@ InfiniteScroller.prototype.attachContent = function () {
52905301
this._setupAnimations(tombstoneAnimations, curPos);
52915302
};
52925303

5304+
InfiniteScroller.prototype.resetMore = function () {
5305+
this.hasMore = true;
5306+
};
5307+
52935308
InfiniteScroller.prototype._removeTombstones = function () {
52945309
var markIndex = void 0;
52955310
var tombstoneLen = 0;
@@ -5519,7 +5534,7 @@ mouseWheelMixin(BScroll);
55195534
zoomMixin(BScroll);
55205535
infiniteMixin(BScroll);
55215536

5522-
BScroll.Version = '1.12.4';
5537+
BScroll.Version = '1.12.6';
55235538

55245539
/* harmony default export */ __webpack_exports__["default"] = (BScroll);
55255540

@@ -5851,25 +5866,30 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
58515866
create: function create(config, renderFn, single) {
58525867
var ownerInstance = this;
58535868
var isInVueInstance = !!ownerInstance.$on;
5854-
var renderData = (0, _parseRenderData2.default)(config, events);
5855-
5856-
cancelWatchProps();
5857-
processProps();
5858-
processEvents();
5859-
process$();
58605869

58615870
if (typeof renderFn !== 'function' && single === undefined) {
58625871
single = renderFn;
58635872
renderFn = null;
58645873
}
58655874

5875+
cancelWatchProps();
5876+
58665877
var options = {
58675878
single: single
58685879
};
58695880
if (isInVueInstance) {
58705881
options.parent = ownerInstance;
5882+
if (!ownerInstance.__createAPI_watchers) {
5883+
ownerInstance.__createAPI_watchers = [];
5884+
}
58715885
}
58725886

5887+
var renderData = (0, _parseRenderData2.default)(config, events);
5888+
5889+
processProps();
5890+
processEvents();
5891+
process$();
5892+
58735893
var eventBeforeDestroy = 'hook:beforeDestroy';
58745894

58755895
var component = api.open(renderData, renderFn, options);
@@ -5913,15 +5933,15 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
59135933
}
59145934
});
59155935
if (isInVueInstance) {
5916-
ownerInstance.__createAPI_watcher = ownerInstance.$watch(function () {
5936+
ownerInstance.__createAPI_watchers.push(ownerInstance.$watch(function () {
59175937
var props = {};
59185938
watchKeys.forEach(function (key, i) {
59195939
props[key] = ownerInstance[watchPropKeys[i]];
59205940
});
59215941
return props;
59225942
}, function (newProps) {
59235943
component && component.$updateProps(newProps);
5924-
});
5944+
}));
59255945
}
59265946
}
59275947
}
@@ -5952,9 +5972,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
59525972
}
59535973

59545974
function cancelWatchProps() {
5955-
if (ownerInstance.__createAPI_watcher) {
5956-
ownerInstance.__createAPI_watcher();
5957-
ownerInstance.__createAPI_watcher = null;
5975+
if (ownerInstance.__createAPI_watchers) {
5976+
ownerInstance.__createAPI_watchers.forEach(function (watcher) {
5977+
watcher();
5978+
});
5979+
ownerInstance.__createAPI_watchers = null;
59585980
}
59595981
}
59605982
}
@@ -6263,11 +6285,19 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
62636285
}, [_c('div', {
62646286
staticClass: "cube-popup-mask",
62656287
on: {
6288+
"touchmove": function($event) {
6289+
$event.preventDefault();
6290+
},
62666291
"click": _vm.maskClick
62676292
}
62686293
}, [_vm._t("mask")], 2), _vm._v(" "), _c('div', {
62696294
staticClass: "cube-popup-container",
6270-
class: _vm.containerClass
6295+
class: _vm.containerClass,
6296+
on: {
6297+
"touchmove": function($event) {
6298+
$event.preventDefault();
6299+
}
6300+
}
62716301
}, [(_vm.$slots.default) ? _c('div', {
62726302
staticClass: "cube-popup-content"
62736303
}, [_vm._t("default")], 2) : _c('div', {

‎lib/create-api/create-api.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)