Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/components/FlowChartComponent/index.vue

@@ -134,7 +134,6 @@ export default {
             });
 
           }
-
           this.initToolbar = this.myDesigner.initToolbar('paletteDiv',this.data.moduleType)
           this.myDesigner.displayFlow(JSON.parse(JSON.stringify(this.data.guiStyle)));// 在设计面板中显示流程图
           this.data.myDisplay = this.myDesigner.diagram

ruoyi-ui/src/utils/flow-desinger.js

@@ -1,4 +1,4 @@
-import icons from './icon.js'
+import icons from './icon.js'
 
 function FlowDesigner(diagramDiv,event) {
     var G = go.GraphObject.make;
@@ -52,11 +52,12 @@ function FlowDesigner(diagramDiv,event) {
                     nodeTemplateMap: _designer.nodeTemplateMap, // 跟设计图共同一套样式模板
                     model: new go.GraphLinksModel(modelArr)
                 });
+                
             myPalette = Palette
         }else{
             myPalette.model.nodeDataArray = modelArr
         }
-
+        console.log(myPalette,222222)
         return myPalette;
     };
 
@@ -735,6 +736,7 @@ function FlowDesigner(diagramDiv,event) {
      * @returns {*}
      */
     function approvalNodeTemplate(){
+      console.log(1222)
         return G(go.Node, "Spot",
             { locationSpot: go.Spot.Center },
             new go.Binding("location", "loc", go.Point.parse).makeTwoWay(go.Point.stringify),

ruoyi-ui/src/views/activiti/TemplateManagementNew/index.vue

@@ -57,7 +57,7 @@
           :data="data"
           :currentSteps="currentSteps"
           :noFreshFlag="noFreshFlag"
-          @dataChange=dataChange
+          @dataChange="dataChange"
           >
         </component>
       </keep-alive>
@@ -186,16 +186,13 @@ export default {
         if(val === 0 ){
           Vue.component(componentName,ParameterConfiguration)
         }else if(val === 1){
-
+          console.log(componentName,91111111111)
           Vue.component(componentName,FlowChartComponent)
         }else if(val === 2){
           Vue.component(componentName,FlowSuccess)
         }
       }
-
       this.currentComponent = componentName
-
-
     }
   },
   methods:{
@@ -203,12 +200,12 @@ export default {
     getModuleInfo (id) {
       getLoad({id:id}).then((res) => {
         if(res.resultCode === 0){
+          console.log(res.data,999911111)
           res.data.businessType = [{
             ID:res.data.businessType,
             Label:res.data.businessTypeName,
             val:res.data.businessTypeText
           }]
-
           res.data.businessNumber = [{
             ID:String(res.data.businessKeyId),
             Label:res.data.businessKey,
@@ -261,8 +258,6 @@ export default {
         })
         return
       }
-
-
       if( this.data.name && (this.data.moduleType === 0?(this.data.businessType && this.data.businessType.length > 0):true) ){
         this.defaultModuleType = this.data.moduleType
         ++this.currentSteps
@@ -476,7 +471,6 @@ export default {
   created () {
     Vue.component(`component_${this.currentSteps}`,Vue.extend(Object.assign({isKeepAliveModel:true},ParameterConfiguration)))
     this.currentComponent = `component_${this.currentSteps}`
-    console.log(this.$route.params.id,99998)
     if(this.$route.params.flag === '1'){
       this.readOnly = true
       this.noFreshFlag = true
@@ -484,7 +478,7 @@ export default {
       return
     }
     if(this.$route.params.id === undefined){  //新增
-      console.log(22233)
+
     }else{  //编辑
       this.noFreshFlag = true
       this.currentSteps = 1
@@ -496,11 +490,12 @@ export default {
   }
 }
 </script>
-<style lang="scss" >
+<style lang="scss" scoped>
 .TemplateManagementNew{
   padding:16px;
   background: white;
   display: flex;
+  height: calc(100vh - 100px);
   flex-direction: column;
 
   .breadcrumb{

ruoyi-ui/src/views/system/role/fz-index.vue

@@ -6,7 +6,7 @@
         <span>功能权限</span>
       </el-col>
       <el-col :span="24" class="roleBot">
-        <el-row :gutter="10" class="mb8">
+        <el-row :gutter="10">
           <el-col :span="1.5">
             <el-button type="primary" style="background-color: #2AC1CA;color: #fff;border: none;" plain icon="el-icon-plus"
               @click="handleAdd" v-hasPermi="['system:role:add']">新增</el-button>
@@ -47,7 +47,7 @@
       </el-col>
       <el-col :span="19" class="roleContr">
         <div class="roleContrBox">
-          <el-col :span="7">
+          <el-col :span="7" style="height: 100%;">
             <div class="searContLeft">
               <el-tree class="tree-border" @node-click="qxList" :data="deptOptions"
                 default-expand-all ref="dept" node-key="id" :props="defaultProps"></el-tree>
@@ -542,6 +542,9 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
+  }
+  .roleCont{
+    height: calc(100% - 168px);
   }
 
   .roleContrBox {
@@ -549,14 +552,15 @@
     border-radius: 6px;
     overflow: hidden;
     padding: 23px 0;
-    height: calc(100% - 183px);
+    height: 100%;
+    box-sizing: border-box;
   }
 
   .roleContr {
     padding-left: 17px;
-
+	  height: 100%;
     .searContLeft {
-      max-height: calc(100vh - 353px);
+      height: 100%;
       overflow-y: auto;
       box-sizing: border-box;
       padding: 23px 17px 23px 23px;
@@ -627,7 +631,8 @@
     background-color: #fff;
     border-radius: 6px;
     box-sizing: border-box;
-    padding: 23px;
+    padding: 23px;
+    height: 100%;
 
     .searBox {
       display: flex;