From 926d1a1a4f06271cb39de001d74c68832fc004c7 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 26 三月 2024 17:12:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue | 67 +++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 20 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
index 8da8fb6..774c6e4 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
@@ -1,19 +1,22 @@
<template>
- <div class="UI-dynamic" :id="'UI-dynamic-'+areasName+componentVO.oid">
- <avue-crud v-model="form"
- ref="dataTable"
+ <div :id="'UI-dynamic-'+areasName+componentVO.oid" class="UI-dynamic">
+ <avue-crud ref="dataTable"
+ v-model="form"
:data="tableList"
:option="option"
- :page.sync="page"
- :table-loading="loading">
+ :page.sync="pageType"
+ :table-loading="loading"
+ @selection-change="selectChange">
<!--top鍖哄煙鎸夐挳-->
<template slot="menuLeft" slot-scope="scope">
- <dynamic-button LocationType="top" type="table":butttonList="componentVO.buttons" ></dynamic-button>
+ <dynamic-button :butttonList="componentVO.buttons" :selectList="selectList" LocationType="top"
+ type="table"></dynamic-button>
</template>
<!--menu鍖哄煙鎸夐挳-->
<template slot="menu" slot-scope="scope">
- <dynamic-button :scope="scope" LocationType="menu" type="table":butttonList="componentVO.buttons" ></dynamic-button>
+ <dynamic-button :butttonList="componentVO.buttons" :scope="scope" :selectList="selectList" LocationType="menu"
+ type="table"></dynamic-button>
</template>
</avue-crud>
</div>
@@ -49,18 +52,30 @@
type: Boolean,
default: true
},
+ dataStore: {
+ //寮圭獥鏃舵寜閽墍灞炲尯鍩熼�変腑鏁版嵁
+ type: Array,
+ default: []
+ },
+ tableType: {
+ type: String
+ }
},
data() {
return {
- parentHeight:'100%',//褰撳墠缁勪欢鏍硅妭鐐瑰厓绱犻珮搴�
+ parentHeight: '100%',//褰撳墠缁勪欢鏍硅妭鐐瑰厓绱犻珮搴�
form: {},
- formName: '',
loading: false,
- visible: false,
page: {
pageSize: 10,
currentPage: 1,
- total: 5,
+ total: 50,
+ },
+ simplePage: {
+ currentPage: 1,
+ total: 100,
+ pagerCount: 4,
+ layout: "prev, pager, next"
},
//琛ㄦ牸鏁版嵁
tableList: [
@@ -462,12 +477,15 @@
addBtn: false,
editBtn: false,
delBtn: false,
+ selection: true,
+ tip: false,
height: '100%',
calcHeight: 15,
indexFixed: false,
menuFixed: false,
column: [],
},
+ selectList: [],
}
},
computed: {
@@ -486,14 +504,17 @@
};
});
},
+ pageType() {
+ return this.areasName === 'westArea' ? this.simplePage : this.page;
+ }
},
- watch:{
- parentHeight:{
+ watch: {
+ parentHeight: {
handler(newval) {
- if(newval >50){
- this.option.height=newval;
+ if (newval > 50) {
+ this.option.height = newval;
//doLayout涓嶇敓鏁堬紝鎵嬪姩璁剧疆琛ㄦ牸楂樺害
- this.$children[0].$children[1].$children[1].$children[0].$el.style.height=newval+'px';
+ this.$children[0].$children[1].$children[1].$children[0].$el.style.height = newval + 'px';
/*this.$nextTick(() => {
if (this.$refs.dataTable && this.$refs.dataTable.doLayout) {
this.$refs.dataTable.doLayout();
@@ -502,24 +523,30 @@
}
}
},
- isShow:{
+ isShow: {
handler(newval) {
- if(newval && this.$el.clientHeight>50) {
+ if (newval && this.$el.clientHeight > 50) {
this.parentHeight = this.$el.clientHeight - this.$children[0].$children[1].$children[0].$el.clientHeight - this.$children[0].$children[2].$el.clientHeight - 5;
}
}
}
},
created() {
- this.option.column=this.updatedColumns;
+ this.option.column = this.updatedColumns;
},
mounted() {
- if(this.$el.clientHeight>50) {
+ if (this.$el.clientHeight > 50) {
//鐖跺厓绱犻珮搴�-鎸夐挳楂樺害-鍒嗛〉楂樺害
this.parentHeight = this.$el.clientHeight - this.$children[0].$children[1].$children[0].$el.clientHeight - this.$children[0].$children[2].$el.clientHeight - 5;
}
},
methods: {
+ selectChange(row) {
+ this.selectList = row;
+ },
+ TreeSelectChange(row) {
+ this.TreeSelectList = row;
+ }
}
}
</script>
--
Gitblit v1.9.3