@leevan/jtui 2.0.43 → 2.0.45

package/packages/jt-table/filter.js

@@ -12,6 +12,9 @@ Vue.component(FilterContent.name, FilterContent)
 Vue.component(FilterComplex.name, FilterComplex)
 Vue.component(FilterExcel.name, FilterExcel)
 
+import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx';
+VXETable.use(VXETablePluginExportXLSX);
+
 // 创建一个简单的输入框筛选
 VXETable.renderer.add('FilterInput', {
     // 不显示底部按钮，使用自定义的按钮

package/packages/jt-table/index.vue

@@ -4,26 +4,34 @@
     :class="isWrap ? 'isWrap' : ''"
     style="position: absolute; top: 1px; left: 1px; right: 1px; bottom: 1px"
   >
-    <!-- 普通表格 -->
+    
     <div style="position: relative" v-if="isTool">
       <vxe-toolbar
         class="jt-toolbar"
-        custom
-        :custom-options="{ icon: 'jtIcon iconpeizhi41 colStyle' }"
+        :custom="{ icon: 'jtIcon iconpeizhi41 colStyle' }"
       ></vxe-toolbar>
     </div>
+    <div style="width:100%;height:100%;position: relative;">
+        <div class="cus-empty-box" v-if="isShowEmpty">
+          <el-empty  :image-size="200">
+              <template #description>
+                <p style="font-size:30px">暂无数据</p>
+              </template>
+            </el-empty>
+        </div>
+    <!-- 普通表格 -->
     <vxe-table
       class="jt-table-class-only"
       height="auto"
       size="mini"
-      show-overflow="title"
-      show-header-overflow="title"
+      show-overflow
+      show-header-overflow
       auto-resize
-      :row-config="{ isCurrent: true, isHover: true, useKey: true}"
-      :current-row-config="{isFollowSelected: true}"
-      :column-config="{ isCurrent: true, useKey: true}"
-      :current-column-config="{ isFollowSelected: true }"
+      resizable
+      highlight-current-row
+      highlight-current-column
       keep-source
+      empty-text=" "
       v-if="tableType === 'default'"
       :id="id"
       :ref="id"
@@ -54,7 +62,7 @@
         trigger: 'dblclick',
         mode: 'cell',
         showStatus: true,
-        beforeEditMethod: activeCellMethod,
+        activeMethod: activeCellMethod,
       }"
       :expand-config="{
         visibleMethod,
@@ -130,8 +138,7 @@
         :align="handlerConfig.align"
         :width="handlerConfig.width"
         :fixed="handlerConfig.fixed"
-        show-overflow="title"
-        field="handler"
+        show-overflow
       >
         <template v-slot="{ row, rowIndex }">
           <el-dropdown v-if="handlerConfig.btnGroup">
@@ -193,27 +200,20 @@
           </template>
         </template>
       </vxe-table-column>
-      <template #empty>
-        <el-empty  :image-size="200">
-          <template #description>
-            <p style="font-size:30px">暂无数据</p>
-          </template>
-        </el-empty>
-      </template>
-      </vxe-table>
+    </vxe-table>
     <!-- 大数据 -->
     <vxe-table
       class="jt-table-class-only"
       height="auto"
       size="mini"
-      show-overflow="title"
-      show-header-overflow="title"
+      show-overflow
+      show-header-overflow
       auto-resize
-      :row-config="{ isCurrent: true, isHover: true, useKey: true}"
-      :current-row-config="{isFollowSelected: true}"
-      :column-config="{ isCurrent: true, useKey: true}"
-      :current-column-config="{ isFollowSelected: true }"
+      resizable
+      highlight-current-row
+      highlight-current-column
       keep-source
+      empty-text=" "
       v-if="tableType === 'bigData'"
       :header-cell-class-name="headerClass"
       :id="id"
@@ -241,7 +241,7 @@
         trigger: 'dblclick',
         mode: 'cell',
         showStatus: true,
-        beforeEditMethod: activeCellMethod,
+        activeMethod: activeCellMethod,
       }"
       @scroll="scroll"
       @checkbox-change="selectChangeEvent"
@@ -307,8 +307,7 @@
         :align="handlerConfig.align"
         :width="handlerConfig.width"
         :fixed="handlerConfig.fixed"
-        show-overflow="title"
-        field="handler"
+        show-overflow
       >
         <template v-slot="{ row, rowIndex }">
           <el-dropdown v-if="handlerConfig.btnGroup">
@@ -370,13 +369,6 @@
           </template>
         </template>
       </vxe-table-column>
-      <template #empty>
-        <el-empty  :image-size="200">
-          <template #description>
-            <p style="font-size:30px">暂无数据</p>
-          </template>
-        </el-empty>
-      </template>
     </vxe-table>
     <!-- 分组表格 -->
     <vxe-table
@@ -384,22 +376,22 @@
       class="jt-table-class-only"
       :id="id"
       :ref="id"
+      empty-text=" "
       v-if="tableType === 'group'"
       :custom-config="{ storage: true, checkMethod: checkColumnMethod }"
       :border="border"
-      show-overflow="title"
-      show-header-overflow="title"
+      show-overflow
+      show-header-overflow
       height="auto"
       :max-height="maxHeight"
       auto-resize
