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/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue | 16 +++-------------
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue | 15 ++++++++-------
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue | 11 ++---------
3 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue
index 3056f86..467db02 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue
@@ -226,11 +226,7 @@
return false;
},
allowDrag: (dropNode) => {
- if (dropNode.data.attrs && dropNode.data.attrs.length > 0) {
- return false;
- } else {
- return true;
- }
+ return true;
},
props: {
label: 'name',
@@ -426,10 +422,7 @@
},
businessQueryDefineChange(data) {
if (data.value) {
- this.businessTreeData = [{
- name: data.value,
- attrs: data.item.attrs
- }]
+ this.businessTreeData = [data.item]
}
},
// 寮�濮嬫嫋鎷芥爲鑺傜偣浜嬩欢
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
index 4147ca2..06fff09 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
@@ -286,11 +286,7 @@
return false;
},
allowDrag: (dropNode) => {
- if (dropNode.data.attrs && dropNode.data.attrs.length>0) {
- return false;
- } else {
- return true;
- }
+ return true;
},
props:{
label:'name',
@@ -559,18 +555,12 @@
},
linkQueryDefineChange(data) {
if (data.value) {
- this.linkTreeData = [{
- name: data.value,
- attrs: data.item.attrs
- }]
+ this.linkTreeData = [ data.item]
}
},
businessQueryDefineChange(data) {
if (data.value) {
- this.businessTreeData = [{
- name: data.value,
- attrs: data.item.attrs
- }]
+ this.businessTreeData = [ data.item]
}
},
// 寮�濮嬫嫋鎷芥爲鑺傜偣浜嬩欢
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 837849b..73a0c21 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
@@ -13,18 +13,18 @@
style="width: 32%;display: inline-block;text-align: right;word-break: break-all">{{ condition.clause }}</span>
<avue-select v-model="condition.operator" :clearable="false" :dic="condition.operatorDic" :disabled="readOnly"
style="width: 80px;margin: 0 5px;" type="tree"></avue-select>
- <!--<el-date-picker v-if="condition.type=='VTDate'" v-model="condition.ordinaryValue" :disabled="readOnly"
- style="width:300px;margin-right: 5px;display: inline-block;" type="date"
+ <el-date-picker v-if="condition.type=='VTDate'" v-model="condition.ordinaryValue" :disabled="readOnly"
+ style="width:36%;margin-right: 5px;display: inline-block;" type="date"
value-format="YYYY-MM-DD">
</el-date-picker>
<el-date-picker v-else-if="condition.type=='VTDateTime'" v-model="condition.ordinaryValue" :disabled="readOnly"
- style="width:300px;margin-right: 5px;display: inline-block;"
+ style="width:36%;margin-right: 5px;display: inline-block;"
type="datetime">
</el-date-picker>
<el-time-select v-else-if="condition.type=='VTTime'" v-model="condition.ordinaryValue" :disabled="readOnly"
- style="width:300px;margin-right: 5px;display: inline-block;" value-format="HH:mm:ss">
+ style="width:36%;margin-right: 5px;display: inline-block;" value-format="HH:mm:ss">
</el-time-select>
- <avue-input-number v-else-if="condition.type=='VTInteger'" v-model="condition.ordinaryValue"
+ <!--<avue-input-number v-else-if="condition.type=='VTInteger'" v-model="condition.ordinaryValue"
:disabled="readOnly"
precision="0"
style="width:300px;margin-right: 5px;display: inline-block;"></avue-input-number>
@@ -34,7 +34,7 @@
style="width:300px;margin-right: 5px;display: inline-block;"></avue-input-number>
<avue-input v-else v-model="condition.ordinaryValue" :disabled="readOnly" placeholder=""
style="width: 300px;margin-right: 5px;"></avue-input>-->
- <avue-input v-model="condition.ordinaryValue" :disabled="readOnly" placeholder=""
+ <avue-input v-else v-model="condition.ordinaryValue" :disabled="readOnly" placeholder=""
style="width: 36%;margin-right: 5px;"></avue-input>
<el-button v-if="!readOnly" plain size="mini" type="primary" @click="checkTemp(index)">閫夋嫨鏌ヨ妯℃澘</el-button>
<el-button v-if="!readOnly" icon="el-icon-delete" size="mini" style="padding: 7px 8px" type="danger"
@@ -681,7 +681,8 @@
//閫夋嫨鏌ヨ妯℃澘
checkTemp(index) {
if (index >= 0) {
- if (['VTInteger', 'VTDouble', 'VTLong', 'VTDateTime', 'VTDate', 'VTTime'].includes(this.conditionList[index].type)) {
+ if (['VTDateTime', 'VTDate', 'VTTime'].includes(this.conditionList[index].type)) {
+ this.$message.warning("璇ュ睘鎬х被鍨嬩笉鑳介�夋嫨鏌ヨ妯℃澘");
return false;
}
}
--
Gitblit v1.9.3