imatrix-ui 2.9.15-dw-tmp2 → 2.9.16-boe10

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

@@ -1,5 +1,5 @@
 @import './sidebar.scss';
-
+@import './font-style.scss';
 .blue2 .el-dialog__header {
   padding: 10px 10px 10px;
 }
@@ -81,6 +81,8 @@
 
   .app-container {
     padding: 20px;
+    border-radius: 6px;
+    box-shadow: 0px 1px 8px 0px #00000019;
   }
 
   .operation-area {
@@ -92,18 +94,6 @@
     padding-right: 24px;
     padding-top: 10px;
   }
-  .form-container {
-    height: calc(100vh - 82px);
-    overflow: auto;
-  }
-
-  .form-container .el-form .el-card {
-    margin-bottom: 10px;
-  }
-
-  .form-container .el-form .el-card:last-child {
-    margin-bottom: 0;
-  }
 
 
   // 解决tab页签中内容多时没有滚动条问题

package/src/styles/theme/dark-blue/card.scss

@@ -55,10 +55,8 @@
     .el-card__header>div {
       line-height: 22px;
     }
-
-    .card-style {
-      margin-top: 20px;
-    }
   }
-
-}
+  .card-style {
+    margin-top: 20px;
+  }
+}

package/src/styles/theme/dark-blue/form.scss

