From deb9457cbf67185699de2cd6dbc1ec5690584da0 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 06 九月 2024 12:30:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue | 82 +++++++++++++++++++++++++++++-----------
1 files changed, 59 insertions(+), 23 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 b997c17..96e4274 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
@@ -25,7 +25,7 @@
</div>
</div>
<div v-else @drop="drop" @dragover.prevent style="height: 220px;text-align: left">
- <avue-tree ref="tree" @node-drop="handleDrop" style="height: 220px" :data="treeData" :option="treeOption" @node-click="nodeClick" node-key="value"></avue-tree>
+ <avue-tree ref="tree" @node-drop="handleDrop" @node-drag-end="handleDragEnd" style="height: 220px" :data="treeData" :option="treeOption" @node-click="nodeClick" node-key="value"></avue-tree>
</div>
<div style="text-align: right;margin-top: 10px;">
<el-button v-if="radioForm==1" plain size="mini" type="primary" @click="addHandler">澧炲姞閫昏緫</el-button>
@@ -379,12 +379,20 @@
let inputValue='';
let operator='';
let showLabel=''
- if(values.length>1){
- operator=values[1];
- if(values.length>2){
- inputValue=values[2];
+ if(item.column.indexOf('not in')!=-1){
+ operator='not in';
+ if(values.length>3){
+ inputValue=values[3];
+ }
+ }else{
+ if(values.length>1){
+ operator=values[1];
+ if(values.length>2){
+ inputValue=values[2];
+ }
}
}
+
if(values[0].indexOf('.')!=-1){
const labels=values[0].split('.')
showLabel=labels[labels.length-1];
@@ -462,18 +470,38 @@
this.$message.error('璇烽�変腑閫昏緫鏉′欢娣诲姞鏌ヨ椤�');
return;
}
- this.treeIndex++;
- this.$refs.tree.append({
- label: data.value,
- value: data.value + this.treeIndex,
- valueIndex: 'v' + this.treeIndex,
- children: []
- }, this.clickNode);
+ this.$refs.tree.append(this.initItem(data), this.clickNode);
}
+ },
+ initItem(data){
+ this.treeIndex++;
+ let item={
+ label: data.value,
+ value: data.value + this.treeIndex,
+ valueIndex: 'v' + this.treeIndex,
+ type:data.vtDataType,
+ children: [],
+ inputValue:data.value,
+ operator:'=',
+ showLabel:data.value
+ };
+ let showLabel='';
+ if(data.value.indexOf('.')!=-1){
+ const labels=data.value.split('.')
+ showLabel=labels[labels.length-1];
+ }else {
+ showLabel=data.value;
+ }
+ item.showLabel=showLabel;
+ return item
},
handleDrop(draggingNode, dropNode, dropType, ev) {
debugger;
console.log('tree drop: ', dropNode.label, dropType);
+ },
+ handleDragEnd(draggingNode, dropNode, dropType, ev) {
+ debugger;
+ console.log('tree drag end: ', dropNode && dropNode.label, dropType);
},
//鍒犻櫎鏅�氭煡璇㈡潯浠�
delCondition(index) {
@@ -498,9 +526,13 @@
if(node.children){
this.clearTreeValue(node.children)
}else {
- let values=node.label.split(' ');
- if(values.length>2){
- node.label=values[0]+' '+values[1];
+ if(node.label.indexOf('not in')!=-1){
+ node.label=node.label.split(' ')[0]+' not in'
+ }else {
+ let values = node.label.split(' ');
+ if (values.length > 2) {
+ node.label = values[0] + ' ' + values[1];
+ }
}
}
})
@@ -610,15 +642,19 @@
//鏌ヨ鏉′欢淇濆瓨
submitDialog() {
const values= this.clickNode.label.split(' ');
- if(['VTDateTime'].includes(this.clickNode.type)){
- this.clickNode.label = values[0]+' '+this.clickNode.operator+' '+dateFormat(this.clickNode.inputValue);
- }else if(['VTDate'].includes(this.clickNode.type)){
- this.clickNode.label = values[0]+' '+this.clickNode.operator+' '+dateFormat(this.clickNode.inputValue ,'yyyy-MM-dd');
- }else if(['VTTime'].includes(this.clickNode.type)){
- this.clickNode.label = values[0]+' '+this.clickNode.operator+' '+dateFormat(this.clickNode.inputValue ,'hh:mm:ss');
- }else {
- this.clickNode.label = values[0]+' '+this.clickNode.operator+' '+this.clickNode.inputValue;
+ this.clickNode.label = values[0]+' '+this.clickNode.operator+' '+this.clickNode.inputValue;
+ try{
+ if(['VTDateTime'].includes(this.clickNode.type)){
+ this.clickNode.label = values[0]+' '+this.clickNode.operator+' '+dateFormat(this.clickNode.inputValue);
+ }else if(['VTDate'].includes(this.clickNode.type)){
+ this.clickNode.label = values[0]+' '+this.clickNode.operator+' '+dateFormat(this.clickNode.inputValue ,'yyyy-MM-dd');
+ }else if(['VTTime'].includes(this.clickNode.type)){
+ this.clickNode.label = values[0]+' '+this.clickNode.operator+' '+dateFormat(this.clickNode.inputValue ,'hh:mm:ss');
+ }
+ }catch (e) {
+
}
+
this.dialog.showDialog = false;
},
//鑾峰彇鏌ヨ妯℃澘鍒楄〃
--
Gitblit v1.9.3