From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue | 47 +++++++++++++++++++++--------------------------
1 files changed, 21 insertions(+), 26 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue
index 137fb73..837849b 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue
@@ -364,23 +364,30 @@
let list = [];
let that = this;
let getValue = function (queryTemplate, item) {
- for (let key in queryTemplate.condition.cIMap) {
- if (queryTemplate.condition.cIMap[key].leaf) {
- item.clause += '.' + queryTemplate.condition.cIMap[key].leafInfo.clause;
- if (queryTemplate.condition.cIMap[key].leafInfo.value.queryTemplate) {
- getValue(queryTemplate.condition.cIMap[key].leafInfo.value.queryTemplate, item)
- } else {
- //item.ordinaryValue = queryTemplate.condition.cIMap[key].leafInfo.value.ordinaryValue;
- item.type = queryTemplate.condition.cIMap[key].leafInfo.type;
- if (['VTInteger', 'VTDouble', 'VTLong'].includes(item.type)) {
- item.operatorDic = that.operatorIntDic;
- } else if (['VTDateTime', 'VTDate', 'VTTime'].includes(item.type)) {
- item.operatorDic = that.operatorDateDic;
+ if(queryTemplate.id.indexOf('qt_')==0){
+ item.clause += '.' + queryTemplate.condition.cIMap['ci1'].leafInfo.clause;
+ item.ordinaryValue = queryTemplate.condition.cIMap['ci1'].leafInfo.value.ordinaryValue;
+ item.type = queryTemplate.condition.cIMap['ci1'].leafInfo.type;
+ }else {
+ item.ordinaryValue = queryTemplate.id+';'+queryTemplate.clauseList.join(',');
+ /*for (let key in queryTemplate.condition.cIMap) {
+ if (queryTemplate.condition.cIMap[key].leaf) {
+ item.clause += '.' + queryTemplate.condition.cIMap[key].leafInfo.clause;
+ if (queryTemplate.condition.cIMap[key].leafInfo.value.queryTemplate) {
+ getValue(queryTemplate.condition.cIMap[key].leafInfo.value.queryTemplate, item)
} else {
- item.operatorDic = that.operatorDic;
+ item.ordinaryValue = queryTemplate.condition.cIMap[key].leafInfo.value.ordinaryValue;
+ item.type = queryTemplate.condition.cIMap[key].leafInfo.type;
}
}
- }
+ }*/
+ }
+ if (['VTInteger', 'VTDouble', 'VTLong'].includes(item.type)) {
+ item.operatorDic = that.operatorIntDic;
+ } else if (['VTDateTime', 'VTDate', 'VTTime'].includes(item.type)) {
+ item.operatorDic = that.operatorDateDic;
+ } else {
+ item.operatorDic = that.operatorDic;
}
}
for (let key in val.cIMap) {
@@ -394,19 +401,7 @@
operatorDic: []
}
if (this.queryCondition.cIMap[key].leafInfo.value.queryTemplate) {
- item.ordinaryValue = this.queryCondition.cIMap[key].leafInfo.value.queryTemplate.id+';'+this.queryCondition.cIMap[key].leafInfo.value.queryTemplate.clauseList.join(',');
- if(this.queryCondition.cIMap[key].leafInfo.value.queryTemplate.id.indexOf('qt_')==0){
getValue(this.queryCondition.cIMap[key].leafInfo.value.queryTemplate, item)
- }else {
- item.type = this.queryCondition.cIMap[key].leafInfo.type;
- if (['VTInteger', 'VTDouble', 'VTLong'].includes(item.type)) {
- item.operatorDic = that.operatorIntDic;
- } else if (['VTDateTime', 'VTDate', 'VTTime'].includes(item.type)) {
- item.operatorDic = that.operatorDateDic;
- } else {
- item.operatorDic = that.operatorDic;
- }
- }
} else {
item.ordinaryValue = this.queryCondition.cIMap[key].leafInfo.value.ordinaryValue;
item.type = this.queryCondition.cIMap[key].leafInfo.type;
--
Gitblit v1.9.3