imatrix-ui 2.8.7 → 2.8.8-boe10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.8.7",
+  "version": "2.8.8-boe10",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,
@@ -34,7 +34,7 @@
     "element-ui": "2.15.3",
     "eslint": "5.16.0",
     "eslint-plugin-vue": "5.2.2",
-    "node-sass": "4.12.0",
+    "node-sass": "4.14.1",
     "nprogress": "^0.2.0",
     "sass-loader": "^7.1.0",
     "sessionstorage": "^0.1.0",

package/src/i18n/langs/cn.js

@@ -90,6 +90,7 @@ const cn = {
     isShow: '是否显示',
     isExportable: '是否导出',
     recordLine: '第 {row} 行记录',
+    pageRecordLine: '第 {pageNum} 页第 {row} 行记录',
     fileName: '文件名称',
     deleteSuccessful: '删除成功',
     index: '序号',
@@ -207,6 +208,7 @@ const cn = {
     commonButtonOperation: '{1}执行了[{2}]操作',
     history_draw_task: '{1}领取了任务,取消了候选人[{2}]的任务',
     history_abandon_draw: '{1}放弃领取该任务,还原了候选人[{2}]的任务',
+    create_copy_task: '{1}把任务抄送给了[{2}]',
     toDoText: '待处理',
     operator: '操作人',
     operatorDept: '操作人部门',

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.',
@@ -202,8 +203,9 @@ const en = {
     history_quit_transfer: '{1} Resignation, has transferred task [{2}] to [{3}',
     history_change_job_transfer: '{1} Change job,has transferred task [{2}] to [{3}',
     commonButtonOperation: '{1} execute [{2}] operation',
-    history_draw_task: '{1}received the task and cancelled the task of the candidate [{2}]',
-    history_abandon_draw: '{1}gives up the task and restores the task of candidate [{2}]',
+    history_draw_task: '{1} received the task and cancelled the task of the candidate [{2}]',
+    history_abandon_draw: '{1} gives up the task and restores the task of candidate [{2}]',
+    create_copy_task: '{1} The task was copied to [{2}',
     toDoText: 'Todo',
     operator: 'Operator',
     operatorDept: 'Operator Dept',

package/src/router/index.js

@@ -69,6 +69,16 @@ export const publicRouterMap = [
     path: '/show-sub-wf-history',
     component: () => import('../views/wf-history/tache-subprocess-history'),
     hidden: true
+  },
+  {
+    path: '/tab-content-index',
+    component: () => import('../views/layout/tab-content-index'),
+    hidden: true
+  },
+  {
+    path: '/tab-content-iframe-index',
+    component: () => import('../views/layout/tab-content-iframe-index'),
+    hidden: true
   }
 
 ]

package/src/store/modules/tab-content.js

@@ -22,6 +22,12 @@ const tabContent = {
     // 设置当前激活的tab
     set_active_index(state, index) {
       state.activeIndex = index
+    },
+    // 清空tabs
+    clear_tabs(state, route) {
+      if (state.openTab.length > 0) {
+        state.openTab.splice(0, state.openTab.length)
+      }
     }
   },
   actions: {

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,85 @@ body .el-table colgroup.gutter {
 
 .formContent .el-form-item {
   margin-bottom: 0;
-}
+}
+
+.operation-area,
+.grid-search-form .search-button,
+.grid-area .grid-operation-buttons {
+  .el-button:not(:first-child) {
+    margin-left: 10px;
+  }
+}
+
+.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;
+}
+
+// 带有tab页签的表单高度
+.tab-form-container {
+  height: calc(100vh - 190px);
+  overflow: auto;
+}
+
+.form-container {
+  height: calc(100vh - 90px);
+  overflow: auto;
+}
+
+.form-container-bottom-button {
+  margin-bottom: 50px;
+}
+
+.form-container .el-form .el-card {
+  margin-bottom: 10px;
+}
+
+.form-container .el-form .el-card:last-child {
+  margin-bottom: 0;
+}
+
+.operation-area-float {
+  float: right;
+  position: fixed;
+  bottom: 0;
+  right: 4%;
+}
+
+.el-button+.el-button {
+  margin-left: 10px;
+}
+

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

@@ -0,0 +1,70 @@
+.gray {
+  $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/black/index.scss

@@ -1,4 +1,5 @@
 @import './sidebar.scss';
+@import './font-style.scss';
 
 .black .el-dialog__header {
   padding: 10px 10px 10px;
@@ -79,34 +80,19 @@
 
   .app-container {
     padding: 20px;
+    border-radius: 6px;
+    box-shadow: 0px 1px 8px 0px #00000019;
   }
 
   .operation-area {
     margin-bottom: 10px;
   }
+
   .operation-area-chart {
     float: right;
     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页签的表单高度
-  .tab-form-container {
-    height: calc(100vh - 190px);
-    overflow: auto;
-  }
 
   // 解决tab页签中内容多时没有滚动条问题
   .el-tabs__content {
@@ -217,6 +203,8 @@
 
   .app-container {
     padding: 20px;
+    border-radius: 6px;
+    box-shadow: 0px 1px 8px 0px #00000019;
   }
 
   .operation-area {
@@ -224,18 +212,6 @@
     height: 40px;
   }
 
-  .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/blue/font-style.scss

@@ -6,4 +6,41 @@
     cursor: pointer;
   }
 
+  .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/blue/index.scss

@@ -80,6 +80,8 @@
 
   .app-container {
     padding: 20px;
+    border-radius: 6px;
+    box-shadow: 0px 1px 8px 0px #00000019;
   }
 
   .operation-area {
@@ -91,24 +93,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页签的表单高度
-  .tab-form-container {
-    height: calc(100vh - 190px);
-    overflow: auto;
-  }
 
 
   // 解决tab页签中内容多时没有滚动条问题

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

@@ -0,0 +1,70 @@
+.gray {
+  $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/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/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";
+}