Skip to content

Commit 97bdc2f

Browse files
xuliangzhanxuliangzhan
committed
update
1 parent b442fb2 commit 97bdc2f

File tree

7 files changed

+30
-17
lines changed

7 files changed

+30
-17
lines changed

‎docs/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/vue-element-extends/favicon.ico><title>ElementUI 2.X components extends.</title><link href=/vue-element-extends/static/css/chunk-vendors.a8b08852.css rel=preload as=style><link href=/vue-element-extends/static/css/index.b5f8c35c.css rel=preload as=style><link href=/vue-element-extends/static/js/chunk-vendors.5e1205b6.js rel=preload as=script><link href=/vue-element-extends/static/js/index.3eac0076.js rel=preload as=script><link href=/vue-element-extends/static/css/chunk-vendors.a8b08852.css rel=stylesheet><link href=/vue-element-extends/static/css/index.b5f8c35c.css rel=stylesheet></head><body><noscript><strong>We're sorry but test2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vue-element-extends/static/js/chunk-vendors.5e1205b6.js></script><script src=/vue-element-extends/static/js/index.3eac0076.js></script></body></html>
1+
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/vue-element-extends/favicon.ico><title>ElementUI 2.X components extends.</title><link href=/vue-element-extends/static/css/chunk-vendors.a8b08852.css rel=preload as=style><link href=/vue-element-extends/static/css/index.b5f8c35c.css rel=preload as=style><link href=/vue-element-extends/static/js/chunk-vendors.5e1205b6.js rel=preload as=script><link href=/vue-element-extends/static/js/index.ab24c6fa.js rel=preload as=script><link href=/vue-element-extends/static/css/chunk-vendors.a8b08852.css rel=stylesheet><link href=/vue-element-extends/static/css/index.b5f8c35c.css rel=stylesheet></head><body><noscript><strong>We're sorry but test2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vue-element-extends/static/js/chunk-vendors.5e1205b6.js></script><script src=/vue-element-extends/static/js/index.ab24c6fa.js></script></body></html>

