@leevan/jtui 2.0.24 → 2.0.26

package/examples/tableTest/table-ptbg.vue

@@ -131,11 +131,11 @@ import { data1 } from '../data2';
             }
         },
         created(){
-            const res = data5();
+            const res = data23();
             this.tableData[0].retjson = res[0].retjson;
         },
         mounted(){
-            const res = data5();
+            const res = data23();
             let timeId = setTimeout(()=>{
                 this.$refs.tablePtbg.loadData(res[0].DataArray);
                 clearTimeout(timeId);

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=067cf9f4&
+// 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=587ba536&
 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=067cf9f4&
+// CONCATENATED MODULE: ./packages/jt-table/index.vue?vue&type=template&id=587ba536&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
 var es_array_concat = __webpack_require__("99af");
@@ -231453,21 +231453,6 @@ function _defineProperty(obj, key, value) {
 
   return obj;
 }
-// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/arrayLikeToArray.js
-function _arrayLikeToArray(arr, len) {
-  if (len == null || len > arr.length) len = arr.length;
-
-  for (var i = 0, arr2 = new Array(len); i < len; i++) {
-    arr2[i] = arr[i];
-  }
-
-  return arr2;
-}
-// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/arrayWithoutHoles.js
-
-function _arrayWithoutHoles(arr) {
-  if (Array.isArray(arr)) return _arrayLikeToArray(arr);
-}
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.symbol.js
 var es_symbol = __webpack_require__("a4d3");
 
@@ -231477,9 +231462,6 @@ var es_symbol_description = __webpack_require__("e01a");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.symbol.iterator.js
 var es_symbol_iterator = __webpack_require__("d28b");
 
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.from.js
-var es_array_from = __webpack_require__("a630");
-
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.iterator.js
 var es_array_iterator = __webpack_require__("e260");
 
@@ -231489,6 +231471,47 @@ var es_string_iterator = __webpack_require__("3ca3");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom-collections.iterator.js
 var web_dom_collections_iterator = __webpack_require__("ddb0");
 
+// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/typeof.js
+
+
+
+
+
+
+
+function _typeof(obj) {
+  "@babel/helpers - typeof";
+
+  if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
+    _typeof = function _typeof(obj) {
+      return typeof obj;
+    };
+  } else {
+    _typeof = function _typeof(obj) {
+      return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+    };
+  }
+
+  return _typeof(obj);
+}
+// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/arrayLikeToArray.js
+function _arrayLikeToArray(arr, len) {
+  if (len == null || len > arr.length) len = arr.length;
+
+  for (var i = 0, arr2 = new Array(len); i < len; i++) {
+    arr2[i] = arr[i];
+  }
+
+  return arr2;
+}
+// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/arrayWithoutHoles.js
+
+function _arrayWithoutHoles(arr) {
+  if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+}
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.from.js
+var es_array_from = __webpack_require__("a630");
+
 // CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/iterableToArray.js
 
 
@@ -231797,6 +231820,7 @@ var component = normalizeComponent(
 
 
 
+
 //
 //
 //
@@ -232885,6 +232909,9 @@ var component = normalizeComponent(
           };
       }
     },
+    objectTxt: function objectTxt(cellValue) {
+      return _typeof(cellValue) == 'object' && cellValue != null ? JSON.stringify(cellValue) : cellValue;
+    },
     //枚举转换
     formatEnum: function formatEnum(_ref) {
       var column = _ref.column,
@@ -232908,38 +232935,38 @@ var component = normalizeComponent(
                   str += "<span \n                        class=\"jtIcon ".concat(item.icon, "\" style=\"\n                        color:").concat(item.color, ";\n                        font-size:").concat(item.size, "px;\n                        margin-right:").concat(item.margin || "8", "px\"\n                        onclick=\"iconItem(").concat(i, ")\"\n                        ></span>");
                 }
               });
