Skip to content

Commit 516e00e

Browse files
element-botelement-bot
committed
[build] v2.10.1
1 parent d5e1168 commit 516e00e

21 files changed

Lines changed: 146 additions & 115 deletions

‎autocomplete.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,17 +210,17 @@ module.exports = require("element-ui/lib/utils/clickoutside");
210210

211211
/***/ }),
212212

213-
/***/ 14:
213+
/***/ 13:
214214
/***/ (function(module, exports) {
215215

216-
module.exports = require("throttle-debounce/debounce");
216+
module.exports = require("element-ui/lib/scrollbar");
217217

218218
/***/ }),
219219

220220
/***/ 15:
221221
/***/ (function(module, exports) {
222222

223-
module.exports = require("element-ui/lib/scrollbar");
223+
module.exports = require("throttle-debounce/debounce");
224224

225225
/***/ }),
226226

@@ -418,7 +418,7 @@ render._withStripped = true
418418
// CONCATENATED MODULE: ./packages/autocomplete/src/autocomplete.vue?vue&type=template&id=152f2ee6&
419419

420420
// EXTERNAL MODULE: external "throttle-debounce/debounce"
421-
var debounce_ = __webpack_require__(14);
421+
var debounce_ = __webpack_require__(15);
422422
var debounce_default = /*#__PURE__*/__webpack_require__.n(debounce_);
423423

424424
// EXTERNAL MODULE: external "element-ui/lib/input"
@@ -494,7 +494,7 @@ var emitter_ = __webpack_require__(4);
494494
var emitter_default = /*#__PURE__*/__webpack_require__.n(emitter_);
495495

496496
// EXTERNAL MODULE: external "element-ui/lib/scrollbar"
497-
var scrollbar_ = __webpack_require__(15);
497+
var scrollbar_ = __webpack_require__(13);
498498
var scrollbar_default = /*#__PURE__*/__webpack_require__.n(scrollbar_);
499499

500500
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/autocomplete/src/autocomplete-suggestions.vue?vue&type=script&lang=js&

‎carousel.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ var throttle_ = __webpack_require__(25);
343343
var throttle_default = /*#__PURE__*/__webpack_require__.n(throttle_);
344344

345345
// EXTERNAL MODULE: external "element-ui/lib/utils/resize-event"
346-
var resize_event_ = __webpack_require__(13);
346+
var resize_event_ = __webpack_require__(14);
347347

348348
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/carousel/src/main.vue?vue&type=script&lang=js&
349349
//
@@ -678,7 +678,7 @@ main.install = function (Vue) {
678678

679679
/***/ }),
680680

