meixioacomponent 0.2.70 → 0.2.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "0.2.70",
+  "version": "0.2.73",
   "private": false,
   "author": "YuRi",
   "main": "lib/meixioacomponent.umd.min.js",

package/packages/components/proPageTable/oa_pro_table.vue

@@ -72,8 +72,9 @@
           <!-- 加载骨架屏 -->
           <oa_pro_table_skeletonVue
             slot="append"
+            v-if="loading"
+            :row="showTableHeader.length"
             :height="`${tableHeight}px`"
-            v-show="loading"
           ></oa_pro_table_skeletonVue>
           <span></span>
         </template>
@@ -452,20 +453,21 @@ export default {
     cellMouseEnter(row, column, cell, event) {
       let content = row[`${column.property}`];
       this.tooltip.show = false;
-      if (typeof content == Boolean || typeof content == Object || !content)
-        return;
-      const { tooltip } = this;
-      let style = event.target;
-      let position = style.getBoundingClientRect();
-      tooltip.width = style.clientWidth;
-      tooltip.height = style.clientHeight;
-      tooltip.top = position.top;
-      tooltip.left = position.left;
-      tooltip.content = content;
-
-      this.$nextTick(() => {
-        tooltip.show = true;
-      });
+      if (typeof content == "number" || typeof content == "string") {
+        const { tooltip } = this;
+        let style = event.target;
+        let position = style.getBoundingClientRect();
+        const { top, left } = position;
+        const { clientWidth, clientHeight } = style;
+        tooltip.width = clientWidth;
+        tooltip.height = clientHeight;
+        tooltip.top = top;
+        tooltip.left = left;
+        tooltip.content = content;
+        this.$nextTick(() => {
+          tooltip.show = true;
+        });
+      }
     },
 
     cellMouseLeave() {
@@ -654,17 +656,18 @@ export default {
       this.loading = true;
       this.defaultSvg = false;
       this.cleanCheckValue();
+      clearTimeout(this.triggerDown);
       if (init) {
         this.$props.pageProps[this.$props.pageConfig.page] = 1;
       }
 
       let screenResult = this.returnProScreenResult();
-      this.$props.httpRequire(screenResult).then((res, immediately = false) => {
-        this.setTableData(res, immediately);
+      this.$props.httpRequire(screenResult).then((res) => {
+        this.setTableData(res);
       });
     },
     // 设置表格数据
-    setTableData(data, immediately = false) {
+    setTableData(data, immediately = true) {
       this.tableData = [];
       this.tableData = data;
       if (immediately) {

package/packages/components/proPageTable/oa_pro_table_skeleton.vue

@@ -1,8 +1,13 @@
 <template>
-  <div class="table-skeleton-wrap" :style="{ height: height }">
+  <div
+    class="table-skeleton-wrap"
+    :style="{ height: `calc(${height} - 50px)` }"
+  >
     <baseSkeletonVue
+      :key="index"
       :shape="`rect`"
-      :lines="[5, 2, 8, 7, 3, 1, 8, 10, 4, 9]"
+      v-for="index in row"
+      :lines="[3.3, 10, 10, 10, 10, 10, 10, 10, 10, 10, 6.6]"
     ></baseSkeletonVue>
   </div>
 </template>
@@ -14,6 +19,7 @@ export default {
     return {};
   },
   props: {
+    row: {},
     height: {
       require: true,
     },
@@ -29,5 +35,9 @@ export default {
 .table-skeleton-wrap {
   width: 100%;
   height: auto;
+  display: flex;
+  flex-flow: row nowrap;
+  align-items: flex-start;
+  justify-content: space-between;
 }
 </style>