From f399034d0f8e7960512858392d0e8a8692406773 Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期一, 13 一月 2025 18:14:33 +0800
Subject: [PATCH] 查询模板候选条件可以选择父节点，时间类型不能选择查询模板
---
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 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 243aa33..36bbd88 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
@@ -298,18 +298,33 @@
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 (['type', 'context', 'content', 'querytemplate', 'querytype'].includes(i)) continue;
- sourceDataMap['sourceData["' + i + '"]'] = item
+ if (item && item.constructor === Object) {
+ sourceDataMap['sourceData["' + i + '"]'] = JSON.stringify(item)
+ }else {
+ sourceDataMap['sourceData["' + i + '"]'] = item
+ }
}
}
@@ -324,7 +339,7 @@
},
getParams: function () {
const tableParams = {
- btmname: this.currentDefineVO.btmType,
+ btmName: this.currentDefineVO.btmType,
btmType:this.currentDefineVO.btmType,
tableDefineId: this.currentDefineVO.id,
componentOid: this.componentVO.oid,
@@ -341,7 +356,11 @@
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 url='';
+ if(this.componentVO.bsDataModel && this.componentVO.bsDataModel.indexOf('/')!=-1){
+ url=this.componentVO.bsDataModel;
+ }
+ getList(page.currentPage, page.pageSize, Object.assign({},this.params,this.query,params),url).then(res => {
let data = [];
if (res.data && res.data.data) {
data = res.data.data;
--
Gitblit v1.9.3