From 353efff194122e281925a390be5d576c2f4fff6d Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 27 三月 2024 18:04:04 +0800
Subject: [PATCH] UI上下文展示引擎

---
 Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 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..2bdc3df 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
@@ -24,6 +24,7 @@
 
 <script>
 import {treeMenu} from '@/api/treeMyMenu'
+import {validatenull} from '@/util/validate'
 export default {
   name: "dynamic-table",
   props: {
@@ -493,11 +494,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,
@@ -512,7 +513,7 @@
       });
     },
     pageType() {
-      return this.areasName === 'westArea' ? this.simplePage : this.page;
+      return this.areasName.indexOf('westArea') == 0  ? this.simplePage : this.page;
     }
   },
   watch: {
@@ -536,6 +537,12 @@
           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() {
@@ -550,9 +557,10 @@
   methods: {
     selectChange(row) {
       this.selectList = row;
-    },
-    TreeSelectChange(row) {
-      this.TreeSelectList = row;
+      this.$emit("setDataStore", {
+        area: this.areasName,
+        dataStore:row
+      });
     }
   }
 }

--
Gitblit v1.9.3