From 06272b4e887651be78de34a6483c37870e030fb9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 20 三月 2024 17:29:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
index 3ec92d0..eece340 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
@@ -22,14 +22,15 @@
{{ item.name }}
</el-button>
</div>
- <div v-if="type === 'form'">
+ <div v-else-if="type === 'form'">
<el-button v-for="item in basicButtonList"
:key="item.oid"
- :type="(item.paramVOS.buttonType !== 'text' ? item.paramVOS.buttonType : 'primary') || 'primary'" plain
- size="small"
:icon="item.icon"
+ :type="(item.paramVOS.buttonType !== 'text' ? item.paramVOS.buttonType : 'primary') || 'primary'"
+ plain
+ size="small"
@click="buttonClick(item)">
- {{item.name}}
+ {{ item.name }}
</el-button>
</div>
</div>
@@ -67,11 +68,14 @@
const basicColumn = this.butttonList;
if (this.type === 'form') {
- console.log('basicColumn',basicColumn)
+
return basicColumn;
+
} else if (this.type === 'table') {
+
const top = basicColumn.filter(item => item.paramVOS.location === 'top' || func.isEmpty(item.paramVOS.location)); // 杩囨护鍑烘潵琛ㄦ牸涓婇潰鍖哄煙灞曠ず鐨勬寜閽�
const menu = basicColumn.filter(item => item.paramVOS.location === 'menu'); // 杩囨护鍑烘潵鎿嶄綔鏍忓睍绀虹殑鎸夐挳
+
return {
top: top,
menu: menu
--
Gitblit v1.9.3