From 3b3fd904b9b34e77445d749bca8c28beadcaf3db Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 27 十一月 2024 14:35:50 +0800
Subject: [PATCH] 查询模板查询条件显示

---
 Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 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 b8ecc68..243aa33 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
@@ -211,7 +211,7 @@
     isShow: {
       handler(newval) {
         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;
+          this.parentHeight = this.$el.clientHeight - this.$children[0].$children[1].$children[0].$el.clientHeight - (this.$children[0].$children[2].$el.clientHeight || 57) - 5;
         }
         if(newval){
           this.handleRefresh();
@@ -270,6 +270,7 @@
       const queryFields = !validatenull(this.currentDefineVO.queryColumns) ? this.currentDefineVO.queryColumns.map(item => item.field) : [];
       return this.currentDefineVO.cols[0].map(item => {
         const search = queryFields.includes(item.field); // 鍒ゆ柇 field 鏄惁鍦� queryColumns 閲�
+        item.type = this.columnType[item.fieldType] || item.fieldType;
         if (this.currentDefineVO.btmType == 'fileobject' && item.field == 'name') {
           //鏄枃浠�
           item.formatter = function (d) {
@@ -280,13 +281,17 @@
         if (typeof formatter == "string" && formatter != '') {
           formatter = eval("(" + formatter + ")");
         }
-        item.type = this.columnType[item.fieldType] || item.fieldType;
+        if (['date', 'datetime', 'time'].includes(item.type)) {
+          item.valueFormat = item.dateFormate;
+          item.format = item.dateFormate;
+        }
         return {
           ...item,
           prop: item.field,
           label: item.title,
           search: search,
-          formatter: formatter
+          formatter: formatter,
+          overHidden: true
         };
       });
     },
@@ -311,7 +316,7 @@
       if (Object.keys(this.paramVOS).length>0) {
         for (let j in this.paramVOS) {
           if (this.paramVOS[j] && this.paramVOS[j].constructor === Object) continue;
-          if (['type', 'context', 'content', "getdataurl", "getdatamethod", "url", "method", "uploadfileurl", "title", 'querytemplate', 'querytype', 'usesourcedata'].includes(j)) continue;
+          if (['type', 'context', 'content', "getdataurl", "getdatamethod", "url", "method", "uploadfileurl", "title", 'querytemplate', 'querytype', 'usesourcedata','component'].includes(j)) continue;
           sourceDataMap['sourceData["' + j + '"]'] = this.paramVOS[j]
         }
       }

--
Gitblit v1.9.3