‎docs/static/js/index.3eac0076.js renamed to ‎docs/static/js/index.ab24c6fa.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.common.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5876,12 +5876,12 @@ table_column.install = function (Vue) {
58765876

58775877
var TableColumn = table_column;
58785878
/* harmony default export */ var packages_table_column = (table_column);
5879-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"224f41c8-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/editable/src/editable.vue?vue&type=template&id=7aa430c8&
5880-
var editablevue_type_template_id_7aa430c8_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-table',_vm._g(_vm._b({ref:"refElTable",staticClass:"elx-editable",scopedSlots:_vm._u([(_vm.$slots.empty)?{key:"empty",fn:function(){return [_vm._t("empty")]},proxy:true}:null,{key:"append",fn:function(){return [(_vm.isCtxMenu)?_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.ctxMenuStore.visible),expression:"ctxMenuStore.visible"}],ref:"contextMenu",staticClass:"elx-contextmenu",style:(_vm.ctxMenuStore.style)},_vm._l((_vm.ctxMenuStore.list),function(options,index){return _c('ul',{key:index,staticClass:"ctx-menu_wrapper"},_vm._l((options),function(item){return _c('li',{key:item.code,class:[item.code, {disabled: item.disabled, 'active': item === _vm.ctxMenuStore.selected}]},[_c('a',{staticClass:"ctx-menu_link",on:{"click":function($event){return _vm._ctxMenuEvent($event, item)},"mouseover":function($event){return _vm._ctxMenuMouseoverEvent($event, item)},"mouseout":function($event){return _vm._ctxMenuMouseoutEvent($event, item)}}},[(item.prefixIcon)?_c('i',{staticClass:"ctx-prefix-icon",class:item.prefixIcon}):_vm._e(),_c('span',{staticClass:"content"},[_vm._v(_vm._s(item.name))]),(item.suffixIcon)?_c('i',{staticClass:"ctx-suffix-icon",class:item.suffixIcon}):_vm._e()]),(_vm._hasCtxChilds(item))?_c('ul',{staticClass:"ctx-menu_child-wrapper",class:{show: item === _vm.ctxMenuStore.selected && _vm.ctxMenuStore.showChild}},_vm._l((item.children),function(child,cIndex){return _c('li',{key:(index + "_" + cIndex),class:[child.code, {disabled: child.disabled, 'active': child === _vm.ctxMenuStore.selectChild}]},[_c('a',{staticClass:"ctx-menu_link",on:{"click":function($event){return _vm._ctxMenuEvent($event, child)},"mouseover":function($event){return _vm._ctxMenuMouseoverEvent($event, item, child)},"mouseout":function($event){return _vm._ctxMenuMouseoutEvent($event, item, child)}}},[(child.prefixIcon)?_c('i',{staticClass:"ctx-prefix-icon",class:child.prefixIcon}):_vm._e(),_c('span',{staticClass:"content"},[_vm._v(_vm._s(child.name))])])])}),0):_vm._e()])}),0)}),0):_vm._e(),(_vm.$slots.append)?[_vm._t("append")]:_vm._e()]},proxy:true}],null,true)},'el-table',_vm.attrs,false),_vm.events),[_vm._t("default")],2)}
5881-
var editablevue_type_template_id_7aa430c8_staticRenderFns = []
5879+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"224f41c8-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/editable/src/editable.vue?vue&type=template&id=021c1927&
5880+
var editablevue_type_template_id_021c1927_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-table',_vm._g(_vm._b({ref:"refElTable",staticClass:"elx-editable",scopedSlots:_vm._u([(_vm.$slots.empty)?{key:"empty",fn:function(){return [_vm._t("empty")]},proxy:true}:null,{key:"append",fn:function(){return [(_vm.isCtxMenu)?_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.ctxMenuStore.visible),expression:"ctxMenuStore.visible"}],ref:"contextMenu",staticClass:"elx-contextmenu",style:(_vm.ctxMenuStore.style)},_vm._l((_vm.ctxMenuStore.list),function(options,index){return _c('ul',{key:index,staticClass:"ctx-menu_wrapper"},_vm._l((options),function(item){return _c('li',{key:item.code,class:[item.code, {disabled: item.disabled, 'active': item === _vm.ctxMenuStore.selected}]},[_c('a',{staticClass:"ctx-menu_link",on:{"click":function($event){return _vm._ctxMenuEvent($event, item)},"mouseover":function($event){return _vm._ctxMenuMouseoverEvent($event, item)},"mouseout":function($event){return _vm._ctxMenuMouseoutEvent($event, item)}}},[(item.prefixIcon)?_c('i',{staticClass:"ctx-prefix-icon",class:item.prefixIcon}):_vm._e(),_c('span',{staticClass:"content"},[_vm._v(_vm._s(item.name))]),(item.suffixIcon)?_c('i',{staticClass:"ctx-suffix-icon",class:item.suffixIcon}):_vm._e()]),(_vm._hasCtxChilds(item))?_c('ul',{staticClass:"ctx-menu_child-wrapper",class:{show: item === _vm.ctxMenuStore.selected && _vm.ctxMenuStore.showChild}},_vm._l((item.children),function(child,cIndex){return _c('li',{key:(index + "_" + cIndex),class:[child.code, {disabled: child.disabled, 'active': child === _vm.ctxMenuStore.selectChild}]},[_c('a',{staticClass:"ctx-menu_link",on:{"click":function($event){return _vm._ctxMenuEvent($event, child)},"mouseover":function($event){return _vm._ctxMenuMouseoverEvent($event, item, child)},"mouseout":function($event){return _vm._ctxMenuMouseoutEvent($event, item, child)}}},[(child.prefixIcon)?_c('i',{staticClass:"ctx-prefix-icon",class:child.prefixIcon}):_vm._e(),_c('span',{staticClass:"content"},[_vm._v(_vm._s(child.name))])])])}),0):_vm._e()])}),0)}),0):_vm._e(),(_vm.$slots.append)?[_vm._t("append")]:_vm._e()]},proxy:true}],null,true)},'el-table',_vm.attrs,false),_vm.events),[_vm._t("default")],2)}
5881+
var editablevue_type_template_id_021c1927_staticRenderFns = []
58825882

58835883

5884-
// CONCATENATED MODULE: ./packages/editable/src/editable.vue?vue&type=template&id=7aa430c8&
5884+
// CONCATENATED MODULE: ./packages/editable/src/editable.vue?vue&type=template&id=021c1927&
58855885

58865886
// EXTERNAL MODULE: ./node_modules/@babel/runtime-corejs2/core-js/symbol/iterator.js
58875887
var iterator = __webpack_require__("5d58");
@@ -8311,6 +8311,10 @@ window.addEventListener(wheelName, GlobalEvent.trigger, false);
83118311
}
83128312

