Преглед на файлове

增加节点弹窗动画,修改路线弹窗bug

sh4wmoo преди 3 години
родител
ревизия
5f3502c842
променени са 2 файла, в които са добавени 10 реда и са изтрити 17 реда
  1. 4 12
      src/components/business/process/edge-modal/edge-modal.vue
  2. 6 5
      src/view/process/process-flow/process-setting.vue

+ 4 - 12
src/components/business/process/edge-modal/edge-modal.vue

@@ -62,19 +62,8 @@ export default {
   },
   computed: {
     ...mapState(['process']),
-    id(){
-      return this.process.currentEdgeId
-    }
-  },
-  watch:{
-    id(n,o){
-      if(n){
-        let graph = Process.graph;
-        let cell = graph.getCellById(this.process.currentEdgeId);
-        this.edgeData=cell.data
-      }
-    }
   },
+
   data() {
     let self=this
     return {
@@ -100,6 +89,9 @@ export default {
     }
   },
   created() {
+    let graph = Process.graph;
+    let cell = graph.getCellById(this.process.currentEdgeId);
+    this.edgeData=cell.data
   },
   methods: {
     ...mapMutations(['setProcessEdgeModalDisplay','setCurrentEdgeId']),

+ 6 - 5
src/view/process/process-flow/process-setting.vue

@@ -30,11 +30,12 @@
         </Footer>
       </Layout>
     </Layout>
-    <!--  节点弹窗  -->
-    <NodeModal v-if="process.nodeModal.display" :dataKindList="dataKindList" :productGradeList="productGradeList"
-               :jobList="jobList"/>
-    <!--  连线弹窗  -->
-    <EdgeModal v-if="process.edgeModal.display" :dataKindList="dataKindList" :productGradeList="productGradeList"/>
+    <transition-group name="fade">
+      <!--  节点弹窗  -->
+      <NodeModal key="node" v-if="process.nodeModal.display" :dataKindList="dataKindList" :productGradeList="productGradeList" :jobList="jobList"/>
+      <!--  连线弹窗  -->
+      <EdgeModal key="edge" v-if="process.edgeModal.display" :dataKindList="dataKindList" :productGradeList="productGradeList"/>
+    </transition-group>
   </div>
 </template>
 <script>