-      :row-config="{ isCurrent: true, isHover: true, useKey: true}"
-      :current-row-config="{isFollowSelected: true}"
-      :column-config="{ isCurrent: true, useKey: true}"
-      :current-column-config="{ isFollowSelected: true }"
+      resizable
+      highlight-current-row
       :tree-config="groupConfig"
       :row-class-name="rowClassName"
       :cell-class-name="gcellClassName"
       :keyboard-config="{ isArrow: true }"
+      highlight-current-column
       @checkbox-change="treeSelectChangeEvent"
       :checkbox-config="{
         highlight: true,
@@ -429,7 +421,7 @@
       <template v-for="(item, index) in data.retjson.header">
         <vxe-table-column
           :key="index"
-          show-overflow="title"
+          show-overflow
           :tree-node="item.prop == treeField"
           :field="item.prop"
           :align="item.align"
@@ -448,8 +440,7 @@
         :align="handlerConfig.align"
         :width="handlerConfig.width"
         :fixed="handlerConfig.fixed"
-        show-overflow="title"
-        field="handler"
+        show-overflow
       >
         <template v-slot="{ row, rowIndex }">
           <el-dropdown v-if="handlerConfig.btnGroup">
@@ -519,13 +510,6 @@
           </template>
         </template>
       </vxe-table-column>
-      <template #empty>
-        <el-empty  :image-size="200">
-          <template #description>
-            <p style="font-size:30px">暂无数据</p>
-          </template>
-        </el-empty>
-      </template>
     </vxe-table>
     <!-- 树形表格 and 树 -->
     <vxe-table
@@ -535,20 +519,19 @@
       :ref="id"
       :stripe="stripe"
       :show-header="treeTypeConfig.type == 'treeTable'"
+      empty-text=" "
       v-if="tableType === 'tree'"
       :max-height="maxHeight"
       :border="border"
-      show-overflow="title"
-      show-header-overflow="title"
+      show-overflow
+      show-header-overflow
       height="auto"
       auto-resize
       :cell-style="cellStyle_m"
       :row-style="rowStyle"
       :span-method="spanMethod"
-      :row-config="{ isCurrent: true, isHover: true, useKey: true}"
-      :current-row-config="{isFollowSelected: true}"
-      :column-config="{ isCurrent: true, useKey: true}"
-      :current-column-config="{ isFollowSelected: true }"
+      resizable
+      highlight-current-row
       :tree-config="treeConfig"
       :row-key="true"
       row-id="pkid"
@@ -570,7 +553,7 @@
         trigger: 'dblclick',
         mode: 'cell',
         showStatus: true,
-        beforeEditMethod: activeCellMethod,
+        activeMethod: activeCellMethod,
       }"
       keep-source
       :loading="loading"
@@ -618,7 +601,7 @@
           :type="treeTypeConfig.colType"
           :tree-node="index == 0"
           :key="index"
-          show-overflow="title"
+          show-overflow
           :field="item.prop"
           align="left"
           :title="item.label"
@@ -652,7 +635,7 @@
           :edit-render="item.edit"
           :tree-node="index == 0"
           :key="index"
-          show-overflow="title"
+          show-overflow
           :field="item.prop"
           :align="item.align"
           :title="item.label"
@@ -706,8 +689,7 @@
         :align="handlerConfig.align"
         :width="handlerConfig.width"
         :fixed="handlerConfig.fixed"
-        show-overflow="title"
-        field="handler"
+        show-overflow
       >
         <template v-slot="{ row, rowIndex }">
           <el-dropdown v-if="handlerConfig.btnGroup">
@@ -777,14 +759,8 @@
           </template>
         </template>
       </vxe-table-column>
-      <template #empty>
-        <el-empty  :image-size="200">
-          <template #description>
-            <p style="font-size:30px">暂无数据</p>
-          </template>
-        </el-empty>
-      </template>
     </vxe-table>
+    </div>
   </div>
 </template>
 
@@ -991,8 +967,30 @@ export default {
       default: null
     }
   },
+  watch:{
+    loading:{
+      deep:true,
+      handler(n){
+        if(this.$refs[this.id]){
+          const temp = this.$refs[this.id].getTableData()
+          if(temp.fullData.length > 0){
+            this.isShowEmpty = false
+          }else{
+            if(n){
+              this.isShowEmpty = false
+            }else{
+              this.isShowEmpty = true
+            }
+          }
+        }else{
+          this.isShowEmpty = false
+        }
+      }
+    }
+  },
   data() {
     return {
+      isShowEmpty:false,
       tableData: this.data.DataArray, //表格数据
       headerClass: (this.data.retjson.header || []).find(i => (i.children || []).length) ? 'has-sub-header' : 'normal-header',
       colNum: 0, //当前列的数量
@@ -1045,6 +1043,10 @@ export default {
     loadData(data) {
       return this.$refs[this.id].loadData(data);
     },
+    //重载数据
+    reloadData(data) {
+      return this.$refs[this.id].reloadData(data);
+    },
     //根据类型返回筛选框源数据
     filterData(type) {
       switch (type) {
@@ -1759,4 +1761,11 @@ export default {
 .vxe-table--render-default .vxe-body--column{
   line-height:normal !important;
 }
+.cus-empty-box{
+  position: absolute;
+  top:50%;
+  left:50%;
+  transform: translate(-50%,-50%);
+  z-index:999;
+}
 </style>