From 5a00f7eec311c7b71b40df4beaded505eca5329c Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 11 四月 2024 17:49:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue | 94 ++++++++++++++++++++++++++---------------------
1 files changed, 52 insertions(+), 42 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
index 1c26a42..7b8dee8 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
@@ -1,8 +1,8 @@
<template>
<div>
<!--琛ㄦ牸鍩虹鎸夐挳-->
- <div v-if="type === 'table'">
- <!--top灞曠ず琛ㄦ牸涓婃柟鍖哄煙 menu灞曠ず琛ㄦ牸鎿嶄綔鏍忓尯鍩� -->
+ <div v-if="type === 'table' || type === 'TreeTable'">
+ <!--top灞曠ず琛ㄦ牸涓婃柟鍖哄煙 menu灞曠ず琛ㄦ牸鎿嶄綔鏍忓尯鍩� 鏃犲氨鏄粯璁� -->
<el-button v-for="item in basicButtonList.top"
v-if="LocationType === 'top'"
:key="item.oid" :icon="item.paramVOS.webUiButtonIcon"
@@ -12,15 +12,18 @@
{{ item.name }}
</el-button>
+ <el-button type="text" @click="handleDefaultAddChildren(scope.row)" v-if="(LocationType === 'menu' && this.default === 'default')">鏂板瀛愮骇</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
size="small"
- @click="buttonClick(item,scope)">
+ @click="buttonClick(item)">
{{ item.name }}
</el-button>
+
+
<!-- 琛ㄦ牸鍐呮寜閽搷浣滃璇濇琛ㄥ崟 -->
<dynamic-table-form ref="dynamicForm" :formList="formList" :title="formName" :visible.sync="visible"
style="display: none"></dynamic-table-form>
@@ -29,7 +32,18 @@
<el-button v-for="item in basicButtonList"
:key="item.oid"
:icon="item.paramVOS.webUiButtonIcon"
- :type="(item.paramVOS.webUiButtonType !== 'text' ? item.paramVOS.buttonType : 'primary') || 'primary'"
+ :type="(item.paramVOS.webUiButtonType !== 'text' ? item.paramVOS.webUiButtonType : 'primary') || 'primary'"
+ plain
+ size="small"
+ @click="buttonClick(item)">
+ {{ item.name }}
+ </el-button>
+ </div>
+ <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'"
plain
size="small"
@click="buttonClick(item)">
@@ -42,6 +56,7 @@
<script>
import func from "@/util/func";
import {validatenull} from "@/util/validate";
+import {doAction} from '@/actions/base/BaseAction';
export default {
name: "dynamic-button",
@@ -57,6 +72,13 @@
},
butttonList: {
type: Array
+ },
+ selectList: {
+ type: Array,
+ default: []
+ },
+ default:{
+ type:String,
}
},
data() {
@@ -228,57 +250,45 @@
},
computed: {
basicButtonList() {
- // const basicColumn = this.butttonList.filter(item => item.id !== 'launchworkflow'); // 棣栧厛杩囨护鍑烘潵鍩虹琛ㄥ崟浜嬩欢鐨勬寜閽�
const basicColumn = this.butttonList;
+ if (!basicColumn || !Array.isArray(basicColumn)) {
+ return []; // 濡傛灉 basicColumn 鏈畾涔夋垨鑰呬笉鏄暟缁勶紝杩斿洖绌烘暟缁�
+ }
- if (this.type === 'form') {
-
+ if (this.type === 'form' || this.type === 'tree') {
return basicColumn;
-
- } else if (this.type === 'table') {
-
- const top = basicColumn.filter(item => item.paramVOS.webUiButtonLocation === 'top' || func.isEmpty(item.paramVOS.webUiButtonLocation)); // 杩囨护鍑烘潵琛ㄦ牸涓婇潰鍖哄煙灞曠ず鐨勬寜閽�
- const menu = basicColumn.filter(item => item.paramVOS.webUiButtonLocation === 'menu'); // 杩囨护鍑烘潵鎿嶄綔鏍忓睍绀虹殑鎸夐挳
-
+ } 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));
+ });
+ const menu = basicColumn.filter(item => {
+ return item.paramVOS && item.paramVOS.webUiButtonLocation === 'menu';
+ });
return {
top: top,
- menu: menu
+ menu: menu,
};
}
}
},
methods: {
+ //琛ㄦ牸鏍戦粯璁ゆ柊澧炲瓙椤�
+ handleDefaultAddChildren(row){
+ this.visible = true;
+ this.formName = '鏂板瀛愮骇'
+ this.$refs.dynamicForm.form = row;
+ },
buttonClick(item) {
- this.formName = item.name;
+ doAction(item,{
+ paramVOS: item.paramVOS,
+ dataStore: [],
+ sourceData: {},
+ callback: function (){
- function handleAdd() {
- this.visible = true;
- }
-
- function handleEdit() {
- this.visible = true;
- this.$refs.dynamicForm.form = this.scope.row;
- }
-
- function handleDelete() {
- this.$message.success('鍒犻櫎鎴愬姛锛�');
- }
-
- const methodHandlers = {
- add: handleAdd.bind(this),
- edit: handleEdit.bind(this),
- delete: handleDelete.bind(this),
- };
-
- const method = item.paramVOS.webUiButtonMethods;
- const handler = methodHandlers[method];
- if (handler) {
- handler();
- } else {
- this.$message.error('璇烽噸鏂伴厤缃寜閽紒')
- }
+ }
+ });
}
- }
+ },
}
</script>
--
Gitblit v1.9.3