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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.9.15-dw-tmp2",
+  "version": "2.9.16-boe2",
   "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.0",
     "nprogress": "^0.2.0",
     "sass-loader": "^7.1.0",
     "sessionstorage": "^0.1.0",

package/src/api/sso-service.js

@@ -11,6 +11,23 @@ function login(username, password, language) {
 
   return request.post(Vue.prototype.baseAPI + '/sso/login', usernamePasswordToken)
 }
+function loginWithValidateCode(username, password, language, validateCode, imageCodeKey) {
+  const usernamePasswordToken = {
+    username,
+    password
+  }
+  if (language) {
+    usernamePasswordToken.language = language
+  }
+  if (validateCode) {
+    usernamePasswordToken.validateCode = validateCode
+  }
+  if (imageCodeKey) {
+    usernamePasswordToken.imageCodeKey = imageCodeKey
+  }
+
+  return request.post(Vue.prototype.baseAPI + '/sso/login-with-validate-code', usernamePasswordToken)
+}
 
 function getCurrentUser() {
   return request.get(
@@ -96,5 +113,6 @@ export default {
   isResetPasswordJwtOverdue,
   resetPassword,
   isLoginTimeOut,
-  getUserPermissionMenusBySystemCode
+  getUserPermissionMenusBySystemCode,
+  loginWithValidateCode
 }

package/src/i18n/i18n.js

@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import locale from '@gcommon/gcommon-ui/lib/locale'
+import locale from 'element-ui/lib/locale'
 import VueI18n from 'vue-i18n'
 import en from './langs/en'
 import cn from './langs/cn'

package/src/i18n/langs/cn.js

@@ -1,4 +1,4 @@
-import zhLocale from '@gcommon/gcommon-ui/lib/locale/lang/zh-CN'
+import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
 const cn = {
   imatrixUIPublicModel: {
     sure: '确定',
@@ -74,7 +74,8 @@ const cn = {
     search: '查询',
     forbiddenException: '您没有权限访问该资源',
     theButtonIsNotBoundToAResource: '该按钮未绑定资源,请先绑定资源',
-    asyncExport: '正在异步导出，请等待消息通知!'
+    asyncExport: '正在异步导出，请等待消息通知!',
+    NoContent: '暂无内容'
   },
   // 列表组件
   superGrid: {
@@ -148,7 +149,8 @@ const cn = {
     branch: '所属分支',
     removeUser: '移除用户',
     email: '邮箱',
-    loginName: '登录名'
+    loginName: '登录名',
+    superiorDeptNameFullPath: '组织全路径'
   },
   // 工作组树
   workgroupTree: {
@@ -176,7 +178,9 @@ const cn = {
     assign: '交办',
     assign_task: '转办',
     readed: '已阅',
-    export_report: '导出报告'
+    export_report: '导出报告',
+    draw_dept_task: '部门领取',
+    abandon_draw_dept_task: '放弃部门领取'
   },
   // 流转历史文本组件
   workflowHistoryList: {
@@ -209,11 +213,13 @@ const cn = {
     commonButtonOperation: '{1}执行了[{2}]操作',
     history_draw_task: '{1}领取了任务,取消了候选人[{2}]的任务',
     history_abandon_draw: '{1}放弃领取该任务,还原了候选人[{2}]的任务',
+    create_copy_task: '{1}把任务抄送给了[{2}]',
     toDoText: '待处理',
     operator: '操作人',
     operatorDept: '操作人部门',
-    operationTime: '操作时间'
-
+    operationTime: '操作时间',
+    history_draw_dept_task: '{1}领取了部门[{2}]的任务',
+    history_abandon_draw_dept_task: '{1}放弃领取部门[{2}]的任务'
   },
   gateway: {
     timeout: '接口调用超时',
@@ -239,6 +245,12 @@ const cn = {
     callingRearCamera: '正在调用后置摄像头...',
     identificationFailed: '识别失败'
   },
+  IntervalSelection: {
+    year: '年',
+    quarter: '季度',
+    auxiliary: '第',
+    week: '周'
+  },
   ...zhLocale
 }
 export default cn

package/src/i18n/langs/en.js

@@ -1,4 +1,4 @@
-import enLocale from '@gcommon/gcommon-ui/lib/locale/lang/en'
+import enLocale from 'element-ui/lib/locale/lang/en'
 const en = {
   imatrixUIPublicModel: {
     sure: 'Sure',
@@ -74,7 +74,8 @@ const en = {
     search: 'Search',
     forbiddenException: 'You do not have permission to access this resource',
     theButtonIsNotBoundToAResource: 'The button is not bound to a resource, Bind the resource first',
-    asyncExport: 'Asynchronous export, please wait for message notification!'
+    asyncExport: 'Asynchronous export, please wait for message notification!',
+    NoContent: 'No Content'
   },
   superGrid: {
     columnConfig: 'Column Config',
@@ -145,7 +146,8 @@ const en = {
     branch: 'Branch',
     removeUser: 'Remove User',
     email: 'Email',
-    loginName: 'Login Name'
+    loginName: 'Login Name',
+    superiorDeptNameFullPath: 'Department full path'
   },
   // 工作组树
   workgroupTree: {
@@ -173,7 +175,9 @@ const en = {
     assign: 'Hand over',
     assign_task: 'Transfer',
     readed: 'Readed',
-    export_report: 'Export Report'
+    export_report: 'Export Report',
+    draw_dept_task: 'Draw Department',
+    abandon_draw_dept_task: 'Give Up Draw Department'
   },
   // 流转历史文本组件
   workflowHistoryList: {
@@ -204,12 +208,15 @@ 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',
-    operationTime: 'Operation Time'
+    operationTime: 'Operation Time',
+    history_draw_dept_task: '{1} Received tasks from department [{2}]',
+    history_abandon_draw_dept_task: '{1} Abandon the task of receiving department [{2}]'
   },
   gateway: {
     timeout: 'Interface call timeout',
@@ -235,6 +242,12 @@ const en = {
     callingRearCamera: 'Calling rear camera',
     identificationFailed: 'Identification failed'
   },
+  IntervalSelection: {
+    year: 'year',
+    quarter: 'quarter',
+    auxiliary: 'auxiliary word for ordinal numbers',
+    week: 'week'
+  },
   ...enLocale
 }
 export default en

package/src/permission.js

@@ -4,7 +4,7 @@ import { getToken, setToken } from './utils/auth' // 验权
 import store from './store'
 import router, { errorRouterMap } from './router'
 NProgress.configure({ showSpinner: false })// NProgress Configuration
-import { Message } from '@gcommon/gcommon-ui'
+import { Message } from 'element-ui'
 import Vue from 'vue'
 
 const whiteList = ['/login', '/update-password', '/forget-password', '/reset-password', '/redirect'] // 不重定向白名单
@@ -31,7 +31,7 @@ router.beforeEach((to, from, next) => {
   }
   if (to.query && to.query._systemName_) {
     // 表示需要设置浏览器页签名
-    document.title = to.query._systemName_
+    window.top.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) {

package/src/plugins.js

@@ -3,9 +3,9 @@ import Vue from 'vue'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 import './styles/index.scss' // global css
 
-import ElementUI from '@gcommon/gcommon-ui'
-import '@gcommon/gcommon-ui/lib/theme-chalk/index.css'
-import locale from '@gcommon/gcommon-ui/lib/locale/lang/zh-CN' // lang i18n
+import ElementUI from 'element-ui'
+import 'element-ui/lib/theme-chalk/index.css'
+import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n
 
 import SuperUI from 'imatrix-ui'
 import 'imatrix-ui/lib/super-ui.css'

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/store/modules/user.js

@@ -42,12 +42,42 @@ const user = {
         })
       })
     },
+    // 登录
+    loginWithValidateCode({ commit }, userInfo) {
+      const username = userInfo.username.trim()
+      return new Promise((resolve, reject) => {
+        ssoService.loginWithValidateCode(username, userInfo.password, userInfo.language, userInfo.validCode, userInfo.imageCodeKey).then(data => {
+          // const data = response.data
+          setToken(data.jwt)
+          commit('setToken', data.jwt)
+          return ssoService.getCurrentUserPermissionsBySystem(data.subject)
+        }).then(permissions => {
+          let currentPermissions = ['index']
+          currentPermissions = currentPermissions.concat(permissions)
+          setPermissions(currentPermissions)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 登录。根据token登录系统
     loginWithCookieToken({ commit }, loginName) {
       return new Promise((resolve, reject) => {
+        if (!loginName) {
+          ssoService.getCurrentUser().then(user => {
+            if (user) {
+              loginName = user.loginName
+              setUsername(user.loginName)
+              setCurrentUser(user)
+              commit('setName', user.name)
+            }
+            resolve(user)
+          }).catch(error => {
+            reject(error)
+          })
+        }
         if (loginName) {
-          // setToken(tokenInfo.jwt)
-          // commit('setToken', tokenInfo.jwt)
           ssoService.getCurrentUserPermissionsBySystem(loginName).then(permissions => {
             let currentPermissions = ['index']
             currentPermissions = currentPermissions.concat(permissions)

package/src/styles/display-layout.scss

@@ -15,7 +15,7 @@
 }
 
 .three-column-layout {
-  height: calc(100vh - 20px);
+  height: calc(100vh - 35px);
 
   .el-aside {
     margin-right: 20px;

package/src/styles/index.scss

@@ -9,8 +9,8 @@
 @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 './theme/dark-blue/index.scss';
+@import './theme/dark-blue/sidebar.scss';
 @import './display-layout.scss';
 
 body {
@@ -75,13 +75,83 @@ body .el-table colgroup.gutter {
   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: 5px;
+  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;
+
+  }
+}