From a34c10535d130c4be667301434a0e8072ee82716 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 14 十月 2024 15:21:48 +0800
Subject: [PATCH] 整合代码，修改表单定义按钮排列方式

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue |   70 ++++++++++++++++++++---------------
 1 files changed, 40 insertions(+), 30 deletions(-)

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 d37c1d1..23931d1 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
@@ -60,6 +60,7 @@
                                :queryCondition="queryCondition"
                                :queryTree="queryTree"
                                :levelFlag.sync="form.levelFlag"
+                               @queryHandler="queryHandler"
             ></form-query-dialog>
           </fieldset>
         </el-main>
@@ -85,7 +86,7 @@
 
 <script>
 import {getAllOrderbyAttributeByLink} from "@/api/modeling/linkType/api";
-import {linkSave} from "@/api/queryTemplate/linkTypeQuery";
+import {linkSave,getCriteria} from "@/api/queryTemplate/linkTypeQuery";
 import basicOption from "@/util/basic-option";
 import {queryTemplateListByAttr} from "@/api/queryTemplate/queryDefine";
 import formQueryDialog from "./formQueryDialog.vue";
@@ -97,15 +98,11 @@
       dialog: {
         showDialog: false,
         title: "鍒涘缓",
-        submitTxt: "淇濆瓨",
-        submitIcon: "el-icon-check",
         loading: false,
         type: "add",
       },
       crudDialog: {
         showDialog: false,
-        submitTxt: "淇濆瓨",
-        submitIcon: "el-icon-check",
       },
       formItems:[{
         label: '鏌ヨ妯℃澘鍚嶇О',
@@ -268,12 +265,21 @@
         addBtn: false,
         filter:false,
         draggable: true,
-        allowDrop: () => {
+        allowDrop: (node) => {
           return false;
         },
-        allowDrag: () => {
-          return true;
+        allowDrag: (dropNode) => {
+          if (dropNode.data.attrs && dropNode.data.attrs.length>0) {
+            return false;
+          } else {
+            return true;
+          }
         },
+        props:{
+          label:'name',
+          value:'name',
+          children:'attrs'
+        }
       },
       linkQueryDefineForm:'',//閾炬帴绫诲瀷鏌ヨ妯℃澘瀹氫箟閫変腑鍊�
       linkQueryDefineDic:[],//閾炬帴绫诲瀷鏌ヨ妯℃澘瀹氫箟涓嬫媺鏁版嵁
@@ -369,7 +375,9 @@
         };
       }
       this.dialog.showDialog = true;
+      this.treeOption.defaultExpandedKeys=[data.treeData.label]
       this.getTemp(data.treeData.label, true)
+
     },
     cancelDialog() {
       this.dialog.loading = false;
@@ -516,7 +524,7 @@
     //鑾峰彇鏌ヨ妯℃澘瀹氫箟涓嬫媺
     getTemp(btmName,linkFlag) {
       if (btmName) {
-        queryTemplateListByAttr({btmName: btmName, linkFlag: linkFlag,direction:this.form.direction}).then(res => {
+        queryTemplateListByAttr({btmName: btmName, linkFlag: linkFlag,direction:linkFlag?null:this.form.direction}).then(res => {
           const data = res.data.data.map(item => {
             item.label = item.name + '-' + (item.linkTypeName || item.btmName);
             item.value = item.name;
@@ -534,33 +542,17 @@
     },
     linkQueryDefineChange(data) {
       if (data.value) {
-        const childData = data.item.attrs.map(item => {
-          return {
-            label: item.name,
-            value: item.name,
-            atttributes:item
-          };
-        });
         this.linkTreeData = [{
-          label: data.value,
-          value: data.value,
-          children: childData
+          name: data.value,
+          attrs: data.item.attrs
         }]
       }
     },
     businessQueryDefineChange(data) {
       if (data.value) {
-        const childData = data.item.attrs.map(item => {
-          return {
-            label: item.name,
-            value: item.name,
-            atttributes:item
-          };
-        });
         this.businessTreeData = [{
-          label: data.value,
-          value: data.value,
-          children: childData
+          name: data.value,
+          attrs: data.item.attrs
         }]
       }
     },
@@ -576,7 +568,25 @@
       if(this.form.levelFlag==1) {
         this.$refs.formQuery.$refs.tree.$emit('tree-node-drag-end', ev);
       }
-    }
+    },
+    //鏌ヨ
+    queryHandler(){
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.$refs.formQuery.queryResultDialog.loading=true;
+          const formData=this.initFormData();
+          getCriteria(formData).then(res => {
+            if (res.data.success) {
+              this.resultData=res.data.data;
+              this.$refs.formQuery.queryResultDialog.showDialog=true;
+              this.$refs.formQuery.queryResultDialog.loading=false;
+            }
+          });
+        } else {
+          return false;
+        }
+      });
+    },
   },
 }
 </script>

--
Gitblit v1.9.3