agilebuilder-ui 1.1.57-sit3 → 1.1.58-sit1

package/src/styles/theme/gray/index.scss

@@ -71,7 +71,7 @@
 
   //main-container全局样式
   .app-main {
-    padding: var(--app-main-padding-vertical, 15px) var(--app-main-padding-horizontal, 15px);
+    padding: var(--app-main-padding, 15px);
     min-height: 100vh; // min-height: calc(100vh - (var(--app-main-padding, 15px) * 2));
     background: #f7f7f8;
   }

package/src/styles/theme/green/checkbox.scss

@@ -7,7 +7,12 @@
     background-color: $--color-primary;
     border-color: $--color-primary;
   }
-  .el-checkbox-group .is-checked .el-checkbox__label{
+
+  .el-checkbox-group .is-checked .el-checkbox__label {
     color: $--color-primary;
   }
-}
+
+  .el-checkbox {
+    --el-checkbox-font-size: var(--el-font-size-base);
+  }
+}

package/src/styles/theme/green/index.scss

@@ -26,6 +26,7 @@
   text-rendering: optimizeLegibility;
   height: 100%;
   --el-color-primary: #00B9B4;
+  --el-tabs__item-height: 48px;
 
   .el-button {
     font-family: Source Han Sans CN;
@@ -88,7 +89,7 @@
 
   //main-container全局样式
   .app-main {
-    padding: var(--app-main-padding-vertical, 15px) var(--app-main-padding-horizontal, 15px);
+    padding: var(--app-main-padding, 15px);
     min-height: 100vh; // min-height: calc(100vh - (var(--app-main-padding, 15px) * 2));
     background: #f7f7f8;
   }
@@ -160,8 +161,8 @@
   }
 
   .menu-tab-container .el-tabs__item {
-    height: 48px;
-    line-height: 48px;
+    height: var(--el-tabs__item-height);
+    line-height: var(--el-tabs__item-height);
   }
 
   //顶部标签字体样式
@@ -215,10 +216,12 @@
   }
 
   iframe.tab-main-content {
-    height: calc(100vh - 38px) !important;
+    height: calc(100vh - var(--el-tabs__item-height)) !important;
   }
 
   .runtime-page-container {
+    --layout-form-flex-gap: 20px;
+
     .el-button>span {
       align-items: center;
       display: inline-flex;
@@ -270,7 +273,7 @@
       --el-input-height: 38px;
       box-sizing: border-box;
       display: inline-flex;
-      font-size: 16px;
+      font-size: var(--input-font-size);
       line-height: var(--el-input-height);
       position: relative;
       vertical-align: middle;
@@ -298,25 +301,11 @@
       text-align: left;
       font-style: normal;
       text-transform: none;
-      width: 113px;
     }
 
     .yx-card-box-view-main .yx-card-box-view-title {
-      position: relative;
-      z-index: 2;
-      flex: 1 1 auto;
-      width: 16px;
-      font-family: Noto Sans SC, Noto Sans SC;
-      font-weight: 400;
-      color: #333333;
-      font-style: normal;
-      text-transform: none;
-
-      width: 66px;
-      height: 26px;
       font-family: Noto Sans SC, Noto Sans SC;
-      font-weight: 400;
-      font-size: 16px;
+      font-size: var(--tab-header-font-size);
       color: #333333;
       text-align: left;
       font-style: normal;
@@ -349,7 +338,7 @@
       height: 26px;
       font-family: Noto Sans SC, Noto Sans SC;
       font-weight: normal;
-      font-size: 16px;
+      font-size: var(--input-font-size);
       color: #595959;
       text-align: left;
       font-style: normal;
@@ -378,8 +367,6 @@
       width: 100%;
     }
 
-    .el-tabs__header {}
-
     .el-tabs__item {
       align-items: center;
       box-sizing: border-box;
@@ -443,13 +430,14 @@
       text-transform: none !important;
     }
 
-		
+
+  }
+
+  .smb-sidebar-menu-item .smb-sidebar-menu-item-title>div {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    font-size: var(--menu-font-size);
   }
-	.smb-sidebar-menu-item .smb-sidebar-menu-item-title>div {
-	  white-space: nowrap;
-	  overflow: hidden;
-	  text-overflow: ellipsis;
-	  font-size: 14px;
-	}
 
 }

package/src/styles/theme/green/pagination.scss

@@ -19,4 +19,8 @@
     color: $--button-default-font-color;
     border-radius: 6px;
   }
+
+  .el-pagination {
+    --el-pagination-font-size: 16px;
+  }
 }

package/src/styles/theme/green/select.scss

@@ -1,6 +1,12 @@
 @import "./green.scss";
+
 .green {
-  .el-select-dropdown__list .is-selected{
+  .el-select-dropdown__list .is-selected {
     color: $--select-font-color;
   }
-}
+
+  .el-select__wrapper {
+    height: var(--el-input-height);
+    font-size: var(--input-font-size);
+  }
+}

