@leevan/jtui 2.0.53 → 2.0.54-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/jtui.umd.js CHANGED
@@ -250080,7 +250080,7 @@ var es_function_name = __webpack_require__("b0c0");
250080
250080
  var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
250081
250081
  var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
250082
250082
 
250083
- // 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&
250083
+ // 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&
250084
250084
  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":{
250085
250085
  type: 'xlsx',
250086
250086
  types: ['xlsx', 'csv', 'html', 'xml', 'txt'],
@@ -250180,7 +250180,7 @@ return [(_vm.handlerConfig.btnGroup)?_c('el-dropdown',[_c('el-button',{attrs:{"s
250180
250180
  var staticRenderFns = []
250181
250181
 
250182
250182
 
250183
- // CONCATENATED MODULE: ./packages/jt-table/index.vue?vue&type=template&id=64603e4a&
250183
+ // CONCATENATED MODULE: ./packages/jt-table/index.vue?vue&type=template&id=4a739b24&
250184
250184
 
250185
250185
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
250186
250186
  var es_array_concat = __webpack_require__("99af");
@@ -250381,42 +250381,29 @@ function _toConsumableArray(arr) {
250381
250381
  var xe_utils = __webpack_require__("c695");
250382
250382
  var xe_utils_default = /*#__PURE__*/__webpack_require__.n(xe_utils);
250383
250383
 
250384
- // 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=80b8c75a&
250385
- var tableColumnvue_type_template_id_80b8c75a_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){
250384
+ // 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=8c78c7b6&
250385
+ var tableColumnvue_type_template_id_8c78c7b6_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){
250386
250386
  var row = ref.row;
250387
- 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:{"type":(_vm.item.edit.props && _vm.item.edit.props.type) || 'text',"table-instance":_vm.vxeTableInstance},model:{value:(row[subSubItem.prop]),callback:function ($$v) {_vm.$set(row, subSubItem.prop, $$v)},expression:"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){
250387
+ 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:{"type":(_vm.item.edit.props && _vm.item.edit.props.type) || 'text',"row":row,"prop":subSubItem.prop},model:{value:(row[subSubItem.prop]),callback:function ($$v) {_vm.$set(row, subSubItem.prop, $$v)},expression:"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){
250388
250388
  var row = ref.row;
250389
- 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:{"type":(_vm.item.edit.props && _vm.item.edit.props.type) || 'text',"table-instance":_vm.vxeTableInstance},model:{value:(row[subItem.prop]),callback:function ($$v) {_vm.$set(row, subItem.prop, $$v)},expression:"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){
250389
+ 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:{"type":(_vm.item.edit.props && _vm.item.edit.props.type) || 'text',"row":row,"prop":subItem.prop},model:{value:(row[subItem.prop]),callback:function ($$v) {_vm.$set(row, subItem.prop, $$v)},expression:"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){
250390
250390
  var row = ref.row;
250391
- 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:{"type":(_vm.item.edit.props && _vm.item.edit.props.type) || 'text',"table-instance":_vm.vxeTableInstance},model:{value:(row[_vm.item.prop]),callback:function ($$v) {_vm.$set(row, _vm.item.prop, $$v)},expression:"row[item.prop]"}}):_vm._e()]}}])})}
250392
- var tableColumnvue_type_template_id_80b8c75a_staticRenderFns = []
250391
+ 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:{"type":(_vm.item.edit.props && _vm.item.edit.props.type) || 'text',"row":row,"prop":_vm.item.prop},model:{value:(row[_vm.item.prop]),callback:function ($$v) {_vm.$set(row, _vm.item.prop, $$v)},expression:"row[item.prop]"}}):_vm._e()]}}])})}
250392
+ var tableColumnvue_type_template_id_8c78c7b6_staticRenderFns = []
250393
250393
 
250394
250394
 
250395
- // CONCATENATED MODULE: ./packages/jt-table/components/tableColumn.vue?vue&type=template&id=80b8c75a&
250395
+ // CONCATENATED MODULE: ./packages/jt-table/components/tableColumn.vue?vue&type=template&id=8c78c7b6&
250396
250396
 
250397
- // 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=7d953fc5&
250398
- var EditInputvue_type_template_id_7d953fc5_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)}
250399
- var EditInputvue_type_template_id_7d953fc5_staticRenderFns = []
250397
+ // 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=469bb260&
250398
+ var EditInputvue_type_template_id_469bb260_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)}
250399
+ var EditInputvue_type_template_id_469bb260_staticRenderFns = []
250400
250400
 
250401
250401
 
