@leevan/jtui 2.0.52 → 2.0.54-beta.1

package/lib/jtui.common.js

@@ -26847,6 +26847,13 @@ function helperDefaultCompare (v1, v2) {
 module.exports = helperDefaultCompare
 
 
+/***/ }),
+
+/***/ "2ca0":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "2cf4":
@@ -238728,6 +238735,17 @@ module.exports = _default;
 
 /***/ }),
 
+/***/ "ec9f":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_EditInput_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("2ca0");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_EditInput_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_EditInput_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+ /* unused harmony default export */ var _unused_webpack_default_export = (_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_EditInput_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0___default.a); 
+
+/***/ }),
+
 /***/ "ecf8":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -250053,7 +250071,7 @@ var es_function_name = __webpack_require__("b0c0");
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
 var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"09b5e250-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/jt-table/index.vue?vue&type=template&id=64603e4a&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"09b5e250-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/jt-table/index.vue?vue&type=template&id=4a739b24&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"tableStyle-2",class:_vm.isWrap ? 'isWrap' : '',staticStyle:{"position":"absolute","top":"1px","left":"1px","right":"1px","bottom":"1px"}},[(_vm.isTool)?_c('div',{staticStyle:{"position":"relative"}},[_c('vxe-toolbar',{staticClass:"jt-toolbar",attrs:{"custom":{ icon: 'jtIcon iconpeizhi41 colStyle' }}})],1):_vm._e(),_c('div',{staticStyle:{"width":"100%","height":"100%","position":"relative"}},[(_vm.isShowEmpty)?_c('div',{staticClass:"cus-empty-box"},[_c('el-empty',{attrs:{"image-size":200},scopedSlots:_vm._u([{key:"description",fn:function(){return [_c('p',{staticStyle:{"font-size":"30px"}},[_vm._v("暂无数据")])]},proxy:true}],null,false,1618345459)})],1):_vm._e(),(_vm.tableType === 'default')?_c('vxe-table',{ref:_vm.id,staticClass:"jt-table-class-only table-2-repair",attrs:{"height":"auto","size":"mini","show-overflow":"","show-header-overflow":"","auto-resize":"","resizable":"","highlight-current-row":"","highlight-current-column":"","keep-source":"","empty-text":" ","id":_vm.id,"data":_vm.data.DataArray,"stripe":_vm.stripe,"border":_vm.border,"max-height":_vm.maxHeight,"show-footer":_vm.isFooter,"footer-method":_vm.footerMethod,"footer-span-method":_vm.footerColspanMethod,"footer-cell-class-name":_vm.footerCellClassName,"loading":_vm.loading,"row-style":_vm.rowStyle,"cell-style":_vm.cellStyle_m,"header-cell-class-name":_vm.headerClass,"span-method":_vm.spanMethod,"scroll-y":{ mode: 'wheel' },"sort-config":{ sortMethod: _vm.sortMethod },"radio-config":{ checkRowKey: null },"keyboard-config":{ isArrow: true },"checkbox-config":{ highlight: true },"export-config":{
       type: 'xlsx',
       types: ['xlsx', 'csv', 'html', 'xml', 'txt'],
@@ -250153,7 +250171,7 @@ return [(_vm.handlerConfig.btnGroup)?_c('el-dropdown',[_c('el-button',{attrs:{"s
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/jt-table/index.vue?vue&type=template&id=64603e4a&
+// CONCATENATED MODULE: ./packages/jt-table/index.vue?vue&type=template&id=4a739b24&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
 var es_array_concat = __webpack_require__("99af");
@@ -250354,20 +250372,27 @@ function _toConsumableArray(arr) {
 var xe_utils = __webpack_require__("c695");
 var xe_utils_default = /*#__PURE__*/__webpack_require__.n(xe_utils);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"09b5e250-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/jt-table/components/tableColumn.vue?vue&type=template&id=07966dbe&
-var tableColumnvue_type_template_id_07966dbe_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.item.children && _vm.item.children.length)?_c('vxe-colgroup',{key:_vm.index,attrs:{"title":_vm.item.label,"type":_vm.item.html ? 'html' : ''}},[_vm._l((_vm.item.children),function(subItem,subIndex){return [(subItem.children && subItem.children.length)?_c('vxe-colgroup',{key:subIndex,attrs:{"title":subItem.label,"type":subItem.html ? 'html' : ''}},_vm._l((subItem.children),function(subSubItem,subSubIndex){return _c('vxe-table-column',{key:subSubIndex,attrs:{"edit-render":subSubItem.edit,"show-overflow":"","field":subSubItem.prop,"align":subSubItem.align,"title":subSubItem.label,"type":subSubItem.html ? 'html' : '',"min-width":subSubItem.width,"sortable":subSubItem.isSort,"visible":subSubItem.width != 0,"fixed":subSubItem.isFixed,"filters":_vm.filterData(subSubItem.filterRender),"filter-render":{ name: subSubItem.filterRender },"formatter":_vm.formatEnum,"cell-render":_vm.cellRenderData(subSubItem.cellRender)},scopedSlots:_vm._u([(_vm.item && _vm.item.edit && _vm.item.edit.name == '$select')?{key:"edit",fn:function(ref){
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"09b5e250-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/jt-table/components/tableColumn.vue?vue&type=template&id=b725c65a&
+var tableColumnvue_type_template_id_b725c65a_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.item.children && _vm.item.children.length)?_c('vxe-colgroup',{key:_vm.index,attrs:{"title":_vm.item.label,"type":_vm.item.html ? 'html' : ''}},[_vm._l((_vm.item.children),function(subItem,subIndex){return [(subItem.children && subItem.children.length)?_c('vxe-colgroup',{key:subIndex,attrs:{"title":subItem.label,"type":subItem.html ? 'html' : ''}},_vm._l((subItem.children),function(subSubItem,subSubIndex){return _c('vxe-table-column',{key:subSubIndex,attrs:{"edit-render":subSubItem.edit,"show-overflow":"","field":subSubItem.prop,"align":subSubItem.align,"title":subSubItem.label,"type":subSubItem.html ? 'html' : '',"min-width":subSubItem.width,"sortable":subSubItem.isSort,"visible":subSubItem.width != 0,"fixed":subSubItem.isFixed,"filters":_vm.filterData(subSubItem.filterRender),"filter-render":{ name: subSubItem.filterRender },"formatter":_vm.formatEnum,"cell-render":_vm.cellRenderData(subSubItem.cellRender)},scopedSlots:_vm._u([{key:"edit",fn:function(ref){
 var row = ref.row;
-return [_c('div',{ref:"selectWrapper",refInFor:true,staticClass:"custom-select-wrapper"},[_c('div',{ref:"inputRef",refInFor:true,staticClass:"custom-select-input",on:{"click":_vm.toggleDropdown}},[_c('span',{staticClass:"custom-select-value"},[_vm._v(" "+_vm._s(_vm.getLabel(row[_vm.item.prop]))+" ")]),_c('i',{staticClass:"custom-select-arrow",class:{'is-open': _vm.isOpen}})]),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isOpen),expression:"isOpen"}],ref:"dropdownRef",refInFor:true,staticClass:"custom-select-dropdown"},[_c('ul',_vm._l((_vm.item.edit.options),function(op){return _c('li',{key:op.value,class:{'is-selected': row[_vm.item.prop] === op.value},on:{"mousedown":function($event){$event.preventDefault();return _vm.selectOption(op, row)}}},[_vm._v(" "+_vm._s(op.label)+" ")])}),0)])])]}}:null],null,true)})}),1):_c('vxe-table-column',{key:subIndex,attrs:{"edit-render":subItem.edit,"show-overflow":"","field":subItem.prop,"align":subItem.align,"title":subItem.label,"type":subItem.html ? 'html' : '',"min-width":subItem.width,"sortable":subItem.isSort,"visible":subItem.width != 0,"fixed":subItem.isFixed,"filters":_vm.filterData(subItem.filterRender),"filter-render":{ name: subItem.filterRender },"formatter":_vm.formatEnum,"cell-render":_vm.cellRenderData(subItem.cellRender)},scopedSlots:_vm._u([(_vm.item && _vm.item.edit && _vm.item.edit.name == '$select')?{key:"edit",fn:function(ref){
+return [(_vm.item && _vm.item.edit && _vm.item.edit.name == '$select')?_c('div',{ref:"selectWrapper",refInFor:true,staticClass:"custom-select-wrapper"},[_c('div',{ref:"inputRef",refInFor:true,staticClass:"custom-select-input",on:{"click":_vm.toggleDropdown}},[_c('span',{staticClass:"custom-select-value"},[_vm._v(" "+_vm._s(_vm.getLabel(row[_vm.item.prop]))+" ")]),_c('i',{staticClass:"custom-select-arrow",class:{'is-open': _vm.isOpen}})]),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isOpen),expression:"isOpen"}],ref:"dropdownRef",refInFor:true,staticClass:"custom-select-dropdown"},[_c('ul',_vm._l((_vm.item.edit.options),function(op){return _c('li',{key:op.value,class:{'is-selected': row[_vm.item.prop] === op.value},on:{"mousedown":function($event){$event.preventDefault();return _vm.selectOption(op, row)}}},[_vm._v(" "+_vm._s(op.label)+" ")])}),0)])]):(_vm.item && _vm.item.edit && _vm.item.edit.name == '$input')?_c('EditInput',{attrs:{"value":row[subSubItem.prop],"type":(_vm.item.edit.props && _vm.item.edit.props.type) || 'text'},on:{"input":function (val) { return _vm.handleInputChange(val, row, subSubItem.prop); }}}):_vm._e()]}}],null,true)})}),1):_c('vxe-table-column',{key:subIndex,attrs:{"edit-render":subItem.edit,"show-overflow":"","field":subItem.prop,"align":subItem.align,"title":subItem.label,"type":subItem.html ? 'html' : '',"min-width":subItem.width,"sortable":subItem.isSort,"visible":subItem.width != 0,"fixed":subItem.isFixed,"filters":_vm.filterData(subItem.filterRender),"filter-render":{ name: subItem.filterRender },"formatter":_vm.formatEnum,"cell-render":_vm.cellRenderData(subItem.cellRender)},scopedSlots:_vm._u([{key:"edit",fn:function(ref){
 var row = ref.row;
-return [_c('div',{ref:"selectWrapper",refInFor:true,staticClass:"custom-select-wrapper"},[_c('div',{ref:"inputRef",refInFor:true,staticClass:"custom-select-input",on:{"click":_vm.toggleDropdown}},[_c('span',{staticClass:"custom-select-value"},[_vm._v(" "+_vm._s(_vm.getLabel(row[_vm.item.prop]))+" ")]),_c('i',{staticClass:"custom-select-arrow",class:{'is-open': _vm.isOpen}})]),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isOpen),expression:"isOpen"}],ref:"dropdownRef",refInFor:true,staticClass:"custom-select-dropdown"},[_c('ul',_vm._l((_vm.item.edit.options),function(op){return _c('li',{key:op.value,class:{'is-selected': row[_vm.item.prop] === op.value},on:{"mousedown":function($event){$event.preventDefault();return _vm.selectOption(op, row)}}},[_vm._v(" "+_vm._s(op.label)+" ")])}),0)])])]}}:null],null,true)})]})],2):_c('vxe-table-column',{key:_vm.index,attrs:{"edit-render":_vm.item.edit && _vm.item.edit.name == '$select' ? {autofocus: '.vxe-input--inner'} : _vm.item.edit,"show-overflow":"","field":_vm.item.prop,"align":_vm.item.align,"title":_vm.item.label,"type":_vm.item.html ? 'html' : '',"min-width":_vm.item.width,"sortable":_vm.item.isSort,"visible":_vm.item.width != 0,"fixed":_vm.item.isFixed,"filters":_vm.filterData(_vm.item.filterRender),"filter-render":{ name: _vm.item.filterRender },"formatter":_vm.formatEnum,"cell-render":_vm.cellRenderData(_vm.item.cellRender)},scopedSlots:_vm._u([(_vm.item && _vm.item.edit && _vm.item.edit.name == '$select')?{key:"edit",fn:function(ref){
+return [(_vm.item && _vm.item.edit && _vm.item.edit.name == '$select')?_c('div',{ref:"selectWrapper",refInFor:true,staticClass:"custom-select-wrapper"},[_c('div',{ref:"inputRef",refInFor:true,staticClass:"custom-select-input",on:{"click":_vm.toggleDropdown}},[_c('span',{staticClass:"custom-select-value"},[_vm._v(" "+_vm._s(_vm.getLabel(row[_vm.item.prop]))+" ")]),_c('i',{staticClass:"custom-select-arrow",class:{'is-open': _vm.isOpen}})]),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isOpen),expression:"isOpen"}],ref:"dropdownRef",refInFor:true,staticClass:"custom-select-dropdown"},[_c('ul',_vm._l((_vm.item.edit.options),function(op){return _c('li',{key:op.value,class:{'is-selected': row[_vm.item.prop] === op.value},on:{"mousedown":function($event){$event.preventDefault();return _vm.selectOption(op, row)}}},[_vm._v(" "+_vm._s(op.label)+" ")])}),0)])]):(_vm.item && _vm.item.edit && _vm.item.edit.name == '$input')?_c('EditInput',{attrs:{"value":row[subItem.prop],"type":(_vm.item.edit.props && _vm.item.edit.props.type) || 'text'},on:{"input":function (val) { return _vm.handleInputChange(val, row, subItem.prop); }}}):_vm._e()]}}],null,true)})]})],2):_c('vxe-table-column',{key:_vm.index,attrs:{"edit-render":_vm.item.edit && _vm.item.edit.name == '$select' ? {autofocus: '.vxe-input--inner'} : _vm.item.edit,"show-overflow":"","field":_vm.item.prop,"align":_vm.item.align,"title":_vm.item.label,"type":_vm.item.html ? 'html' : '',"min-width":_vm.item.width,"sortable":_vm.item.isSort,"visible":_vm.item.width != 0,"fixed":_vm.item.isFixed,"filters":_vm.filterData(_vm.item.filterRender),"filter-render":{ name: _vm.item.filterRender },"formatter":_vm.formatEnum,"cell-render":_vm.cellRenderData(_vm.item.cellRender)},scopedSlots:_vm._u([{key:"edit",fn:function(ref){
 var row = ref.row;
-return [_c('div',{ref:"selectWrapper",staticClass:"custom-select-wrapper"},[_c('div',{ref:"inputRef",staticClass:"custom-select-input",on:{"click":_vm.toggleDropdown}},[_c('span',{staticClass:"custom-select-value"},[_vm._v(" "+_vm._s(_vm.getLabel(row[_vm.item.prop]))+" ")]),_c('i',{staticClass:"custom-select-arrow",class:{'is-open': _vm.isOpen}})]),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isOpen),expression:"isOpen"}],ref:"dropdownRef",staticClass:"custom-select-dropdown"},[_c('ul',_vm._l((_vm.item.edit.options),function(op){return _c('li',{key:op.value,class:{'is-selected': row[_vm.item.prop] === op.value},on:{"mousedown":function($event){$event.preventDefault();return _vm.selectOption(op, row)}}},[_vm._v(" "+_vm._s(op.label)+" ")])}),0)])])]}}:null],null,true)})}
-var tableColumnvue_type_template_id_07966dbe_staticRenderFns = []
+return [(_vm.item && _vm.item.edit && _vm.item.edit.name == '$select')?_c('div',{ref:"selectWrapper",staticClass:"custom-select-wrapper"},[_c('div',{ref:"inputRef",staticClass:"custom-select-input",on:{"click":_vm.toggleDropdown}},[_c('span',{staticClass:"custom-select-value"},[_vm._v(" "+_vm._s(_vm.getLabel(row[_vm.item.prop]))+" ")]),_c('i',{staticClass:"custom-select-arrow",class:{'is-open': _vm.isOpen}})]),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isOpen),expression:"isOpen"}],ref:"dropdownRef",staticClass:"custom-select-dropdown"},[_c('ul',_vm._l((_vm.item.edit.options),function(op){return _c('li',{key:op.value,class:{'is-selected': row[_vm.item.prop] === op.value},on:{"mousedown":function($event){$event.preventDefault();return _vm.selectOption(op, row)}}},[_vm._v(" "+_vm._s(op.label)+" ")])}),0)])]):(_vm.item && _vm.item.edit && _vm.item.edit.name == '$input')?_c('EditInput',{attrs:{"value":row[_vm.item.prop],"type":(_vm.item.edit.props && _vm.item.edit.props.type) || 'text'},on:{"input":function (val) { return _vm.handleInputChange(val, row, _vm.item.prop); }}}):_vm._e()]}}])})}
+var tableColumnvue_type_template_id_b725c65a_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/jt-table/components/tableColumn.vue?vue&type=template&id=07966dbe&
+// CONCATENATED MODULE: ./packages/jt-table/components/tableColumn.vue?vue&type=template&id=b725c65a&
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/jt-table/components/tableColumn.vue?vue&type=script&lang=js&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"09b5e250-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/jt-table/components/edit-components/EditInput.vue?vue&type=template&id=8ee7abe0&
+var EditInputvue_type_template_id_8ee7abe0_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"edit-input-wrapper"},[(_vm.inputType === 'text')?_c('el-input',{ref:"inputRef",attrs:{"type":"text","size":"mini"},on:{"blur":_vm.handleBlur,"change":_vm.handleChange,"keyup":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.handleBlur($event)}},model:{value:(_vm.currentValue),callback:function ($$v) {_vm.currentValue=$$v},expression:"currentValue"}}):(_vm.inputType === 'password')?_c('el-input',{ref:"inputRef",attrs:{"type":"password","show-password":"","size":"mini"},on:{"blur":_vm.handleBlur,"change":_vm.handleChange,"keyup":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.handleBlur($event)}},model:{value:(_vm.currentValue),callback:function ($$v) {_vm.currentValue=$$v},expression:"currentValue"}}):(_vm.inputType === 'number')?_c('el-input-number',{ref:"inputRef",attrs:{"controls":true,"size":"mini"},on:{"blur":_vm.handleBlur,"change":_vm.handleChange},model:{value:(_vm.currentValue),callback:function ($$v) {_vm.currentValue=$$v},expression:"currentValue"}}):(_vm.inputType === 'integer')?_c('el-input-number',{ref:"inputRef",attrs:{"precision":0,"step":1,"size":"mini"},on:{"blur":_vm.handleBlur,"change":_vm.handleChange},model:{value:(_vm.currentValue),callback:function ($$v) {_vm.currentValue=$$v},expression:"currentValue"}}):(_vm.inputType === 'float')?_c('el-input-number',{ref:"inputRef",attrs:{"precision":2,"step":0.1,"size":"mini"},on:{"blur":_vm.handleBlur,"change":_vm.handleChange},model:{value:(_vm.currentValue),callback:function ($$v) {_vm.currentValue=$$v},expression:"currentValue"}}):(_vm.inputType === 'date')?_c('el-date-picker',{ref:"inputRef",attrs:{"type":"date","value-format":"yyyy-MM-dd","size":"mini"},on:{"change":_vm.handleChange},model:{value:(_vm.currentValue),callback:function ($$v) {_vm.currentValue=$$v},expression:"currentValue"}}):(_vm.inputType === 'datetime')?_c('el-date-picker',{ref:"inputRef",attrs:{"type":"datetime","value-format":"yyyy-MM-dd HH:mm:ss","size":"mini"},on:{"change":_vm.handleChange},model:{value:(_vm.currentValue),callback:function ($$v) {_vm.currentValue=$$v},expression:"currentValue"}}):(_vm.inputType === 'week')?_c('el-date-picker',{ref:"inputRef",attrs:{"type":"week","format":"yyyy 第 WW 周","value-format":"yyyy-Www","size":"mini"},on:{"change":_vm.handleChange},model:{value:(_vm.currentValue),callback:function ($$v) {_vm.currentValue=$$v},expression:"currentValue"}}):(_vm.inputType === 'month')?_c('el-date-picker',{ref:"inputRef",attrs:{"type":"month","value-format":"yyyy-MM","size":"mini"},on:{"change":_vm.handleChange},model:{value:(_vm.currentValue),callback:function ($$v) {_vm.currentValue=$$v},expression:"currentValue"}}):(_vm.inputType === 'year')?_c('el-date-picker',{ref:"inputRef",attrs:{"type":"year","value-format":"yyyy","size":"mini"},on:{"change":_vm.handleChange},model:{value:(_vm.currentValue),callback:function ($$v) {_vm.currentValue=$$v},expression:"currentValue"}}):_c('el-input',{ref:"inputRef",attrs:{"type":"text","size":"mini"},on:{"blur":_vm.handleBlur,"change":_vm.handleChange,"keyup":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.handleBlur($event)}},model:{value:(_vm.currentValue),callback:function ($$v) {_vm.currentValue=$$v},expression:"currentValue"}})],1)}
+var EditInputvue_type_template_id_8ee7abe0_staticRenderFns = []
+
+
+// CONCATENATED MODULE: ./packages/jt-table/components/edit-components/EditInput.vue?vue&type=template&id=8ee7abe0&
+
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/jt-table/components/edit-components/EditInput.vue?vue&type=script&lang=js&
 
 
 //
