hjq/mart-admin
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'admin-22.07.16:修复行内表单最后一个el-form-item位置下移问题'

Browse Source
This commit is contained in:
lyt 2022-07-16 22:57:49 +08:00
parent e57dde4bab
commit 356040806d
3 changed files with 371 additions and 356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

700
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

16
package.json
View File

@ -11,7 +11,7 @@
}, },
"dependencies": { "dependencies": {
"@element-plus/icons-vue": "^2.0.6", "@element-plus/icons-vue": "^2.0.6",
"@wangeditor/editor": "^5.1.1", "@wangeditor/editor": "^5.1.10",
"axios": "^0.27.2", "axios": "^0.27.2",
"countup.js": "^2.3.2", "countup.js": "^2.3.2",
"cropperjs": "^1.5.12", "cropperjs": "^1.5.12",
@ -23,7 +23,7 @@
"jsplumb": "^2.15.6", "jsplumb": "^2.15.6",
"mitt": "^3.0.0", "mitt": "^3.0.0",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"pinia": "^2.0.14", "pinia": "^2.0.16",
"print-js": "^1.6.0", "print-js": "^1.6.0",
"qrcodejs2-fixes": "^0.0.2", "qrcodejs2-fixes": "^0.0.2",
"screenfull": "^6.0.2", "screenfull": "^6.0.2",
@ -33,15 +33,15 @@
"vue-clipboard3": "^2.0.0", "vue-clipboard3": "^2.0.0",
"vue-grid-layout": "^3.0.0-beta1", "vue-grid-layout": "^3.0.0-beta1",
"vue-i18n": "^9.1.10", "vue-i18n": "^9.1.10",
"vue-router": "^4.1.1" "vue-router": "^4.1.2"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^18.0.3", "@types/node": "^18.0.5",
"@types/nprogress": "^0.2.0", "@types/nprogress": "^0.2.0",
"@types/sortablejs": "^1.13.0", "@types/sortablejs": "^1.13.0",
"@typescript-eslint/eslint-plugin": "^5.30.5", "@typescript-eslint/eslint-plugin": "^5.30.6",
"@typescript-eslint/parser": "^5.30.5", "@typescript-eslint/parser": "^5.30.6",
"@vitejs/plugin-vue": "^2.3.3", "@vitejs/plugin-vue": "^3.0.0",
"@vue/compiler-sfc": "^3.2.37", "@vue/compiler-sfc": "^3.2.37",
"dotenv": "^16.0.1", "dotenv": "^16.0.1",
"eslint": "^8.19.0", "eslint": "^8.19.0",
@ -50,7 +50,7 @@
"sass": "^1.53.0", "sass": "^1.53.0",
"sass-loader": "^13.0.2", "sass-loader": "^13.0.2",
"typescript": "^4.7.4", "typescript": "^4.7.4",
"vite": "^2.9.14", "vite": "^3.0.0",
"vue-eslint-parser": "^9.0.3" "vue-eslint-parser": "^9.0.3"
}, },
"browserslist": [ "browserslist": [

11
src/theme/element.scss
View File

@ -30,9 +30,20 @@
/* Form 表单 /* Form 表单
------------------------------- */ ------------------------------- */
.el-form { .el-form {
// 用于修改弹窗时表单内容间隔太大问题，如系统设置的新增菜单弹窗里的表单内容
.el-form-item:last-of-type { .el-form-item:last-of-type {
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }
// 修复行内表单最后一个 el-form-item 位置下移问题
&.el-form--inline {
.el-form-item--large.el-form-item:last-of-type {
margin-bottom: 22px !important;
}
.el-form-item--default.el-form-item:last-of-type,
.el-form-item--small.el-form-item:last-of-type {
margin-bottom: 18px !important;
}
}
} }
/* Alert 警告 /* Alert 警告