From 893ce756a697d6b2b8c13cbfa56119218d6894f4 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 29 十一月 2024 11:11:01 +0800
Subject: [PATCH] 修改sourceData绑定值

---
 Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue |   50 ++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 36 insertions(+), 14 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 8cc40c2..35cbcb8 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
@@ -4,15 +4,15 @@
                v-model="form"
                :data="tableList"
                :option="option"
-               :page.sync="pageType"
+               :page.sync="componentVO.uiComponentType == 'TreeTable'?{}:pageType"
                :table-loading="loading"
                @on-load="onLoad"
                @search-reset="searchReset"
+               @search-change='searchChange'
                @refresh-change="handleRefresh"
                @current-change="currentChange"
                @size-change="sizeChange"
                @row-click="rowClickChange"
-               @search-change='searchChange'
                @filter="filterChange"
                @selection-change="selectChange">
       <!--top鍖哄煙鎸夐挳-->
@@ -59,7 +59,12 @@
         </el-tooltip>
       </template>
       <template #icon="{ row }">
-          <i :class="'iconfont '+row.icon"> </i>
+          <span class="avue-icon avue-icon--small">
+            <svg v-if="row.icon && row.icon.indexOf('#')==0" aria-hidden="true">
+              <use :xlink:href="row.icon"></use>
+            </svg>
+            <i v-else :class="row.icon"></i>
+          </span>
       </template>
     </avue-crud>
   </div>
@@ -206,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();
@@ -265,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) {
@@ -275,30 +281,46 @@
         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
         };
       });
     },
     sourceDataMap: function () {
       const sourceDataMap = {};
       if (Object.keys(this.sourceData).length>0) {
-        if(this.sourceData.oid ) {
-          if (this.sourceData.oid.indexOf('@vcitreesep@') > -1) {
-            this.sourceData.oid = this.sourceData.oid.split('@vcitreesep@')[1];
+        if(this.sourceData.part && Object.keys(this.sourceData.part).length>0){
+          //璇存槑婧愭暟鎹槸鏍戣妭鐐�
+          if(this.sourceData.part.oid ) {
+            if (this.sourceData.part.oid.indexOf('@vcitreesep@') > -1) {
+              this.sourceData.part.oid = this.sourceData.oid.split('@vcitreesep@')[1];
+            }
+            sourceDataMap.sourceBtmName = this.sourceBtmType;
+            sourceDataMap.sourceOid = this.sourceData.part.oid;
           }
-          sourceDataMap.sourceBtmName = this.sourceBtmType;;
-          sourceDataMap.sourceOid = this.sourceData.oid;
+        }else {
+          if(this.sourceData.oid ) {
+            if (this.sourceData.oid.indexOf('@vcitreesep@') > -1) {
+              this.sourceData.oid = this.sourceData.oid.split('@vcitreesep@')[1];
+            }
+            sourceDataMap.sourceBtmName = this.sourceBtmType;
+            sourceDataMap.sourceOid = this.sourceData.oid;
+          }
         }
+
         for (let i in this.sourceData) {
           const item = this.sourceData[i]
-          if (item && item.constructor === Object) continue;
-          if (i == 'type' || i == 'context' || i == 'content') continue;
+          //if (item && item.constructor === Object) continue; //鏍戣妭鐐瑰瓙闆嗘槸瀵硅薄
+          if (['type', 'context', 'content', 'querytemplate', 'querytype'].includes(i)) continue;
           sourceDataMap['sourceData["' + i + '"]'] = item
         }
       }
@@ -306,7 +328,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 (j == 'type' || j == 'context' || j == 'content' || j == "getdataurl" || j == "getdatamethod" || j == "url" || j == "method" || j == "uploadfileurl" || j == "title") 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