From 485125c2b5b8862a5295216b24cf28121d8ca169 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 08 四月 2024 11:32:07 +0800
Subject: [PATCH] 解决冲突
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 209 insertions(+), 19 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..52bf1b5 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
@@ -1,35 +1,42 @@
<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.icon"
- :type="item.paramVOS.buttonType || 'primary'" plain
+ :key="item.oid" :icon="item.paramVOS.webUiButtonIcon"
+ :type="item.paramVOS.webUiButtonType || '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 v-for="item in basicButtonList.menu"
v-if="LocationType === 'menu'"
:key="item.oid"
- :icon="item.paramVOS.icon ? item.paramVOS.icon : (item.paramVOS.buttonMethods === 'edit' ? 'el-icon-edit' : (item.paramVOS.buttonMethods === 'delete' ? 'el-icon-delete' : ''))"
- :type="item.paramVOS.buttonType || 'text'" plain
+ :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>
</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
+ :icon="item.paramVOS.webUiButtonIcon"
+ :type="(item.paramVOS.webUiButtonType !== 'text' ? item.paramVOS.webUiButtonType : 'primary') || 'primary'"
+ plain
size="small"
- :icon="item.icon"
@click="buttonClick(item)">
- {{item.name}}
+ {{ item.name }}
</el-button>
</div>
</div>
@@ -53,37 +60,220 @@
},
butttonList: {
type: Array
+ },
+ selectList: {
+ type: Array,
+ default: []
+ },
+ default:{
+ type:String,
}
},
data() {
return {
visible: false,
formName: '',
+ // 琛ㄥ崟鏁版嵁
+ formList: [
+ {
+ comboxKey: null,
+ customClass: null,
+ data: null,
+ dateFormate: null,
+ defaultValue: "",
+ displayExtension: "",
+ extendAttrMap: null,
+ extendAttrString: null,
+ field: "name",
+ hidden: false,
+ keyAttr: true,
+ prefix: null,
+ readOnly: false,
+ referConfig: null,
+ required: true,
+ selectLibFlag: null,
+ showField: null,
+ suffix: '$',
+ text: "鍚嶇О",
+ tooltips: '鍚嶇О',
+ type: "text",
+ unique: false,
+ verify: ""
+ },
+ {
+ comboxKey: null,
+ customClass: null,
+ data: null,
+ dateFormate: null,
+ defaultValue: "",
+ displayExtension: "",
+ extendAttrMap: null,
+ extendAttrString: null,
+ field: "code",
+ hidden: false,
+ keyAttr: false,
+ prefix: null,
+ readOnly: false,
+ referConfig: null,
+ required: false,
+ selectLibFlag: null,
+ showField: null,
+ suffix: null,
+ disabled: true,
+ text: "缂栫爜",
+ tooltips: null,
+ type: "text",
+ unique: false,
+ verify: ""
+ },
+ {
+ comboxKey: "EnumReviewType",
+ customClass: null,
+ data: null,
+ dateFormate: null,
+ defaultValue: "department",
+ displayExtension: "",
+ extendAttrMap: null,
+ extendAttrString: null,
+ field: "reviewtype",
+ hidden: false,
+ keyAttr: false,
+ prefix: null,
+ readOnly: false,
+ referConfig: null,
+ required: false,
+ selectLibFlag: null,
+ showField: null,
+ suffix: null,
+ text: "绫诲瀷",
+ tooltips: null,
+ type: "combox",
+ unique: false,
+ verify: "",
+ dicData: [{
+ label: '娴嬭瘯1',
+ value: 'department'
+ }, {
+ label: '娴嬭瘯2',
+ value: 'departments'
+ }]
+ },
+ {
+ comboxKey: null,
+ customClass: null,
+ data: null,
+ dateFormate: null,
+ defaultValue: "",
+ displayExtension: "",
+ extendAttrMap: null,
+ extendAttrString: null,
+ field: "creator",
+ hidden: true,
+ keyAttr: false,
+ prefix: null,
+ readOnly: true,
+ referConfig: null,
+ required: false,
+ selectLibFlag: null,
+ showField: null,
+ suffix: null,
+ text: "鍒涘缓浜�",
+ tooltips: null,
+ type: "text",
+ unique: false,
+ verify: ""
+ },
+ {
+ comboxKey: null,
+ customClass: null,
+ data: null,
+ dateFormate: "yyyy-MM-dd HH:mm:ss",
+ defaultValue: "",
+ displayExtension: "",
+ extendAttrMap: null,
+ extendAttrString: null,
+ field: "createtime",
+ hidden: true,
+ keyAttr: false,
+ prefix: null,
+ readOnly: false,
+ referConfig: null,
+ required: false,
+ selectLibFlag: null,
+ showField: null,
+ suffix: null,
+ text: "鍒涘缓鏃堕棿",
+ tooltips: null,
+ type: "datetime",
+ unique: false,
+ verify: ""
+ },
+ {
+ comboxKey: null,
+ customClass: null,
+ data: null,
+ dateFormate: null,
+ defaultValue: "",
+ displayExtension: "",
+ extendAttrMap: null,
+ extendAttrString: null,
+ field: "content",
+ hidden: false,
+ keyAttr: false,
+ prefix: null,
+ readOnly: false,
+ referConfig: null,
+ required: false,
+ selectLibFlag: null,
+ showField: null,
+ suffix: null,
+ text: "澶囨敞",
+ tooltips: null,
+ type: "textarea",
+ unique: false,
+ verify: ""
+ },
+ ],
}
},
computed: {
basicButtonList() {
- // const basicColumn = this.butttonList.filter(item => item.id !== 'launchworkflow'); // 棣栧厛杩囨护鍑烘潵鍩虹琛ㄥ崟浜嬩欢鐨勬寜閽�
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'); // 杩囨护鍑烘潵鎿嶄綔鏍忓睍绀虹殑鎸夐挳
+ } 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'); // 杩囨护鍑烘潵鎿嶄綔鏍忓睍绀虹殑鎸夐挳
return {
top: top,
- menu: menu
+ menu: menu,
};
}
}
},
methods: {
+ //琛ㄦ牸鏍戦粯璁ゆ柊澧炲瓙椤�
+ handleDefaultAddChildren(row){
+ this.visible = true;
+ this.formName = '鏂板瀛愮骇'
+ this.$refs.dynamicForm.form = row;
+ },
buttonClick(item) {
- this.$emit('buttonClick', this.scope, item)
+ // 鏍规嵁 type 鏉′欢鍔ㄦ�佸紩鍏ヤ笉鍚岀殑JS鏂囦欢锛屽苟浼犻�� item this 鍙傛暟
+ if (this.type === 'table') {
+ import('@/views/base/buttonTable').then(module => {
+ const buttonClickTable = module.default;
+ buttonClickTable.buttonClick(item,this);
+ })
+ } else if (this.type === 'form') {
+ import('@/views/base/buttonForm').then(module => {
+ const buttonClickForm = module.default;
+ buttonClickForm.buttonClick(item,this);
+ })
+ }
}
- }
+ },
}
</script>
--
Gitblit v1.9.3