Merge branch 'dev-bugfix' into 'dev'

bugFix

See merge request apaas/apaas-system-ui!11

src/page/main/config/preference/index.vue

@@ -28,7 +28,10 @@
             <el-input disabled v-model="authorizeFormData.system_version" />
           </el-form-item>
           <el-form-item label="User" prop="system_user">
-            <el-input placeholder="统一管理用户认证平台" v-model="authorizeFormData.system_user" maxlength="30" />
+            <el-input
+              placeholder="统一管理用户认证平台"
+              v-model="authorizeFormData.system_user"
+              maxlength="30" />
           </el-form-item>
           <el-form-item label="Key" prop="license">
             <el-input
@@ -42,12 +45,15 @@
             <el-input disabled v-model="authorizeFormData.license_dead_date" />
           </el-form-item>
           <el-form-item label="剩余有效期提醒" prop="license_inform_day">
-            <el-input placeholder="请输入" v-model.trim.number="authorizeFormData.license_inform_day">
+            <el-input
+              placeholder="请输入"
+              v-model.trim.number="authorizeFormData.license_inform_day">
               <template #append>天</template>
             </el-input>
             <el-tooltip placement="top-start" effect="light">
               <template #content>
-                范围（0~90），单位：天， 当剩余有效期在配置区间内时，系统会在用户登录系统时发出提醒，0表示不提醒
+                范围（0~90），单位：天，
+                当剩余有效期在配置区间内时，系统会在用户登录系统时发出提醒，0表示不提醒
               </template>
               <div class="tip-image"></div>
             </el-tooltip>
@@ -91,14 +97,19 @@
             </el-form-item>
           </div>
           <el-form-item label="密码有效期" prop="pwd_validity">
-            <el-input placeholder="请输入" v-model.trim.number="secureFormData.pwd_validity" maxlength="3">
+            <el-input
+              placeholder="请输入"
+              v-model.trim.number="secureFormData.pwd_validity"
+              maxlength="3">
               <template #append>天</template>
             </el-input>
             <el-tooltip placement="top-start" effect="light">
               <template #content>
                 <span>单位，天</span>
                 <br />
-                <span>密码有效期是指强制修改密码的周期，例如60天表示用户需要每60天修改一次密码。</span>
+                <span
+                  >密码有效期是指强制修改密码的周期，例如60天表示用户需要每60天修改一次密码。</span
+                >
                 <br />
                 <span>若配置为0，表示密码有效期为永久</span>
               </template>
@@ -229,7 +240,9 @@ const state = reactive({
   },
   //授权表单校验规则
   authorizeRules: {
-    license_inform_day: [{ type: "number", min: 0, max: 90, message: "请输入0~90的整数", trigger: "blur" }],
+    license_inform_day: [
+      { type: "number", min: 0, max: 90, message: "请输入0~90的整数", trigger: "blur" },
+    ],
   },
 
   //安全相关信息表单
@@ -439,16 +452,19 @@ const confirm = () => {
   }
   .right_container {
     position: relative;
-    width: calc(100% - 256px);
+    width: calc(100% - 250px);
+    min-width: 852px;
     height: 100%;
     padding: 32px 0 68px 24px;
+    margin-left: 16px;
 
     .authorizeForm,
     .secureForm,
     .registerForm {
       :deep() .el-form-item {
         margin-bottom: 24px;
-        width: 750px;
+        width: 54%;
+        min-width: 580px;
         font-size: 14px;
         .el-form-item__label,
         .el-radio__label {
@@ -473,6 +489,9 @@ const confirm = () => {
           flex-shrink: 0;
           margin-right: 56px;
         }
+        .el-form-item:nth-of-type(2) {
+          min-width: auto;
+        }
       }
     }
 
@@ -487,11 +506,16 @@ const confirm = () => {
         color: var(--el-text-color-primary);
         .el-form-item {
           margin: 0px 8px;
+          min-width: auto;
           &:nth-of-type(1),
           &:nth-of-type(3) {
+            flex: 0;
+            min-width: 110px;
             width: 120px;
           }
           &:nth-of-type(2) {
+            flex: 0;
+            min-width: 140px;
             width: 150px;
           }
         }

src/page/main/develop/systemApproval/approval/index.vue

@@ -2,6 +2,7 @@
   <div class="page_container">
     <bg-breadcrumb></bg-breadcrumb>
     <div class="page_content">
+      <div class="inner-container apaas_scroll_min">
         <bg-form-gap title="注册信息"></bg-form-gap>
         <bg-detail-table2 class="register_info" :list="instanceData.approveBasicInfo">
           <!-- <template v-slot:approvalStatus="{ data }">
@@ -52,6 +53,7 @@
             </el-form-item>
           </el-form>
         </div>
+      </div>
       <div class="operate_btns">
         <el-button type="default" @click="cancel"> 取消 </el-button>
         <el-button type="primary" @click="save"> 保存 </el-button>
@@ -162,7 +164,9 @@ const getApproveInfo = () => {
     });
 };
 //取消
-const cancel = () => {};
+const cancel = () => {
+  router.push("/develop/systemApproval");
+};
 //保存
 const save = () => {
   approveFormRef.value.validate((val) => {
@@ -187,7 +191,14 @@ const save = () => {
 <style lang="scss" scoped>
 .page_content {
   position: relative;
-  padding: 24px 0 68px 24px;
+  padding: 24px 0 80px 24px;
+
+  .inner-container {
+    width: 100%;
+    height: 100%;
+    padding-bottom: 16px;
+    overflow: auto;
+  }
   .register_info {
     margin-bottom: 24px;
     width: 960px;
@@ -275,4 +286,8 @@ const save = () => {
     }
   }
 }
+.apaas_scroll_min::-webkit-scrollbar {
+  width: 6px;
+  height: 4px;
+}
 </style>