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-table.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
index 2bdc3df..16d531f 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
@@ -6,6 +6,8 @@
:option="option"
:page.sync="pageType"
:table-loading="loading"
+ @row-click="rowClickChange"
+ @search-change='searchChange'
@selection-change="selectChange">
<!--top鍖哄煙鎸夐挳-->
<template slot="menuLeft" slot-scope="scope">
@@ -513,7 +515,7 @@
});
},
pageType() {
- return this.areasName.indexOf('westArea') == 0 ? this.simplePage : this.page;
+ return this.areasName === 'westArea' ? this.simplePage : this.page;
}
},
watch: {
@@ -537,12 +539,6 @@
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);
- }
}
},
created() {
@@ -555,8 +551,15 @@
}
},
methods: {
+ rowClickChange(row){
+ this.$refs.dataTable.toggleRowSelection(row);
+ },
selectChange(row) {
this.selectList = row;
+ },
+ searchChange(form,done){
+ console.log(form)
+ done()
this.$emit("setDataStore", {
area: this.areasName,
dataStore:row
--
Gitblit v1.9.3