package/src/styles/theme/green/tree.scss

@@ -7,7 +7,7 @@
     background-color: $th-cell-background;
   }
 
-  .el-tree-node__content > .el-checkbox {
+  .el-tree-node__content>.el-checkbox {
     margin-right: 8px;
   }
 
@@ -16,6 +16,12 @@
     background-color: $--menu-hove-background-color;
   }
 
+  .el-tree-node__content {
+    .item-side {
+      font-size: var(--input-font-size);
+    }
+  }
+
   // .el-tree-node .is-checked {
   //   background-color: $th-cell-background !important;
   // }
@@ -58,4 +64,4 @@
   //  }
   //}
 
-}
+}

package/src/styles/theme/ocean-blue/button.scss

@@ -13,13 +13,19 @@
     }
   }
 
-  .button--default, button.el-button:not([class*="el-button--primary"]):not([class*="el-button--success"]):not([class*="el-button--info"]):not([class*="el-button--warning"]):not([class*="el-button--danger"]):not([class*="el-button--default"]):not([class*="el-button--text"]) {
+  .el-button {
+    font-family: Source Han Sans CN;
+  }
+
+  .button--default,
+  button.el-button:not([class*="el-button--primary"]):not([class*="el-button--success"]):not([class*="el-button--info"]):not([class*="el-button--warning"]):not([class*="el-button--danger"]):not([class*="el-button--default"]):not([class*="el-button--text"]) {
     border-radius: 4px;
     border-color: $--color-primary;
     color: $--color-primary;
   }
 
-  .button--default:hover, button.el-button:not([class*="el-button--primary"]):not([class*="el-button--success"]):not([class*="el-button--info"]):not([class*="el-button--warning"]):not([class*="el-button--danger"]):not([class*="el-button--default"]):not([class*="el-button--text"]):hover {
+  .button--default:hover,
+  button.el-button:not([class*="el-button--primary"]):not([class*="el-button--success"]):not([class*="el-button--info"]):not([class*="el-button--warning"]):not([class*="el-button--danger"]):not([class*="el-button--default"]):not([class*="el-button--text"]):hover {
     color: $--color-primary;
     background-color: $--color-hover;
     border-color: $--color-primary;
@@ -40,7 +46,7 @@
     border: 1px solid $--button-default-border-color;
   }
 
-  .el-button.el-button--primary.is-plain:hover{
+  .el-button.el-button--primary.is-plain:hover {
     color: $--color-primary;
     background-color: $--color-hover;
     border-color: $--color-primary;
@@ -76,18 +82,18 @@
   }
 
   //单选选中样式
-  .el-radio__input.is-checked + .el-radio__label {
+  .el-radio__input.is-checked+.el-radio__label {
     color: $--color-primary;
   }
 
   //下拉菜单
-  .el-dropdown__list .el-dropdown-menu .el-dropdown-menu__item:hover{
+  .el-dropdown__list .el-dropdown-menu .el-dropdown-menu__item:hover {
     color: $--select-font-color;
     background-color: $th-cell-background;
   }
 
   //工作流结束按钮
-  .workflow-end-button{
+  .workflow-end-button {
     background-color: #ee6666;
     border-color: #ee6666;
     color: #FFFFFF;
@@ -99,4 +105,8 @@
     color: #8C8C8C;
     border: 1px solid #E3E3E3;
   }
-}
+
+  .row-operation-icon {
+    font-size: 18px;
+  }
+}

package/src/styles/theme/ocean-blue/checkbox.scss

@@ -7,7 +7,12 @@
     background-color: $--color-primary;
     border-color: $--color-primary;
   }
-  .el-checkbox-group .is-checked .el-checkbox__label{
+
+  .el-checkbox-group .is-checked .el-checkbox__label {
     color: $--color-primary;
   }
-}
+
+  .el-checkbox {
+    --el-checkbox-font-size: var(--el-font-size-base);
+  }
+}

package/src/styles/theme/ocean-blue/index.scss

@@ -16,6 +16,7 @@
 @import './message.scss';
 @import './radio.scss';
 @import "./ocean-blue.scss";
+@import "./select.scss";
 
 .ocean-blue {
   font-family: Source Han Sans CN;
@@ -26,10 +27,7 @@
   text-rendering: optimizeLegibility;
   height: 100%;
   --el-color-primary: #019AD4;
-
-  .el-button {
-    font-family: Source Han Sans CN;
-  }
+  --el-tabs__item-height: 48px;
 
   .fl {
     float: left;
@@ -88,7 +86,7 @@
 
   //main-container全局样式
   .app-main {
-    padding: var(--app-main-padding-vertical, 15px) var(--app-main-padding-horizontal, 15px);
+    padding: var(--app-main-padding, 15px);
     min-height: 100vh; // min-height: calc(100vh - (var(--app-main-padding, 15px) * 2));
     background: #f7f7f8;
   }
@@ -160,8 +158,8 @@
   }
 
   .menu-tab-container .el-tabs__item {
-    height: 48px;
-    line-height: 48px;
+    height: var(--el-tabs__item-height);
+    line-height: var(--el-tabs__item-height);
   }
 
   //顶部标签字体样式
@@ -210,15 +208,15 @@
     box-shadow: 0 0px 0px #ccc;
   }
 
-  :root {
-    --layout-form-flex-gap: 20px;
-  }
 
   iframe.tab-main-content {
-    height: calc(100vh - 38px) !important;
+    height: calc(100vh - var(--el-tabs__item-height)) !important;
   }
 
   .runtime-page-container {
+
+    --layout-form-flex-gap: 20px;
+
     .el-button>span {
       align-items: center;
       display: inline-flex;
@@ -270,7 +268,7 @@
       --el-input-height: 38px;
       box-sizing: border-box;
       display: inline-flex;
-      font-size: 16px;
+      font-size: var(--input-font-size);
       line-height: var(--el-input-height);
       position: relative;
       vertical-align: middle;
@@ -297,25 +295,11 @@
       text-align: left;
       font-style: normal;
       text-transform: none;
-      width: 113px;
     }
 
     .yx-card-box-view-main .yx-card-box-view-title {
-      position: relative;
-      z-index: 2;
-      flex: 1 1 auto;
-      width: 16px;
       font-family: Noto Sans SC, Noto Sans SC;
-      font-weight: 400;
-      color: #333333;
-      font-style: normal;
-      text-transform: none;
-
-      width: 66px;
-      height: 26px;
-      font-family: Noto Sans SC, Noto Sans SC;
-      font-weight: 400;
-      font-size: 16px;
+      font-size: var(--tab-header-font-size);
       color: #333333;
       text-align: left;
       font-style: normal;
@@ -332,7 +316,7 @@
       height: 26px;
       font-family: Noto Sans SC, Noto Sans SC;
       font-weight: normal;
-      font-size: 16px;
+      font-size: var(--input-font-size);
       color: #595959;
       text-align: left;
       font-style: normal;
@@ -426,6 +410,6 @@
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-    font-size: 14px;
+    font-size: var(--menu-font-size);
   }
 }

package/src/styles/theme/ocean-blue/input.scss

@@ -12,4 +12,8 @@
     }
   }
 
