From 6db912e165bb83ed6ffc83c8229c33eccc88cc96 Mon Sep 17 00:00:00 2001 From: xuliangzhan Date: Thu, 18 Jul 2024 10:33:29 +0800 Subject: [PATCH] releases 3.8.15 --- README.md | 5 +++++ package.json | 6 +++--- packages/modal/src/modal.js | 10 ++++------ packages/table/src/methods.js | 3 ++- styles/export.scss | 2 +- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index aa4f3f5da..099a3bc74 100644 --- a/README.md +++ b/README.md @@ -155,6 +155,11 @@ npm run serve npm run lib ``` +## PR + +1. 如果是修复 bug,必须有示例的复现链接 +2. 如果新功能,涉及代码风格、质量、还需有对应的示例页面 + ## Contributors Thank you to everyone who contributed to this project. diff --git a/package.json b/package.json index 81e847be1..3a2e6e6f5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vxe-table", - "version": "3.8.14", + "version": "3.8.15", "description": "一个基于 vue 的 PC 端表单/表格组件,支持增删改查、虚拟树、列拖拽,懒加载、快捷菜单、数据校验、树形结构、打印导出、自定义模板、渲染器、JSON 配置式...", "scripts": { "update": "npm install --legacy-peer-deps", @@ -60,8 +60,8 @@ "gulp-typescript": "^5.0.1", "gulp-uglify": "^3.0.2", "postcss": "^8.2.15", - "sass": "^1.75.0", - "sass-loader": "^14.2.0", + "sass": "^1.77.8", + "sass-loader": "^14.2.1", "typescript": "~4.5.5", "vue": "^2.7.14", "vue-i18n": "^8.18.1", diff --git a/packages/modal/src/modal.js b/packages/modal/src/modal.js index 0a6af585d..a2923aeb5 100644 --- a/packages/modal/src/modal.js +++ b/packages/modal/src/modal.js @@ -480,9 +480,7 @@ export default { maximize () { return this.$nextTick().then(() => { if (!this.revertLocat) { - const marginSize = Math.max(0, this.marginSize) const modalBoxElem = this.getBox() - const { visibleHeight, visibleWidth } = DomTools.getDomNode() this.revertLocat = { top: modalBoxElem.offsetTop, left: modalBoxElem.offsetLeft, @@ -490,10 +488,10 @@ export default { height: modalBoxElem.offsetHeight + (modalBoxElem.style.height ? 0 : 1) } Object.assign(modalBoxElem.style, { - top: `${marginSize}px`, - left: `${marginSize}px`, - width: `${visibleWidth - marginSize * 2}px`, - height: `${visibleHeight - marginSize * 2}px` + top: '0', + left: '0', + width: '100%', + height: '100%' }) this.savePosStorage() } diff --git a/packages/table/src/methods.js b/packages/table/src/methods.js index a0bf770e5..c43437775 100644 --- a/packages/table/src/methods.js +++ b/packages/table/src/methods.js @@ -1635,7 +1635,8 @@ const Methods = { const bodyWidth = tableBodyElem ? tableBodyElem.clientWidth - 1 : 0 rdWidth = Math.floor(colWidth * bodyWidth) } - column.renderWidth = rdWidth + column.resizeWidth = rdWidth + return this.refreshColumn() } return this.$nextTick() }, diff --git a/styles/export.scss b/styles/export.scss index 1f639e3c3..f66e4b924 100644 --- a/styles/export.scss +++ b/styles/export.scss @@ -91,10 +91,10 @@ cursor: pointer; } &:hover { + color: $vxe-primary-color; & > i { display: block; } - color: $vxe-primary-color; } } .vxe-import-select--file {