imatrix-ui 2.8.2-dw → 2.8.2

package/package.json

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

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: '确定',
@@ -46,7 +46,7 @@ const cn = {
     whetherToConfirmDeletion: '是否确认删除',
     tips: '提示',
     pleaseEnterContent: '请输入内容',
-    internalServerError: '服务器出错了，请联系管理员',
+    internalServerError: '请求失败',
     pleaseSelectDepartment: '请选择部门',
     pleaseSelectPersonnel: '请选择人员',
     pleaseRemoveallpersonnelBeforeSelectingSpecificPersonnel: '请先移除所有人员，再选择具体人员',
@@ -71,7 +71,8 @@ const cn = {
     fileUpload: '文件上传',
     selectYear: '选择年',
     search: '查询',
-    forbiddenException: '您没有权限访问该资源'
+    forbiddenException: '您没有权限访问该资源',
+    theButtonIsNotBoundToAResource: '该按钮未绑定资源,请先绑定资源'
   },
   // 列表组件
   superGrid: {
@@ -122,7 +123,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',
@@ -46,7 +46,7 @@ const en = {
     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 +71,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',
@@ -119,7 +120,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'] // 不重定向白名单
@@ -30,7 +30,7 @@ router.beforeEach((to, from, next) => {
     }
   }
   // 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 +84,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/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/index.scss

@@ -31,4 +31,29 @@ 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;
 }

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

@@ -5,7 +5,7 @@
     background: rgb(255, 255, 255);
     line-height: 72px;
     height: 72px;
-    position: fixed;
+    position: absolute;
     z-index: 100;
     top: 0px;
     left: 0px;
@@ -17,7 +17,7 @@
     background: rgb(255, 255, 255);
     line-height: 72px;
     height: 72px;
-    position: fixed;
+    position: absolute;
     bottom: 0px;
     z-index: 100;
     left: 0px;

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

@@ -6,6 +6,14 @@
       height: 32px;
       line-height: 32px;
     }
+
+    .el-input.is-disabled .el-input__inner {
+      color: #606266;
+    }
+
+    .el-textarea.is-disabled .el-textarea__inner {
+      color: #606266;
+    }
   }
 
 }

package/src/utils/auth.js

@@ -4,6 +4,7 @@ import Vue from 'vue'
 
 const jwtKey = 'JWT'
 const currentUserNameKey = 'USERNAME'
+const currentUserInfoKey = 'CURRENT_USER'
 
 export function getToken() {
   let jwt = sessionStorage.getItem(jwtKey)
@@ -46,3 +47,23 @@ export function setUsername(username) {
 export function removeUsername() {
   sessionStorage.removeItem(currentUserNameKey)
 }
+
+export function getCurrentUser() {
+  const userJson = sessionStorage.getItem(currentUserInfoKey)
+  if (userJson) {
+    return JSON.parse(userJson)
+  }
+}
+
+export function setCurrentUser(userInfo) {
+  if (userInfo) {
+    if (userInfo.password) {
+      userInfo.password = null
+    }
+    sessionStorage.setItem(currentUserInfoKey, JSON.stringify(userInfo))
+  }
+}
+
+export function removeCurrentUser() {
+  sessionStorage.removeItem(currentUserInfoKey)
+}

package/src/utils/common-util.js

@@ -189,3 +189,16 @@ export function getServerConfigUtil(http) {
     })
   })
 }
+/**
+ * postmessage跨域传message时获得orign路径使用
+ * @returns orign路径
+ */
+export function getOrignUrl() {
+  const url = window.location.href
+  let orignUrl
+  if (url && url.indexOf('/') > 0) {
+    const urls = url.split('/')
+    orignUrl = urls[0] + '//' + urls[2]
+  }
+  return orignUrl
+}

package/src/utils/jump-page-utils.js

@@ -421,6 +421,7 @@ function openDialogWhenPopup(jumpPageSetting, system, pageCode, dataId, jumpMode
     popPageSetting.jumpPageHeight = jumpPageSetting.jumpPageHeight
     popPageSetting.valueMappings = jumpPageSetting.valueMappings
     popPageSetting.updateValueEvent = jumpPageSetting.updateValueEvent
+    popPageSetting.closeEvent = jumpPageSetting.closeEvent
   }
   // 是否是自定义系统
   let isDsc = false

package/src/utils/menu.js

@@ -0,0 +1,19 @@
+import { getLanguageWithLocale } from './util'
+
+export function getI18nName(menu) {
+  if (!menu) {
+    return
+  }
+  if (menu.i18Names) {
+    const language = getLanguageWithLocale()
+    const i18Names = JSON.parse(menu.i18Names)
+    if (i18Names[language]) {
+      return i18Names[language]
+    }
+  }
+  if (menu.i18nValue) {
+    return menu.i18nValue
+  } else {
+    return menu.name
+  }
+}

package/src/utils/permission.js

@@ -24,3 +24,7 @@ export default function checkPermission(permission) {
     return false
   }
 }
+
+export {
+  checkPermission
+}

package/src/utils/permissionAuth.js

@@ -2,11 +2,18 @@ import sessionStorage from 'sessionstorage'
 import Vue from 'vue'
 
 const permissionKey = 'PERMISSION-'
+const permissionMenuKey = 'PERMISSION_MENU-'
 export function getSystemCode() {
-  let systemCode = Vue.prototype.systemCode
+  let systemCode
   if (Vue.prototype.customSystem) {
     systemCode = Vue.prototype.customSystem
+  } else {
+    systemCode = Vue.prototype.systemCode
   }
+  // let systemCode = Vue.prototype.systemCode
+  // if (Vue.prototype.customSystem) {
+  //   systemCode = Vue.prototype.customSystem
+  // }
   return systemCode
 }
 
