From fd15db44e6bd9b7b9a6537b82bb90a81c009b24a Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 10 五月 2024 18:16:49 +0800
Subject: [PATCH] action
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue | 4 ++--
Source/ProjectWeb/src/components/actions/base/DeleteAction.js | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Source/ProjectWeb/src/components/actions/base/DeleteAction.js b/Source/ProjectWeb/src/components/actions/base/DeleteAction.js
index eac2e9a..0357892 100644
--- a/Source/ProjectWeb/src/components/actions/base/DeleteAction.js
+++ b/Source/ProjectWeb/src/components/actions/base/DeleteAction.js
@@ -34,7 +34,6 @@
}).catch(()=>{
})
-
};
/**
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
index ab6646c..18457b8 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
@@ -115,7 +115,7 @@
return basicColumn;
} else if (this.type === 'table' || this.type === 'TreeTable') {
const top = basicColumn.filter(item => {
- if (item.paramVOS && item.paramVOS.webUiButtonLocation && item.paramVOS.webUiButtonLocation !== 'menu') {
+ if (item.paramVOS && item.paramVOS.showLocation && item.paramVOS.showLocation !== 'menu') {
return true;
} else if (item.id != "edit" && item.id != "del" && item.id != "delete" && item.id != "refresh") {
return true;
@@ -123,7 +123,7 @@
return false
});
const menu = basicColumn.filter(item => {
- if (item.paramVOS && item.paramVOS.webUiButtonLocation && item.paramVOS.webUiButtonLocation === 'menu') {
+ if (item.paramVOS && item.paramVOS.showLocation && item.paramVOS.showLocation === 'menu') {
return true
} else if (item.id == "edit" || item.id == "del" || item.id == "delete"){
return true;
--
Gitblit v1.9.3