83138313
return this.$nextTick().then(function () {
8314+
if (!_this20.lastActive) {
8315+
_this20._restoreTooltip();
8316+
}
8317+
83148318
return rest;
83158319
});
83168320
},
@@ -8670,8 +8674,8 @@ var editablevue_type_style_index_0_lang_css_ = __webpack_require__("00fb");
86708674

86718675
var editable_component = normalizeComponent(
86728676
src_editablevue_type_script_lang_js_,
8673-
editablevue_type_template_id_7aa430c8_render,
8674-
editablevue_type_template_id_7aa430c8_staticRenderFns,
8677+
editablevue_type_template_id_021c1927_render,
8678+
editablevue_type_template_id_021c1927_staticRenderFns,
86758679
false,
86768680
null,
86778681
null,

‎lib/index.umd.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5885,12 +5885,12 @@ table_column.install = function (Vue) {
58855885

58865886
var TableColumn = table_column;
58875887
/* harmony default export */ var packages_table_column = (table_column);
5888-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"224f41c8-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/editable/src/editable.vue?vue&type=template&id=7aa430c8&
5889-
var editablevue_type_template_id_7aa430c8_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-table',_vm._g(_vm._b({ref:"refElTable",staticClass:"elx-editable",scopedSlots:_vm._u([(_vm.$slots.empty)?{key:"empty",fn:function(){return [_vm._t("empty")]},proxy:true}:null,{key:"append",fn:function(){return [(_vm.isCtxMenu)?_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.ctxMenuStore.visible),expression:"ctxMenuStore.visible"}],ref:"contextMenu",staticClass:"elx-contextmenu",style:(_vm.ctxMenuStore.style)},_vm._l((_vm.ctxMenuStore.list),function(options,index){return _c('ul',{key:index,staticClass:"ctx-menu_wrapper"},_vm._l((options),function(item){return _c('li',{key:item.code,class:[item.code, {disabled: item.disabled, 'active': item === _vm.ctxMenuStore.selected}]},[_c('a',{staticClass:"ctx-menu_link",on:{"click":function($event){return _vm._ctxMenuEvent($event, item)},"mouseover":function($event){return _vm._ctxMenuMouseoverEvent($event, item)},"mouseout":function($event){return _vm._ctxMenuMouseoutEvent($event, item)}}},[(item.prefixIcon)?_c('i',{staticClass:"ctx-prefix-icon",class:item.prefixIcon}):_vm._e(),_c('span',{staticClass:"content"},[_vm._v(_vm._s(item.name))]),(item.suffixIcon)?_c('i',{staticClass:"ctx-suffix-icon",class:item.suffixIcon}):_vm._e()]),(_vm._hasCtxChilds(item))?_c('ul',{staticClass:"ctx-menu_child-wrapper",class:{show: item === _vm.ctxMenuStore.selected && _vm.ctxMenuStore.showChild}},_vm._l((item.children),function(child,cIndex){return _c('li',{key:(index + "_" + cIndex),class:[child.code, {disabled: child.disabled, 'active': child === _vm.ctxMenuStore.selectChild}]},[_c('a',{staticClass:"ctx-menu_link",on:{"click":function($event){return _vm._ctxMenuEvent($event, child)},"mouseover":function($event){return _vm._ctxMenuMouseoverEvent($event, item, child)},"mouseout":function($event){return _vm._ctxMenuMouseoutEvent($event, item, child)}}},[(child.prefixIcon)?_c('i',{staticClass:"ctx-prefix-icon",class:child.prefixIcon}):_vm._e(),_c('span',{staticClass:"content"},[_vm._v(_vm._s(child.name))])])])}),0):_vm._e()])}),0)}),0):_vm._e(),(_vm.$slots.append)?[_vm._t("append")]:_vm._e()]},proxy:true}],null,true)},'el-table',_vm.attrs,false),_vm.events),[_vm._t("default")],2)}
5890-
var editablevue_type_template_id_7aa430c8_staticRenderFns = []
5888+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"224f41c8-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/editable/src/editable.vue?vue&type=template&id=021c1927&
5889+
var editablevue_type_template_id_021c1927_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-table',_vm._g(_vm._b({ref:"refElTable",staticClass:"elx-editable",scopedSlots:_vm._u([(_vm.$slots.empty)?{key:"empty",fn:function(){return [_vm._t("empty")]},proxy:true}:null,{key:"append",fn:function(){return [(_vm.isCtxMenu)?_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.ctxMenuStore.visible),expression:"ctxMenuStore.visible"}],ref:"contextMenu",staticClass:"elx-contextmenu",style:(_vm.ctxMenuStore.style)},_vm._l((_vm.ctxMenuStore.list),function(options,index){return _c('ul',{key:index,staticClass:"ctx-menu_wrapper"},_vm._l((options),function(item){return _c('li',{key:item.code,class:[item.code, {disabled: item.disabled, 'active': item === _vm.ctxMenuStore.selected}]},[_c('a',{staticClass:"ctx-menu_link",on:{"click":function($event){return _vm._ctxMenuEvent($event, item)},"mouseover":function($event){return _vm._ctxMenuMouseoverEvent($event, item)},"mouseout":function($event){return _vm._ctxMenuMouseoutEvent($event, item)}}},[(item.prefixIcon)?_c('i',{staticClass:"ctx-prefix-icon",class:item.prefixIcon}):_vm._e(),_c('span',{staticClass:"content"},[_vm._v(_vm._s(item.name))]),(item.suffixIcon)?_c('i',{staticClass:"ctx-suffix-icon",class:item.suffixIcon}):_vm._e()]),(_vm._hasCtxChilds(item))?_c('ul',{staticClass:"ctx-menu_child-wrapper",class:{show: item === _vm.ctxMenuStore.selected && _vm.ctxMenuStore.showChild}},_vm._l((item.children),function(child,cIndex){return _c('li',{key:(index + "_" + cIndex),class:[child.code, {disabled: child.disabled, 'active': child === _vm.ctxMenuStore.selectChild}]},[_c('a',{staticClass:"ctx-menu_link",on:{"click":function($event){return _vm._ctxMenuEvent($event, child)},"mouseover":function($event){return _vm._ctxMenuMouseoverEvent($event, item, child)},"mouseout":function($event){return _vm._ctxMenuMouseoutEvent($event, item, child)}}},[(child.prefixIcon)?_c('i',{staticClass:"ctx-prefix-icon",class:child.prefixIcon}):_vm._e(),_c('span',{staticClass:"content"},[_vm._v(_vm._s(child.name))])])])}),0):_vm._e()])}),0)}),0):_vm._e(),(_vm.$slots.append)?[_vm._t("append")]:_vm._e()]},proxy:true}],null,true)},'el-table',_vm.attrs,false),_vm.events),[_vm._t("default")],2)}
5890+
var editablevue_type_template_id_021c1927_staticRenderFns = []
58915891

58925892

5893-
// CONCATENATED MODULE: ./packages/editable/src/editable.vue?vue&type=template&id=7aa430c8&
5893+
// CONCATENATED MODULE: ./packages/editable/src/editable.vue?vue&type=template&id=021c1927&
58945894

58955895
// EXTERNAL MODULE: ./node_modules/@babel/runtime-corejs2/core-js/symbol/iterator.js
58965896
var iterator = __webpack_require__("5d58");
@@ -8320,6 +8320,10 @@ window.addEventListener(wheelName, GlobalEvent.trigger, false);
83208320
}
83218321

83228322
return this.$nextTick().then(function () {
8323+
if (!_this20.lastActive) {
8324+
_this20._restoreTooltip();
8325+
}
8326+
83238327
return rest;
83248328
});
83258329
},
@@ -8679,8 +8683,8 @@ var editablevue_type_style_index_0_lang_css_ = __webpack_require__("00fb");
86798683

86808684
var editable_component = normalizeComponent(
86818685
src_editablevue_type_script_lang_js_,
8682-
editablevue_type_template_id_7aa430c8_render,
8683-
editablevue_type_template_id_7aa430c8_staticRenderFns,
8686+
editablevue_type_template_id_021c1927_render,
8687+
editablevue_type_template_id_021c1927_staticRenderFns,
86848688
false,
86858689
null,
86868690
null,

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

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-element-extends",
3-
"version": "1.2.15",
3+
"version": "1.2.16",
44
"description": "Extension component based on ElementUI 2.x",
55
"scripts": {
66
"serve": "vue-cli-service serve",

‎packages/editable/src/editable.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1700,7 +1700,12 @@ export default {
17001700
this._clearScrollChecked()
17011701
}
17021702
}
1703-
return this.$nextTick().then(() => rest)
1703+
return this.$nextTick().then(() => {
1704+
if (!this.lastActive) {
1705+
this._restoreTooltip()
1706+
}
1707+
return rest
1708+
})
17041709
},
17051710
getSelecteds () {
17061711
return this._getSelectRows().map(item => item.data)

0 commit comments

Comments
 (0)