@@ -1,4 +1,7 @@
 .dark-blue {
+  .grid-search-form .el-form-item {
+    margin-bottom: 0px;
+  }
 
   .button-at-top {
     width: 100%;
@@ -38,14 +41,14 @@
     line-height: 72px;
   }
 
-  .form-center-position{
+  .form-center-position {
     position: relative;
 
-    .form-center-son{
+    .form-center-son {
       position: absolute;
       top: 50%;
       left: 50%;
-      transform: translate(-50%,-50%);
+      transform: translate(-50%, -50%);
     }
   }
-}
+}

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

@@ -12,10 +12,12 @@
 @import './dialog.scss';
 @import './tree.scss';
 @import './scrollbar-style.scss';
+@import './message.scss';
+@import './radio.scss';
 
 
 .dark-blue {
-  font-family: cursive;
+  font-family: Source Han Sans CN;
   font-size: 14px;
   color: rgba(0, 0, 0, 0.85);
   -moz-osx-font-smoothing: grayscale;
@@ -24,7 +26,7 @@
   height: 100%;
 
   .el-button {
-    font-family: cursive;
+    font-family: Source Han Sans CN;
   }
 
   .fl {
@@ -84,16 +86,16 @@
 
   //main-container全局样式
   .app-main {
-    min-height: 100%;
+    min-height: 100vh;
     background: #f7f7f8;
-    padding: 11px 24px 11px 24px;
+    padding: 11px 24px 24px 24px;
     // padding-top: 12px;
   }
 
   .app-container {
     // padding: 20px;
     // padding: 0px;
-    padding: 20px 24px;
+    padding: 20px 24px 0px 24px;
     background: #FFFFFF;
     border-radius: 6px;
     box-shadow: 0px 1px 8px 0px #00000019;
@@ -116,6 +118,7 @@
       top: 50%;
       left: 50%;
       transform: translate(-50%, -50%);
+      height: auto;
 
       .add_form_buttomButton {
         text-align: right;
@@ -125,7 +128,21 @@
 
   .operation-area {
     margin-bottom: 20px;
+  }
 
+  /**
+   * @description: 工具栏布局
+   * @Date: 2023-07-17 15:48:04
+   * @param {*}
+   * @return {*}
+   */
+  .toolbar_flex {
+    display: flex;
+    justify-content: space-between;
+
+    .list_toolbar_page_style {
+      text-align: right;
+    }
   }
 
   .operation-area-chart {
@@ -244,4 +261,12 @@
   //   box-shadow: 0px 1px 8px 0px #00000019;
   // }
   // }
+
+  // 清除 app-container 类样式
+  .clear_app_container {
+    padding: 0;
+    background: transparent;
+    border-radius: 0;
+    box-shadow: 0 0px 0px #ccc;
+  }
 }

package/src/styles/theme/dark-blue/message.scss

@@ -0,0 +1,8 @@
+.dark-blue {
+
+  //将message的提示框位于遮罩层的上方
+  .el-message--warning {
+    z-index:3000 !important;
+  }
+
+}

package/src/styles/theme/dark-blue/radio.scss

@@ -0,0 +1,13 @@
+.dark-blue {
+
+  // radio中间的圆点颜色
+  .el-radio__input.is-disabled.is-checked .el-radio__inner::after {
+    background-color: #000000;
+  }
+
+  .el-radio__input.is-disabled .el-radio__inner,
+  .el-radio__input.is-disabled.is-checked .el-radio__inner {
+    background-color: #F5F7FA;
+    border-color: #666666;
+  }
+}

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

@@ -6,30 +6,26 @@
     .main-container {
       height: 100%;
       transition: margin-left .28s;
-      margin-left: 210px;
+      margin-left: 224px;
       // padding-left: 24px;
       position: relative;
       background: #F8F9FA;
 
       .nav-tab {
-        padding-top: 0px;
-        padding-left: 0px;
-        .el-tabs__header{
-          padding-left: 24px;
-        }
+        padding-top: 5px;
+        padding-left: 5px;
       }
     }
 
     // 侧边栏
     .sidebar-container {
       transition: width 0.28s;
-      width: 210px !important;
+      width: 224px !important;
       height: 100%;
       position: fixed;
       top: 0;
       bottom: 0;
       left: 0;
-      padding-top: 16px;
       z-index: 1001;
       overflow: hidden;
       font-weight: medium;
@@ -173,11 +169,11 @@
 
     .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
     .sidebar-container .el-submenu .el-menu-item {
-      min-width: 180px !important;
+      min-width: 224px !important;
     }
 
     .sidebar-container .el-menu--collapse .el-menu .el-submenu {
-      min-width: 180px !important;
+      min-width: 224px !important;
     }
 
     .sidebar-container .el-menu--collapse .el-submenu.is-active>.el-submenu__title,
@@ -185,7 +181,7 @@
       background-color: #FFFFFF !important;
       color: #1A6BF3;
       font-weight: medium;
-      border-left: 4px solid #1A6BF3
+      border-right: 2px solid #3D4CF2
     }
 
     .sidebar-container .el-menu--collapse .el-submenu__title:not(.is-disabled):hover,
@@ -227,10 +223,6 @@
     }
   }
 
-  .sidebar-container-popper {
-    width: 180px;
-  }
-
   .sidebar-container-popper .el-submenu__title:not(.is-disabled):hover {
     background: #F7F7F8;
     color: rgba(0, 13, 31, 0.85);
@@ -259,33 +251,11 @@
     text-align: left;
   }
 
-  //侧边弹出菜单样式
-  .sidebar-container-popper .el-menu-item {
-    height: 46px;
-    line-height: 46px;
-    font-weight: medium;
-    color: #A4ABB8;
-    min-width: 164px;
-  }
-
-  .sidebar-container-popper .el-submenu__title {
-    height: 46px;
-    line-height: 46px;
-    color: #A4ABB8;
-    font-weight: medium;
-  }
 
   .sidebar-container-popper .el-menu--collapse {
     text-align: left;
   }
 
-  .sidebar-container-popper .el-menu--popup {
-    min-width: 180px;
-    padding: 12px 8px 12px 8px;
-  }
-
-
-
   .el-menu--vertical {
     &>.el-menu {
       .svg-icon {

package/src/styles/theme/dark-blue/tab.scss

@@ -1,4 +1,7 @@
 .dark-blue {
+  .el-tabs__header {
+    margin: 0 0 0 0;
+  }
 
   .superForm,
   .chartTabPage {
@@ -80,4 +83,4 @@
   }
 
 
-}
+}

package/src/styles/theme/dark-blue/table.scss

@@ -22,6 +22,7 @@
   // }
 
   .el-table .el-table__cell {
+    color: $table-cell-font-color;
     padding: 0;
   }
 
@@ -38,7 +39,6 @@
 
   // 表格内容颜色
   .el-table .cell {
-    color: $table-cell-font-color;
     font-family: Source Han Sans CN;
     font-weight: regular;
     font-size: 14px;

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

@@ -12,20 +12,45 @@
   }
 
 
+  // .el-tree-node .is-checked {
+  //   background-color: $th-cell-background !important;
+  // }
 
-  .el-tree-node .is-checked {
-    background-color: $th-cell-background !important;
-  }
-
-  .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
-    background-color: transparent;
-  }
+  // .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
+  //   background-color: transparent;
+  // }
 
-  .el-tree-node .is-expanded .is-focusable .is-checked {
-    background-color: transparent;
-  }
+  // .el-tree-node .is-expanded .is-focusable .is-checked {
+  //   background-color: transparent;
+  // }
 
   .el-tree-node .is-current .is-focusable {
     background-color: $th-cell-background !important;
   }
+
+  // "暂无更多" 样式
+  .roleQuery_center_area {
+    width: 100%;
+    position: relative;
+
+    .roleQuery_notAvailable {
+      background-image: url('../assets/nonemessage.png');
+      background-size: 100%;
+      position: absolute;
+      top: 30%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+
+      .roleQuery_notAvailable_text {
+        position: absolute;
+        bottom: 0;
+        left: 50%;
+        transform: translate(-50%, 100%);
+        color: #313233;
+        font-weight: regular;
+        font-size: 14px;
+      }
+    }
+  }
+
 }

package/src/styles/theme/gray/card-style.scss

@@ -38,5 +38,17 @@
 
 
   }
-
+  .gray_card_box {
+    border-radius: 6px;
+    background: #FFFFFF;
+    padding: 20px;
+    box-shadow: 0px 1px 8px 0px #00000019;
+    box-sizing: border-box;
+    overflow-y: scroll;
+  }
+  .gray_buttomBtn_box{
+    position: fixed;
+    bottom: 0;
+    right: 4%;
+  }
 }

package/src/styles/theme/gray/font-style.scss

@@ -29,4 +29,42 @@
       color: rgba(0, 13, 31, 0.85);
     }
   }
