From 9c67a9d48ec6a71e2d4edf11fae3f5e802a97bff Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 19 十一月 2024 16:35:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
index 9d71bfd..8cc40c2 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
@@ -58,6 +58,9 @@
:size="scope.size"></el-button>
</el-tooltip>
</template>
+ <template #icon="{ row }">
+ <i :class="'iconfont '+row.icon"> </i>
+ </template>
</avue-crud>
</div>
</template>
@@ -202,7 +205,6 @@
},
isShow: {
handler(newval) {
- debugger;
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;
}
@@ -227,7 +229,7 @@
},
'sourceData':{
handler(newval) {
- if(newval) {
+ if(newval && Object.keys(newval).length>0) {
this.sourceDataMapParams=this.sourceDataMap();
this.getParams();
this.handleRefresh();
@@ -327,6 +329,7 @@
},
onLoad(page, params = {}) {
if (Object.keys(this.sourceData).length>0 && this.isShow) {
+ this.tableList = [];
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign({},this.params,this.query,params)).then(res => {
let data = [];
@@ -353,7 +356,7 @@
this.$refs.dataTable.rowView(row,index)
},
rowClickChange(row){
- this.$refs.dataTable.toggleRowSelection(row);
+ this.$refs.dataTable.toggleRowSelection(row,true);
},
selectChange(row) {
this.selectList = row;
@@ -400,6 +403,7 @@
this.onLoad(this.page,parms);
},
searchReset() {
+ console.log('searchReset')
this.query = {};
this.onLoad(this.page);
},
@@ -412,6 +416,7 @@
}
},
handleRefresh(type) {
+ console.log('handleRefresh')
this.onLoad(this.page);
},
rowExcel() {
--
Gitblit v1.9.3