imatrix-ui 2.8.2-dw → 2.8.2-tmp2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.8.2-dw",
+  "version": "2.8.2-tmp2",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,
@@ -13,9 +13,11 @@
     "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
+    "@tinymce/tinymce-vue": "^3.2.4",
     "@zxing/library": "^0.19.1",
     "js-cookie": "^2.2.0",
-    "sortablejs": "1.10.2"
+    "sortablejs": "1.10.2",
+    "tinymce": "^5.6.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "3.8.0",

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: '确定',
@@ -40,13 +40,14 @@ const cn = {
     switchToAdvancedQuery: '切换为高级查询',
     isNull: '等于Null',
     isNotNull: '不等于Null',
-    previewImage: '预览图片'
+    previewImage: '预览图片',
+    fullScreen: '全屏'
   },
   imatrixUIMessage: {
     whetherToConfirmDeletion: '是否确认删除',
     tips: '提示',
     pleaseEnterContent: '请输入内容',
-    internalServerError: '服务器出错了，请联系管理员',
+    internalServerError: '请求失败',
     pleaseSelectDepartment: '请选择部门',
     pleaseSelectPersonnel: '请选择人员',
     pleaseRemoveallpersonnelBeforeSelectingSpecificPersonnel: '请先移除所有人员，再选择具体人员',
@@ -71,7 +72,8 @@ const cn = {
     fileUpload: '文件上传',
     selectYear: '选择年',
     search: '查询',
-    forbiddenException: '您没有权限访问该资源'
+    forbiddenException: '您没有权限访问该资源',
+    theButtonIsNotBoundToAResource: '该按钮未绑定资源,请先绑定资源'
   },
   // 列表组件
   superGrid: {
@@ -88,6 +90,7 @@ const cn = {
     isShow: '是否显示',
     isExportable: '是否导出',
     recordLine: '第 {row} 行记录',
+    pageRecordLine: '第 {pageNum} 页第 {row} 行记录',
     fileName: '文件名称',
     deleteSuccessful: '删除成功',
     index: '序号',
@@ -122,7 +125,9 @@ const cn = {
     pleaseEnterDepartmentName: '请输入部门名称',
     name: '部门名称',
     code: '部门编码',
-    removeDepartment: '移除部门'
+    removeDepartment: '移除部门',
+    selectedDept: '已选部门',
+    namePath: '名称路径'
   },
   // 用户树
   departmentUserTree: {

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',
@@ -40,13 +40,14 @@ const en = {
     switchToAdvancedQuery: 'Switch To Advanced Query',
     isNull: 'Is Null',
     isNotNull: 'Is Not Null',
-    previewImage: 'Preview image'
+    previewImage: 'Preview image',
+    fullScreen: 'Full Screen'
   },
   imatrixUIMessage: {
     whetherToConfirmDeletion: 'Whether To Confirm Deletion',
     tips: 'Tips',
     pleaseEnterContent: 'Please Enter Content',
-    internalServerError: 'Server error, please contact administrator',
+    internalServerError: 'Server error',
     pleaseSelectDepartment: 'Please Select Department',
     pleaseSelectPersonnel: 'Please Select Personnel',
     pleaseRemoveallpersonnelBeforeSelectingSpecificPersonnel: 'Please Remove All Personnel Before Selecting Specific Personnel',
@@ -71,7 +72,8 @@ const en = {
     fileUpload: 'File Upload',
     selectYear: 'Select Year',
     search: 'Search',
-    forbiddenException: 'You do not have permission to access this resource'
+    forbiddenException: 'You do not have permission to access this resource',
+    theButtonIsNotBoundToAResource: 'The button is not bound to a resource, Bind the resource first'
   },
   superGrid: {
     columnConfig: 'Column Config',
@@ -87,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.',
@@ -119,7 +122,9 @@ const en = {
     pleaseEnterDepartmentName: 'Please Enter Department Name',
     name: 'Department Name',
     code: 'Department Code',
-    removeDepartment: 'Remove Department'
+    removeDepartment: 'Remove Department',
+    selectedDept: 'Selected Departments',
+    namePath: 'Name Path'
   },
   // 用户树
   departmentUserTree: {

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'] // 不重定向白名单
@@ -29,8 +29,12 @@ 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 && 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') {
       next({ path: '/', query: to.query })
       NProgress.done() // if current page is dashboard will not trigger	afterEach hook, so manually handle it
@@ -84,7 +88,7 @@ router.beforeEach((to, from, next) => {
       }
     }
   } else {
-    if (whiteList.indexOf(to.path) !== -1) {
+    if (whiteList.indexOf(to.path) !== -1 || store.getters.whiteList.indexOf(to.path) !== -1) {
       next()
     } else {
       // 必须使用to.fullPath，fullPath是带有参数的，to.path没有参数，会导致跳转到的页面参数丢失

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

@@ -79,6 +79,30 @@ export const errorRouterMap = [
   // 404的映射必须是最后一个
   { path: '*', redirect: '/404', hidden: true }
 ]
+
+// 解决Uncaught (in promise) NavigationDuplicated: Avoided redundant navigation to current location问题
+const originalPush = Router.prototype.push
+const originReplace = Router.prototype.replace
+
+// 第一个参数，告诉原来push方法，你往哪里跳转（传递哪些参数）
+// 第二个参数是成功的回调
+// 第三个参数是失败的回调
+Router.prototype.push = function(location, resolve, reject) {
+  // 如果传了 resolve&&reject
+  if (resolve && reject) {
+    originalPush.call(this, location, resolve, reject)
+  } else {
+    originalPush.call(this, location, () => {}, () => {})
+  }
+}
+Router.prototype.replace = function(location, resolve, reject) {
+  if (resolve && reject) {
+    originReplace.call(this, location, resolve, reject)
+  } else {
+    originReplace.call(this, location, () => {}, () => {})
+  }
+}
+
 export default new Router({
   // mode: 'history', //后端支持可开
   scrollBehavior: () => ({ y: 0 }),

package/src/store/getters.js

@@ -9,6 +9,7 @@ const getters = {
   preventReclick: state => state.app.preventReclick,
   menus: state => state.user.menus,
   openTab: state => state.tabContent.openTab,
-  activeIndex: state => state.tabContent.activeIndex
+  activeIndex: state => state.tabContent.activeIndex,
+  whiteList: state => state.app.whiteList
 }
 export default getters

package/src/store/modules/app.js

@@ -6,7 +6,8 @@ const app = {
       withoutAnimation: false
     },
     device: 'desktop',
-    preventReclick: false
+    preventReclick: false,
+    whiteList: []
   },
   mutations: {
     toggleSidebar: state => {
@@ -28,6 +29,11 @@ const app = {
     },
     togglePreventReclick: (state, preventReclick) => {
       state.preventReclick = preventReclick
+    },
+    setWhiteList: (state, whiteList) => {
+      if (whiteList instanceof Array) {
+        state.whiteList = whiteList
+      }
     }
   },
   actions: {
@@ -39,6 +45,9 @@ const app = {
     },
     toggelDevice({ commit }, device) {
       commit('toggleDevice', device)
+    },
+    addWhiteList({ commit }, whiteList) {
+      commit('setWhiteList', whiteList)
     }
   }
 }

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

@@ -1,7 +1,7 @@
 import ssoService from '../../api/sso-service'
-import { setToken, removeToken, setUsername, getUsername, removeUsername } from '../../utils/auth'
+import { setToken, removeToken, setUsername, getUsername, removeUsername, setCurrentUser, removeCurrentUser } from '../../utils/auth'
 
-import { removePermissions, getPermissions, setPermissions } from '../../utils/permissionAuth'
+import { removePermissions, getPermissions, setPermissions, getMenus, setMenus, removeMenus } from '../../utils/permissionAuth'
 
 const user = {
   state: {
@@ -42,6 +42,23 @@ const user = {
         })
       })
     },
+    // 登录。根据token登录系统
+    loginWithCookieToken({ commit }, loginName) {
+      return new Promise((resolve, reject) => {
+        if (loginName) {
+          // setToken(tokenInfo.jwt)
+          // commit('setToken', tokenInfo.jwt)
+          ssoService.getCurrentUserPermissionsBySystem(loginName).then(permissions => {
+            let currentPermissions = ['index']
+            currentPermissions = currentPermissions.concat(permissions)
+            setPermissions(currentPermissions)
+            resolve()
+          }).catch(error => {
+            reject(error)
+          })
+        }
+      })
+    },
 
     // 获取用户信息
     getCurrentUser({ commit, state }) {
@@ -51,9 +68,11 @@ const user = {
           ssoService.getCurrentUser().then(user => {
             if (user) {
               setUsername(user.loginName)
+              setCurrentUser(user)
               commit('setName', user.name)
             } else {
               removeUsername()
+              removeCurrentUser()
               commit('setName', '')
             }
             // commit('SET_AVATAR', data.avatar)
@@ -77,9 +96,12 @@ const user = {
 
           commit('setName', '')
           removeUsername()
+          removeCurrentUser()
 
           removePermissions()
 
+          removeMenus()
+
           resolve(data)
         }).catch(error => {
           reject(error)
@@ -95,9 +117,12 @@ const user = {
 
         commit('setName', '')
         removeUsername()
+        removeCurrentUser()
 
         removePermissions()
 
+        removeMenus()
+
         resolve()
       })
     },
@@ -107,18 +132,18 @@ const user = {
       return new Promise((resolve, reject) => {
         let storePermissions = getPermissions()
         // 这个判断会导致资源不会重新加载？？
-        // if (typeof (storePermissions) === 'undefined' || storePermissions === '' || storePermissions === null) {
-        ssoService.getCurrentUserPermissionsBySystem(loginName, systemCode).then(permissions => {
-          let currentPermissions = ['index']
-          currentPermissions = currentPermissions.concat(permissions)
-          storePermissions = setPermissions(currentPermissions)
+        if (typeof (storePermissions) === 'undefined' || storePermissions === '' || storePermissions === null) {
+          ssoService.getCurrentUserPermissionsBySystem(loginName, systemCode).then(permissions => {
+            let currentPermissions = ['index']
+            currentPermissions = currentPermissions.concat(permissions)
+            storePermissions = setPermissions(currentPermissions)
+            resolve(storePermissions)
+          }).catch(error => {
+            reject(error)
+          })
+        } else {
           resolve(storePermissions)
-        }).catch(error => {
-          reject(error)
-        })
-        // } else {
-        //   resolve(storePermissions)
-        // }
+        }
       })
     },
 
@@ -156,12 +181,18 @@ const user = {
     // 获得有权限的菜单集合
     getPermissionMenus({ commit }, systemCode) {
       return new Promise((resolve, reject) => {
-        ssoService.getUserPermissionMenusBySystemCode(systemCode).then(menus => {
-          commit('setMenus', menus)
-          resolve(menus)
-        }).catch(error => {
-          reject(error)
-        })
+        const storePermissionMenus = getMenus(systemCode)
+        if (typeof (storePermissionMenus) === 'undefined' || storePermissionMenus === '' || storePermissionMenus === null) {
+          ssoService.getUserPermissionMenusBySystemCode(systemCode).then(menus => {
+            // commit('setMenus', menus)
+            setMenus(menus, systemCode)
+            resolve(menus)
+          }).catch(error => {
+            reject(error)
+          })
+        } else {
+          resolve(storePermissionMenus)
+        }
       })
     }
 

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;
@@ -31,4 +34,54 @@ 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 {
+  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 {
+  width: 100%;
+}
+
+// 日期选择按钮太小问题（gcommon ui）
+.el-picker-panel__footer .el-button--mini {
+  font-size: 16px;
+}
+
+// 显示必填标志
+.is_req {
+  .required__label::before {
+    content: '*';
+    color: #f56c6c;
+    margin-right: 4px;
+  }
+}
+
+.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";
+}