@@ -250481,123 +250506,91 @@ var tableColumnvue_type_template_id_07966dbe_staticRenderFns = []
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-/* harmony default export */ var tableColumnvue_type_script_lang_js_ = ({
-  name: "tableColumn",
+/* harmony default export */ var EditInputvue_type_script_lang_js_ = ({
+  name: 'EditInput',
+  props: {
+    value: [String, Number],
+    type: {
+      type: String,
+      default: 'text'
+    }
+  },
   data: function data() {
     return {
-      isOpen: false
+      currentValue: this.value
     };
   },
+  computed: {
+    inputType: function inputType() {
+      return this.type || 'text';
+    }
+  },
+  watch: {
+    value: function value(newVal) {
+      this.currentValue = newVal;
+    }
+  },
   mounted: function mounted() {
     var _this = this;
 
-    // 点击外部关闭下拉框
-    document.addEventListener('click', this.handleClickOutside); // 编辑激活时自动打开
-
     this.$nextTick(function () {
-      _this.isOpen = true;
-    });
-  },
-  beforeDestroy: function beforeDestroy() {
-    document.removeEventListener('click', this.handleClickOutside);
-  },
-  props: {
-    item: Object,
-    filterData: {
-      type: Function,
-      default: function _default() {
-        return {};
-      }
-    },
-    cellRenderData: {
-      type: Function,
-      default: function _default() {
-        return {};
-      }
-    },
-    formatEnum: {
-      type: Function,
-      default: function _default() {
-        return {};
+      if (_this.$refs.inputRef) {
+        var input = _this.$refs.inputRef.$el ? _this.$refs.inputRef.$el.querySelector('input') : _this.$refs.inputRef;
+
+        if (input && input.focus) {
+          input.focus();
+        }
       }
-    },
-    index: {
-      type: Number,
-      default: 0
-    }
+    });
   },
   methods: {
-    getLabel: function getLabel(value) {
-      if (!this.item || !this.item.edit || !this.item.edit.options) return value;
-      var findItem = this.item.edit.options.find(function (op) {
-        return op.value === value;
-      });
-      return findItem ? findItem.label : value || '请选择';
+    handleBlur: function handleBlur(e) {
+      this.doComplete();
     },
-    toggleDropdown: function toggleDropdown() {
-      this.isOpen = !this.isOpen;
+    handleChange: function handleChange(val) {
+      this.doComplete();
     },
-    selectOption: function selectOption(op, row) {
-      row[this.item.prop] = op.value;
-      this.isOpen = false;
+    doComplete: function doComplete() {
+      this.$emit('input', this.currentValue);
+      this.closeEdit();
     },
-    handleClickOutside: function handleClickOutside(e) {
-      if (this.$refs.selectWrapper && !this.$refs.selectWrapper.contains(e.target)) {
-        this.isOpen = false;
+    closeEdit: function closeEdit() {
+      try {
+        var vm = this.$parent;
+        var count = 0;
+
+        while (vm && count < 30) {
+          var componentName = vm.$options && vm.$options.name;
+
+          if (componentName === 'VxeTable' || componentName === 'VxeTable') {
+            if (vm.$xegrid) {
+              if (typeof vm.$xegrid._clearActived === 'function') {
+                vm.$xegrid._clearActived();
+
+                return;
+              }
+            }
+
+            if (typeof vm._clearActived === 'function') {
+              vm._clearActived();
+
+              return;
+            }
+          }
+
+          vm = vm.$parent;
+          count++;
+        }
+      } catch (e) {
+        console.error('closeEdit error', e);
       }
     }
   }
 });
-// CONCATENATED MODULE: ./packages/jt-table/components/tableColumn.vue?vue&type=script&lang=js&
- /* harmony default export */ var components_tableColumnvue_type_script_lang_js_ = (tableColumnvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./packages/jt-table/components/tableColumn.vue?vue&type=style&index=0&lang=scss&
-var tableColumnvue_type_style_index_0_lang_scss_ = __webpack_require__("2c8c");
+// CONCATENATED MODULE: ./packages/jt-table/components/edit-components/EditInput.vue?vue&type=script&lang=js&
+ /* harmony default export */ var edit_components_EditInputvue_type_script_lang_js_ = (EditInputvue_type_script_lang_js_); 
+// EXTERNAL MODULE: ./packages/jt-table/components/edit-components/EditInput.vue?vue&type=style&index=0&lang=scss&
+var EditInputvue_type_style_index_0_lang_scss_ = __webpack_require__("ec9f");
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
 /* globals __VUE_SSR_CONTEXT__ */
@@ -250699,7 +250692,7 @@ function normalizeComponent (
   }
 }
 
-// CONCATENATED MODULE: ./packages/jt-table/components/tableColumn.vue
+// CONCATENATED MODULE: ./packages/jt-table/components/edit-components/EditInput.vue
 
 
 
@@ -250709,9 +250702,366 @@ function normalizeComponent (
 /* normalize component */
 
 var component = normalizeComponent(
+  edit_components_EditInputvue_type_script_lang_js_,
+  EditInputvue_type_template_id_8ee7abe0_render,
+  EditInputvue_type_template_id_8ee7abe0_staticRenderFns,
+  false,
+  null,
+  null,
+  null
+  
+)
+
+/* harmony default export */ var EditInput = (component.exports);
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/jt-table/components/tableColumn.vue?vue&type=script&lang=js&
+
+
+
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
+/* harmony default export */ var tableColumnvue_type_script_lang_js_ = ({
+  name: "tableColumn",
+  components: {
+    EditInput: EditInput
+  },
+  data: function data() {
+    return {
+      isOpen: false,
+      vxeTableInstance: null
+    };
+  },
+  mounted: function mounted() {
+    var _this = this;
+
+    // 点击外部关闭下拉框
+    document.addEventListener('click', this.handleClickOutside); // 编辑激活时自动打开
+
+    this.$nextTick(function () {
+      _this.isOpen = true;
+    }); // 查找并保存vxe-table实例
+
+    this.findVxeTable();
+  },
+  beforeDestroy: function beforeDestroy() {
+    document.removeEventListener('click', this.handleClickOutside);
+  },
+  props: {
+    item: Object,
+    filterData: {
+      type: Function,
+      default: function _default() {
+        return {};
+      }
+    },
+    cellRenderData: {
+      type: Function,
+      default: function _default() {
+        return {};
+      }
+    },
+    formatEnum: {
+      type: Function,
+      default: function _default() {
+        return {};
+      }
+    },
+    index: {
+      type: Number,
+      default: 0
+    }
+  },
+  methods: {
+    findVxeTable: function findVxeTable() {
+      // 向上查找vxe-table实例
+      var parent = this.$parent;
+      var count = 0;
+
+      while (parent && count < 30) {
+        var componentName = parent.$options && parent.$options.name;
+
+        if (componentName === 'VxeTable' || componentName === 'VxeTable') {
+          if (parent.clearEdit && typeof parent.clearEdit === 'function') {
+            this.vxeTableInstance = parent;
+            return;
+          }
+
+          if (parent.$vxe && parent.$vxe.table) {
+            this.vxeTableInstance = parent.$vxe.table;
+            return;
+          }
+
+          if (parent.xetable) {
+            this.vxeTableInstance = parent.xetable;
+            return;
+          }
+        }
+
+        if (parent.clearEdit && typeof parent.clearEdit === 'function') {
+          this.vxeTableInstance = parent;
+          return;
+        }
+
+        parent = parent.$parent;
+        count++;
+      }
+    },
+    getLabel: function getLabel(value) {
+      if (!this.item || !this.item.edit || !this.item.edit.options) return value;
+      var findItem = this.item.edit.options.find(function (op) {
+        return op.value === value;
+      });
+      return findItem ? findItem.label : value || '请选择';
+    },
+    handleInputChange: function handleInputChange(val, row, prop) {
+      if (!(prop in row)) {
+        this.$set(row, prop, val);
+      } else {
+        row[prop] = val;
+      }
+    },
+    toggleDropdown: function toggleDropdown() {
+      this.isOpen = !this.isOpen;
+    },
+    selectOption: function selectOption(op, row) {
+      row[this.item.prop] = op.value;
+      this.isOpen = false;
+      this.closeEdit();
+    },
+    closeEdit: function closeEdit() {
+      try {
+        var vm = this.$parent;
+        var count = 0;
+
+        while (vm && count < 30) {
+          var componentName = vm.$options && vm.$options.name;
+
+          if (componentName === 'VxeTable' || componentName === 'VxeTable') {
+            if (vm.$xegrid) {
+              if (typeof vm.$xegrid._clearActived === 'function') {
+                vm.$xegrid._clearActived();
+
+                return;
+              }
+
+              if (typeof vm.$xegrid.clearEdit === 'function') {
+                vm.$xegrid.clearEdit();
+                return;
+              }
+            }
+
+            if (typeof vm._clearActived === 'function') {
+              vm._clearActived();
+
+              return;
+            }
+          }
+
+          vm = vm.$parent;
+          count++;
+        }
+      } catch (e) {
+        console.error('closeEdit error', e);
+      }
+    },
+    handleClickOutside: function handleClickOutside(e) {
+      if (this.$refs.selectWrapper && !this.$refs.selectWrapper.contains(e.target)) {
+        this.isOpen = false;
+      }
+    }
+  }
+});
+// CONCATENATED MODULE: ./packages/jt-table/components/tableColumn.vue?vue&type=script&lang=js&
+ /* harmony default export */ var components_tableColumnvue_type_script_lang_js_ = (tableColumnvue_type_script_lang_js_); 
+// EXTERNAL MODULE: ./packages/jt-table/components/tableColumn.vue?vue&type=style&index=0&lang=scss&
+var tableColumnvue_type_style_index_0_lang_scss_ = __webpack_require__("2c8c");
+
+// CONCATENATED MODULE: ./packages/jt-table/components/tableColumn.vue
+
+
+
+
+
+
+/* normalize component */
+
+var tableColumn_component = normalizeComponent(
   components_tableColumnvue_type_script_lang_js_,
-  tableColumnvue_type_template_id_07966dbe_render,
-  tableColumnvue_type_template_id_07966dbe_staticRenderFns,
+  tableColumnvue_type_template_id_b725c65a_render,
+  tableColumnvue_type_template_id_b725c65a_staticRenderFns,
   false,
   null,
   null,
@@ -250719,7 +251069,7 @@ var component = normalizeComponent(
   
 )
 
-/* harmony default export */ var tableColumn = (component.exports);
+/* harmony default export */ var tableColumn = (tableColumn_component.exports);
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/jt-table/index.vue?vue&type=script&lang=js&
 
 
@@ -251940,29 +252290,33 @@ var component = normalizeComponent(
           property = _ref2.property,
           order = _ref2.order;
       var data1 = data.filter(function (item) {
-        return property in item;
+        return property in item && item[property] != null;
       });
       var data2 = data.filter(function (item) {
-        return !(property in item);
+        return !(property in item) || item[property] == null;
       });
       var list = [];
 
       if (order === "asc" || order === "desc") {
-        if (/.*[\u4e00-\u9fa5]+.*$/.test(data1[0][property]) || /[a-zA-Z]/i.test(data1[0][property])) {
-          list = data1.sort(function (a, b) {
-            return a[property].localeCompare(b[property]);
-          });
-        } else {
-          if (isNaN(data1[0][property]) && !isNaN(Date.parse(data1[0][property]))) {
-            list = data1.sort(function (a, b) {
-              return new Date(a[property]).getTime() - new Date(b[property]).getTime();
-            });
-          } else {
-            list = data1.sort(function (a, b) {
-              return a[property] - b[property];
-            });
+        list = data1.sort(function (a, b) {
+          var valA = a[property];
+          var valB = b[property];
+          var dateA = Date.parse(valA);
+          var dateB = Date.parse(valB);
+
+          if (!isNaN(dateA) && !isNaN(dateB)) {
+            return dateA - dateB;
           }
-        }
+
+          var numA = Number(valA);
+          var numB = Number(valB);
+
+          if (!isNaN(numA) && !isNaN(numB)) {
+            return numA - numB;
+          }
+
+          return String(valA).localeCompare(String(valB));
+        });
       }
 
       if (order === "desc") {