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 | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 662bea2..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鍖哄煙鎸夐挳-->
@@ -60,7 +60,7 @@
</template>
<template #icon="{ row }">
<span class="avue-icon avue-icon--small">
- <svg v-if="row.icon && row.icon.indexOf('#')==-1" aria-hidden="true">
+ <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>
@@ -303,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
}
}
@@ -311,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]
}
}
--
Gitblit v1.9.3