-}
+  .el-input__inner {
+    --el-input-inner-height: 36px;
+  }
+
+}

package/src/styles/theme/ocean-blue/pagination.scss

@@ -19,4 +19,8 @@
     color: #0089ba8a;
     border-radius: 6px;
   }
+
+  .el-pagination {
+    --el-pagination-font-size: 16px;
+  }
 }

package/src/styles/theme/ocean-blue/select.scss

@@ -1,6 +1,12 @@
 @import "./ocean-blue.scss";
+
 .ocean-blue {
-  .el-select-dropdown__list .is-selected{
+  .el-select-dropdown__list .is-selected {
     color: $--select-font-color;
   }
-}
+
+  .el-select__wrapper {
+    height: var(--el-input-height);
+    font-size: var(--input-font-size);
+  }
+}

package/src/styles/theme/ocean-blue/sidebar.scss

@@ -1,4 +1,5 @@
 @import "./ocean-blue.scss";
+
 .ocean-blue {
   #app {
 
@@ -32,13 +33,14 @@
       color: rgba(0, 13, 31, 0.85);
       background: #FFF;
       box-shadow: 0px 2px 8px 0px rgba(164, 178, 201, 0.4);
-      
+
       & {
         display: flex;
         flex-direction: column;
 
-        & > .el-scrollbar {
+        &>.el-scrollbar {
           flex: 1 1 auto;
+
           .el-menu {
             margin-top: 5px;
           }
@@ -56,6 +58,7 @@
 
       .scrollbar-wrapper {
         overflow-x: hidden !important;
+
         .system-item {
           padding-left: 10px;
           font-size: medium;
@@ -83,6 +86,7 @@
         width: 100%;
         overflow: hidden;
       }
+
       .el-menu {
         border: none;
         height: 100%;
@@ -98,6 +102,7 @@
         color: #525A6C;
         font-weight: medium;
       }
+
       .el-menu-item.is-active {
         color: $--menu-dont-color;
         font-weight: medium;
@@ -105,6 +110,7 @@
         letter-spacing: 0px;
         text-align: left;
         box-sizing: border-box;
+
         &::after {
           content: " ";
           position: absolute;
@@ -121,9 +127,10 @@
     .hideSidebar {
       .sidebar-container {
         width: var(--admin-layout-left-menu-collapse, 54px) !important;
+
         .smb-sidebar-menu-item {
           .smb-sidebar-menu-item-icon {
-            & ~ * {
+            &~* {
               display: none !important;
             }
           }
@@ -137,7 +144,7 @@
       .el-submenu {
         overflow: hidden;
 
-        & > .el-submenu__title {
+        &>.el-submenu__title {
           padding-left: 20px !important;
 
           .el-submenu__icon-arrow {
@@ -148,8 +155,8 @@
 
       .el-menu--collapse {
         .el-submenu {
-          & > .el-submenu__title {
-            & > span {
+          &>.el-submenu__title {
+            &>span {
               height: 0;
               width: 0;
               overflow: hidden;
@@ -161,7 +168,7 @@
       }
     }
 
-    .sidebar-container .nest-menu .el-submenu > .el-submenu__title,
+    .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
     .sidebar-container .el-submenu .el-menu-item {
       min-width: 224px !important;
     }
@@ -170,7 +177,7 @@
       min-width: 224px !important;
     }
 
-    .sidebar-container .el-menu--collapse .el-submenu.is-active > .el-submenu__title,
+    .sidebar-container .el-menu--collapse .el-submenu.is-active>.el-submenu__title,
     .sidebar-container .el-menu--collapse .el-menu.is-active {
       background-color: #FFFFFF !important;
       color: #1A6BF3;
@@ -217,7 +224,7 @@
     }
   }
 
-// 注释的原因：会导致孙子菜单显示的位置不正确
+  // 注释的原因：会导致孙子菜单显示的位置不正确
   // .sidebar-container-popper .el-menu{
   //   // height: 100vh;
   //   height: auto;
@@ -232,7 +239,7 @@
     font-weight: medium;
   }
 
-  .sidebar-container-popper .el-menu .el-submenu.is-active > .el-submenu__title {
+  .sidebar-container-popper .el-menu .el-submenu.is-active>.el-submenu__title {
     background-color: #FFFFFF !important;
     color: #3D4CF2;
     font-weight: regular;
@@ -258,22 +265,24 @@
     text-align: left;
   }
 
-  .router-link-active >.is-active{
+  .router-link-active>.is-active {
     color: $--menu-dont-color;
   }
-  .el-menu-item:hover{
+
+  .el-menu-item:hover {
     background-color: $--menu-hove-background-color;
   }
 
-  .el-menu--collapse .el-sub-menu.is-active .el-sub-menu__title{
+  .el-menu--collapse .el-sub-menu.is-active .el-sub-menu__title {
     color: $--menu-dont-color;
   }
-  .el-sub-menu__title:hover{
+
+  .el-sub-menu__title:hover {
     background-color: $--menu-hove-background-color;
   }
 
-  运行时工具栏样式
-  .amb-widget-tools-parent{
+  // 运行时工具栏样式
+  .amb-widget-tools-parent {
     margin-bottom: 20px;
   }
-}
+}

package/src/styles/theme/ocean-blue/tree.scss

@@ -7,7 +7,7 @@
     background-color: $th-cell-background;
   }
 
-  .el-tree-node__content > .el-checkbox {
+  .el-tree-node__content>.el-checkbox {
     margin-right: 8px;
   }
 
@@ -16,6 +16,12 @@
     background-color: $--menu-hove-background-color;
   }
 
+  .el-tree-node__content {
+    .item-side {
+      font-size: var(--input-font-size);
+    }
+  }
+
   // .el-tree-node .is-checked {
   //   background-color: $th-cell-background !important;
   // }
@@ -58,4 +64,4 @@
   //  }
   //}
 
-}
+}

package/src/styles/theme/tiffany-blue-mobile/index.scss

@@ -29,6 +29,7 @@
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
   height: 100%;
+  --el-tabs__item-height: 48px;
 
   .el-button {
     font-family: Source Han Sans CN;
@@ -169,8 +170,8 @@
   }
 
   .menu-tab-container .el-tabs__item {
-    height: 48px;
-    line-height: 48px;
+    height: var(--el-tabs__item-height);
+    line-height: var(--el-tabs__item-height);
   }
 
   //顶部标签字体样式

package/src/utils/common-util.js

@@ -923,4 +923,21 @@ export function cacheAllEnableGlobalPropUtil() {
         cacheAllGlobalPropCache(propMap)
       }
     })
+}
+/**
+ * 获得超时信息
+ * @returns 
+ */
+export function getLoginTimeoutUrlInfo(){
+  const url = window.location.href
+  const paramObj = getURLSearchParamObj(url)
+  let customSystem
+  if(paramObj && paramObj.customSystem) {
+    customSystem = paramObj.customSystem
+  }
+  let msgObj = {loginTimeout:url}
+  if(customSystem){
+    msgObj.customSystem = customSystem
+  }
+  return msgObj
 }