imatrix-ui 2.8.2-tmp1 → 2.8.2-tmp2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.8.2-tmp1",
+  "version": "2.8.2-tmp2",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,

package/src/i18n/langs/cn.js

@@ -90,6 +90,7 @@ const cn = {
     isShow: '是否显示',
     isExportable: '是否导出',
     recordLine: '第 {row} 行记录',
+    pageRecordLine: '第 {pageNum} 页第 {row} 行记录',
     fileName: '文件名称',
     deleteSuccessful: '删除成功',
     index: '序号',

package/src/i18n/langs/en.js

@@ -89,6 +89,7 @@ const en = {
     isShow: 'Is Show',
     isExportable: 'Is Exportable',
     recordLine: 'Record line {row}',
+    pageRecordLine: 'Record in row {row} of page {pageNum}',
     fileName: 'File Name',
     deleteSuccessful: 'Deleted successfully',
     index: 'No.',

package/src/permission.js

@@ -29,6 +29,10 @@ router.beforeEach((to, from, next) => {
       setToken(token)
     }
   }
+  if (to.query && to.query._systemName_) {
+    // 表示需要设置浏览器页签名
+    document.title = to.query._systemName_
+  }
   // console.log('router.beforeEach-getToken()=', token)
   if ((['/update-password', '/forget-password', '/reset-password', '/redirect'].indexOf(to.path) === -1 || store.getters.whiteList.indexOf(to.path) !== -1) && token) {
     if (to.path === '/login') {

package/src/store/modules/permission.js

@@ -86,7 +86,10 @@ const permission = {
       return new Promise(resolve => {
         const currentUserPermissions = data
         // commit('setCurrentUserPermissions', currentUserPermissions)
+        const a = new Date().getTime()
         const accessableRoutersResult = filterProtectedRouter(protectedRouterMap, currentUserPermissions)
+        const b = new Date().getTime()
+        sessionStorage.setItem('=====generateRoutes====>'+new Date().getTime()+'-执行时间b-a=', (b-a)+'')
         const accessableRouters = accessableRoutersResult.allRouters
         const allMenuRoutes = accessableRoutersResult.menuRouters
         // console.log('有权限的路由表结果==', accessableRouters)
@@ -114,6 +117,8 @@ const permission = {
             // console.log('更新后的有权限的路由表结果，更新了根路由跳转的地址==', accessableRouters)
           }
         }
+        const c = new Date().getTime()
+        sessionStorage.setItem('=====generateRoutes====>执行时间c-a=', (c-a)+'')
         commit('setRouters', accessableRouters)
         resolve()
       })

package/src/styles/display-layout.scss

@@ -0,0 +1,34 @@
+.flex-container {
+  display: flex;
+  width: 100%;
+
+  .tree-area {
+    flex: 0 0 200px;
+    overflow: auto;
+  }
+
+  .list-area {
+    flex: 1;
+    overflow: auto;
+    margin-left: 20px;
+  }
+}
+
+.three-column-layout {
+  height: calc(100vh - 20px);
+
+  .el-aside {
+    margin-right: 20px;
+    padding-top: 20px;
+    background-color: #FFFFFF;
+    box-shadow: 0px 1px 8px 0px #00000019;
+
+  }
+
+  .el-main {
+    padding: 20px 0 0 20px;
+    border-radius: 6px;
+    background: #FFFFFF;
+    box-shadow: 0px 1px 8px 0px #00000019;
+  }
+}

package/src/styles/index.scss

@@ -9,6 +9,9 @@
 @import './theme/blue2/sidebar.scss';
 @import './theme/gray/index.scss';
 @import './theme/gray/sidebar.scss';
+@import './theme/dark-blue/index.scss';
+@import './theme/dark-blue/sidebar.scss';
+@import './display-layout.scss';
 
 body {
   overflow: hidden;
@@ -32,19 +35,33 @@ body .el-table th.gutter {
 body .el-table colgroup.gutter {
   display: table-cell !important;
 }
+
 // 日期控件宽度不自适应问题
-.formContent .el-date-editor.el-input,.formContent .el-date-editor.el-input__input,.formContent .el-date-editor.el-input__inner,
-.grid-search-form .el-date-editor.el-input,.grid-search-form .el-date-editor.el-input__input,.grid-search-form .el-date-editor.el-input__inner {
+.formContent .el-date-editor.el-input,
+.formContent .el-date-editor.el-input__input,
+.formContent .el-date-editor.el-input__inner,
+.grid-search-form .el-date-editor.el-input,
+.grid-search-form .el-date-editor.el-input__input,
+.grid-search-form .el-date-editor.el-input__inner {
   width: 100%;
 }
-.formContent .el-date-editor--daterange.el-input,.formContent .el-date-editor--daterange.el-input__inner,.formContent .el-date-editor--timerange.el-input,.formContent .el-date-editor--timerange.el-input__inner,
-.grid-search-form .el-date-editor--daterange.el-input,.grid-search-form .el-date-editor--daterange.el-input__inner,.grid-search-form .el-date-editor--timerange.el-input,.grid-search-form .el-date-editor--timerange.el-input__inner {
+
+.formContent .el-date-editor--daterange.el-input,
+.formContent .el-date-editor--daterange.el-input__inner,
+.formContent .el-date-editor--timerange.el-input,
+.formContent .el-date-editor--timerange.el-input__inner,
+.grid-search-form .el-date-editor--daterange.el-input,
+.grid-search-form .el-date-editor--daterange.el-input__inner,
+.grid-search-form .el-date-editor--timerange.el-input,
+.grid-search-form .el-date-editor--timerange.el-input__inner {
   width: 100%;
 }
+
 // 日期选择按钮太小问题（gcommon ui）
 .el-picker-panel__footer .el-button--mini {
   font-size: 16px;
 }
+
 // 显示必填标志
 .is_req {
   .required__label::before {
@@ -56,4 +73,15 @@ body .el-table colgroup.gutter {
 
 .formContent .el-form-item {
   margin-bottom: 0;
+}
+
+.operation-area-float {
+  float: right;
+  position: fixed;
+  bottom: 5px;
+  right: 4%;
+}
+
+.el-button+.el-button {
+  margin-left: 10px;
 }

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

@@ -0,0 +1,9 @@
+@import "./dark-blue-var.scss";
+
+.dark-blue {
+  .operation-area .el-button--primary {
+    border-radius: 4px;
+    background: $--button-opt-background-color;
+    border-color: $--button-opt-background-color;
+  }
+}

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

@@ -0,0 +1,64 @@
+.dark-blue {
+  $titleColor: rgba(0, 0, 0, 0.85);
+
+  el-card box-card is-always-shadow .card-radius {
+    border-radius: 12px
+  }
+
+  .form-card-header {
+    width: 3px;
+    height: 14px;
+    left: 0;
+    align-items: center;
+    text-align: center;
+  }
+
+  .form-card-header-bgc {
+    width: 3px;
+    height: 14px;
+    display: flex;
+    background-color: #3D4CF2
+  }
+
+  .form-card-text {
+    padding-left: 8px;
+    font-size: 16px;
+    line-height: 24px;
+    font-weight: 500;
+    color: $titleColor;
+    display: table-cell;
+    position: relative;
+  }
+
+  .superForm {
+    .el-card {
+      border-radius: 12px;
+      box-shadow: 0 1px 4px 0 rgba(0, 13, 31, 0.10);
+    }
+
+
+  }
+
+
+  .platform-card {
+    .el-card__header {
+      height: 40px;
+      background: #F0F8FE;
+      color: #005EBA;
+      font-family: Source Han Sans CN;
+      font-weight: medium;
+      font-size: 14px;
+      text-align: left;
+      padding: 9px 0px 9px 20px;
+    }
+
+    .el-card__header>div {
+      line-height: 22px;
+    }
+
+    .card-style {
+      margin-top: 20px;
+    }
+  }
+
+}

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

@@ -0,0 +1,10 @@
+@import "./dark-blue-var.scss";
+
+.dark-blue {
+
+  .el-checkbox__input.is-checked .el-checkbox__inner,
+  .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+    background-color: $--color-primary;
+    border-color: $--color-primary;
+  }
+}

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

@@ -0,0 +1,8 @@
+  /* 改变主题色变量 */
+  $--color-primary: #005EBA;
+  $--button-default-border-color: $--color-primary;
+  $--button-default-font-color: $--color-primary;
+  $--button-font-weight: regular;
+  $--button-default-font-color: $--color-primary;
+  $--button-opt-background-color:#0780ED;
+  $th-cell-background: #F0F8FE;

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

@@ -0,0 +1,21 @@
+.dark-blue {
+  .el-dialog__header {
+    padding: 22px 0px 0px 24px;
+  }
+
+  .el-dialog__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;
+  }
+
+
+}

package/src/styles/theme/dark-blue/element-variables.scss

@@ -0,0 +1,7 @@
+@import "./dark-blue-var.scss";
+
+.dark-blue {
+  /* 改变 icon 字体路径变量，必需 */
+  $--font-path: '~element-ui/lib/theme-chalk/fonts';
+  @import "~element-ui/packages/theme-chalk/src/index";
+}

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

@@ -0,0 +1,71 @@
+.dark-blue {
+  $titleColor: rgba(0, 0, 0, 0.85);
+
+  .list-file {
+    color: rgba(0, 13, 31, 0.45);
+    font-size: 14px;
+    cursor: pointer;
+  }
+
+  .form-list-file {
+    color: rgba(0, 0, 0, 0.65);
+    background: #F2F6FA;
+    border-radius: 6px;
+    font-size: 14px;
+    cursor: pointer;
+    height: 28px;
+    line-height: 28px;
+    padding: 0 8px 0 8px;
+    margin-right: 32px
+  }
+
+  .tip-font {
+    color: rgba(0, 0, 0, 0.65);
+    font-size: 14px;
+  }
+
+  .superForm {
+    .el-form-item__label {
+      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/dark-blue/form.scss

@@ -0,0 +1,51 @@
+.dark-blue {
+
+  .button-at-top {
+    width: 100%;
+    background: rgb(255, 255, 255);
+    line-height: 72px;
+    height: 72px;
+    position: absolute;
+    z-index: 100;
+    top: 0px;
+    left: 0px;
+    right: 0px;
+  }
+
+  .button-at-bottom {
+    width: 100%;
+    background: rgb(255, 255, 255);
+    line-height: 72px;
+    height: 72px;
+    position: absolute;
+    bottom: 0px;
+    z-index: 100;
+    left: 0px;
+    right: 0px;
+  }
+
+  .form-top-button {
+    height: 72px;
+    float: left;
+    padding-left: 24px;
+    line-height: 72px;
+  }
+
+  .form-bottom-button {
+    height: 72px;
+    float: right;
+    padding-right: 24px;
+    line-height: 72px;
+  }
+
+  .form-center-position{
+    position: relative;
+
+    .form-center-son{
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%,-50%);
+    }
+  }
+}

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

@@ -0,0 +1,247 @@
+@import './element-variables.scss';
+@import './table.scss';
+@import './sidebar.scss';
+@import './font.scss';
+@import './card.scss';
+@import './tab.scss';
+@import './input.scss';
+@import './form.scss';
+@import './pagination.scss';
+@import './button.scss';
+@import './checkbox.scss';
+@import './dialog.scss';
+@import './tree.scss';
+@import './scrollbar-style.scss';
+
+
+.dark-blue {
+  font-family: cursive;
+  font-size: 14px;
+  color: rgba(0, 0, 0, 0.85);
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  text-rendering: optimizeLegibility;
+  height: 100%;
+
+  .el-button {
+    font-family: cursive;
+  }
+
+  .fl {
+    float: left;
+  }
+
+  .fr {
+    float: right;
+  }
+
+
+  html {
+    height: 100%;
+    box-sizing: border-box;
+  }
+
+  #app {
+    height: 100%;
+  }
+
+  a,
+  a:focus,
+  a:hover {
+    cursor: pointer;
+    color: inherit;
+    outline: none;
+    text-decoration: none;
+  }
+
+  div:focus {
+    outline: none;
+  }
+
+  a:focus,
+  a:active {
+    outline: none;
+  }
+
+  a,
+  a:focus,
+  a:hover {
+    cursor: pointer;
+    color: inherit;
+    text-decoration: none;
+  }
+
+  .clearfix {
+    &:after {
+      visibility: hidden;
+      display: block;
+      font-size: 0;
+      content: " ";
+      clear: both;
+      height: 0;
+    }
+  }
+
+  //main-container全局样式
+  .app-main {
+    min-height: 100%;
+    background: #f7f7f8;
+    padding: 11px 24px 11px 24px;
+    // padding-top: 12px;
+  }
+
+  .app-container {
+    // padding: 20px;
+    // padding: 0px;
+    padding: 20px 24px;
+    background: #FFFFFF;
+    border-radius: 6px;
+    box-shadow: 0px 1px 8px 0px #00000019;
+
+    .box-card {
+      margin: 0px 0px 0px 0px;
+    }
+  }
+
+  .no-margin {
+    padding: 0px 0px;
+  }
+
+  .add_form_height {
+    height: calc(100vh - 60px);
+    position: relative;
+
+    .add_form_center {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+
+      .add_form_buttomButton {
+        text-align: right;
+      }
+    }
+  }
+
+  .operation-area {
+    margin-bottom: 20px;
+
+  }
+
+  .operation-area-chart {
+    padding-right: 24px;
+    padding-top: 24px;
+    text-align: right;
+  }
+
+  // 解决tab页签中内容多时没有滚动条问题
+  .el-tabs__content {
+    flex-grow: 1;
+    overflow-y: auto;
+  }
+
+  // 解决在edge浏览器中dialog有遮罩层 或 MessageBox的$confirm时，遮罩层偏移，导致弹框中组件元素无法操作问题。
+  // .el-dialog__wrapper、.el-message-box__wrapper、.v-modal默认position是relative，改为absolute就不会出现偏移了。
+  // dialog弹框的样式
+  .el-dialog__wrapper {
+    position: absolute;
+  }
+
+  //  MessageBox的样式，必须这样修改，否则会导致点击确定、取消按钮不好用
+  .el-message-box__wrapper {
+    position: absolute;
+  }
+
+  // dialog遮罩层的样式
+  .v-modal {
+    position: absolute;
+  }
+
+  .menu-tab-container .el-tabs__item {
+    height: 48px;
+    line-height: 48px;
+  }
+
+  //顶部标签字体样式
+  .menu-tab-container .el-tabs__item.is-active {
+    color: #3D4cf2;
+  }
+
+  //顶部标签样式
+  .menu-tab-container .el-tabs__active-bar {
+    background-color: #3D4cf2;
+  }
+
+  .el-pagination {
+    text-align: right;
+  }
+
+  .el-table td {
+    padding: 14px 0;
+  }
+
+  .el-table td,
+  .el-table th {
+    height: 40px;
+  }
+
+  .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 {
+    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 {
+    border-right: 1px solid #fefefe;
+  }
+
+  .selectPeopleClass {
+    color: #313233;
+    font-family: Source Han Sans CN;
+    font-weight: regular;
+    font-size: 14px;
+    line-height: 22px;
+    letter-spacing: 0px;
+    text-align: left;
+  }
+
+  .el-button+.el-button {
+    margin-left: 10px;
+  }
+
+  // .el-main {
+  //   padding: 0px;
+  // }
+
+  // .el-aside {
+  //   margin-right: 20px;
+  // }
+
+  // .three-column-layout {
+  //   height: calc(100vh - 20px);
+
+  //   .el-aside {
+  //   margin-right: 20px;
+  //     padding-top: 20px;
+  //     background-color: #FFFFFF;
+  //     box-shadow: 0px 1px 8px 0px #00000019;
+
+  //   }
+
+  // .el-main {
+  //   padding: 20px 0 0 20px;
+  //   border-radius: 6px;
+  //   background: #FFFFFF;
+  //   box-shadow: 0px 1px 8px 0px #00000019;
+  // }
+  // }
+}

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

@@ -0,0 +1,15 @@
+.dark-blue {
+
+  .superForm {
+
+    .el-input--medium .el-input__inner {
+      height: 32px;
+      line-height: 32px;
+    }
+
+    .el-input.is-disabled .el-input__inner {
+      color: #606266;
+    }
+  }
+
+}

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

@@ -0,0 +1,14 @@
+@import "./dark-blue-var.scss";
+
+.dark-blue {
+  .el-pager li:not(.disabled) {
+    &:hover {
+      //color: $--pagination-hover-color;
+    }
+
+    &.active {
+      color: #FFFFFF;
+      background-color: $--button-default-font-color;
+    }
+  }
+}