From 4006805916d04a398243292316fbad8a05d2f67b Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期一, 06 一月 2025 16:23:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-button.vue | 5 +++++
Source/plt-web/plt-web-ui/src/styles/ui.scss | 8 ++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-button.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-button.vue
index e7b8b47..2bc22b3 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-button.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-button.vue
@@ -7,6 +7,7 @@
<el-button :key="item.oid"
:type="item.paramVOS && item.paramVOS.btnType ? item.paramVOS.btnType : 'primary'" plain
size="small"
+ class="button-custom-icon"
@click="buttonClick(item)">
<icon-show :name="item.iconPath"></icon-show>{{ item.name }}
</el-button>
@@ -19,6 +20,7 @@
<el-button :key="item.oid"
:type="item.paramVOS.btnType || 'text'" plain
size="small"
+ class="button-custom-icon"
@click="buttonClick(item,scope.row)">
<icon-show v-if="item.iconPath" :name="item.iconPath"></icon-show>
<i v-else :class="item.id === 'edit' ? 'el-icon-edit' : (item.id === 'delete' ||item.id === 'del' ? 'el-icon-delete' : '')"></i>
@@ -36,6 +38,7 @@
:type="item.paramVOS && item.paramVOS.btnType ? item.paramVOS.btnType : 'primary'" plain
plain
size="small"
+ class="button-custom-icon"
@click="buttonClick(item)">
<icon-show :name="item.iconPath"></icon-show>{{ item.name }}
</el-button>
@@ -47,6 +50,7 @@
:type="item.paramVOS && item.paramVOS.btnType ? item.paramVOS.btnType : 'primary'" plain
plain
size="small"
+ class="button-custom-icon"
@click="buttonClick(item)">
<icon-show :name="item.iconPath"></icon-show>{{ item.name }}
</el-button>
@@ -54,6 +58,7 @@
<el-button type="primary"
plain
size="small"
+ class="button-custom-icon"
@click="$emit('refresh')">鍒锋柊</el-button>
</div>
</div>
diff --git a/Source/plt-web/plt-web-ui/src/styles/ui.scss b/Source/plt-web/plt-web-ui/src/styles/ui.scss
index dc0a8b7..1d7a736 100644
--- a/Source/plt-web/plt-web-ui/src/styles/ui.scss
+++ b/Source/plt-web/plt-web-ui/src/styles/ui.scss
@@ -546,7 +546,7 @@
}
/*鏄剧ずsvg鍥炬爣鐨勬寜閽�*/
.el-button--small.button-custom-icon{
- padding: 7px 14px;
+ padding: 7px 12px;
}
.el-button--small.button-custom-icon > span{
height: 16px;
@@ -562,9 +562,9 @@
}
/*鍥炬爣**/
.el-button--small.button-custom-icon > span .iconShow{
- font-size: 16px !important;
- width: 16px !important;
- height: 16px !important;
+ font-size: 12px !important;
+ width: 12px !important;
+ height: 12px !important;
margin-right: 6px;
}
--
Gitblit v1.9.3