-              return str ? str : cellValue;
+              return str ? str : this.objectTxt(cellValue);
             } else {
               var item = data.html.find(function (item) {
                 return item.value == cellValue;
               });
-              return item ? "<span class=\"jtIcon ".concat(item.icon, "\" style=\"color:").concat(item.color, ";font-size:").concat(item.size, "px\"></span>") : cellValue;
+              return item ? "<span class=\"jtIcon ".concat(item.icon, "\" style=\"color:").concat(item.color, ";font-size:").concat(item.size, "px\"></span>") : this.objectTxt(cellValue);
             }
           } else if (data.htmlType == "a") {
             var _item = data.html.find(function (item) {
               return item.value == cellValue;
             });
 
-            return _item ? "<a href=\"javascript:\">".concat(cellValue, "</a>") : cellValue;
+            return _item ? "<a href=\"javascript:\">".concat(cellValue, "</a>") : this.objectTxt(cellValue);
           } else if (data.htmlType == 'tag') {
             var _item2 = data.html.find(function (item) {
               return item.value == cellValue;
             });
 
-            return _item2 ? "<span style=\"\n            display:inline-block;\n            background-color: #fdf6ec;\n            height: 26px;\n            padding: 0 10px;\n            line-height: 26px;\n            font-size: 12px;\n            color: #e6a23c;\n            border: 1px solid #d9ecff;\n            border-radius: 4px;\n            box-sizing: border-box;\n            white-space: nowrap;\n            \">".concat(_item2.label, "</span>") : cellValue;
+            return _item2 ? "<span style=\"\n            display:inline-block;\n            background-color: #fdf6ec;\n            height: 26px;\n            padding: 0 10px;\n            line-height: 26px;\n            font-size: 12px;\n            color: #e6a23c;\n            border: 1px solid #d9ecff;\n            border-radius: 4px;\n            box-sizing: border-box;\n            white-space: nowrap;\n            \">".concat(_item2.label, "</span>") : this.objectTxt(cellValue);
           }
         } else if (data && "enum" in data) {
           var _item3 = data.enum.find(function (item) {
             return item.value == cellValue;
           });
 
-          return _item3 ? _item3.label : cellValue;
+          return _item3 ? _item3.label : this.objectTxt(cellValue);
         } else {
-          return cellValue;
+          return this.objectTxt(cellValue);
         }
       } catch (error) {
         console.log(error);
-        return cellValue;
+        return this.objectTxt(cellValue);
       }
     },
     //全局排序自定义排序方法
@@ -237727,29 +237754,6 @@ var tabsBtnvue_type_template_id_07d1e8aa_scoped_true_staticRenderFns = []
 
 // CONCATENATED MODULE: ./packages/jt-table/components/tabsBtn.vue?vue&type=template&id=07d1e8aa&scoped=true&
 
-// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/typeof.js
-
-
-
-
-
-
-
-function _typeof(obj) {
-  "@babel/helpers - typeof";
-
-  if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-    _typeof = function _typeof(obj) {
-      return typeof obj;
-    };
-  } else {
-    _typeof = function _typeof(obj) {
-      return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-    };
-  }
-
-  return _typeof(obj);
-}
 // 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/tabsBtn.vue?vue&type=script&lang=js&
 
 

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=067cf9f4&
+// 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=587ba536&
 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=067cf9f4&
+// CONCATENATED MODULE: ./packages/jt-table/index.vue?vue&type=template&id=587ba536&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
 var es_array_concat = __webpack_require__("99af");
@@ -231462,21 +231462,6 @@ function _defineProperty(obj, key, value) {
 
   return obj;
 }
-// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/arrayLikeToArray.js
-function _arrayLikeToArray(arr, len) {
-  if (len == null || len > arr.length) len = arr.length;
-
-  for (var i = 0, arr2 = new Array(len); i < len; i++) {
-    arr2[i] = arr[i];
-  }
-
-  return arr2;
-}
-// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/arrayWithoutHoles.js
-
-function _arrayWithoutHoles(arr) {
-  if (Array.isArray(arr)) return _arrayLikeToArray(arr);
-}
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.symbol.js
 var es_symbol = __webpack_require__("a4d3");
 
@@ -231486,9 +231471,6 @@ var es_symbol_description = __webpack_require__("e01a");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.symbol.iterator.js
 var es_symbol_iterator = __webpack_require__("d28b");
 
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.from.js
-var es_array_from = __webpack_require__("a630");
-
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.iterator.js
 var es_array_iterator = __webpack_require__("e260");
 
@@ -231498,6 +231480,47 @@ var es_string_iterator = __webpack_require__("3ca3");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom-collections.iterator.js
 var web_dom_collections_iterator = __webpack_require__("ddb0");
 
+// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/typeof.js
+
+
+
+
+
+
+
+function _typeof(obj) {
+  "@babel/helpers - typeof";
+
+  if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
+    _typeof = function _typeof(obj) {
+      return typeof obj;
+    };
+  } else {
+    _typeof = function _typeof(obj) {
+      return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+    };
+  }
+
+  return _typeof(obj);
+}
+// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/arrayLikeToArray.js
+function _arrayLikeToArray(arr, len) {
+  if (len == null || len > arr.length) len = arr.length;
+
+  for (var i = 0, arr2 = new Array(len); i < len; i++) {
+    arr2[i] = arr[i];
+  }
+
+  return arr2;
+}
+// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/arrayWithoutHoles.js
+
+function _arrayWithoutHoles(arr) {
+  if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+}
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.from.js
+var es_array_from = __webpack_require__("a630");
+
 // CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/iterableToArray.js
 
 