+
+  .page-layout__title {
+    width: 46px;
+    height: 16px;
+    font-size: 11px;
+    font-weight: 500;
+    color: #333333;
+    line-height: 13px;
+  }
+
+  .component-type-name__title {
+    width: 40px;
+    height: 14px;
+    font-size: 10px;
+    font-weight: 500;
+    color: #333333;
+    line-height: 12px;
+    // -webkit-background-clip: text;
+    // -webkit-text-fill-color: transparent;
+  }
+
+  .page-layout__title::before {
+    content: "";
+    text-align: center;
+    background: #1A6BF3;
+    float: left;
+    position: relative;
+    border-radius: 3px;
+    /** 定义成 block 元素 **/
+    display: block;
+    // height: 21px;
+    // width: 4px;
+    margin-right: 12px;
+
+    width: 2px;
+    height: 16px;
+
+  }
 }

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

@@ -3,7 +3,7 @@
 @import './card-style.scss';
 @import './tab-style.scss';
 @import './input-style.scss';
-@import './form-style.scss';
+@import './scrollbar-style.scss';
 
 .gray {
   font-family: microsoft yahei, Arial, Helvetica, sans-serif;
@@ -76,8 +76,9 @@
   }
 
   .app-container {
-    // padding: 20px;
-    padding: 0px;
+    padding: 20px;
+    border-radius: 6px;
+    box-shadow: 0px 1px 8px 0px #00000019;
 
     .box-card {
       margin: 16px 24px;
@@ -95,26 +96,6 @@
   }
 
 
-  .form-container {
-    height: calc(100vh - 82px);
-    overflow: auto;
-  }
-
-  .form-container .el-form .el-card {
-    margin-bottom: 10px;
-  }
-
-  .form-container .el-form .el-card:last-child {
-    margin-bottom: 0;
-  }
-
-  // 带有tab页签的表单高度
-  .tab-form-container {
-    height: calc(100vh - 190px);
-    overflow: auto;
-  }
-
-
   // 解决tab页签中内容多时没有滚动条问题
   .el-tabs__content {
     flex-grow: 1;
@@ -173,12 +154,19 @@
   .el-table th {
     padding: 0;
   }
+
   /**表格内容纵向分隔线去掉**/
-  .el-table--border td, .el-table--border th, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
+  .el-table--border td,
+  .el-table--border th,
+  .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
     border-right: 0px
   }
+
   /**表格标题纵向分隔线颜色调浅点儿**/
-  .el-table--border td, .el-table--border th,.el-table--border th.is-leaf, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
+  .el-table--border td,
+  .el-table--border th,
+  .el-table--border th.is-leaf,
+  .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
     border-right: 1px solid #fefefe;
   }
 }

package/src/styles/theme/gray/scrollbar-style.scss

