cloud-web-corejs 1.0.54-dev.744 → 1.0.54-dev.745

package/src/layout/components/AppMain.vue

@@ -89,11 +89,14 @@ export default {
 <style lang="scss" scoped>
 .app-main {
   /* 45= navbar  45  */
-  min-height: calc(100vh - 45px);
-  //height:calc(100vh - 10px);
+  //min-height: calc(100vh - 45px);
+  height:calc(100vh - 10px);
   width: 100%;
   position: relative;
   overflow: hidden;
+  > div{
+    height:100%;
+  }
 }
 
 .fixed-header + .app-main {

package/src/layout/components/extractedCode/viewDialog.vue

@@ -179,7 +179,7 @@ export default {
   right: 130px;
   top: 0;
 }
-
+/*
 ::v-deep .tab-boxOnly > .el-tabs__content .el-tab-pane .el-tab-pane {
   .detail-wrap .d-cont {
     height: calc(100vh - 158px) !important;
@@ -203,5 +203,5 @@ export default {
   .grid-height {
     height: calc(100vh - 84px) !important;
   }
-}
+} */
 </style>

package/src/views/bd/setting/formVersion/ftHistoryDialog.vue

@@ -479,13 +479,5 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-.grid-height {
-  height: calc(100vh - 106px) !important;
-}
-::v-deep .detail-wrap{
-  margin:-8px -10px 0;
-  .d-cont {
-    height: calc(100vh - 148px) !important;
-  }
-}
+
 </style>

package/src/views/bd/setting/form_template/formDesignerDialog.vue

@@ -144,28 +144,28 @@ export default {
   top: 0;
 }
 
-::v-deep .tab-boxOnly > .el-tabs__content .el-tab-pane .el-tab-pane {
-  .detail-wrap .d-cont {
-    height: calc(100vh - 158px) !important;
-  }
+// ::v-deep .tab-boxOnly > .el-tabs__content .el-tab-pane .el-tab-pane {
+//   .detail-wrap .d-cont {
+//     height: calc(100vh - 158px) !important;
+//   }
 
-  .grid-height {
-    height: calc(100vh - 126px) !important;
-  }
-}
+//   .grid-height {
+//     height: calc(100vh - 126px) !important;
+//   }
+// }
 
-::v-deep
-  .designer-drawer.is-fullscreen
-  .tab-boxOnly
-  > .el-tabs__content
-  .el-tab-pane
-  .el-tab-pane {
-  .detail-wrap .d-cont {
-    height: calc(100vh - 116px) !important;
-  }
+// ::v-deep
+//   .designer-drawer.is-fullscreen
+//   .tab-boxOnly
+//   > .el-tabs__content
+//   .el-tab-pane
+//   .el-tab-pane {
+//   .detail-wrap .d-cont {
+//     height: calc(100vh - 116px) !important;
+//   }
 
-  .grid-height {
-    height: calc(100vh - 84px) !important;
-  }
-}
+//   .grid-height {
+//     height: calc(100vh - 84px) !important;
+//   }
+// }
 </style>

package/src/views/bd/setting/form_template/wfObjConfigDialog.vue

@@ -12,52 +12,51 @@
     v-el-drag-dialog
     v-el-dialog-center
   >
-    <div class="cont">
-      <div id="containt">
-        <el-form ref="editForm" :model="formData">
-          <div class="grid-height" style="height: 500px">
-            <vxe-grid
-              class="is-pointer"
-              ref="table-m1"
-              :data="formData.wfObjConfigDTOs"
-              v-bind="vxeOption"
-              @resizable-change="$vxeTableUtil.onColumnWitchChange"
-              @custom="$vxeTableUtil.customHandle"
-            >
-              <template #form>
-                <div class="clearfix screen-btns">
-                  <div class="fl">
-                    <vxe-button status="primary" class="button-sty" icon="el-icon-plus"
-                                @click="openCompanyDialog">
-                      新增
-                    </vxe-button>
-                    <span class="button-sty tips">{{ $t1('选择表单所在的组织，填写组织对应的流程单据类型数据。') }}</span>
-                  </div>
+    <div id="containt">
+      <el-form ref="editForm" :model="formData">
+        <div class="grid-height" style="height: 500px">
+          <vxe-grid
+            class="is-pointer"
+            ref="table-m1"
+            :data="formData.wfObjConfigDTOs"
+            v-bind="vxeOption"
+            @resizable-change="$vxeTableUtil.onColumnWitchChange"
+            @custom="$vxeTableUtil.customHandle"
+          >
+            <template #form>
+              <div class="clearfix screen-btns">
+                <div class="fl">
+                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus"
+                              @click="openCompanyDialog">
+                    新增
+                  </vxe-button>
+                  <span class="button-sty tips">{{ $t1('选择表单所在的组织，填写组织对应的流程单据类型数据。') }}</span>
                 </div>
-              </template>
-              <template #objTypeName="{row,rowIndex}">
-                <el-form-item :prop="'wfObjConfigDTOs.'+rowIndex+'.objTypeName'"
-                              :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input v-model="row.objTypeName" clearable></el-input>
-                </el-form-item>
-              </template>
-              <template #operate="{row}">
-                <a
-                  href="javascript:void(0);"
-                  class="a-link"
-                  @click="openEditDialog(row.id)"
-                >
-                  <el-tooltip :enterable="false" effect="dark" :content="$t2('查看','common.view')" placement="top"
-                              popper-class="tooltip-skin">
-                    <i class="el-icon-edit"/>
-                  </el-tooltip>
-                </a>
-              </template>
-            </vxe-grid>
-          </div>
-        </el-form>
-      </div>
+              </div>
+            </template>
+            <template #objTypeName="{row,rowIndex}">
+              <el-form-item :prop="'wfObjConfigDTOs.'+rowIndex+'.objTypeName'"
+                            :rules="[{ required: true, trigger: 'blur' }]">
+                <el-input v-model="row.objTypeName" clearable></el-input>
+              </el-form-item>
+            </template>
+            <template #operate="{row}">
+              <a
+                href="javascript:void(0);"
+                class="a-link"
+                @click="openEditDialog(row.id)"
+              >
+                <el-tooltip :enterable="false" effect="dark" :content="$t2('查看','common.view')" placement="top"
+                            popper-class="tooltip-skin">
+                  <i class="el-icon-edit"/>
+                </el-tooltip>
+              </a>
+            </template>
+          </vxe-grid>
+        </div>
+      </el-form>
     </div>
+
     <span slot="footer" class="dialog-footer">
 			<el-button type="primary" plain class="button-sty" @click="closeDialog">
 				<i class="el-icon-close el-icon"></i>

package/src/views/user/wf/wfReport/index.vue

@@ -520,6 +520,10 @@ export default {
   background: none;
   padding: 10px 0 0;
   box-shadow: none;
+  display:flex;flex-direction: column;
+  > .el-row{flex:1;
+    > .el-col{height:100%;}
+  }
 }
 .filter-btns {
   .f-btn {
@@ -580,12 +584,13 @@ export default {
   }
 }
 ::v-deep .box-style1 {
-  margin: 10px 5px 0;
+  margin: 10px 5px 0;height:calc(100% - 10px);display:flex;flex-direction:column;
   .el-card__body {
-    height: calc(100vh - 254px);
+    flex:1;
   }
 }
 .node-box {
+  height:100%;overflow:auto;display:flex;flex-direction: column;
   .info {
     border: solid 1px #e6ebf5;
     background: #f6faff;
@@ -602,18 +607,19 @@ export default {
       position: absolute;
       right: 12px;
       top: 50%;
-      margin-top: -14px;
+      margin-top: -14px !important;
     }
     .tit {
       font-size: 13px;
       color: #212121;
       margin-bottom: 5px;
+      margin-top:0;
     }
   }
   .el-steps {
-    height: calc(100vh - 326px);
     overflow: auto;
     padding-right: 10px;
+    flex:1;
   }
 }
 </style>