imatrix-ui 2.8.97-dw-tmp13 → 2.8.97-dw-tmp15

package/package.json

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

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

@@ -52,9 +52,9 @@ export default {
         </div>)
       } else {
         // 有子菜单时
-        vnodes.push(<template v-slot:title>  <div style='display: inline-block'>
+        vnodes.push(<div v-slot:title style='display: inline-block'>
           <div title={title} style={'display: inline-block;width:' + width + ';overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:keep-all;'}>{(title)}</div>
-        </div></template>)
+        </div>)
       }
     }
     return vnodes

package/src/permission111.js

@@ -1,105 +0,0 @@
-import NProgress from 'nprogress' // Progress 进度条
-import 'nprogress/nprogress.css'// Progress 进度条样式
-import { getToken, setToken } from './utils/auth' // 验权
-import store from './store'
-import router, { errorRouterMap } from './router'
-NProgress.configure({ showSpinner: false })// NProgress Configuration
-import { Message } from 'element-ui'
-import Vue from 'vue'
-
-const whiteList = ['/login', '/update-password', '/forget-password', '/reset-password', '/redirect'] // 不重定向白名单
-router.beforeEach((to, from, next) => {
-  NProgress.start()
-  console.log('router.beforeEach-to=', to)
-  console.log('router.beforeEach-from=', from)
-  // console.log('router.beforeEach-to.path=', to.path)
-  let token = getToken()
-  // console.log('router.beforeEach-to.query.JWT=', to.query.JWT)
-  if (!token && to.query && to.query.JWT) {
-    token = to.query.JWT
-    if (token) {
-      // 微信小程序web-view直接访问路径时使用?将JWT传过来
-      setToken(token)
-    }
-  }
-  if (!token && to.query && to.query.jwt) {
-    token = to.query.jwt
-    if (token) {
-      // 微信小程序web-view直接访问路径时使用?将JWT传过来
-      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') {
-      next({ path: '/', query: to.query })
-      NProgress.done() // if current page is dashboard will not trigger	afterEach hook, so manually handle it
-    } else {
-      console.log('router.beforeEach-to.path!=login')
-      if (store.getters.name === '') {
-        // 表示刷新了页面（例如点击了一级菜单）后，会重新走该方法
-        console.log('router.beforeEach-store.getters.name === ""')
-        store.dispatch('isLoginTimeOut').then((result) => {
-          if (result === true) {
-            store.dispatch('clearToken').then(() => {
-              next({ path: '/', replace: true })
-              NProgress.done()
-            })
-          } else {
-            store.dispatch('getCurrentUser').then(user => {
-              console.log('router.beforeEach-getCurrentUser')
-              return store.dispatch('getCurrentUserPermissions', user.loginName)
-            }).then(permissions => {
-              console.log('router.beforeEach-getCurrentUserPermissions-result==')
-              return store.dispatch('generateRoutes', permissions)
-            }).then(() => {
-              console.log('iMatrix-router.beforeEach2-getPermissionMenus')
-              return store.dispatch('getPermissionMenus', Vue.prototype.currentSystem)
-            }).then(() => {
-              // 根据roles权限生成可访问的路由表
-              console.log('router.beforeEach-generateRoutes==to=', to, ',from=', from)
-              router.addRoutes(store.getters.protectedRouters) // 动态添加可访问路由表
-              // 404等错误路由一定要放到受权限保护的路由之后
-              router.addRoutes(errorRouterMap)
-              sessionStorage.setItem(new Date().getTime() + '-name=null-from~~toPath', from.path + '~~' + to.path)
-              console.log('router.beforeEach-generateRoutes==to.path=', to.path)
-              next({ ...to, replace: true })
-            }).catch((err) => {
-              store.dispatch('clearToken').then(() => {
-                Message.error(err || 'Verification failed, please login again')
-                next({ path: '/' })
-              })
-            })
-          }
-        }).catch((err) => {
-          store.dispatch('clearToken').then(() => {
-            Message.error(err || 'Verification failed, please login again')
-            next({ path: '/' })
-          })
-        })
-      } else {
-        sessionStorage.setItem(new Date().getTime() + '-name!==null-from~~toPath', from.path + '~~' + to.path)
-        console.log('router.beforeEach-store.getters.name ==', store.getters.name)
-        next()
-      }
-    }
-  } else {
-    if (whiteList.indexOf(to.path) !== -1 || store.getters.whiteList.indexOf(to.path) !== -1) {
-      next()
-    } else {
-      // 必须使用to.fullPath，fullPath是带有参数的，to.path没有参数，会导致跳转到的页面参数丢失
-      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-      NProgress.done()
-    }
-  }
-  const r2 = new Date().getTime()
-  console.log('路由导航所用时间', r2 - r1)
-})
-
-router.afterEach(() => {
-  NProgress.done() // 结束Progress
-})