250402
- // CONCATENATED MODULE: ./packages/jt-table/components/edit-components/EditInput.vue?vue&type=template&id=7d953fc5&
250403
-
250404
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
250405
- var es_array_includes = __webpack_require__("caad");
250406
-
250407
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.keys.js
250408
- var es_object_keys = __webpack_require__("b64b");
250409
-
250410
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
250411
- var es_string_includes = __webpack_require__("2532");
250402
+ // CONCATENATED MODULE: ./packages/jt-table/components/edit-components/EditInput.vue?vue&type=template&id=469bb260&
250412
250403
 
250413
250404
  // 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&
250414
250405
 
250415
250406
 
250416
-
250417
-
250418
-
250419
-
250420
250407
  //
250421
250408
  //
250422
250409
  //
@@ -250535,6 +250522,14 @@ var es_string_includes = __webpack_require__("2532");
250535
250522
  type: {
250536
250523
  type: String,
250537
250524
  default: 'text'
250525
+ },
250526
+ row: {
250527
+ type: Object,
250528
+ default: null
250529
+ },
250530
+ prop: {
250531
+ type: String,
250532
+ default: ''
250538
250533
  }
250539
250534
  },
250540
250535
  data: function data() {
@@ -250573,12 +250568,19 @@ var es_string_includes = __webpack_require__("2532");
250573
250568
  this.doComplete();
250574
250569
  },
250575
250570
  doComplete: function doComplete() {
250571
+ if (this.row && this.prop) {
250572
+ if (!(this.prop in this.row)) {
250573
+ this.$set(this.row, this.prop, this.currentValue);
250574
+ } else {
250575
+ this.row[this.prop] = this.currentValue;
250576
+ }
250577
+ }
250578
+
250576
250579
  this.$emit('input', this.currentValue);
250577
250580
  this.closeEdit();
250578
250581
  },
