@leevan/jtui 2.0.19 → 2.0.20

package/examples/tableTest/table-ptbg.vue

@@ -99,7 +99,7 @@
 </template>
 
 <script>
-import { data23 , data13,data7 } from '../../packages/jt-table-pc/data2';
+import { data23 , data13,data7 ,data5} from '../../packages/jt-table-pc/data2';
 import { data1 } from '../data2'; 
     export default {
         data(){ 
@@ -131,11 +131,11 @@ import { data1 } from '../data2';
             }
         },
         created(){
-            const res = data1();
+            const res = data5();
             this.tableData[0].retjson = res[0].retjson;
         },
         mounted(){
-            const res = data1();
+            const res = data5();
             let timeId = setTimeout(()=>{
                 this.$refs.tablePtbg.loadData(res[0].DataArray);
                 clearTimeout(timeId);
@@ -147,7 +147,6 @@ import { data1 } from '../data2';
                 this.$refs.tablePtbg.exportTableData();
             },
             exportDataExcel(){
-                debugger;
                 this.$refs.tablePtbg.exportData({ type: 'csv' });
             },
             //导入数据

package/lib/jtui.common.js

@@ -231258,7 +231258,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":"7e503786-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=8cbb7cbc&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7e503786-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=66056588&
 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(),(_vm.tableType === 'default')?_c('vxe-table',{ref:_vm.id,staticClass:"jt-table-class-only",attrs:{"height":"auto","size":"mini","show-overflow":"","show-header-overflow":"","auto-resize":"","resizable":"","highlight-current-row":"","highlight-current-column":"","keep-source":"","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'],
@@ -231358,7 +231358,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=8cbb7cbc&
+// CONCATENATED MODULE: ./packages/jt-table/index.vue?vue&type=template&id=66056588&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
 var es_array_concat = __webpack_require__("99af");
@@ -232957,9 +232957,15 @@ var component = normalizeComponent(
             return a[property].localeCompare(b[property]);
           });
         } else {
-          list = data1.sort(function (a, b) {
-            return a[property] - b[property];
-          });
+          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];
+            });
+          }
         }
       }
 
@@ -233118,7 +233124,7 @@ var component = normalizeComponent(
         var ch = $event.target.clientHeight;
         var sh = $event.target.scrollHeight;
 
-        if (scrollTop + ch >= sh) {
+        if (scrollTop + ch >= sh && scrollTop != 0) {
           _this2.$emit("scrollBottom", ++_this2.pageIndex);
         }
       }, 200);

package/lib/jtui.umd.js

@@ -231267,7 +231267,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":"7e503786-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=8cbb7cbc&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7e503786-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=66056588&
 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(),(_vm.tableType === 'default')?_c('vxe-table',{ref:_vm.id,staticClass:"jt-table-class-only",attrs:{"height":"auto","size":"mini","show-overflow":"","show-header-overflow":"","auto-resize":"","resizable":"","highlight-current-row":"","highlight-current-column":"","keep-source":"","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'],
@@ -231367,7 +231367,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=8cbb7cbc&
+// CONCATENATED MODULE: ./packages/jt-table/index.vue?vue&type=template&id=66056588&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
 var es_array_concat = __webpack_require__("99af");
@@ -232966,9 +232966,15 @@ var component = normalizeComponent(
             return a[property].localeCompare(b[property]);
           });
         } else {
-          list = data1.sort(function (a, b) {
-            return a[property] - b[property];
-          });
+          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];
+            });
+          }
         }
       }
 
@@ -233127,7 +233133,7 @@ var component = normalizeComponent(
         var ch = $event.target.clientHeight;
         var sh = $event.target.scrollHeight;
 
-        if (scrollTop + ch >= sh) {
+        if (scrollTop + ch >= sh && scrollTop != 0) {
           _this2.$emit("scrollBottom", ++_this2.pageIndex);
         }
       }, 200);