@leevan/jtui 2.0.44 → 2.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leevan/jtui",
-  "version": "2.0.44",
+  "version": "2.0.45",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/packages/jt-table/index.vue

@@ -4,13 +4,22 @@
     :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="{ 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"
@@ -22,6 +31,7 @@
       highlight-current-row
       highlight-current-column
       keep-source
+      empty-text=" "
       v-if="tableType === 'default'"
       :id="id"
       :ref="id"
@@ -190,14 +200,7 @@
           </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"
@@ -210,6 +213,7 @@
       highlight-current-row
       highlight-current-column
       keep-source
+      empty-text=" "
       v-if="tableType === 'bigData'"
       :header-cell-class-name="headerClass"
       :id="id"
@@ -365,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
@@ -379,6 +376,7 @@
       class="jt-table-class-only"
       :id="id"
       :ref="id"
+      empty-text=" "
       v-if="tableType === 'group'"
       :custom-config="{ storage: true, checkMethod: checkColumnMethod }"
       :border="border"
@@ -512,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
@@ -528,6 +519,7 @@
       :ref="id"
       :stripe="stripe"
       :show-header="treeTypeConfig.type == 'treeTable'"
+      empty-text=" "
       v-if="tableType === 'tree'"
       :max-height="maxHeight"
       :border="border"
@@ -767,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>
 
@@ -981,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, //当前列的数量
@@ -1753,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>