@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.
@@ -9,6 +9,7 @@
9
9
  <el-button size="mini" @click="clearData">清空数据</el-button>
10
10
  <el-button size="mini" @click="radioSelect">单选选中</el-button>
11
11
  <el-button size="mini" @click="checkboxSelect">多选选中</el-button>
12
+ <el-button size="mini" @click="getEditData">编辑数据</el-button>
12
13
  <el-switch
13
14
  v-model="isTool"
14
15
  active-color="#13ce66"
@@ -274,8 +275,12 @@ import { data1 ,data0} from '../data2';
274
275
  checkboxSelect(){
275
276
  const fullData = this.$refs.tablePtbg.jtTable().getTableData().fullData
276
277
  this.$refs.tablePtbg.setCheckboxRow(fullData[0], true);
278
+ },
279
+ //获取编辑数据
280
+ getEditData(){
281
+ const editData = this.$refs.tablePtbg.getEditData();
282
+ console.log(editData);
277
283
  }
278
-
279
284
  }
280
285
  }
281
286
  </script>
@@ -250071,7 +250071,7 @@ var es_function_name = __webpack_require__("b0c0");
250071
250071
  var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
250072
250072
  var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
250073
250073
 
250074
- // 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&
250074
+ // 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&
250075
250075
  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":{
250076
250076
  type: 'xlsx',
250077
250077
  types: ['xlsx', 'csv', 'html', 'xml', 'txt'],
@@ -250171,7 +250171,7 @@ return [(_vm.handlerConfig.btnGroup)?_c('el-dropdown',[_c('el-button',{attrs:{"s
250171
250171
  var staticRenderFns = []
250172
250172
 
250173
250173
 
250174
- // CONCATENATED MODULE: ./packages/jt-table/index.vue?vue&type=template&id=64603e4a&
250174
+ // CONCATENATED MODULE: ./packages/jt-table/index.vue?vue&type=template&id=4a739b24&
250175
250175
 
250176
250176
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
250177
250177
  var es_array_concat = __webpack_require__("99af");
@@ -250372,42 +250372,29 @@ function _toConsumableArray(arr) {
250372
250372
  var xe_utils = __webpack_require__("c695");
250373
250373
  var xe_utils_default = /*#__PURE__*/__webpack_require__.n(xe_utils);
250374
250374
 
250375
- // 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&
250376
- 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){
250375
+ // 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&
250376
+ 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){
250377
250377
  var row = ref.row;
250378
- 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){
250378
+ 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){
250379
250379
  var row = ref.row;
250380
- 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){
250380
+ 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){
250381
250381
  var row = ref.row;
250382
- 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()]}}])})}
250383
- var tableColumnvue_type_template_id_80b8c75a_staticRenderFns = []
250382
+ 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()]}}])})}
250383
+ var tableColumnvue_type_template_id_8c78c7b6_staticRenderFns = []
250384
250384
 
250385
250385
 
250386
- // CONCATENATED MODULE: ./packages/jt-table/components/tableColumn.vue?vue&type=template&id=80b8c75a&
250386
+ // CONCATENATED MODULE: ./packages/jt-table/components/tableColumn.vue?vue&type=template&id=8c78c7b6&
250387
250387
 
250388
- // 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&
250389
- 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)}
250390
- var EditInputvue_type_template_id_7d953fc5_staticRenderFns = []
250388
+ // 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&
250389
+ 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)}
250390
+ var EditInputvue_type_template_id_469bb260_staticRenderFns = []
250391
250391
 
250392
250392
 
250393
- // CONCATENATED MODULE: ./packages/jt-table/components/edit-components/EditInput.vue?vue&type=template&id=7d953fc5&
250394
-
250395
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
250396
- var es_array_includes = __webpack_require__("caad");
250397
-
250398
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.keys.js
250399
- var es_object_keys = __webpack_require__("b64b");
250400
-
250401
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
250402
- var es_string_includes = __webpack_require__("2532");
250393
+ // CONCATENATED MODULE: ./packages/jt-table/components/edit-components/EditInput.vue?vue&type=template&id=469bb260&
250403
250394
 
250404
250395
  // 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&
250405
250396
 
250406
250397
 
250407
-
250408
-
250409
-
250410
-
250411
250398
  //
