From fecc7305a48f8ce6e283434718da33e143885c75 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 09 四月 2024 10:03:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
index 7c7db7a..5c04b55 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">
@@ -23,7 +25,7 @@
</template>
<script>
-import {treeMenu} from '@/api/treeMyMenu'
+import {validatenull} from '@/util/validate'
export default {
name: "dynamic-table",
props: {
@@ -493,11 +495,11 @@
},
computed: {
updatedColumns() {
- const queryFields = this.componentVO.tableDefineVO.queryColumns.map(item => item.field);
+ const queryFields = !validatenull(this.componentVO.tableDefineVO.queryColumns) ? this.componentVO.tableDefineVO.queryColumns.map(item => item.field) : [];
return this.componentVO.tableDefineVO.cols[0].map(item => {
const typeValue = item.fieldType === 'text' || item.fieldType === 'combox' ? 'input' : item.fieldType; // 琛ㄥ崟Type绫诲瀷
- const search = queryFields.includes(item.field);
+ const search = queryFields.includes(item.field); // 鍒ゆ柇 field 鏄惁鍦� queryColumns 閲�
return {
align: item.align,
@@ -548,11 +550,19 @@
}
},
methods: {
+ rowClickChange(row){
+ this.$refs.dataTable.toggleRowSelection(row);
+ },
selectChange(row) {
this.selectList = row;
},
- TreeSelectChange(row) {
- this.TreeSelectList = row;
+ searchChange(form,done){
+ console.log(form)
+ done()
+ this.$emit("setDataStore", {
+ area: this.areasName,
+ dataStore:row
+ });
}
}
}
--
Gitblit v1.9.3