build v3.4.5

nmxiaowei · Jun 12, 2024 · 6b422a0 · 6b422a0
1 parent 2ef6148
commit 6b422a0
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 21 deletions.
diff --git a/lib/avue.js b/lib/avue.js
diff --git a/lib/avue.min.js b/lib/avue.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@smallwei/avue",
-  "version": "3.4.4",
+  "version": "3.4.5",
   "description": "A Magic Configurable Web Framework",
   "main": "lib/avue.min.js",
   "unpkg": "lib/avue.min.js",

diff --git a/packages/core/components/form/index.vue b/packages/core/components/form/index.vue
@@ -141,7 +141,7 @@ export default {
     },
     getPlaceholder,
     getBind (column) {
-      let params = { ...column, ...params, ...this.$uploadFun(column) };
+      let params = { ...column, ...this.params, ...this.$uploadFun(column) };
       ['value', 'className'].forEach(ele => {
         delete params[ele]
       })

diff --git a/packages/element-ui/crud/column/column-dynamic.vue b/packages/element-ui/crud/column/column-dynamic.vue
@@ -9,7 +9,7 @@
              :filters="getColumnProp(columnOption,'filters')"
              :filter-method="getColumnProp(columnOption,'filterMethod')?handleFilterMethod:undefined"
              :filter-multiple="validData(columnOption.filterMultiple,true)"
-             :show-overflow-tooltip="columnOption.overHidden"
+             :show-overflow-tooltip="columnOption.showOverflowTooltip || columnOption.overHidden"
              :min-width="columnOption.minWidth"
              :sortable="getColumnProp(columnOption,'sortable')"
              :render-header="columnOption.renderHeader"

diff --git a/packages/element-ui/crud/index.vue b/packages/element-ui/crud/index.vue
@@ -517,8 +517,8 @@ export default create({
       }
     },
     getTableHeight () {
-      if (this.isAutoHeight) {
-        this.$nextTick(() => {
+      this.$nextTick(() => {
+        if (this.isAutoHeight) {
           const clientHeight = document.documentElement.clientHeight;
           const calcHeight = this.calcHeight || 0;
           const tableRef = this.$refs.table;
@@ -533,11 +533,12 @@ export default create({
             tableHeight -= height;
           }
           this.tableHeight = tableHeight;
-        });
-      } else {
-        this.tableHeight = this.tableOption.height;
-      }
-      this.refreshTable()
+
+        } else {
+          this.tableHeight = this.tableOption.height;
+        }
+        this.refreshTable()
+      });
     },
     doLayout () {
       this.$refs.table.doLayout()

diff --git a/packages/element-ui/upload/index.vue b/packages/element-ui/upload/index.vue
@@ -500,14 +500,26 @@ export default create({
         };
 
         const uploadToDefault = () => {
+          let timer = null;
           this.$axios({
             url,
             method: "post",
             data: param,
             headers,
             onUploadProgress: (progressEvent) => {
-              let complete = progressEvent.loaded / progressEvent.total * 100 | 0;
-              if (fileState) fileState.percentage = complete;
+              let complete = (progressEvent.loaded / progressEvent.total * 100) || 0;
+              if (complete >= 80) {
+                if (timer) return
+                timer = setInterval(() => {
+                  complete += (100 - complete) * 0.2
+                  if (fileState) fileState.percentage = parseFloat(complete.toFixed(2))
+                  if (complete > 99) {
+                    timer && clearInterval(timer)
+                  }
+                }, 1000)
+              } else {
+                if (fileState) fileState.percentage = parseFloat(complete.toFixed(2))
+              }
             }
           }).then(handleUploadResult).catch(handleUploadError);
         };

diff --git a/src/version.js b/src/version.js
@@ -1 +1 @@
-export const version = '3.4.4'
+export const version = '3.4.5'