@@ -41,3 +48,37 @@ export function removePermissions() {
   }
 }
 
+export function getMenus(systemCode) {
+  if (!systemCode) {
+    systemCode = getSystemCode()
+  }
+  const permissions = sessionStorage.getItem(permissionMenuKey + systemCode)
+  if (permissions) {
+    return JSON.parse(permissions)
+  }
+  return null
+}
+
+export function setMenus(menus, systemCode) {
+  if (menus) {
+    if (!systemCode) {
+      systemCode = getSystemCode()
+    }
+    sessionStorage.setItem(permissionMenuKey + systemCode, JSON.stringify(menus))
+    return menus
+  }
+}
+
+export function removeMenus(systemCode) {
+  if (!systemCode) {
+    systemCode = getSystemCode()
+  }
+  sessionStorage.removeItem(permissionMenuKey + systemCode)
+  for (var i = 0; i < sessionStorage.length; i++) {
+    var key = sessionStorage.key(i)
+    if (key.indexOf(permissionMenuKey) >= 0) {
+      sessionStorage.removeItem(key)
+    }
+  }
+}
+

package/src/utils/request.js

@@ -1,7 +1,7 @@
 import axios from 'axios'
 import {
   Message
-} from '@gcommon/gcommon-ui'
+} from 'element-ui'
 import {
   getToken,
   removeToken

package/src/utils/util.js

@@ -393,7 +393,7 @@ export function analysisValue(conditionValue, entity, additionalParameter, conte
 }
 
 /**
- * 设置entity中某属性的值,处理子对象的情况
+ * 设置entity中某属性的值,处理子对象的情况。使用该方法，性能可能有问题
  * @param {*} entity
  * @param {*} prop
  * @param {*} value
@@ -403,10 +403,23 @@ export function setEntityFieldValue(entity, prop, value) {
     if (prop && prop.indexOf('.') > 0) {
       const parentObj = getParentObjectUtil(prop, entity)
       if (parentObj) {
-        Vue.set(parentObj, prop.substring(prop.lastIndexOf('.') + 1), value)
+        const subProp = prop.substring(prop.lastIndexOf('.') + 1)
+        if (parentObj[subProp] === undefined) {
+          // 动态对象属性赋值，防止属性不存在，导致属性无法赋值问题
+          Vue.set(parentObj, prop.substring(prop.lastIndexOf('.') + 1), value)
+        } else {
+          // 静态对象属性赋值，提高性能
+          parentObj[subProp] = value
+        }
       }
     } else {
-      Vue.set(entity, prop, value)
+      if (entity[prop] === undefined) {
+        // 动态对象属性赋值，防止属性不存在，导致属性无法赋值问题
+        Vue.set(entity, prop, value)
+      } else {
+        // 静态对象属性赋值，提高性能
+        entity[prop] = value
+      }
     }
   }
 }

package/src/views/404.vue

@@ -2,26 +2,30 @@
   <div class="wscn-http404-container">
     <div class="wscn-http404">
       <div class="pic-404">
-        <img class="pic-404__parent" src="@/assets/404/404.png" alt="404">
-        <img class="pic-404__child left" src="@/assets/404/404-cloud.png" alt="404">
-        <img class="pic-404__child mid" src="@/assets/404/404-cloud.png" alt="404">
-        <img class="pic-404__child right" src="@/assets/404/404-cloud.png" alt="404">
+        <img class="pic-404__parent" src="../../assets/404/404.png" alt="404">
+        <img class="pic-404__child left" src="../../assets/404/404-cloud.png" alt="404">
+        <img class="pic-404__child mid" src="../../assets/404/404-cloud.png" alt="404">
+        <img class="pic-404__child right" src="../../assets/404/404-cloud.png" alt="404">
       </div>
       <div class="bullshit">
-        <div class="bullshit__oops">
+        <!-- <div class="bullshit__oops">
           OOPS!
         </div>
         <div class="bullshit__info">
           版权所有
-          <a class="link-type" href="https://wallstreetcn.com" target="_blank">华尔街见闻</a>
-        </div>
+          <a class="link-type" href="https://wallstreetcn.com" target="_blank">
+            华尔街见闻
+          </a>
+        </div> -->
         <div class="bullshit__headline">
           {{ message }}
         </div>
         <div class="bullshit__info">
-          请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告
+          请检查您输入的网址是否正确
         </div>
-        <a href="" class="bullshit__return-home">返回首页</a>
+        <!-- <a href="" class="bullshit__return-home">
+          返回首页
+        </a> -->
       </div>
     </div>
   </div>
@@ -33,7 +37,7 @@ export default {
   name: 'Page404',
   computed: {
     message() {
-      return '网管说这个页面你不能进......'
+      return '页面不存在'
     }
   }
 }

package/src/views/dsc-component/Sidebar/Link.vue

@@ -6,9 +6,12 @@
     <slot />
   </a> -->
 
-    <router-link :to="to">
+    <router-link v-if="!isOpenNewTab" :to="to">
       <slot />
     </router-link>
+    <div v-else>
+      <slot />
+    </div>
   </div>
 </template>
 
@@ -23,8 +26,14 @@ export default {
   },
   data() {
     const isExter = this.to.isExternal
+    const openWay = this.to.openWay
+    let isOpenNewTab = false
+    if (openWay && openWay === 'NEW_PAGE_OPEN') {
+      isOpenNewTab = true
+    }
     return {
-      isExter
+      isExter,
+      isOpenNewTab
     }
   }
 }