@leevan/jtui 2.0.14-np → 2.0.16

package/examples/App.vue

@@ -78,7 +78,7 @@ export default {
                     idx:'l-form'
                 }
             ],
-            menuIdx:'more-charts'
+            menuIdx:'table-ptbg'
         }
     },
     methods: {

package/examples/tableTest/table-dsj.vue

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

package/examples/tableTest/table-tree.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: leevan
  * @Date: 2022-01-15 17:02:55
- * @LastEditTime: 2022-03-03 14:10:39
+ * @LastEditTime: 2022-03-20 12:58:17
  * @LastEditors: leevan
  * @FilePath: /jtui-pc/examples/tableTest/table-tree.vue
 -->
@@ -10,6 +10,7 @@
         <el-button @click="getCurrent">获取选中</el-button>
         <div style="position:relative;margin-top:10px;height:600px">
             <jt-table-pc 
+            :treeLazy="false"
             id="table_tree" 
             ref="table_tree" 
             :data="data[0]"
@@ -23,10 +24,11 @@
 </template>
 
 <script>
+import { data4 } from '../../packages/jt-table-pc/data2';
     export default {
         async created(){
-            const { data } = await this.$axios.post('/api/treetest/ROOT');
-            this.data = data;
+            // const { data } = await this.$axios.post('/api/treetest/ROOT');
+            this.data = data4();
         },
         data(){
             return {
@@ -36,7 +38,7 @@
                     colType:'checkbox',//树开启checkbox还是radio，只针对于树，如果是radio，封装层自动禁用了非最后一级。还有就是如果不是树，这个属性不要。
                     type:'tree',//控制显示树(tree)还是树型表格（treeTable）
                     checkbox:true,//这里来控制树型表格的checkbox和radio，还有就是不是树形表格，这个属性不要。
-                    line:false,//是否开启连接线
+                    line:true,//是否开启连接线
                     expandAll:false,//是否默认展开所有节点
                     checkRowKeys:[], //根据id自动勾选节点
                 },

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=b220e982&
+// 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=d9e605f2&
 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=b220e982&
+// CONCATENATED MODULE: ./packages/jt-table/index.vue?vue&type=template&id=d9e605f2&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
 var es_array_concat = __webpack_require__("99af");
@@ -236943,12 +236943,12 @@ var FilterInput_component = normalizeComponent(
 )
 
 /* harmony default export */ var FilterInput = (FilterInput_component.exports);
-// 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/examples/FilterContent.vue?vue&type=template&id=64e88788&
-var FilterContentvue_type_template_id_64e88788_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"jt-table-filter-content"},[_c('div',{staticClass:"jt-table-fc-search"},[_c('div',{staticClass:"jt-table-fc-search-top"},[_c('vxe-input',{attrs:{"placeholder":"搜索","suffix-icon":"fa fa-search"},on:{"keyup":_vm.searchEvent},model:{value:(_vm.option.data.sVal),callback:function ($$v) {_vm.$set(_vm.option.data, "sVal", $$v)},expression:"option.data.sVal"}})],1),_c('div',{staticClass:"jt-table-fc-search-content"},[(_vm.valList.length)?[_c('ul',{staticClass:"jt-table-fc-search-list jt-table-fc-search-list-head"},[_c('li',{staticClass:"jt-table-fc-search-item"},[_c('vxe-checkbox',{attrs:{"indeterminate":_vm.isIndeterminate},on:{"change":_vm.changeAllEvent},model:{value:(_vm.isAll),callback:function ($$v) {_vm.isAll=$$v},expression:"isAll"}},[_vm._v("全选")])],1)]),_c('ul',{staticClass:"jt-table-fc-search-list jt-table-fc-search-list-body"},_vm._l((_vm.valList),function(item,sIndex){return _c('li',{key:sIndex,staticClass:"jt-table-fc-search-item"},[_c('vxe-checkbox',{on:{"change":_vm.changeItemEvent},model:{value:(item.checked),callback:function ($$v) {_vm.$set(item, "checked", $$v)},expression:"item.checked"}},[_vm._v(_vm._s(item.value))])],1)}),0)]:[_c('div',{staticClass:"jt-table-fc-search-empty"},[_vm._v("无匹配项")])]],2)]),_c('div',{staticClass:"jt-table-fc-footer"},[_c('vxe-button',{attrs:{"status":"primary"},on:{"click":_vm.confirmFilterEvent}},[_vm._v("确认")]),_c('vxe-button',{on:{"click":_vm.resetFilterEvent}},[_vm._v("重置")])],1)])}
-var FilterContentvue_type_template_id_64e88788_staticRenderFns = []
+// 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/examples/FilterContent.vue?vue&type=template&id=2466fbca&
+var FilterContentvue_type_template_id_2466fbca_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"jt-table-filter-content"},[_c('div',{staticClass:"jt-table-fc-search"},[_c('div',{staticClass:"jt-table-fc-search-top"},[_c('vxe-input',{attrs:{"placeholder":"搜索","suffix-icon":"fa fa-search"},on:{"keyup":_vm.searchEvent},model:{value:(_vm.option.data.sVal),callback:function ($$v) {_vm.$set(_vm.option.data, "sVal", $$v)},expression:"option.data.sVal"}})],1),_c('div',{staticClass:"jt-table-fc-search-content"},[(_vm.valList.length)?[_c('ul',{staticClass:"jt-table-fc-search-list jt-table-fc-search-list-head"},[_c('li',{staticClass:"jt-table-fc-search-item"},[_c('vxe-checkbox',{attrs:{"indeterminate":_vm.isIndeterminate},on:{"change":_vm.changeAllEvent},model:{value:(_vm.isAll),callback:function ($$v) {_vm.isAll=$$v},expression:"isAll"}},[_vm._v("全选")])],1)]),_c('ul',{staticClass:"jt-table-fc-search-list jt-table-fc-search-list-body"},_vm._l((_vm.valList),function(item,sIndex){return _c('li',{key:sIndex,staticClass:"jt-table-fc-search-item"},[_c('vxe-checkbox',{on:{"change":_vm.changeItemEvent},model:{value:(item.checked),callback:function ($$v) {_vm.$set(item, "checked", $$v)},expression:"item.checked"}},[_vm._v(_vm._s(item.value))])],1)}),0)]:[_c('div',{staticClass:"jt-table-fc-search-empty"},[_vm._v("无匹配项")])]],2)]),_c('div',{staticClass:"jt-table-fc-footer"},[_c('vxe-button',{attrs:{"status":"primary"},on:{"click":_vm.confirmFilterEvent}},[_vm._v("确认")]),_c('vxe-button',{on:{"click":_vm.resetFilterEvent}},[_vm._v("重置")])],1)])}
+var FilterContentvue_type_template_id_2466fbca_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/jt-table/examples/FilterContent.vue?vue&type=template&id=64e88788&
+// CONCATENATED MODULE: ./packages/jt-table/examples/FilterContent.vue?vue&type=template&id=2466fbca&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.every.js
 var es_array_every = __webpack_require__("a623");
