From 3defe8e0363bc3511169cc2432bcfe1a02b820db Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 02 一月 2025 17:33:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-button.vue | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 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 7d69abf..e7b8b47 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
@@ -4,11 +4,11 @@
<div v-if="type === 'table' || type === 'TreeTable'">
<!--top灞曠ず琛ㄦ牸涓婃柟鍖哄煙 menu灞曠ず琛ㄦ牸鎿嶄綔鏍忓尯鍩� 鏃犲氨鏄粯璁� -->
<el-tooltip v-if="LocationType === 'top'" v-for="item in basicButtonList.top" :content="item.description || item.name" placement="top">
- <el-button :key="item.oid" :icon="item.paramVOS.icon"
- :type="item.paramVOS.btnType || 'primary'" plain
+ <el-button :key="item.oid"
+ :type="item.paramVOS && item.paramVOS.btnType ? item.paramVOS.btnType : 'primary'" plain
size="small"
@click="buttonClick(item)">
- {{ item.name }}
+ <icon-show :name="item.iconPath"></icon-show>{{ item.name }}
</el-button>
</el-tooltip>
@@ -17,10 +17,11 @@
<el-tooltip v-if="LocationType === 'menu'" v-for="item in basicButtonList.menu" :content="item.description || item.name" placement="top">
<el-button :key="item.oid"
- :icon="item.paramVOS.icon ? item.paramVOS.icon : (item.id === 'edit' ? 'el-icon-edit' : (item.id === 'delete' ||item.id === 'del' ? 'el-icon-delete' : ''))"
:type="item.paramVOS.btnType || 'text'" plain
size="small"
@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>
{{ item.name }}
</el-button>
</el-tooltip>
@@ -32,32 +33,28 @@
<div v-else-if="type === 'form'">
<el-tooltip v-for="item in basicButtonList" :content="item.description || item.name" placement="top">
<el-button :key="item.oid"
- :icon="item.paramVOS.icon"
- :type="item.paramVOS.btnType || 'primary'"
+ :type="item.paramVOS && item.paramVOS.btnType ? item.paramVOS.btnType : 'primary'" plain
plain
size="small"
@click="buttonClick(item)">
- {{ item.name }}
+ <icon-show :name="item.iconPath"></icon-show>{{ item.name }}
</el-button>
</el-tooltip>
</div>
<div v-else-if="type === 'tree'" class="tree-buttons">
<el-tooltip v-for="item in basicButtonList" :content="item.description || item.name" placement="top">
<el-button :key="item.oid"
- :icon="item.paramVOS.icon"
- :type="item.paramVOS.btnType || 'primary'"
+ :type="item.paramVOS && item.paramVOS.btnType ? item.paramVOS.btnType : 'primary'" plain
plain
size="small"
@click="buttonClick(item)">
- {{ item.name }}
+ <icon-show :name="item.iconPath"></icon-show>{{ item.name }}
</el-button>
</el-tooltip>
<el-button type="primary"
plain
size="small"
- @click="$emit('refresh')">
- 鍒锋柊
- </el-button>
+ @click="$emit('refresh')">鍒锋柊</el-button>
</div>
</div>
</template>
@@ -65,7 +62,7 @@
<script>
import func from "@/util/func";
import {validatenull} from "@/util/validate";
-import {doAction} from '@/components/actions/base/BaseAction';
+import {doAction} from '@/components/actions/BaseAction';
import Vue from "vue";
export default {
--
Gitblit v1.9.3