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-TreeTable.vue | 192 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 185 insertions(+), 7 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-TreeTable.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-TreeTable.vue
index 28b19a6..b563d16 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-TreeTable.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-TreeTable.vue
@@ -5,6 +5,7 @@
:data="TreeData"
:option="option"
:page.sync="pageType"
+ @row-click="rowClickChange"
@selection-change="TreeSelectChange">
<template #icon="scope">
<i :class="scope.row.icon"
@@ -12,14 +13,14 @@
</template>
<!--top鍖哄煙鎸夐挳-->
<template slot="menuLeft" slot-scope="scope">
- <dynamic-button :butttonList="componentVO.buttons" :selectList="selectList" LocationType="top"
- type="table"></dynamic-button>
+ <dynamic-button :butttonList="componentVO.buttons" :selectList="TreeSelectList" LocationType="top"
+ type="TreeTable"></dynamic-button>
</template>
<!--menu鍖哄煙鎸夐挳-->
<template slot="menu" slot-scope="scope">
- <dynamic-button :butttonList="componentVO.buttons" :scope="scope" :selectList="selectList" LocationType="menu"
- type="table"></dynamic-button>
+ <dynamic-button :butttonList="componentVO.buttons" :scope="scope" :selectList="TreeSelectList" LocationType="menu" default="default"
+ type="TreeTable"></dynamic-button>
</template>
</avue-crud>
</div>
@@ -180,7 +181,170 @@
comment: '鏃�'
},
],
- TreeSelectList: []
+ TreeSelectList: [],
+ // 琛ㄥ崟鏁版嵁
+ 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: ""
+ },
+ ],
+ formName: '',
+ visible:false
}
},
watch: {
@@ -204,6 +368,13 @@
this.parentHeight = this.$el.clientHeight - this.$children[0].$children[1].$children[0].$el.clientHeight - this.$children[0].$children[2].$el.clientHeight - 5;
}
}
+ },
+ sourceData:{
+ handler(newval) {
+ //婧愭暟鎹湁鍙樺寲鏃跺彉鏇村綋鍓嶅尯鍩熸暟鎹�
+ console.log(this.areasName);
+ console.log(newval);
+ }
}
},
mounted() {
@@ -214,13 +385,20 @@
},
computed: {
pageType() {
- return this.areasName === 'westArea' ? this.simplePage : this.page;
+ return this.areasName.indexOf('westArea') == 0 ? this.simplePage : this.page;
}
},
methods: {
+ rowClickChange(row){
+ this.$refs.treeTable.toggleRowSelection(row);
+ },
TreeSelectChange(row) {
this.TreeSelectList = row;
- }
+ this.$emit("setDataStore", {
+ area: this.areasName,
+ dataStore:row
+ });
+ },
}
}
</script>
--
Gitblit v1.9.3