Skip to content

Commit 49942a7

Browse files
committed
[build] v2.5.3
1 parent 86229ed commit 49942a7

File tree

4 files changed

+110
-102
lines changed

4 files changed

+110
-102
lines changed

element-ui.common.js

+55-51
Original file line numberDiff line numberDiff line change
@@ -22177,7 +22177,6 @@ tab_barvue_type_template_id_2031f33a_render._withStripped = true
2217722177
get: function get() {
2217822178
var _this = this;
2217922179

22180-
if (!this.$parent.$refs.tabs) return {};
2218122180
var style = {};
2218222181
var offset = 0;
2218322182
var tabSize = 0;
@@ -22189,7 +22188,7 @@ tab_barvue_type_template_id_2031f33a_render._withStripped = true
2218922188
});
2219022189
};
2219122190
this.tabs.every(function (tab, index) {
22192-
var $el = Object(util_["arrayFind"])(_this.$parent.$refs.tabs, function (t) {
22191+
var $el = Object(util_["arrayFind"])(_this.$parent.$refs.tabs || [], function (t) {
2219322192
return t.id.replace('tab-', '') === tab.paneName;
2219422193
});
2219522194
if (!$el) {
@@ -28548,52 +28547,59 @@ var mainvue_type_template_id_455b9f60_render = function() {
2854828547
var _vm = this
2854928548
var _h = _vm.$createElement
2855028549
var _c = _vm._self._c || _h
28551-
return _c("transition", { attrs: { name: "el-message-fade" } }, [
28552-
_c(
28553-
"div",
28554-
{
28555-
directives: [
28556-
{
28557-
name: "show",
28558-
rawName: "v-show",
28559-
value: _vm.visible,
28560-
expression: "visible"
28561-
}
28562-
],
28563-
class: [
28564-
"el-message",
28565-
_vm.type && !_vm.iconClass ? "el-message--" + _vm.type : "",
28566-
_vm.center ? "is-center" : "",
28567-
_vm.showClose ? "is-closable" : "",
28568-
_vm.customClass
28569-
],
28570-
attrs: { role: "alert" },
28571-
on: { mouseenter: _vm.clearTimer, mouseleave: _vm.startTimer }
28572-
},
28573-
[
28574-
_vm.iconClass
28575-
? _c("i", { class: _vm.iconClass })
28576-
: _c("i", { class: _vm.typeClass }),
28577-
_vm._t("default", [
28578-
!_vm.dangerouslyUseHTMLString
28579-
? _c("p", { staticClass: "el-message__content" }, [
28580-
_vm._v(_vm._s(_vm.message))
28581-
])
28582-
: _c("p", {
28583-
staticClass: "el-message__content",
28584-
domProps: { innerHTML: _vm._s(_vm.message) }
28550+
return _c(
28551+
"transition",
28552+
{
28553+
attrs: { name: "el-message-fade" },
28554+
on: { "after-leave": _vm.handleAfterLeave }
28555+
},
28556+
[
28557+
_c(
28558+
"div",
28559+
{
28560+
directives: [
28561+
{
28562+
name: "show",
28563+
rawName: "v-show",
28564+
value: _vm.visible,
28565+
expression: "visible"
28566+
}
28567+
],
28568+
class: [
28569+
"el-message",
28570+
_vm.type && !_vm.iconClass ? "el-message--" + _vm.type : "",
28571+
_vm.center ? "is-center" : "",
28572+
_vm.showClose ? "is-closable" : "",
28573+
_vm.customClass
28574+
],
28575+
attrs: { role: "alert" },
28576+
on: { mouseenter: _vm.clearTimer, mouseleave: _vm.startTimer }
28577+
},
28578+
[
28579+
_vm.iconClass
28580+
? _c("i", { class: _vm.iconClass })
28581+
: _c("i", { class: _vm.typeClass }),
28582+
_vm._t("default", [
28583+
!_vm.dangerouslyUseHTMLString
28584+
? _c("p", { staticClass: "el-message__content" }, [
28585+
_vm._v(_vm._s(_vm.message))
28586+
])
28587+
: _c("p", {
28588+
staticClass: "el-message__content",
28589+
domProps: { innerHTML: _vm._s(_vm.message) }
28590+
})
28591+
]),
28592+
_vm.showClose
28593+
? _c("i", {
28594+
staticClass: "el-message__closeBtn el-icon-close",
28595+
on: { click: _vm.close }
2858528596
})
28586-
]),
28587-
_vm.showClose
28588-
? _c("i", {
28589-
staticClass: "el-message__closeBtn el-icon-close",
28590-
on: { click: _vm.close }
28591-
})
28592-
: _vm._e()
28593-
],
28594-
2
28595-
)
28596-
])
28597+
: _vm._e()
28598+
],
28599+
2
28600+
)
28601+
]
28602+
)
2859728603
}
2859828604
var mainvue_type_template_id_455b9f60_staticRenderFns = []
2859928605
mainvue_type_template_id_455b9f60_render._withStripped = true
@@ -28664,14 +28670,12 @@ var src_mainvue_type_script_lang_js_typeMap = {
2866428670
closed: function closed(newVal) {
2866528671
if (newVal) {
2866628672
this.visible = false;
28667-
this.$el.addEventListener('transitionend', this.destroyElement);
2866828673
}
2866928674
}
2867028675
},
2867128676

2867228677
methods: {
28673-
destroyElement: function destroyElement() {
28674-
this.$el.removeEventListener('transitionend', this.destroyElement);
28678+
handleAfterLeave: function handleAfterLeave() {
2867528679
this.$destroy(true);
2867628680
this.$el.parentNode.removeChild(this.$el);
2867728681
},
@@ -35286,7 +35290,7 @@ if (typeof window !== 'undefined' && window.Vue) {
3528635290
}
3528735291

3528835292
/* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
35289-
version: '2.5.2',
35293+
version: '2.5.3',
3529035294
locale: lib_locale_default.a.use,
3529135295
i18n: lib_locale_default.a.i18n,
3529235296
install: src_install,

index.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

message.js

+53-48
Original file line numberDiff line numberDiff line change
@@ -225,52 +225,59 @@ var render = function() {
225225
var _vm = this
226226
var _h = _vm.$createElement
227227
var _c = _vm._self._c || _h
228-
return _c("transition", { attrs: { name: "el-message-fade" } }, [
229-
_c(
230-
"div",
231-
{
232-
directives: [
233-
{
234-
name: "show",
235-
rawName: "v-show",
236-
value: _vm.visible,
237-
expression: "visible"
238-
}
239-
],
240-
class: [
241-
"el-message",
242-
_vm.type && !_vm.iconClass ? "el-message--" + _vm.type : "",
243-
_vm.center ? "is-center" : "",
244-
_vm.showClose ? "is-closable" : "",
245-
_vm.customClass
246-
],
247-
attrs: { role: "alert" },
248-
on: { mouseenter: _vm.clearTimer, mouseleave: _vm.startTimer }
249-
},
250-
[
251-
_vm.iconClass
252-
? _c("i", { class: _vm.iconClass })
253-
: _c("i", { class: _vm.typeClass }),
254-
_vm._t("default", [
255-
!_vm.dangerouslyUseHTMLString
256-
? _c("p", { staticClass: "el-message__content" }, [
257-
_vm._v(_vm._s(_vm.message))
258-
])
259-
: _c("p", {
260-
staticClass: "el-message__content",
261-
domProps: { innerHTML: _vm._s(_vm.message) }
228+
return _c(
229+
"transition",
230+
{
231+
attrs: { name: "el-message-fade" },
232+
on: { "after-leave": _vm.handleAfterLeave }
233+
},
234+
[
235+
_c(
236+
"div",
237+
{
238+
directives: [
239+
{
240+
name: "show",
241+
rawName: "v-show",
242+
value: _vm.visible,
243+
expression: "visible"
244+
}
245+
],
246+
class: [
247+
"el-message",
248+
_vm.type && !_vm.iconClass ? "el-message--" + _vm.type : "",
249+
_vm.center ? "is-center" : "",
250+
_vm.showClose ? "is-closable" : "",
251+
_vm.customClass
252+
],
253+
attrs: { role: "alert" },
254+
on: { mouseenter: _vm.clearTimer, mouseleave: _vm.startTimer }
255+
},
256+
[
257+
_vm.iconClass
258+
? _c("i", { class: _vm.iconClass })
259+
: _c("i", { class: _vm.typeClass }),
260+
_vm._t("default", [
261+
!_vm.dangerouslyUseHTMLString
262+
? _c("p", { staticClass: "el-message__content" }, [
263+
_vm._v(_vm._s(_vm.message))
264+
])
265+
: _c("p", {
266+
staticClass: "el-message__content",
267+
domProps: { innerHTML: _vm._s(_vm.message) }
268+
})
269+
]),
270+
_vm.showClose
271+
? _c("i", {
272+
staticClass: "el-message__closeBtn el-icon-close",
273+
on: { click: _vm.close }
262274
})
263-
]),
264-
_vm.showClose
265-
? _c("i", {
266-
staticClass: "el-message__closeBtn el-icon-close",
267-
on: { click: _vm.close }
268-
})
269-
: _vm._e()
270-
],
271-
2
272-
)
273-
])
275+
: _vm._e()
276+
],
277+
2
278+
)
279+
]
280+
)
274281
}
275282
var staticRenderFns = []
276283
render._withStripped = true
@@ -341,14 +348,12 @@ var typeMap = {
341348
closed: function closed(newVal) {
342349
if (newVal) {
343350
this.visible = false;
344-
this.$el.addEventListener('transitionend', this.destroyElement);
345351
}
346352
}
347353
},
348354

349355
methods: {
350-
destroyElement: function destroyElement() {
351-
this.$el.removeEventListener('transitionend', this.destroyElement);
356+
handleAfterLeave: function handleAfterLeave() {
352357
this.$destroy(true);
353358
this.$el.parentNode.removeChild(this.$el);
354359
},

tabs.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@ var util_ = __webpack_require__(4);
249249
get: function get() {
250250
var _this = this;
251251

252-
if (!this.$parent.$refs.tabs) return {};
253252
var style = {};
254253
var offset = 0;
255254
var tabSize = 0;
@@ -261,7 +260,7 @@ var util_ = __webpack_require__(4);
261260
});
262261
};
263262
this.tabs.every(function (tab, index) {
264-
var $el = Object(util_["arrayFind"])(_this.$parent.$refs.tabs, function (t) {
263+
var $el = Object(util_["arrayFind"])(_this.$parent.$refs.tabs || [], function (t) {
265264
return t.id.replace('tab-', '') === tab.paneName;
266265
});
267266
if (!$el) {

0 commit comments

Comments
 (0)