From d2008fc35a45ff00b0f37939a13b792ab12e8c6f Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 十一月 2024 10:25:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue | 18 +++++++++++++++---
1 files changed, 15 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 6dca0c5..662bea2 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,14 @@
:size="scope.size"></el-button>
</el-tooltip>
</template>
+ <template #icon="{ row }">
+ <span class="avue-icon avue-icon--small">
+ <svg v-if="row.icon && row.icon.indexOf('#')==-1" aria-hidden="true">
+ <use :xlink:href="row.icon"></use>
+ </svg>
+ <i v-else :class="row.icon"></i>
+ </span>
+ </template>
</avue-crud>
</div>
</template>
@@ -143,6 +151,8 @@
//琛ㄦ牸鏁版嵁
tableList: [],
option: {
+ border:true,
+ stripe:true,
index: true,
addBtn: false,
editBtn: false,
@@ -200,7 +210,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;
}
@@ -225,7 +234,7 @@
},
'sourceData':{
handler(newval) {
- if(newval) {
+ if(newval && Object.keys(newval).length>0) {
this.sourceDataMapParams=this.sourceDataMap();
this.getParams();
this.handleRefresh();
@@ -325,6 +334,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 = [];
@@ -351,7 +361,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;
@@ -398,6 +408,7 @@
this.onLoad(this.page,parms);
},
searchReset() {
+ console.log('searchReset')
this.query = {};
this.onLoad(this.page);
},
@@ -410,6 +421,7 @@
}
},
handleRefresh(type) {
+ console.log('handleRefresh')
this.onLoad(this.page);
},
rowExcel() {
--
Gitblit v1.9.3