From 9c06f1650313b76c8e1c06ac35a18dce44664320 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 十一月 2024 15:05:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 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 9d71bfd..b8ecc68 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鍖哄煙鎸夐挳-->
@@ -57,6 +57,14 @@
           <el-button icon="el-icon-refresh" circle @click="$refs.dataTable.refreshChange()"
                      :size="scope.size"></el-button>
         </el-tooltip>
+      </template>
+      <template #icon="{ row }">
+          <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>
@@ -202,7 +210,6 @@
     },
     isShow: {
       handler(newval) {
-        debugger;
         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;
         }
@@ -227,7 +234,7 @@
     },
     'sourceData':{
       handler(newval) {
-        if(newval) {
+        if(newval && Object.keys(newval).length>0) {
           this.sourceDataMapParams=this.sourceDataMap();
           this.getParams();
           this.handleRefresh();
@@ -296,7 +303,7 @@
         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 (['type', 'context', 'content', 'querytemplate', 'querytype'].includes(i)) continue;
           sourceDataMap['sourceData["' + i + '"]'] = item
         }
       }
@@ -304,7 +311,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'].includes(j)) continue;
           sourceDataMap['sourceData["' + j + '"]'] = this.paramVOS[j]
         }
       }
@@ -327,6 +334,7 @@
     },
     onLoad(page, params = {}) {
       if (Object.keys(this.sourceData).length>0 && this.isShow) {
+        this.tableList = [];
         this.loading = true;
         getList(page.currentPage, page.pageSize, Object.assign({},this.params,this.query,params)).then(res => {
           let data = [];
@@ -353,7 +361,7 @@
       this.$refs.dataTable.rowView(row,index)
     },
     rowClickChange(row){
-      this.$refs.dataTable.toggleRowSelection(row);
+      this.$refs.dataTable.toggleRowSelection(row,true);
     },
     selectChange(row) {
       this.selectList = row;
@@ -400,6 +408,7 @@
       this.onLoad(this.page,parms);
     },
     searchReset() {
+      console.log('searchReset')
       this.query = {};
       this.onLoad(this.page);
     },
@@ -412,6 +421,7 @@
       }
     },
     handleRefresh(type) {
+      console.log('handleRefresh')
       this.onLoad(this.page);
     },
     rowExcel() {

--
Gitblit v1.9.3