From c3ef1eb784684c0029aa4ad0afd4371ce6f210ff Mon Sep 17 00:00:00 2001
From: icanci <qiang1.zhu@ly.com>
Date: Sun, 17 Sep 2023 16:22:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=A0=E5=AF=9F=E5=9B=BE=E5=9B=BE=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E4=B8=8E=E5=9B=9E=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bic-config/components/ruleTreeNode.vue    |  4 +-
 .../bic-config/dialog/unit-view-tree-form.vue | 58 +++++++++++++++++--
 .../src/views/bic-config/unit-view-tree.vue   | 23 ++------
 3 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/views/src/main/resources/vueboot/src/views/bic-config/components/ruleTreeNode.vue b/views/src/main/resources/vueboot/src/views/bic-config/components/ruleTreeNode.vue
index 902f499..c0a6843 100644
--- a/views/src/main/resources/vueboot/src/views/bic-config/components/ruleTreeNode.vue
+++ b/views/src/main/resources/vueboot/src/views/bic-config/components/ruleTreeNode.vue
@@ -188,10 +188,10 @@
         <el-form
           label-position="right"
           ref="relationModelDetailForm" :model="relationModelDetail" label-width="180px">
-          <el-form-item label="开始节点样式" prop="sourceNodeDataMode">
+          <el-form-item label="开始节点样式" prop="sourceStyleUuid">
             <el-select filterable
                        @change="refreshSelf()"
-                       v-model="relationModelDetail.sourceNodeDataMode"
+                       v-model="relationModelDetail.sourceStyleUuid"
                        placeholder="开始节点样式">
               <el-option
                 v-for="item in selectors.nodeStyleOptions"
diff --git a/views/src/main/resources/vueboot/src/views/bic-config/dialog/unit-view-tree-form.vue b/views/src/main/resources/vueboot/src/views/bic-config/dialog/unit-view-tree-form.vue
index 02729e6..5a085f2 100644
--- a/views/src/main/resources/vueboot/src/views/bic-config/dialog/unit-view-tree-form.vue
+++ b/views/src/main/resources/vueboot/src/views/bic-config/dialog/unit-view-tree-form.vue
@@ -85,6 +85,7 @@ import {remoteValidateUnitViewUnique, unitViewSave} from "@/api/unitView";
 import ruleTreeList from "@/views/bic-config/components/ruleTreeList";
 import unitViewTree from "@/views/bic-config/unit-view-tree.vue";
 import {remoteValidateUnitViewTreeUnique, unitViewTreeSave} from "@/api/unitViewTree";