@@ -237090,7 +237090,7 @@ var es_string_includes = __webpack_require__("2532");
       }).map(function (item) {
         return item.value;
       });
-      option.checked = true;
+      $panel.changeOption(null, true, option);
       $panel.confirmFilter();
     },
     resetFilterEvent: function resetFilterEvent() {
@@ -237115,8 +237115,8 @@ var FilterContentvue_type_style_index_0_lang_css_ = __webpack_require__("e617");
 
 var FilterContent_component = normalizeComponent(
   examples_FilterContentvue_type_script_lang_js_,
-  FilterContentvue_type_template_id_64e88788_render,
-  FilterContentvue_type_template_id_64e88788_staticRenderFns,
+  FilterContentvue_type_template_id_2466fbca_render,
+  FilterContentvue_type_template_id_2466fbca_staticRenderFns,
   false,
   null,
   null,
@@ -237223,12 +237223,12 @@ var FilterComplex_component = normalizeComponent(
 )
 
 /* harmony default export */ var FilterComplex = (FilterComplex_component.exports);
-// 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/examples/FilterExcel.vue?vue&type=template&id=09cabe86&
-var FilterExcelvue_type_template_id_09cabe86_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"jt-table-filter-excel"},[_c('div',{staticClass:"jt-table-fe-top"},[_c('div',{staticClass:"jt-table-fe-popup"},[_c('div',{staticClass:"jt-table-fe-popup-filter jt-table-fe-popup-f1"},[_c('vxe-select',{staticClass:"jt-table-fe-popup-filter-select",attrs:{"transfer":""},model:{value:(_vm.option.data.f1Type),callback:function ($$v) {_vm.$set(_vm.option.data, "f1Type", $$v)},expression:"option.data.f1Type"}},_vm._l((_vm.allCaseList),function(fItem,index){return _c('vxe-option',{key:index,attrs:{"value":fItem.value,"label":fItem.label}})}),1),_c('vxe-input',{staticClass:"jt-table-fe-popup-filter-input",model:{value:(_vm.option.data.f1Val),callback:function ($$v) {_vm.$set(_vm.option.data, "f1Val", $$v)},expression:"option.data.f1Val"}})],1),_c('div',{staticClass:"jt-table-fe-popup-concat"},[_c('vxe-radio-group',{model:{value:(_vm.option.data.fMode),callback:function ($$v) {_vm.$set(_vm.option.data, "fMode", $$v)},expression:"option.data.fMode"}},[_c('vxe-radio',{attrs:{"label":"and"}},[_vm._v("与")]),_c('vxe-radio',{attrs:{"label":"or"}},[_vm._v("或")])],1)],1),_c('div',{staticClass:"jt-table-fe-popup-filter jt-table-fe-popup-f2"},[_c('vxe-select',{staticClass:"jt-table-fe-popup-filter-select",attrs:{"transfer":""},model:{value:(_vm.option.data.f2Type),callback:function ($$v) {_vm.$set(_vm.option.data, "f2Type", $$v)},expression:"option.data.f2Type"}},_vm._l((_vm.allCaseList),function(fItem,index){return _c('vxe-option',{key:index,attrs:{"value":fItem.value,"label":fItem.label}})}),1),_c('vxe-input',{staticClass:"jt-table-fe-popup-filter-input",attrs:{"clearable":""},model:{value:(_vm.option.data.f2Val),callback:function ($$v) {_vm.$set(_vm.option.data, "f2Val", $$v)},expression:"option.data.f2Val"}})],1)])]),_c('div',{staticClass:"jt-table-fe-footer"},[_c('vxe-button',{attrs:{"status":"primary"},on:{"click":_vm.confirmFilterEvent}},[_vm._v("确认")]),_c('vxe-button',{on:{"click":_vm.resetFilterEvent}},[_vm._v("重置")])],1)])}
-var FilterExcelvue_type_template_id_09cabe86_staticRenderFns = []
+// 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/examples/FilterExcel.vue?vue&type=template&id=1e19dab6&
+var FilterExcelvue_type_template_id_1e19dab6_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"jt-table-filter-excel"},[_c('div',{staticClass:"jt-table-fe-top"},[_c('div',{staticClass:"jt-table-fe-popup"},[_c('div',{staticClass:"jt-table-fe-popup-filter jt-table-fe-popup-f1"},[_c('vxe-select',{staticClass:"jt-table-fe-popup-filter-select",attrs:{"transfer":""},model:{value:(_vm.option.data.f1Type),callback:function ($$v) {_vm.$set(_vm.option.data, "f1Type", $$v)},expression:"option.data.f1Type"}},_vm._l((_vm.allCaseList),function(fItem,index){return _c('vxe-option',{key:index,attrs:{"value":fItem.value,"label":fItem.label}})}),1),_c('vxe-input',{staticClass:"jt-table-fe-popup-filter-input",model:{value:(_vm.option.data.f1Val),callback:function ($$v) {_vm.$set(_vm.option.data, "f1Val", $$v)},expression:"option.data.f1Val"}})],1),_c('div',{staticClass:"jt-table-fe-popup-concat"},[_c('vxe-radio-group',{model:{value:(_vm.option.data.fMode),callback:function ($$v) {_vm.$set(_vm.option.data, "fMode", $$v)},expression:"option.data.fMode"}},[_c('vxe-radio',{attrs:{"label":"and"}},[_vm._v("与")]),_c('vxe-radio',{attrs:{"label":"or"}},[_vm._v("或")])],1)],1),_c('div',{staticClass:"jt-table-fe-popup-filter jt-table-fe-popup-f2"},[_c('vxe-select',{staticClass:"jt-table-fe-popup-filter-select",attrs:{"transfer":""},model:{value:(_vm.option.data.f2Type),callback:function ($$v) {_vm.$set(_vm.option.data, "f2Type", $$v)},expression:"option.data.f2Type"}},_vm._l((_vm.allCaseList),function(fItem,index){return _c('vxe-option',{key:index,attrs:{"value":fItem.value,"label":fItem.label}})}),1),_c('vxe-input',{staticClass:"jt-table-fe-popup-filter-input",attrs:{"clearable":""},model:{value:(_vm.option.data.f2Val),callback:function ($$v) {_vm.$set(_vm.option.data, "f2Val", $$v)},expression:"option.data.f2Val"}})],1)])]),_c('div',{staticClass:"jt-table-fe-footer"},[_c('vxe-button',{attrs:{"status":"primary"},on:{"click":_vm.confirmFilterEvent}},[_vm._v("确认")]),_c('vxe-button',{on:{"click":_vm.resetFilterEvent}},[_vm._v("重置")])],1)])}
+var FilterExcelvue_type_template_id_1e19dab6_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/jt-table/examples/FilterExcel.vue?vue&type=template&id=09cabe86&
+// CONCATENATED MODULE: ./packages/jt-table/examples/FilterExcel.vue?vue&type=template&id=1e19dab6&
 
 // 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/FilterExcel.vue?vue&type=script&lang=js&
 
@@ -237390,7 +237390,7 @@ var FilterExcelvue_type_template_id_09cabe86_staticRenderFns = []
       var $panel = params.$panel;
       data.f1 = '';
       data.f2 = '';
-      option.checked = true;
+      $panel.changeOption(null, true, option);
       $panel.confirmFilter();
     },
     resetFilterEvent: function resetFilterEvent() {
@@ -237415,8 +237415,8 @@ var FilterExcelvue_type_style_index_0_lang_css_ = __webpack_require__("341b");
 
 var FilterExcel_component = normalizeComponent(
   examples_FilterExcelvue_type_script_lang_js_,
-  FilterExcelvue_type_template_id_09cabe86_render,
-  FilterExcelvue_type_template_id_09cabe86_staticRenderFns,
+  FilterExcelvue_type_template_id_1e19dab6_render,
+  FilterExcelvue_type_template_id_1e19dab6_staticRenderFns,
   false,
   null,
   null,