250579
250582
  closeEdit: function closeEdit() {
250580
250583
  try {
250581
- console.log('EditInput closeEdit, start finding VxeTable...');
250582
250584
  var vm = this.$parent;
250583
250585
  var count = 0;
250584
250586
 
@@ -250586,27 +250588,12 @@ var es_string_includes = __webpack_require__("2532");
250586
250588
  var componentName = vm.$options && vm.$options.name;
250587
250589
 
250588
250590
  if (componentName === 'VxeTable' || componentName === 'VxeTable') {
250589
- console.log('Found VxeTable component!');
250590
- console.log('vm.$xegrid:', vm.$xegrid);
250591
-
250592
250591
  if (vm.$xegrid) {
250593
- console.log('Methods on $xegrid:', Object.keys(vm.$xegrid));
250594
-
250595
- if (typeof vm.$xegrid.clearEdit === 'function') {
250596
- vm.$xegrid.clearEdit();
250597
- return;
250598
- }
250599
-
250600
250592
  if (typeof vm.$xegrid._clearActived === 'function') {
250601
250593
  vm.$xegrid._clearActived();
250602
250594
 
250603
250595
  return;
250604
250596
  }
250605
-
250606
- if (typeof vm.$xegrid.closeEdit === 'function') {
250607
- vm.$xegrid.closeEdit();
250608
- return;
250609
- }
250610
250597
  }
250611
250598
 
250612
250599
  if (typeof vm._clearActived === 'function') {
@@ -250614,29 +250601,6 @@ var es_string_includes = __webpack_require__("2532");
250614
250601
 
250615
250602
  return;
250616
250603
  }
250617
-
250618
- if (_typeof(vm.$xegrid) && typeof vm.$xegrid._clearActived === 'function') {
250619
- vm.$xegrid._clearActived();
250620
-
250621
- return;
250622
- }
250623
-
250624
- console.log('Trying all methods on VxeTable vm:', Object.keys(vm));
250625
-
250626
- for (var _i = 0, _Object$keys = Object.keys(vm); _i < _Object$keys.length; _i++) {
250627
- var key = _Object$keys[_i];
250628
-
250629
- if (typeof vm[key] === 'function' && (key.toLowerCase().includes('clear') || key.toLowerCase().includes('close') || key.toLowerCase().includes('edit'))) {
250630
- console.log('Found potential method:', key);
250631
-
250632
- try {
250633
- vm[key]();
250634
- return;
250635
- } catch (e) {
250636
- console.log('Tried', key, 'but failed:', e);
250637
- }
250638
- }
250639
- }
250640
250604
  }
250641
250605
 
250642
250606
  vm = vm.$parent;
@@ -250764,8 +250728,8 @@ function normalizeComponent (
250764
250728
 
250765
250729
  var component = normalizeComponent(
250766
250730
  edit_components_EditInputvue_type_script_lang_js_,
250767
- EditInputvue_type_template_id_7d953fc5_render,
250768
- EditInputvue_type_template_id_7d953fc5_staticRenderFns,
250731
+ EditInputvue_type_template_id_469bb260_render,
250732
+ EditInputvue_type_template_id_469bb260_staticRenderFns,
250769
250733
  false,
250770
250734
  null,
250771
250735
  null,
@@ -250953,6 +250917,9 @@ var component = normalizeComponent(
250953
250917
  //
250954
250918
  //
250955
250919
  //
250920
+ //
250921
+ //
250922
+ //
250956
250923
 
250957
250924
  /* harmony default export */ var tableColumnvue_type_script_lang_js_ = ({
250958
250925
  name: "tableColumn",
@@ -251114,8 +251081,8 @@ var tableColumnvue_type_style_index_0_lang_scss_ = __webpack_require__("2c8c");
251114
251081
 
251115
251082
  var tableColumn_component = normalizeComponent(
251116
251083
  components_tableColumnvue_type_script_lang_js_,
251117
- tableColumnvue_type_template_id_80b8c75a_render,
251118
- tableColumnvue_type_template_id_80b8c75a_staticRenderFns,
251084
+ tableColumnvue_type_template_id_8c78c7b6_render,
251085
+ tableColumnvue_type_template_id_8c78c7b6_staticRenderFns,
251119
251086
  false,
251120
251087
  null,
251121
251088
  null,
@@ -252344,29 +252311,33 @@ var tableColumn_component = normalizeComponent(
252344
252311
  property = _ref2.property,
252345
252312
  order = _ref2.order;
252346
252313
  var data1 = data.filter(function (item) {
252347
- return property in item;
252314
+ return property in item && item[property] != null;
252348
252315
  });
252349
252316
  var data2 = data.filter(function (item) {
252350
- return !(property in item);
252317
+ return !(property in item) || item[property] == null;
252351
252318
  });
252352
252319
  var list = [];
252353
252320
 
252354
252321
  if (order === "asc" || order === "desc") {
252355
- if (/.*[\u4e00-\u9fa5]+.*$/.test(data1[0][property]) || /[a-zA-Z]/i.test(data1[0][property])) {
252356
- list = data1.sort(function (a, b) {
252357
- return a[property].localeCompare(b[property]);
252358
- });
252359
- } else {
252360
- if (isNaN(data1[0][property]) && !isNaN(Date.parse(data1[0][property]))) {
252361
- list = data1.sort(function (a, b) {
252362
- return new Date(a[property]).getTime() - new Date(b[property]).getTime();
252363
- });
252364
- } else {
252365
- list = data1.sort(function (a, b) {
252366
- return a[property] - b[property];
252367
- });
252322
+ list = data1.sort(function (a, b) {
252323
+ var valA = a[property];
252324
+ var valB = b[property];
252325
+ var dateA = Date.parse(valA);
252326
+ var dateB = Date.parse(valB);
252327
+
252328
+ if (!isNaN(dateA) && !isNaN(dateB)) {
252329
+ return dateA - dateB;
252368
252330
  }
252369
- }
252331
+
252332
+ var numA = Number(valA);
252333
+ var numB = Number(valB);
252334
+
252335
+ if (!isNaN(numA) && !isNaN(numB)) {
252336
+ return numA - numB;
252337
+ }
252338
+
252339
+ return String(valA).localeCompare(String(valB));
252340
+ });
252370
252341
  }
252371
252342
 
252372
252343
  if (order === "desc") {
@@ -253014,6 +252985,9 @@ var JtFormPcvue_type_template_id_cbb8081c_staticRenderFns = []
253014
252985
 
253015
252986
  // CONCATENATED MODULE: ./packages/jt-form-pc/JtFormPc.vue?vue&type=template&id=cbb8081c&
253016
252987
 
252988
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.keys.js
252989
+ var es_object_keys = __webpack_require__("b64b");
252990
+
253017
252991
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.exec.js
253018
252992
  var es_regexp_exec = __webpack_require__("ac1f");
253019
252993
 
@@ -257355,6 +257329,12 @@ var FilterContentvue_type_template_id_2466fbca_staticRenderFns = []
257355
257329
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.every.js
257356
257330
  var es_array_every = __webpack_require__("a623");
257357
257331
 
257332
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
257333
+ var es_array_includes = __webpack_require__("caad");
257334
+
257335
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
257336
+ var es_string_includes = __webpack_require__("2532");
257337
+
257358
257338
  // 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/examples/FilterContent.vue?vue&type=script&lang=js&
257359
257339
 
257360
257340