+import fa from "element-ui/src/locale/lang/fa";
 
 export default {
   name: "bicEditForm",
@@ -146,11 +147,11 @@ export default {
       rules: {
         systemUuid: [
           {required: true, message: '此项必填', trigger: 'change'},
-          {validator: validateName, trigger: 'blur'}
+          {validator: validateName, trigger: 'change'}
         ],
         useCaseUuid: [
           {required: true, message: '此项必填', trigger: 'change'},
-          {validator: validateName, trigger: 'blur'}
+          {validator: validateName, trigger: 'change'}
         ],
       },
       systemOptions: [],
@@ -219,13 +220,62 @@ export default {
     },
     save() {
       let vm = this
-      // 遍历所有节点
       this.$refs['ruleForm'].validate(async (valid) => {
         if (valid) {
-          await vm.doSave(this.saveData)
+          // 遍历所有节点，进行数据验证
+          let relationModel = vm.$refs.ruleTreeList.getRelationModel()
+          if (relationModel.length === 0) {
+            vm.$message({type: 'error', message: '请至少添加一个节点'});
+            return
+          }
+          vm.loopFillUuid(relationModel)
+
+          if (!vm.loopRelationModelValidate(relationModel)) {
+            return
+          }
+
+          vm.saveData.relationModel = relationModel
+          await vm.doSave(vm.saveData)
         }
       })
     },
+    loopRelationModelValidate(relationModel) {
+      for (let i = 0; i < relationModel.length; i++) {
+        let relationModelItem = relationModel[i];
+        if (relationModelItem.sourceNodeUuid === '') {
+          this.$message({type: 'error', message: '请设置节点【' + relationModelItem.label + '】的开始节点'});
+          return false
+        }
+        if (relationModelItem.targetNodeUuid === '') {
+          this.$message({type: 'error', message: '请设置节点【' + relationModelItem.label + '】的结束节点'});
+          return false
+        }
+        if (relationModelItem.edgeStyleUuid === '') {
+          this.$message({type: 'error', message: '请设置节点【' + relationModelItem.label + '】的边样式'});
+          return false
+        }
+        if (relationModelItem.sourceNodeDataMode === '') {
+          this.$message({type: 'error', message: '请设置节点【' + relationModelItem.label + '】的开始节点数据模式'});
+          return false
+        }
+        if (relationModelItem.targetNodeDataMode === '') {
+          this.$message({type: 'error', message: '请设置节点【' + relationModelItem.label + '】的结束节点数据模式'});
+          return false
+        }
+        if (relationModelItem.sourceNodeDataKey === '') {
+          this.$message({type: 'error', message: '请设置节点【' + relationModelItem.label + '】的开始节点数据键'});
+          return false
+        }
+        if (relationModelItem.targetNodeDataKey === '') {
+          this.$message({type: 'error', message: '请设置节点【' + relationModelItem.label + '】的结束节点数据键'});
+          return false
+        }
+        if (relationModelItem.children) {
+          this.loopRelationModelValidate(relationModelItem.children)
+        }
+      }
+      return true;
+    },
     async doSave(saveData) {
       let vm = this
       let ret = await unitViewTreeSave(saveData);
diff --git a/views/src/main/resources/vueboot/src/views/bic-config/unit-view-tree.vue b/views/src/main/resources/vueboot/src/views/bic-config/unit-view-tree.vue
index a6964b3..30b0842 100644
--- a/views/src/main/resources/vueboot/src/views/bic-config/unit-view-tree.vue
+++ b/views/src/main/resources/vueboot/src/views/bic-config/unit-view-tree.vue
@@ -52,24 +52,7 @@
           align="center"
           label="用例名称">
           <template scope="scope">
-            {{ getUseCaseName(scope.row.nodeUuid) }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="nodeVueName"
-          label="节点组件名称">
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="nodeVueKey"
-          label="节点组件Key">
-        </el-table-column>
-        <el-table-column
-          align="center"
-          label="组件类型">
-          <template scope="scope">
-            {{ getNodeTypeName(scope.row.nodeVueType) }}
+            {{ getUseCaseName(scope.row.useCaseUuid) }}
           </template>
         </el-table-column>
         <el-table-column
@@ -119,7 +102,7 @@
 import vuePage from "@/views/common/vue-page.vue";
 import vueLog from "@/views/common/vue-log.vue";
 import unitViewTreeForm from "@/views/bic-config/dialog/unit-view-tree-form.vue";
-import {allUseCaseSelector, systemSelector, useCaseSelector} from "@/api/loadSelectorApi";
+import {allUseCaseSelector, nodeVueType, systemSelector, useCaseSelector} from "@/api/loadSelectorApi";
 import {unitViewTreePageQuery} from "@/api/unitViewTree";
 
 export default {
@@ -134,6 +117,7 @@ export default {
       systemOptions: [],
       useCaseOptions: [],
       allUseCaseOptions: [],
+      nodeVueTypeOptions: [],
       queryForm: {
         systemUuid: '',
         useCaseUuid: '',
@@ -155,6 +139,7 @@ export default {
     let vm = this
     vm.systemOptions = await systemSelector()
     vm.allUseCaseOptions = await allUseCaseSelector()
+    vm.nodeVueTypeOptions = await nodeVueType()
     await vm.query()
   },
   methods: {
-- 
Gitee