@@ -231806,6 +231829,7 @@ var component = normalizeComponent(
 
 
 
+
 //
 //
 //
@@ -232894,6 +232918,9 @@ var component = normalizeComponent(
           };
       }
     },
+    objectTxt: function objectTxt(cellValue) {
+      return _typeof(cellValue) == 'object' && cellValue != null ? JSON.stringify(cellValue) : cellValue;
+    },
     //枚举转换
     formatEnum: function formatEnum(_ref) {
       var column = _ref.column,
@@ -232917,38 +232944,38 @@ var component = normalizeComponent(
                   str += "<span \n                        class=\"jtIcon ".concat(item.icon, "\" style=\"\n                        color:").concat(item.color, ";\n                        font-size:").concat(item.size, "px;\n                        margin-right:").concat(item.margin || "8", "px\"\n                        onclick=\"iconItem(").concat(i, ")\"\n                        ></span>");
                 }
               });
-              return str ? str : cellValue;
+              return str ? str : this.objectTxt(cellValue);
             } else {
               var item = data.html.find(function (item) {
                 return item.value == cellValue;
               });
-              return item ? "<span class=\"jtIcon ".concat(item.icon, "\" style=\"color:").concat(item.color, ";font-size:").concat(item.size, "px\"></span>") : cellValue;
+              return item ? "<span class=\"jtIcon ".concat(item.icon, "\" style=\"color:").concat(item.color, ";font-size:").concat(item.size, "px\"></span>") : this.objectTxt(cellValue);
             }
           } else if (data.htmlType == "a") {
             var _item = data.html.find(function (item) {
               return item.value == cellValue;
             });
 
-            return _item ? "<a href=\"javascript:\">".concat(cellValue, "</a>") : cellValue;
+            return _item ? "<a href=\"javascript:\">".concat(cellValue, "</a>") : this.objectTxt(cellValue);
           } else if (data.htmlType == 'tag') {
             var _item2 = data.html.find(function (item) {
               return item.value == cellValue;
             });
 
-            return _item2 ? "<span style=\"\n            display:inline-block;\n            background-color: #fdf6ec;\n            height: 26px;\n            padding: 0 10px;\n            line-height: 26px;\n            font-size: 12px;\n            color: #e6a23c;\n            border: 1px solid #d9ecff;\n            border-radius: 4px;\n            box-sizing: border-box;\n            white-space: nowrap;\n            \">".concat(_item2.label, "</span>") : cellValue;
+            return _item2 ? "<span style=\"\n            display:inline-block;\n            background-color: #fdf6ec;\n            height: 26px;\n            padding: 0 10px;\n            line-height: 26px;\n            font-size: 12px;\n            color: #e6a23c;\n            border: 1px solid #d9ecff;\n            border-radius: 4px;\n            box-sizing: border-box;\n            white-space: nowrap;\n            \">".concat(_item2.label, "</span>") : this.objectTxt(cellValue);
           }
         } else if (data && "enum" in data) {
           var _item3 = data.enum.find(function (item) {
             return item.value == cellValue;
           });
 
-          return _item3 ? _item3.label : cellValue;
+          return _item3 ? _item3.label : this.objectTxt(cellValue);
         } else {
-          return cellValue;
+          return this.objectTxt(cellValue);
         }
       } catch (error) {
         console.log(error);
-        return cellValue;
+        return this.objectTxt(cellValue);
       }
     },
     //全局排序自定义排序方法
@@ -237736,29 +237763,6 @@ var tabsBtnvue_type_template_id_07d1e8aa_scoped_true_staticRenderFns = []
 
 // CONCATENATED MODULE: ./packages/jt-table/components/tabsBtn.vue?vue&type=template&id=07d1e8aa&scoped=true&
 
-// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/typeof.js
-
-
-
-
-
-
-
-function _typeof(obj) {
-  "@babel/helpers - typeof";
-
-  if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-    _typeof = function _typeof(obj) {
-      return typeof obj;
-    };
-  } else {
-    _typeof = function _typeof(obj) {
-      return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-    };
-  }
-
-  return _typeof(obj);
-}
 // 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/tabsBtn.vue?vue&type=script&lang=js&