Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@xuliangzhan
xuliangzhan committed May 16, 2019
1 parent 97bdc2f commit 36478c3
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion docs/index.html
View file
Original file line number Diff line number Diff line change
@@ -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.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>
<!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.eb523cbe.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.eb523cbe.js></script></body></html>
2 changes: 1 addition & 1 deletion docs/static/js/index.ab24c6fa.js → docs/static/js/index.eb523cbe.js
View file

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions lib/index.common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5876,12 +5876,12 @@ table_column.install = function (Vue) {

var TableColumn = table_column;
/* harmony default export */ var packages_table_column = (table_column);
// 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&
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)}
var editablevue_type_template_id_021c1927_staticRenderFns = []
// 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=15ec3387&
var editablevue_type_template_id_15ec3387_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)}
var editablevue_type_template_id_15ec3387_staticRenderFns = []


// CONCATENATED MODULE: ./packages/editable/src/editable.vue?vue&type=template&id=021c1927&
// CONCATENATED MODULE: ./packages/editable/src/editable.vue?vue&type=template&id=15ec3387&

// EXTERNAL MODULE: ./node_modules/@babel/runtime-corejs2/core-js/symbol/iterator.js
var iterator = __webpack_require__("5d58");
Expand Down Expand Up @@ -7653,7 +7653,7 @@ window.addEventListener(wheelName, GlobalEvent.trigger, false);
var rule = rules[rIndex];
var isRequired = rule.required === true;

if ((type === 'all' || !rule.trigger || rule.trigger === 'change' || type === rule.trigger) && (isRequired || value)) {
if ((type === 'all' || !rule.trigger || rule.trigger === 'change' || type === rule.trigger) && (isRequired || value || rule.validator)) {
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(rule.validator)) {
rule.validator(rule, value, function (e) {
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isError(e)) {
Expand Down Expand Up @@ -8674,8 +8674,8 @@ var editablevue_type_style_index_0_lang_css_ = __webpack_require__("00fb");

var editable_component = normalizeComponent(
src_editablevue_type_script_lang_js_,
editablevue_type_template_id_021c1927_render,
editablevue_type_template_id_021c1927_staticRenderFns,
editablevue_type_template_id_15ec3387_render,
editablevue_type_template_id_15ec3387_staticRenderFns,
false,
null,
null,
Expand Down
14 changes: 7 additions & 7 deletions lib/index.umd.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5885,12 +5885,12 @@ table_column.install = function (Vue) {

var TableColumn = table_column;
/* harmony default export */ var packages_table_column = (table_column);
// 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&
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)}
var editablevue_type_template_id_021c1927_staticRenderFns = []
// 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=15ec3387&
var editablevue_type_template_id_15ec3387_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)}
var editablevue_type_template_id_15ec3387_staticRenderFns = []


// CONCATENATED MODULE: ./packages/editable/src/editable.vue?vue&type=template&id=021c1927&
// CONCATENATED MODULE: ./packages/editable/src/editable.vue?vue&type=template&id=15ec3387&

// EXTERNAL MODULE: ./node_modules/@babel/runtime-corejs2/core-js/symbol/iterator.js
var iterator = __webpack_require__("5d58");
Expand Down Expand Up @@ -7662,7 +7662,7 @@ window.addEventListener(wheelName, GlobalEvent.trigger, false);
var rule = rules[rIndex];
var isRequired = rule.required === true;

if ((type === 'all' || !rule.trigger || rule.trigger === 'change' || type === rule.trigger) && (isRequired || value)) {
if ((type === 'all' || !rule.trigger || rule.trigger === 'change' || type === rule.trigger) && (isRequired || value || rule.validator)) {
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(rule.validator)) {
rule.validator(rule, value, function (e) {
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isError(e)) {
Expand Down Expand Up @@ -8683,8 +8683,8 @@ var editablevue_type_style_index_0_lang_css_ = __webpack_require__("00fb");

var editable_component = normalizeComponent(
src_editablevue_type_script_lang_js_,
editablevue_type_template_id_021c1927_render,
editablevue_type_template_id_021c1927_staticRenderFns,
editablevue_type_template_id_15ec3387_render,
editablevue_type_template_id_15ec3387_staticRenderFns,
false,
null,
null,
Expand Down
2 changes: 1 addition & 1 deletion lib/index.umd.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-element-extends",
"version": "1.2.16",
"version": "1.2.17",
"description": "Extension component based on ElementUI 2.x",
"scripts": {
"serve": "vue-cli-service serve",
Expand Down
2 changes: 1 addition & 1 deletion packages/editable/src/editable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,7 @@ export default {
validPromise = validPromise.then(rest => new Promise((resolve, reject) => {
let rule = rules[rIndex]
let isRequired = rule.required === true
if ((type === 'all' || !rule.trigger || rule.trigger === 'change' || type === rule.trigger) && (isRequired || value)) {
if ((type === 'all' || !rule.trigger || rule.trigger === 'change' || type === rule.trigger) && (isRequired || value || rule.validator)) {
if (XEUtils.isFunction(rule.validator)) {
rule.validator(rule, value, e => {
if (XEUtils.isError(e)) {
Expand Down

0 comments on commit 36478c3

Please sign in to comment.