681-
/***/ 13:
681+
/***/ 14:
682682
/***/ (function(module, exports) {
683683

684684
module.exports = require("element-ui/lib/utils/resize-event");

‎cascader-panel.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ function normalizeComponent (
189189

190190
/***/ }),
191191

192-
/***/ 15:
192+
/***/ 13:
193193
/***/ (function(module, exports) {
194194

195195
module.exports = require("element-ui/lib/scrollbar");
@@ -284,7 +284,7 @@ var external_babel_helper_vue_jsx_merge_props_ = __webpack_require__(26);
284284
var external_babel_helper_vue_jsx_merge_props_default = /*#__PURE__*/__webpack_require__.n(external_babel_helper_vue_jsx_merge_props_);
285285

286286
// EXTERNAL MODULE: external "element-ui/lib/scrollbar"
287-
var scrollbar_ = __webpack_require__(15);
287+
var scrollbar_ = __webpack_require__(13);
288288
var scrollbar_default = /*#__PURE__*/__webpack_require__.n(scrollbar_);
289289

290290
// EXTERNAL MODULE: external "element-ui/lib/checkbox"

‎cascader.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -213,21 +213,21 @@ module.exports = require("element-ui/lib/utils/clickoutside");
213213
/***/ 13:
214214
/***/ (function(module, exports) {
215215

216-
module.exports = require("element-ui/lib/utils/resize-event");
216+
module.exports = require("element-ui/lib/scrollbar");
217217

218218
/***/ }),
219219

220220
/***/ 14:
221221
/***/ (function(module, exports) {
222222

223-
module.exports = require("throttle-debounce/debounce");
223+
module.exports = require("element-ui/lib/utils/resize-event");
224224

225225
/***/ }),
226226

227227
/***/ 15:
228228
/***/ (function(module, exports) {
229229

230-
module.exports = require("element-ui/lib/scrollbar");
230+
module.exports = require("throttle-debounce/debounce");
231231

232232
/***/ }),
233233

@@ -642,7 +642,7 @@ var tag_ = __webpack_require__(36);
642642
var tag_default = /*#__PURE__*/__webpack_require__.n(tag_);
643643

644644
// EXTERNAL MODULE: external "element-ui/lib/scrollbar"
645-
var scrollbar_ = __webpack_require__(15);
645+
var scrollbar_ = __webpack_require__(13);
646646
var scrollbar_default = /*#__PURE__*/__webpack_require__.n(scrollbar_);
647647

648648
// EXTERNAL MODULE: external "element-ui/lib/cascader-panel"
@@ -666,10 +666,10 @@ var types_ = __webpack_require__(19);
666666
var shared_ = __webpack_require__(22);
667667

668668
// EXTERNAL MODULE: external "element-ui/lib/utils/resize-event"
669-
var resize_event_ = __webpack_require__(13);
669+
var resize_event_ = __webpack_require__(14);
670670

671671
// EXTERNAL MODULE: external "throttle-debounce/debounce"
672-
var debounce_ = __webpack_require__(14);
672+
var debounce_ = __webpack_require__(15);
673673
var debounce_default = /*#__PURE__*/__webpack_require__.n(debounce_);
674674

675675
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/cascader/src/cascader.vue?vue&type=script&lang=js&

‎date-picker.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,14 +249,14 @@ module.exports = require("element-ui/lib/input");
249249
module.exports = require("element-ui/lib/utils/clickoutside");
250250

251251
/***/ }),
252-
/* 13 */,
253-
/* 14 */,
254-
/* 15 */
252+
/* 13 */
255253
/***/ (function(module, exports) {
256254

257255
module.exports = require("element-ui/lib/scrollbar");
258256

259257
/***/ }),
258+
/* 14 */,
259+
/* 15 */,
260260
/* 16 */,
261261
/* 17 */,
262262
/* 18 */
@@ -2137,7 +2137,7 @@ render._withStripped = true
21372137
var date_util_ = __webpack_require__(1);
21382138

21392139
// EXTERNAL MODULE: external "element-ui/lib/scrollbar"
2140-
var scrollbar_ = __webpack_require__(15);
2140+
var scrollbar_ = __webpack_require__(13);
21412141
var scrollbar_default = /*#__PURE__*/__webpack_require__.n(scrollbar_);
21422142

21432143
// EXTERNAL MODULE: ./src/directives/repeat-click.js

‎element-ui.common.js‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -185,19 +185,19 @@ module.exports = require("element-ui/lib/utils/popup");
185185
/* 16 */
186186
/***/ (function(module, exports) {
187187

188-
module.exports = require("element-ui/lib/button");
188+
module.exports = require("element-ui/lib/scrollbar");
189189

190190
/***/ }),
191191
/* 17 */
192192
/***/ (function(module, exports) {
193193

194-
module.exports = require("element-ui/lib/utils/types");
194+
module.exports = require("element-ui/lib/button");
195195

196196
/***/ }),
197197
/* 18 */
198198
/***/ (function(module, exports) {
199199

200-
module.exports = require("element-ui/lib/scrollbar");
200+
module.exports = require("element-ui/lib/utils/types");
201201

202202
/***/ }),
203203
/* 19 */
@@ -1753,7 +1753,7 @@ var vue_popper_ = __webpack_require__(5);
17531753
var vue_popper_default = /*#__PURE__*/__webpack_require__.n(vue_popper_);
17541754

17551755
// EXTERNAL MODULE: external "element-ui/lib/scrollbar"
1756-
var scrollbar_ = __webpack_require__(18);
1756+
var scrollbar_ = __webpack_require__(16);
17571757
var scrollbar_default = /*#__PURE__*/__webpack_require__.n(scrollbar_);
17581758

17591759
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/autocomplete/src/autocomplete-suggestions.vue?vue&type=script&lang=js&
@@ -2191,7 +2191,7 @@ autocomplete.install = function (Vue) {
21912191

21922192
/* harmony default export */ var packages_autocomplete = (autocomplete);
21932193
// EXTERNAL MODULE: external "element-ui/lib/button"
2194-
var button_ = __webpack_require__(16);
2194+
var button_ = __webpack_require__(17);
21952195
var button_default = /*#__PURE__*/__webpack_require__.n(button_);
21962196

21972197
// EXTERNAL MODULE: external "element-ui/lib/button-group"
@@ -9676,9 +9676,7 @@ var tablevue_type_template_id_493fe34e_render = function() {
96769676
_vm.$slots.append
96779677
? _c("div", {
96789678
staticClass: "el-table__append-gutter",
9679-
style: {
9680-
height: _vm.layout.appendHeight + "px"
9681-
}
9679+
style: { height: _vm.layout.appendHeight + "px" }
96829680
})
96839681
: _vm._e()
96849682
],
@@ -9796,7 +9794,13 @@ var tablevue_type_template_id_493fe34e_render = function() {
97969794
"row-style": _vm.rowStyle,
97979795
highlight: _vm.highlightCurrentRow
97989796
}
9799-
})
9797+
}),
9798+
_vm.$slots.append
9799+
? _c("div", {
9800+
staticClass: "el-table__append-gutter",
9801+
style: { height: _vm.layout.appendHeight + "px" }
9802+
})
9803+
: _vm._e()
98009804
],
98019805
1
98029806
),
@@ -10854,6 +10858,9 @@ var doFlattenColumns = function doFlattenColumns(columns) {
1085410858
return filters;
1085510859
},
1085610860
updateSort: function updateSort(column, prop, order) {
10861+
if (this.states.sortingColumn && this.states.sortingColumn !== column) {
10862+
this.states.sortingColumn.order = null;
10863+
}
1085710864
this.states.sortingColumn = column;
1085810865
this.states.sortProp = prop;
1085910866
this.states.sortOrder = order;
@@ -12278,6 +12285,7 @@ var checkbox_group_default = /*#__PURE__*/__webpack_require__.n(checkbox_group_)
1227812285

1227912286

1228012287

12288+
1228112289
/* harmony default export */ var filter_panelvue_type_script_lang_js_ = ({
1228212290
name: 'ElTableFilterPanel',
1228312291

@@ -12289,7 +12297,8 @@ var checkbox_group_default = /*#__PURE__*/__webpack_require__.n(checkbox_group_)
1228912297

1229012298
components: {
1229112299
ElCheckbox: checkbox_default.a,
12292-
ElCheckboxGroup: checkbox_group_default.a
12300+
ElCheckboxGroup: checkbox_group_default.a,
12301+
ElScrollbar: scrollbar_default.a
1229312302
},
1229412303

1229512304
props: {
@@ -13365,6 +13374,8 @@ var tablevue_type_script_lang_js_extends = Object.assign || function (target) {
1336513374
//
1336613375
//
1336713376
//
13377+
//
13378+
//
1336813379

1336913380

1337013381

@@ -14255,7 +14266,7 @@ var columnIdSeed = 1;
1425514266
registerNormalWatchers: function registerNormalWatchers() {
1425614267
var _this3 = this;
1425714268

14258-
var props = ['label', 'property', 'filters', 'filterMultiple', 'sortable', 'index', 'formatter', 'className', 'labelClassName'];
14269+
var props = ['label', 'property', 'filters', 'filterMultiple', 'sortable', 'index', 'formatter', 'className', 'labelClassName', 'showOverflowTooltip'];
1425914270
// 一些属性具有别名
1426014271
var aliases = {
1426114272
prop: 'property',
@@ -14337,7 +14348,7 @@ var columnIdSeed = 1;
1433714348
index: this.index
1433814349
});
1433914350

14340-
var basicProps = ['columnKey', 'label', 'className', 'labelClassName', 'type', 'renderHeader', 'resizable', 'formatter', 'fixed', 'resizable'];
14351+
var basicProps = ['columnKey', 'label', 'className', 'labelClassName', 'type', 'renderHeader', 'formatter', 'fixed', 'resizable'];
1434114352
var sortProps = ['sortMethod', 'sortBy', 'sortOrders'];
1434214353
var selectProps = ['selectable', 'reserveSelection'];
1434314354
var filterProps = ['filterMethod', 'filters', 'filterMultiple', 'filterOpened', 'filteredValue', 'filterPlacement'];
@@ -24324,7 +24335,7 @@ tab_pane.install = function (Vue) {
2432424335
type: String,
2432524336
default: 'light',
2432624337
validator: function validator(val) {
24327-
return ['dark', 'light', 'plain'].includes(val);
24338+
return ['dark', 'light', 'plain'].indexOf(val) !== -1;
2432824339
}
2432924340
}
2433024341
},
@@ -30728,7 +30739,7 @@ mainvue_type_template_id_ada57782_render._withStripped = true
3072830739
// CONCATENATED MODULE: ./packages/rate/src/main.vue?vue&type=template&id=ada57782&
3072930740

3073030741
// EXTERNAL MODULE: external "element-ui/lib/utils/types"
30731-
var types_ = __webpack_require__(17);
30742+
var types_ = __webpack_require__(18);
3073230743

3073330744
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/rate/src/main.vue?vue&type=script&lang=js&
3073430745
//
@@ -40072,7 +40083,7 @@ if (typeof window !== 'undefined' && window.Vue) {
4007240083
}
4007340084

4007440085
/* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
40075-
version: '2.10.0',
40086+
version: '2.10.1',
4007640087
locale: lib_locale_default.a.use,
4007740088
i18n: lib_locale_default.a.i18n,
4007840089
install: src_install,

‎index.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.

‎infinite-scroll.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ module.exports =
9494
__webpack_require__.r(__webpack_exports__);
9595

9696
// EXTERNAL MODULE: external "throttle-debounce/debounce"
97-
var debounce_ = __webpack_require__(14);
97+
var debounce_ = __webpack_require__(15);
9898
var debounce_default = /*#__PURE__*/__webpack_require__.n(debounce_);
9999

100100
// EXTERNAL MODULE: external "element-ui/lib/utils/types"
@@ -273,7 +273,7 @@ main.install = function (Vue) {
273273

274274
/***/ }),
275275

276-
/***/ 14:
276+
/***/ 15:
277277
/***/ (function(module, exports) {
278278

279279
module.exports = require("throttle-debounce/debounce");

0 commit comments

Comments
 (0)