Skip to content

Commit f9879ef

Browse files
dolymooddolymood
committed
publish build
1 parent f066361 commit f9879ef

File tree

9 files changed

+57
-19
lines changed

9 files changed

+57
-19
lines changed

‎lib/cube.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/drawer/drawer.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/drawer/index.js‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5858,6 +5858,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
58585858
return {
58595859
index: -1,
58605860
selectedVal: [],
5861+
selectedText: [],
58615862
selected: [].concat((0, _toConsumableArray3.default)(this.selectedIndex)),
58625863
slideStyle: (0, _defineProperty3.default)({}, transform, 'translate3d(0, 0, 0)')
58635864
};
@@ -5917,6 +5918,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
59175918
this.index = panelIndex;
59185919
this.selected = this.selected.slice(0, panelIndex);
59195920
this.selectedVal = this.selectedVal.slice(0, panelIndex);
5921+
this.selectedText = this.selectedText.slice(0, panelIndex);
59205922
if (index >= 0) {
59215923
this.$set(this.selected, panelIndex, index);
59225924
this.changeHandler(panelIndex, this.data[panelIndex][index], index);
@@ -5958,12 +5960,19 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
59585960
});
59595961
},
59605962
changeHandler: function changeHandler(panelIndex, item, index) {
5961-
this.selectedVal[panelIndex] = typeof item === 'string' ? item : item.value;
5963+
if (typeof item === 'string') {
5964+
this.selectedVal[panelIndex] = item;
5965+
this.selectedText[panelIndex] = item;
5966+
} else {
5967+
this.selectedVal[panelIndex] = item.value;
5968+
this.selectedText[panelIndex] = item.text;
5969+
}
59625970
this.$set(this.selected, panelIndex, index);
59635971
if (panelIndex === this.data.length - 1) {
5964-
this.$emit(EVENT_SELECT, this.selectedVal, this.selected);
5972+
this.$emit(EVENT_SELECT, this.selectedVal, this.selected, this.selectedText);
5973+
this.hide();
59655974
} else {
5966-
this.$emit(EVENT_CHANGE, panelIndex, item, this.selectedVal, this.selected);
5975+
this.$emit(EVENT_CHANGE, panelIndex, item, this.selectedVal, this.selected, this.selectedText);
59675976
}
59685977
},
59695978
drawerClick: function drawerClick() {

‎lib/index-list/index-list.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/index-list/index.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5679,6 +5679,10 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
56795679
speed: {
56805680
type: Number,
56815681
default: 0
5682+
},
5683+
navbar: {
5684+
type: Boolean,
5685+
default: true
56825686
}
56835687
},
56845688
data: function data() {
@@ -6035,7 +6039,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
60356039
"select": _vm.selectItem
60366040
}
60376041
})
6038-
}))], 2)])]), _vm._v(" "), _c('div', {
6042+
}))], 2)])]), _vm._v(" "), (_vm.navbar) ? _c('div', {
60396043
staticClass: "cube-index-list-nav",
60406044
on: {
60416045
"touchstart": _vm.onShortcutTouchStart,
@@ -6057,8 +6061,10 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
60576061
attrs: {
60586062
"data-index": index
60596063
}
6060-
}, [_vm._v(_vm._s(item))])
6061-
}))]), _vm._v(" "), _c('div', {
6064+
}, [_vm._t("nav-item", [_vm._v(_vm._s(item))], {
6065+
item: item
6066+
})], 2)
6067+
}))]) : _vm._e(), _vm._v(" "), _c('div', {
60626068
directives: [{
60636069
name: "show",
60646070
rawName: "v-show",

‎lib/index.js‎

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5446,7 +5446,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
54465446
}
54475447

54485448
var cube = {
5449-
version: "1.7.1",
5449+
version: "1.7.2",
54505450
install: install,
54515451
BScroll: _module.BScroll,
54525452
createAPI: _module.createAPI
@@ -7777,6 +7777,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
77777777

77787778
var COMPONENT_NAME = 'cube-toast';
77797779

7780+
var EVENT_TIMEOUT = 'timeout';
7781+
77807782
exports.default = {
77817783
name: COMPONENT_NAME,
77827784
mixins: [_api2.default],
@@ -7830,6 +7832,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
78307832
if (_this.time !== 0) {
78317833
_this.timer = setTimeout(function () {
78327834
_this.hide();
7835+
_this.$emit(EVENT_TIMEOUT);
78337836
}, _this.time);
78347837
}
78357838
});
@@ -7935,7 +7938,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
79357938
}
79367939

79377940
function addToast(Vue, Toast) {
7938-
(0, _createApi2.default)(Vue, Toast, [], true);
7941+
(0, _createApi2.default)(Vue, Toast, ['timeout'], true);
79397942
}
79407943
module.exports = exports['default'];
79417944
});
@@ -11838,6 +11841,10 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
1183811841
speed: {
1183911842
type: Number,
1184011843
default: 0
11844+
},
11845+
navbar: {
11846+
type: Boolean,
11847+
default: true
1184111848
}
1184211849
},
1184311850
data: function data() {
@@ -13302,7 +13309,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
1330213309
"select": _vm.selectItem
1330313310
}
1330413311
})
13305-
}))], 2)])]), _vm._v(" "), _c('div', {
13312+
}))], 2)])]), _vm._v(" "), (_vm.navbar) ? _c('div', {
1330613313
staticClass: "cube-index-list-nav",
1330713314
on: {
1330813315
"touchstart": _vm.onShortcutTouchStart,
@@ -13324,8 +13331,10 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
1332413331
attrs: {
1332513332
"data-index": index
1332613333
}
13327-
}, [_vm._v(_vm._s(item))])
13328-
}))]), _vm._v(" "), _c('div', {
13334+
}, [_vm._t("nav-item", [_vm._v(_vm._s(item))], {
13335+
item: item
13336+
})], 2)
13337+
}))]) : _vm._e(), _vm._v(" "), _c('div', {
1332913338
directives: [{
1333013339
name: "show",
1333113340
rawName: "v-show",
@@ -13477,6 +13486,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
1347713486
type: Number,
1347813487
default: 2500
1347913488
},
13489+
1348013490
delay: {
1348113491
type: Number,
1348213492
default: 15
@@ -16141,6 +16151,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
1614116151
return {
1614216152
index: -1,
1614316153
selectedVal: [],
16154+
selectedText: [],
1614416155
selected: [].concat((0, _toConsumableArray3.default)(this.selectedIndex)),
1614516156
slideStyle: (0, _defineProperty3.default)({}, transform, 'translate3d(0, 0, 0)')
1614616157
};
@@ -16200,6 +16211,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
1620016211
this.index = panelIndex;
1620116212
this.selected = this.selected.slice(0, panelIndex);
1620216213
this.selectedVal = this.selectedVal.slice(0, panelIndex);
16214+
this.selectedText = this.selectedText.slice(0, panelIndex);
1620316215
if (index >= 0) {
1620416216
this.$set(this.selected, panelIndex, index);
1620516217
this.changeHandler(panelIndex, this.data[panelIndex][index], index);
@@ -16241,12 +16253,19 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
1624116253
});
1624216254
},
1624316255
changeHandler: function changeHandler(panelIndex, item, index) {
16244-
this.selectedVal[panelIndex] = typeof item === 'string' ? item : item.value;
16256+
if (typeof item === 'string') {
16257+
this.selectedVal[panelIndex] = item;
16258+
this.selectedText[panelIndex] = item;
16259+
} else {
16260+
this.selectedVal[panelIndex] = item.value;
16261+
this.selectedText[panelIndex] = item.text;
16262+
}
1624516263
this.$set(this.selected, panelIndex, index);
1624616264
if (panelIndex === this.data.length - 1) {
16247-
this.$emit(EVENT_SELECT, this.selectedVal, this.selected);
16265+
this.$emit(EVENT_SELECT, this.selectedVal, this.selected, this.selectedText);
16266+
this.hide();
1624816267
} else {
16249-
this.$emit(EVENT_CHANGE, panelIndex, item, this.selectedVal, this.selected);
16268+
this.$emit(EVENT_CHANGE, panelIndex, item, this.selectedVal, this.selected, this.selectedText);
1625016269
}
1625116270
},
1625216271
drawerClick: function drawerClick() {

‎lib/time-picker/index.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5386,6 +5386,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
53865386
type: Number,
53875387
default: 2500
53885388
},
5389+
53895390
delay: {
53905391
type: Number,
53915392
default: 15

‎lib/toast/index.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
692692

693693
var COMPONENT_NAME = 'cube-toast';
694694

695+
var EVENT_TIMEOUT = 'timeout';
696+
695697
exports.default = {
696698
name: COMPONENT_NAME,
697699
mixins: [_api2.default],
@@ -745,6 +747,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
745747
if (_this.time !== 0) {
746748
_this.timer = setTimeout(function () {
747749
_this.hide();
750+
_this.$emit(EVENT_TIMEOUT);
748751
}, _this.time);
749752
}
750753
});
@@ -852,7 +855,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
852855
}
853856

854857
function addToast(Vue, Toast) {
855-
(0, _createApi2.default)(Vue, Toast, [], true);
858+
(0, _createApi2.default)(Vue, Toast, ['timeout'], true);
856859
}
857860
module.exports = exports['default'];
858861
});

‎lib/toast/toast.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)