From eb9691c760f6545f23c1c283a1e05c98eb034aa6 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 10 四月 2024 15:16:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
index d927238..2aa8c65 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
@@ -250,12 +250,19 @@
computed: {
basicButtonList() {
const basicColumn = this.butttonList;
+ if (!basicColumn || !Array.isArray(basicColumn)) {
+ return []; // 濡傛灉 basicColumn 鏈畾涔夋垨鑰呬笉鏄暟缁勶紝杩斿洖绌烘暟缁�
+ }
- if (this.type === 'form' || this.type=='tree') {
+ if (this.type === 'form' || this.type === 'tree') {
return basicColumn;
} else if (this.type === 'table' || this.type === 'TreeTable') {
- const top = basicColumn.filter(item => item.paramVOS.webUiButtonLocation === 'top' || func.isEmpty(item.paramVOS.webUiButtonLocation)); // 杩囨护鍑烘潵琛ㄦ牸涓婇潰鍖哄煙灞曠ず鐨勬寜閽�
- const menu = basicColumn.filter(item => item.paramVOS.webUiButtonLocation === 'menu'); // 杩囨护鍑烘潵鎿嶄綔鏍忓睍绀虹殑鎸夐挳
+ const top = basicColumn.filter(item => {
+ return item.paramVOS && (item.paramVOS.webUiButtonLocation === 'top' || func.isEmpty(item.paramVOS.webUiButtonLocation));
+ });
+ const menu = basicColumn.filter(item => {
+ return item.paramVOS && item.paramVOS.webUiButtonLocation === 'menu';
+ });
return {
top: top,
menu: menu,
--
Gitblit v1.9.3