@@ -0,0 +1,32 @@
+.dark-blue {
+
+  // 滚动条基础样式
+  ::-webkit-scrollbar {
+    width: 6px; // 纵向的宽度
+    height: 8px; // 横向的高度
+  }
+
+  // 默认下滚动条的样式
+  ::-webkit-scrollbar-thumb {
+    background: #eaeaea;
+    border: none;
+    border-radius: 4px;
+  }
+
+  // 鼠标悬停在滚动条时的样式
+  ::-webkit-scrollbar-thumb:hover {
+    background: rgba(157, 165, 183, 0.7)
+  }
+
+  // 滚动条区域 空白地方的样式
+  ::-webkit-scrollbar-track {
+    background-color: transparent;
+    border: none;
+  }
+
+  // 鼠标悬停在滚动条时 滚动条区域 空白地方的样式
+  ::-webkit-scrollbar-track:hover {
+    background-color: #eaeaea;
+    border: none;
+  }
+}

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

@@ -8,6 +8,11 @@
       transition: margin-left .28s;
       margin-left: 224px;
       position: relative;
+
+      .nav-tab {
+        padding-top: 5px;
+        padding-left: 5px;
+      }
     }
 
     // 侧边栏
@@ -79,11 +84,8 @@
       }
 
       .el-menu {
-        position: static;
         border: none;
-        // height: 100%;
-        height: auto;
-        max-height: 100vh;
+        height: 100%;
         width: 100% !important;
         background-color: #FFF;
         color: #000D1F
@@ -191,22 +193,13 @@
     }
   }
 
-  .sidebar-container-popper .el-menu{
-    // height: 100vh;
-    height: auto;
-    max-height: 100vh;
-    overflow-y: auto;
-    overflow-x: hidden;
-    scroll-behavior: smooth;
-  }
-
   .sidebar-container-popper .el-submenu__title:not(.is-disabled):hover {
     background: #F7F7F8;
     color: rgba(0, 13, 31, 0.85);
     font-weight: 500;
   }
 
-  .sidebar-container-popper .el-menu-item.is-active,.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: #EBECFF !important;
     color: #3D4CF2;
     font-weight: 500;

package/src/utils/auth-api.js

@@ -4,6 +4,7 @@ import Vue from 'vue'
 const jwtKey = 'JWT'
 const currentUserNameKey = 'USERNAME'
 const currentUserInfoKey = 'CURRENT_USER'
+const currentSystemUrlKey = 'CURRENT_SYSTEM_URL_'
 
 function getToken() {
   let token = getCookieCache(jwtKey)
@@ -66,6 +67,7 @@ function setCurrentUser(userInfo) {
 
 function removeCurrentUser() {
   removeSessionCache(currentUserInfoKey)
+  // 会导致cookie过大，后端没有设置请求头大小时，导致后端报错
   removeCookieCache(currentUserInfoKey)
 }
 
@@ -96,6 +98,46 @@ function setSessionCache(key, value) {
 function removeSessionCache(key) {
   sessionStorage.removeItem(key)
 }
+
+function getSystemCacheUrlByCode(systemCode) {
+  if (!systemCode) {
+    systemCode = Vue.prototype.customSystem
+  }
+  if (!systemCode) {
+    systemCode = Vue.prototype.systemCode
+  }
+  if (systemCode) {
+    const systemUrls = getSystemCacheUrl()
+    if (systemUrls) {
+      return systemUrls[systemCode]
+    }
+  }
+}
+
+function getSystemCacheUrl() {
+  let systemUrlJson = getCookieCache(currentSystemUrlKey)
+  if (!systemUrlJson) {
+    systemUrlJson = getSessionCache(currentSystemUrlKey)
+  }
+  if (systemUrlJson) {
+    return JSON.parse(systemUrlJson)
+  }
+}
+
+function setSystemCacheUrl(systemUrlObj) {
+  if (systemUrlObj) {
+    const systemUrlStr = JSON.stringify(systemUrlObj)
+    setSessionCache(currentSystemUrlKey, systemUrlStr)
+    // 会导致cookie过大，后端没有设置请求头大小时，导致后端报错
+    setCookieCache(currentSystemUrlKey, systemUrlStr)
+  }
+}
+
+function removeSystemCacheUrl() {
+  removeSessionCache(currentSystemUrlKey)
+  removeCookieCache(currentSystemUrlKey)
+}
+
 export default {
   getToken,
   setToken,
@@ -111,5 +153,9 @@ export default {
   removeCookieCache,
   getSessionCache,
   setSessionCache,
-  removeSessionCache
+  removeSessionCache,
+  getSystemCacheUrlByCode,
+  getSystemCacheUrl,
+  setSystemCacheUrl,
+  removeSystemCacheUrl
 }