From 4e778d7f61e2508455e3a69815f7a17c455d81da Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 09 五月 2024 18:20:27 +0800
Subject: [PATCH] 调整列表中按钮展示位置及默认按钮

---
 Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue |   50 ++++++++++++++++++++++++++++++++------------------
 1 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
index 0f9ca1a..8390cda 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
@@ -5,21 +5,22 @@
       <!--top灞曠ず琛ㄦ牸涓婃柟鍖哄煙 menu灞曠ず琛ㄦ牸鎿嶄綔鏍忓尯鍩� 鏃犲氨鏄粯璁� -->
       <el-button v-for="item in basicButtonList.top"
                  v-if="LocationType === 'top'"
-                 :key="item.oid" :icon="item.paramVOS.webUiButtonIcon"
-                 :type="item.paramVOS.webUiButtonType || 'primary'" plain
+                 :key="item.oid" :icon="item.paramVOS.icon"
+                 :type="item.paramVOS.btnType || 'primary'" plain
                  size="small"
                  @click="buttonClick(item)">
         {{ item.name }}
       </el-button>
 
-      <el-button type="text" @click="handleDefaultAddChildren(scope.row)" v-if="(LocationType === 'menu' && this.default === 'default')">鏂板瀛愮骇</el-button>
+      <el-button type="text" @click="handleDefaultAddChildren(scope.row)" v-if="(LocationType === 'menu' && type === 'TreeTable')">鏂板瀛愮骇</el-button>
+      <el-button type="text" icon="el-icon-view" size="small" plain @click="$emit('rowView',scope.row,scope.index)" v-if="LocationType === 'menu'">鏌ョ湅</el-button>
       <el-button v-for="item in basicButtonList.menu"
                  v-if="LocationType === 'menu'"
                  :key="item.oid"
-                 :icon="item.paramVOS.webUiButtonIcon ? item.paramVOS.webUiButtonIcon : (item.paramVOS.webUiButtonMethods === 'edit' ? 'el-icon-edit' : (item.paramVOS.webUiButtonMethods === 'delete' ? 'el-icon-delete' : ''))"
-                 :type="item.paramVOS.webUiButtonType || 'text'" plain
+                 :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)">
+                 @click="buttonClick(item,scope.row)">
         {{ item.name }}
       </el-button>
 
@@ -31,8 +32,8 @@
     <div v-else-if="type === 'form'">
       <el-button v-for="item in basicButtonList"
                  :key="item.oid"
-                 :icon="item.paramVOS.webUiButtonIcon"
-                 :type="(item.paramVOS.webUiButtonType !== 'text' ? item.paramVOS.webUiButtonType : 'primary') || 'primary'"
+                 :icon="item.paramVOS.icon"
+                 :type="item.paramVOS.btnType || 'primary'"
                  plain
                  size="small"
                  @click="buttonClick(item)">
@@ -42,12 +43,18 @@
     <div v-else-if="type === 'tree'" class="tree-buttons">
       <el-button v-for="item in basicButtonList"
                  :key="item.oid"
-                 :icon="item.paramVOS.webUiButtonIcon"
-                 :type="(item.paramVOS.webUiButtonType !== 'text' ? item.paramVOS.webUiButtonType : 'primary') || 'primary'"
+                 :icon="item.paramVOS.icon"
+                 :type="item.paramVOS.btnType || 'primary'"
                  plain
                  size="small"
                  @click="buttonClick(item)">
         {{ item.name }}
+      </el-button>
+      <el-button type="primary"
+                 plain
+                 size="small"
+                 @click="$emit('refresh')">
+        鍒锋柊
       </el-button>
     </div>
   </div>
@@ -56,7 +63,7 @@
 <script>
 import func from "@/util/func";
 import {validatenull} from "@/util/validate";
-import {doAction} from '@/actions/base/BaseAction';
+import {doAction} from '@/components/actions/base/BaseAction';
 import Vue from "vue";
 
 export default {
@@ -77,9 +84,6 @@
     },
     butttonList: {
       type: Array
-    },
-    default:{
-      type:String,
     },
     sourceData: {
       //鎸夐挳鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
@@ -111,10 +115,20 @@
         return basicColumn;
       } else if (this.type === 'table' || this.type === 'TreeTable') {
         const top = basicColumn.filter(item => {
-          return item.paramVOS && (item.paramVOS.webUiButtonLocation === 'top' || func.isEmpty(item.paramVOS.webUiButtonLocation));
+          if (item.paramVOS && item.paramVOS.webUiButtonLocation && item.paramVOS.webUiButtonLocation !== 'menu') {
+            return true;
+          } else if (item.id != "edit" && item.id != "del" && item.id != "delete" &&  item.id != "refresh") {
+            return true;
+          }
+          return false
         });
         const menu = basicColumn.filter(item => {
-          return item.paramVOS && item.paramVOS.webUiButtonLocation === 'menu';
+          if (item.paramVOS && item.paramVOS.webUiButtonLocation && item.paramVOS.webUiButtonLocation === 'menu') {
+            return true
+          } else if (item.id == "edit" || item.id == "del" || item.id == "delete"){
+            return true;
+          }
+            return false;
         });
         return {
           top: top,
@@ -130,7 +144,7 @@
       this.formName = '鏂板瀛愮骇'
       this.$refs.dynamicForm.form = row;
     },
-    buttonClick(buttonitem) {
+    buttonClick(buttonitem,rowData) {
       const paramVOS = buttonitem.paramVOS;
       const DefineVO = this.componentVO.treeDefineVO || this.componentVO.tableDefineVO || this.componentVO.treeTableDefineVO || this.componentVO.formDefineVO;
       if (!paramVOS['title']) {
@@ -150,7 +164,7 @@
       //paramVOS.customBtn //寮圭獥榛樿鏈変繚瀛樻寜閽�,customBtn涓簍rue鏃跺唴瀹瑰睍绀鸿嚜瀹氫箟鎸夐挳
       doAction(buttonitem, {
         paramVOS: paramVOS,
-        dataStore: this.dataStore || [],
+        dataStore: rowData || this.dataStore || [],
         sourceData: this.sourceData || {}
       }, function (actionType,data) {
         that.$emit("afterMethod",actionType,data);

--
Gitblit v1.9.3