element-assits 0.0.93 → 0.0.95

package/lib/index.js

@@ -2420,21 +2420,25 @@ const Qx = {
     },
     getList() {
       if (!this.pageRequest) {
-        let r = [];
+        let t = [];
         if (this.thePagination.show) {
-          const t = (this.page.current - 1) * this.page.pageSize;
-          r = this.data.slice(t, t + this.page.pageSize);
+          const i = (this.page.current - 1) * this.page.pageSize;
+          t = this.data.slice(i, i + this.page.pageSize);
         } else
-          r = this.data;
-        return this.tableData = r, this.page.total = this.data.length, this.asyncPageCurrent = this.page.current, Promise.resolve();
-      }
-      return this.innerLoading = !0, this.errMsg = void 0, this.pageRequest(this.page, this.theForm.attrs.model).then((r) => {
-        const { data: t, total: i, current: a } = r || {};
-        this.tableData = t || [], this.page.total = i || 0, this.asyncPageCurrent = a || this.page.current, le(this.tableData) && !this.tableData.length && this.page.current > 1 && this.handleCurrentChange(this.page.current - 1);
-      }).catch((r) => {
-        this.errMsg = r && r.message;
+          t = this.data;
+        return this.tableData = t, this.page.total = this.data.length, this.asyncPageCurrent = this.page.current, Promise.resolve();
+      }
+      this.innerLoading = !0, this.errMsg = void 0;
+      const r = this.timestamp = Date.now();
+      return this.pageRequest(this.page, this.theForm.attrs.model).then((t) => {
+        if (r !== this.timestamp)
+          return;
+        const { data: i, total: a, current: o } = t || {};
+        this.tableData = i || [], this.page.total = a || 0, this.asyncPageCurrent = o || this.page.current, le(this.tableData) && !this.tableData.length && this.page.current > 1 && this.handleCurrentChange(this.page.current - 1);
+      }).catch((t) => {
+        r === this.timestamp && (this.errMsg = t && t.message);
       }).finally(() => {
-        this.innerLoading = !1;
+        r === this.timestamp && (this.innerLoading = !1);
       });
     },
     hideRefresh() {
@@ -3233,7 +3237,7 @@ const qC = {
   },
   methods: {
     handleSearch() {
-      this.page.current = 1, this.options = [], this.getList();
+      this.pager.current = 1, this.options = [], this.getList();
     },
     async getList(r = !1) {
       this.loading !== !0 && (this.loading = !0, r && (await this.$nextTick(), this.scrollToBottom()), Promise.all([

package/lib/style.scss

@@ -50,45 +50,6 @@ $--background-color-base: #F5F7FA !default;
   }
 }
 
-.ea-data-table {
-  .edt-row {
-    display: flex;
-    .edt-cell {
-      padding: 0 8px;
-      flex: 0 0 auto;
-      box-sizing: border-box;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      word-break: break-all;
-    }
-    &.edt-header {
-      background-color: $--color-border-extralight;
-      color: $--color-primary-text;
-    }
-  }
-  &--border {
-    border: 1px solid $--color-border-light;
-    .edt-row {
-      .edt-cell {
-        border-bottom: 1px solid $--color-border-light;
-        border-left: 1px solid $--color-border-light;
-        &:first-child {
-          border-left: 0;
-        }
-      }
-      &:last-child .edt-cell{
-        border-bottom: 0;
-      }
-    }
-  }
-  .loading-text {
-    color: $--color-secondary-text;
-    text-align: center;
-    font-size: inherit;
-  }
-}
-
 // table
 .ea-table {
   // 表格头部样式美化
@@ -274,6 +235,53 @@ $--background-color-base: #F5F7FA !default;
   }
 }
 
+.ea-data-table {
+  .edt-row {
+    display: flex;
+    .edt-cell {
+      padding: 0 8px;
+      flex: 0 0 auto;
+      box-sizing: border-box;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      word-break: break-all;
+    }
+    &.edt-header {
+      background-color: $--color-border-extralight;
+      color: $--color-primary-text;
+    }
+  }
+  &--border {
+    border: 1px solid $--color-border-light;
+    .edt-row {
+      .edt-cell {
+        border-bottom: 1px solid $--color-border-light;
+        border-left: 1px solid $--color-border-light;
+        &:first-child {
+          border-left: 0;
+        }
+      }
+      &:last-child .edt-cell{
+        border-bottom: 0;
+      }
+    }
+  }
+  .loading-text {
+    color: $--color-secondary-text;
+    text-align: center;
+    font-size: inherit;
+  }
+}
+
+.ea-list {
+  .loading-text {
+    color: $--color-secondary-text;
+    text-align: center;
+    font-size: inherit;
+  }
+}
+
 .ea-button-tooltip + .ea-button-tooltip {
   margin-left: 10px;
 }
@@ -339,6 +347,41 @@ td {
   }
 }
 
+.ea-tree {
+  .ea-tree__main {
+    margin-top: 18px;
+    .ea-tree__header {
+      height: 50px;
+      padding-left: 24px;
+      padding-right: 14px;
+      font-size: 12px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      background-color: $--background-color-base;
+      .ea-tree__header__text {
+        font-weight: bold;
+      }
+    }
+  }
+  .ea-tree-real {
+    .el-tree-node.is-current > .el-tree-node__content {
+      color: $--color-primary;
+    }
+  }
+  &.ea-tree--border {
+    .ea-tree__main {
+      border: 1px solid $--color-border-lighter;
+    }
+    .ea-tree__header {
+      border-bottom: 1px solid $--color-border-lighter;
+    }
+    .ea-tree-real {
+      margin: 10px 0;
+    }
+  }
+}
+
 .ea-split-container {
   display: flex;
   &.is-down {
@@ -390,47 +433,8 @@ td {
   }
 }
 
-.ea-tree {
-  .ea-tree__main {
-    margin-top: 18px;
-    .ea-tree__header {
-      height: 50px;
-      padding-left: 24px;
-      padding-right: 14px;
-      font-size: 12px;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      background-color: $--background-color-base;
-      .ea-tree__header__text {
-        font-weight: bold;
-      }
-    }
-  }
-  .ea-tree-real {
-    .el-tree-node.is-current > .el-tree-node__content {
-      color: $--color-primary;
-    }
-  }
-  &.ea-tree--border {
-    .ea-tree__main {
-      border: 1px solid $--color-border-lighter;
-    }
-    .ea-tree__header {
-      border-bottom: 1px solid $--color-border-lighter;
-    }
-    .ea-tree-real {
-      margin: 10px 0;
-    }
-  }
-}
-
-.ea-list {
-  .loading-text {
-    color: $--color-secondary-text;
-    text-align: center;
-    font-size: inherit;
-  }
+.ea-number .el-input__inner {
+  text-align: left;
 }
 
 .ea-desc {
@@ -477,10 +481,6 @@ td {
   }
 }
 
-.ea-number .el-input__inner {
-  text-align: left;
-}
-
 .file-upload-dialog {
   // 拖拽区域铺满
   .el-upload,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "element-assits",
-  "version": "0.0.93",
+  "version": "0.0.95",
   "description": "element-ui 的扩展组件库",
   "main": "lib/index.js",
   "type": "module",