250412
250399
  //
250413
250400
  //
@@ -250526,6 +250513,14 @@ var es_string_includes = __webpack_require__("2532");
250526
250513
  type: {
250527
250514
  type: String,
250528
250515
  default: 'text'
250516
+ },
250517
+ row: {
250518
+ type: Object,
250519
+ default: null
250520
+ },
250521
+ prop: {
250522
+ type: String,
250523
+ default: ''
250529
250524
  }
250530
250525
  },
250531
250526
  data: function data() {
@@ -250564,12 +250559,19 @@ var es_string_includes = __webpack_require__("2532");
250564
250559
  this.doComplete();
250565
250560
  },
250566
250561
  doComplete: function doComplete() {
250562
+ if (this.row && this.prop) {
250563
+ if (!(this.prop in this.row)) {
250564
+ this.$set(this.row, this.prop, this.currentValue);
250565
+ } else {
250566
+ this.row[this.prop] = this.currentValue;
250567
+ }
250568
+ }
250569
+
250567
250570
  this.$emit('input', this.currentValue);
250568
250571
  this.closeEdit();
250569
250572
  },
250570
250573
  closeEdit: function closeEdit() {
250571
250574
  try {
250572
- console.log('EditInput closeEdit, start finding VxeTable...');
250573
250575
  var vm = this.$parent;
250574
250576
  var count = 0;
250575
250577
 
@@ -250577,27 +250579,12 @@ var es_string_includes = __webpack_require__("2532");
250577
250579
  var componentName = vm.$options && vm.$options.name;
250578
250580
 
250579
250581
  if (componentName === 'VxeTable' || componentName === 'VxeTable') {
250580
- console.log('Found VxeTable component!');
250581
- console.log('vm.$xegrid:', vm.$xegrid);
250582
-
250583
250582
  if (vm.$xegrid) {
250584
- console.log('Methods on $xegrid:', Object.keys(vm.$xegrid));
250585
-
250586
- if (typeof vm.$xegrid.clearEdit === 'function') {
250587
- vm.$xegrid.clearEdit();
250588
- return;
250589
- }
250590
-
250591
250583
  if (typeof vm.$xegrid._clearActived === 'function') {
250592
250584
  vm.$xegrid._clearActived();
250593
250585
 
250594
250586
  return;
250595
250587
  }
250596
-
250597
- if (typeof vm.$xegrid.closeEdit === 'function') {
250598
- vm.$xegrid.closeEdit();
250599
- return;
250600
- }
250601
250588
  }
250602
250589
 
250603
250590
  if (typeof vm._clearActived === 'function') {
@@ -250605,29 +250592,6 @@ var es_string_includes = __webpack_require__("2532");
250605
250592
 
250606
250593
  return;
250607
250594
  }
250608
-
250609
- if (_typeof(vm.$xegrid) && typeof vm.$xegrid._clearActived === 'function') {
250610
- vm.$xegrid._clearActived();
250611
-
250612
- return;
250613
- }
250614
-
250615
- console.log('Trying all methods on VxeTable vm:', Object.keys(vm));
250616
-
250617
- for (var _i = 0, _Object$keys = Object.keys(vm); _i < _Object$keys.length; _i++) {
250618
- var key = _Object$keys[_i];
250619
-
250620
- if (typeof vm[key] === 'function' && (key.toLowerCase().includes('clear') || key.toLowerCase().includes('close') || key.toLowerCase().includes('edit'))) {
250621
- console.log('Found potential method:', key);
250622
-
250623
- try {
250624
- vm[key]();
250625
- return;
250626
- } catch (e) {
250627
- console.log('Tried', key, 'but failed:', e);
250628
- }
250629
- }
250630
- }
250631
250595
  }
250632
250596
 
250633
250597
  vm = vm.$parent;
@@ -250755,8 +250719,8 @@ function normalizeComponent (
250755
250719
 
250756
250720
  var component = normalizeComponent(
250757
250721
  edit_components_EditInputvue_type_script_lang_js_,
250758
- EditInputvue_type_template_id_7d953fc5_render,
250759
- EditInputvue_type_template_id_7d953fc5_staticRenderFns,
250722
+ EditInputvue_type_template_id_469bb260_render,
250723
+ EditInputvue_type_template_id_469bb260_staticRenderFns,
250760
250724
  false,
250761
250725
  null,
250762
250726
  null,
@@ -250944,6 +250908,9 @@ var component = normalizeComponent(
250944
250908
  //
250945
250909
  //
250946
250910
  //
250911
+ //
250912
+ //
250913
+ //
250947
250914
 
250948
250915
  /* harmony default export */ var tableColumnvue_type_script_lang_js_ = ({
250949
250916
  name: "tableColumn",
@@ -251105,8 +251072,8 @@ var tableColumnvue_type_style_index_0_lang_scss_ = __webpack_require__("2c8c");
251105
251072
 
251106
251073
  var tableColumn_component = normalizeComponent(
251107
251074
  components_tableColumnvue_type_script_lang_js_,
251108
- tableColumnvue_type_template_id_80b8c75a_render,
251109
- tableColumnvue_type_template_id_80b8c75a_staticRenderFns,
251075
+ tableColumnvue_type_template_id_8c78c7b6_render,
251076
+ tableColumnvue_type_template_id_8c78c7b6_staticRenderFns,
251110
251077
  false,
251111
251078
  null,
251112
251079
  null,
@@ -252335,29 +252302,33 @@ var tableColumn_component = normalizeComponent(
252335
252302
  property = _ref2.property,
252336
252303
  order = _ref2.order;
252337
252304
  var data1 = data.filter(function (item) {
252338
- return property in item;
252305
+ return property in item && item[property] != null;
252339
252306
  });
252340
252307
  var data2 = data.filter(function (item) {
252341
- return !(property in item);
252308
+ return !(property in item) || item[property] == null;
252342
252309
  });
252343
252310
  var list = [];
252344
252311
 
252345
252312
  if (order === "asc" || order === "desc") {
252346
- if (/.*[\u4e00-\u9fa5]+.*$/.test(data1[0][property]) || /[a-zA-Z]/i.test(data1[0][property])) {
252347
- list = data1.sort(function (a, b) {
252348
- return a[property].localeCompare(b[property]);
252349
- });
252350
- } else {
252351
- if (isNaN(data1[0][property]) && !isNaN(Date.parse(data1[0][property]))) {
252352
- list = data1.sort(function (a, b) {
252353
- return new Date(a[property]).getTime() - new Date(b[property]).getTime();
252354
- });
252355
- } else {
252356
- list = data1.sort(function (a, b) {
252357
- return a[property] - b[property];
252358
- });
252313
+ list = data1.sort(function (a, b) {
252314
+ var valA = a[property];
252315
+ var valB = b[property];
252316
+ var dateA = Date.parse(valA);
252317
+ var dateB = Date.parse(valB);
252318
+
252319
+ if (!isNaN(dateA) && !isNaN(dateB)) {
252320
+ return dateA - dateB;
252359
252321
  }
252360
- }
252322
+
252323
+ var numA = Number(valA);
252324
+ var numB = Number(valB);
252325
+
252326
+ if (!isNaN(numA) && !isNaN(numB)) {
252327
+ return numA - numB;
252328
+ }
252329
+
252330
+ return String(valA).localeCompare(String(valB));
252331
+ });
252361
252332
  }
252362
252333
 
252363
252334
  if (order === "desc") {
@@ -253005,6 +252976,9 @@ var JtFormPcvue_type_template_id_cbb8081c_staticRenderFns = []
253005
252976
 
253006
252977
  // CONCATENATED MODULE: ./packages/jt-form-pc/JtFormPc.vue?vue&type=template&id=cbb8081c&
253007
252978
 
252979
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.keys.js
252980
+ var es_object_keys = __webpack_require__("b64b");
252981
+
253008
252982
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.exec.js
253009
252983
  var es_regexp_exec = __webpack_require__("ac1f");
253010
252984
 
@@ -257346,6 +257320,12 @@ var FilterContentvue_type_template_id_2466fbca_staticRenderFns = []
257346
257320
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.every.js
257347
257321
  var es_array_every = __webpack_require__("a623");
257348
257322
 
257323
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
257324
+ var es_array_includes = __webpack_require__("caad");
257325
+
257326
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
257327
+ var es_string_includes = __webpack_require__("2532");
257328
+
257349
257329
  // 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&
257350
257330
 
257351
257331