imatrix-ui 2.8.97-dw-tmp3 → 2.8.97-dw-tmp5

package/package.json

@@ -1,20 +1,25 @@
 {
   "name": "imatrix-ui",
-  "version": "2.8.97-dw-tmp3",
+  "version": "2.8.97-dw-tmp5",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
-    "lib": "vue-cli-service build --modern --target lib --name super-ui --dest lib packages/index.js --report",
+    "lib": "vue-cli-service build --modern --target lib --name super-ui --dest lib packages/index.js",
     "lint": "vue-cli-service lint",
     "test:e2e": "vue-cli-service test:e2e",
     "test:unit": "vue-cli-service test:unit"
   },
-  "dependencies": {},
-  "devDependencies": {
+  "dependencies": {
     "@tinymce/tinymce-vue": "^3.2.4",
+    "@zxing/library": "^0.19.1",
+    "js-cookie": "^2.2.0",
+    "sortablejs": "1.10.2",
+    "tinymce": "^5.6.1"
+  },
+  "devDependencies": {
     "@vue/cli-plugin-babel": "3.8.0",
     "@vue/cli-plugin-e2e-cypress": "3.8.0",
     "@vue/cli-plugin-eslint": "3.8.0",
@@ -22,22 +27,19 @@
     "@vue/cli-service": "3.8.0",
     "@vue/eslint-config-standard": "^4.0.0",
     "@vue/test-utils": "^1.0.0-beta.29",
-    "@zxing/library": "^0.19.1",
     "axios": "0.19.0",
     "babel-cli": "^6.26.0",
     "babel-eslint": "^10.0.1",
+    "babel-plugin-component": "^1.1.1",
     "chai": "4.2.0",
+    "compression-webpack-plugin": "2.0.0",
     "element-ui": "2.15.3",
     "eslint": "5.16.0",
     "eslint-plugin-vue": "5.2.2",
-    "js-cookie": "^2.2.0",
-    "node-sass": "4.12.0",
+    "node-sass": "4.14.0",
     "nprogress": "^0.2.0",
     "sass-loader": "^7.1.0",
     "sessionstorage": "^0.1.0",
-    "sortablejs": "1.10.2",
-    "tinymce": "^5.6.1",
-    "uglifyjs-webpack-plugin": "^2.2.0",
     "vue": "^2.6.10",
     "vue-cli-plugin-element": "^1.0.1",
     "vue-i18n": "^8.17.4",

package/src/permission111.js

@@ -0,0 +1,105 @@
+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
+})

package/src/plugins.js

@@ -8,7 +8,7 @@ import '@gcommon/gcommon-ui/lib/theme-chalk/index.css'
 import locale from '@gcommon/gcommon-ui/lib/locale/lang/zh-CN' // lang i18n
 
 import SuperUI from 'imatrix-ui'
-//import 'imatrix-ui/lib/super-ui.css'
+import 'imatrix-ui/lib/super-ui.css'
 
 import 'imatrix-ui/src/permission' // permission control
 import permission from 'imatrix-ui/src/directives/permission'

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==>执行时间:', (b - a) + '')
         const accessableRouters = accessableRoutersResult.allRouters
         const allMenuRoutes = accessableRoutersResult.menuRouters
         // console.log('有权限的路由表结果==', accessableRouters)
@@ -115,6 +118,8 @@ const permission = {
           }
         }
         commit('setRouters', accessableRouters)
+        const c = new Date().getTime()
+        sessionStorage.setItem('generateRoutes==>执行时间c-a:', (c - a) + '')
         resolve()
       })
     }

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 {

package/src/utils/permissionAuth.js

@@ -18,15 +18,19 @@ export function getSystemCode() {
 }
 
 export function getPermissions() {
+  const a = new Date().getTime()
   const systemCode = getSystemCode()
   const permissions = sessionStorage.getItem(permissionKey + systemCode)
   if (permissions) {
     return JSON.parse(permissions)
   }
+  const b = new Date().getTime()
+  sessionStorage.setItem('getPermissions==>执行时间:', (b - a) + '')
   return null
 }
 
 export function setPermissions(permissions) {
+  const a = new Date().getTime()
   const systemCode = getSystemCode()
   const permissionObjs = {}
   for (let i = 0; i < permissions.length; i++) {
@@ -34,6 +38,8 @@ export function setPermissions(permissions) {
     permissionObjs[permission] = true
   }
   sessionStorage.setItem(permissionKey + systemCode, JSON.stringify(permissionObjs))
+  const b = new Date().getTime()
+  sessionStorage.setItem('setPermissions==>执行时间:', (b - a) + '')
   return permissionObjs
 }
 

package/src/views/login/index.vue

@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import { Message } from '@gcommon/gcommon-ui'
+import { Message } from 'element-ui'
 export default {
   name: 'Login',
   data() {

package/lib/super-ui.common.1.js

@@ -1,368 +0,0 @@
-((typeof self !== 'undefined' ? self : this)["webpackJsonpsuper_ui"] = (typeof self !== 'undefined' ? self : this)["webpackJsonpsuper_ui"] || []).push([[1],{
-
-/***/ "c4a9":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return getTinymce; });
-/**
- * Copyright (c) 2018-present, Ephox, Inc.
- *
- * This source code is licensed under the Apache 2 license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-var getGlobal = function () { return (typeof window !== 'undefined' ? window : global); };
-var getTinymce = function () {
-    var global = getGlobal();
-    return global && global.tinymce ? global.tinymce : null;
-};
-
-
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("c8ba")))
-
-/***/ }),
-
-/***/ "ca72":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-
-// CONCATENATED MODULE: ./node_modules/@tinymce/tinymce-vue/lib/es2015/main/ts/Utils.js
-/**
- * Copyright (c) 2018-present, Ephox, Inc.
- *
- * This source code is licensed under the Apache 2 license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-var validEvents = [
-    'onActivate',
-    'onAddUndo',
-    'onBeforeAddUndo',
-    'onBeforeExecCommand',
-    'onBeforeGetContent',
-    'onBeforeRenderUI',
-    'onBeforeSetContent',
-    'onBeforePaste',
-    'onBlur',
-    'onChange',
-    'onClearUndos',
-    'onClick',
-    'onContextMenu',
-    'onCopy',
-    'onCut',
-    'onDblclick',
-    'onDeactivate',
-    'onDirty',
-    'onDrag',
-    'onDragDrop',
-    'onDragEnd',
-    'onDragGesture',
-    'onDragOver',
-    'onDrop',
-    'onExecCommand',
-    'onFocus',
-    'onFocusIn',
-    'onFocusOut',
-    'onGetContent',
-    'onHide',
-    'onInit',
-    'onKeyDown',
-    'onKeyPress',
-    'onKeyUp',
-    'onLoadContent',
-    'onMouseDown',
-    'onMouseEnter',
-    'onMouseLeave',
-    'onMouseMove',
-    'onMouseOut',
-    'onMouseOver',
-    'onMouseUp',
-    'onNodeChange',
-    'onObjectResizeStart',
-    'onObjectResized',
-    'onObjectSelected',
-    'onPaste',
-    'onPostProcess',
-    'onPostRender',
-    'onPreProcess',
-    'onProgressState',
-    'onRedo',
-    'onRemove',
-    'onReset',
-    'onSaveContent',
-    'onSelectionChange',
-    'onSetAttrib',
-    'onSetContent',
-    'onShow',
-    'onSubmit',
-    'onUndo',
-    'onVisualAid'
-];
-var isValidKey = function (key) { return validEvents.map(function (event) { return event.toLowerCase(); }).indexOf(key.toLowerCase()) !== -1; };
-var bindHandlers = function (initEvent, listeners, editor) {
-    Object.keys(listeners)
-        .filter(isValidKey)
-        .forEach(function (key) {
-        var handler = listeners[key];
-        if (typeof handler === 'function') {
-            if (key === 'onInit') {
-                handler(initEvent, editor);
-            }
-            else {
-                editor.on(key.substring(2), function (e) { return handler(e, editor); });
-            }
-        }
-    });
-};
-var bindModelHandlers = function (ctx, editor) {
-    var modelEvents = ctx.$props.modelEvents ? ctx.$props.modelEvents : null;
-    var normalizedEvents = Array.isArray(modelEvents) ? modelEvents.join(' ') : modelEvents;
-    editor.on(normalizedEvents ? normalizedEvents : 'change input undo redo', function () {
-        ctx.$emit('input', editor.getContent({ format: ctx.$props.outputFormat }));
-    });
-};
-var initEditor = function (initEvent, ctx, editor) {
-    var value = ctx.$props.value ? ctx.$props.value : '';
-    var initialValue = ctx.$props.initialValue ? ctx.$props.initialValue : '';
-    editor.setContent(value || (ctx.initialized ? ctx.cache : initialValue));
-    // Always bind the value listener in case users use :value instead of v-model
-    ctx.$watch('value', function (val, prevVal) {
-        if (editor && typeof val === 'string' && val !== prevVal && val !== editor.getContent({ format: ctx.$props.outputFormat })) {
-            editor.setContent(val);
-        }
-    });
-    // checks if the v-model shorthand is used (which sets an v-on:input listener) and then binds either
-    // specified the events or defaults to "change keyup" event and emits the editor content on that event
-    if (ctx.$listeners.input) {
-        bindModelHandlers(ctx, editor);
-    }
-    bindHandlers(initEvent, ctx.$listeners, editor);
-    ctx.initialized = true;
-};
-var unique = 0;
-var uuid = function (prefix) {
-    var time = Date.now();
-    var random = Math.floor(Math.random() * 1000000000);
-    unique++;
-    return prefix + '_' + random + unique + String(time);
-};
-var isTextarea = function (element) {
-    return element !== null && element.tagName.toLowerCase() === 'textarea';
-};
-var normalizePluginArray = function (plugins) {
-    if (typeof plugins === 'undefined' || plugins === '') {
-        return [];
-    }
-    return Array.isArray(plugins) ? plugins : plugins.split(' ');
-};
-var mergePlugins = function (initPlugins, inputPlugins) {
-    return normalizePluginArray(initPlugins).concat(normalizePluginArray(inputPlugins));
-};
-var isNullOrUndefined = function (value) { return value === null || value === undefined; };
-
-
-// CONCATENATED MODULE: ./node_modules/@tinymce/tinymce-vue/lib/es2015/main/ts/ScriptLoader.js
-/**
- * Copyright (c) 2018-present, Ephox, Inc.
- *
- * This source code is licensed under the Apache 2 license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-var createState = function () {
-    return {
-        listeners: [],
-        scriptId: uuid('tiny-script'),
-        scriptLoaded: false
-    };
-};
-var CreateScriptLoader = function () {
-    var state = createState();
-    var injectScriptTag = function (scriptId, doc, url, callback) {
-        var scriptTag = doc.createElement('script');
-        scriptTag.referrerPolicy = 'origin';
-        scriptTag.type = 'application/javascript';
-        scriptTag.id = scriptId;
-        scriptTag.src = url;
-        var handler = function () {
-            scriptTag.removeEventListener('load', handler);
-            callback();
-        };
-        scriptTag.addEventListener('load', handler);
-        if (doc.head) {
-            doc.head.appendChild(scriptTag);
-        }
-    };
-    var load = function (doc, url, callback) {
-        if (state.scriptLoaded) {
-            callback();
-        }
-        else {
-            state.listeners.push(callback);
-            if (!doc.getElementById(state.scriptId)) {
-                injectScriptTag(state.scriptId, doc, url, function () {
-                    state.listeners.forEach(function (fn) { return fn(); });
-                    state.scriptLoaded = true;
-                });
-            }
-        }
-    };
-    // Only to be used by tests.
-    var reinitialize = function () {
-        state = createState();
-    };
-    return {
-        load: load,
-        reinitialize: reinitialize
-    };
-};
-var ScriptLoader = CreateScriptLoader();
-
-
-// EXTERNAL MODULE: ./node_modules/@tinymce/tinymce-vue/lib/es2015/main/ts/TinyMCE.js
-var TinyMCE = __webpack_require__("c4a9");
-
-// CONCATENATED MODULE: ./node_modules/@tinymce/tinymce-vue/lib/es2015/main/ts/components/EditorPropTypes.js
-/**
- * Copyright (c) 2018-present, Ephox, Inc.
- *
- * This source code is licensed under the Apache 2 license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-var editorProps = {
-    apiKey: String,
-    cloudChannel: String,
-    id: String,
-    init: Object,
-    initialValue: String,
-    inline: Boolean,
-    modelEvents: [String, Array],
-    plugins: [String, Array],
-    tagName: String,
-    toolbar: [String, Array],
-    value: String,
-    disabled: Boolean,
-    tinymceScriptSrc: String,
-    outputFormat: {
-        type: String,
-        validator: function (prop) { return prop === 'html' || prop === 'text'; }
-    },
-};
-
-// CONCATENATED MODULE: ./node_modules/@tinymce/tinymce-vue/lib/es2015/main/ts/components/Editor.js
-/**
- * Copyright (c) 2018-present, Ephox, Inc.
- *
- * This source code is licensed under the Apache 2 license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-var __assign = (undefined && undefined.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-
-
-
-
-var renderInline = function (h, id, tagName) {
-    return h(tagName ? tagName : 'div', {
-        attrs: { id: id }
-    });
-};
-var renderIframe = function (h, id) {
-    return h('textarea', {
-        attrs: { id: id },
-        style: { visibility: 'hidden' }
-    });
-};
-var initialise = function (ctx) { return function () {
-    var finalInit = __assign(__assign({}, ctx.$props.init), { readonly: ctx.$props.disabled, selector: "#" + ctx.elementId, plugins: mergePlugins(ctx.$props.init && ctx.$props.init.plugins, ctx.$props.plugins), toolbar: ctx.$props.toolbar || (ctx.$props.init && ctx.$props.init.toolbar), inline: ctx.inlineEditor, setup: function (editor) {
-            ctx.editor = editor;
-            editor.on('init', function (e) { return initEditor(e, ctx, editor); });
-            if (ctx.$props.init && typeof ctx.$props.init.setup === 'function') {
-                ctx.$props.init.setup(editor);
-            }
-        } });
-    if (isTextarea(ctx.element)) {
-        ctx.element.style.visibility = '';
-        ctx.element.style.display = '';
-    }
-    Object(TinyMCE["a" /* getTinymce */])().init(finalInit);
-}; };
-var Editor = {
-    props: editorProps,
-    created: function () {
-        this.elementId = this.$props.id || uuid('tiny-vue');
-        this.inlineEditor = (this.$props.init && this.$props.init.inline) || this.$props.inline;
-        this.initialized = false;
-    },
-    watch: {
-        disabled: function () {
-            this.editor.setMode(this.disabled ? 'readonly' : 'design');
-        }
-    },
-    mounted: function () {
-        this.element = this.$el;
-        if (Object(TinyMCE["a" /* getTinymce */])() !== null) {
-            initialise(this)();
-        }
-        else if (this.element && this.element.ownerDocument) {
-            var channel = this.$props.cloudChannel ? this.$props.cloudChannel : '5';
-            var apiKey = this.$props.apiKey ? this.$props.apiKey : 'no-api-key';
-            var scriptSrc = isNullOrUndefined(this.$props.tinymceScriptSrc) ?
-                "https://cdn.tiny.cloud/1/" + apiKey + "/tinymce/" + channel + "/tinymce.min.js" :
-                this.$props.tinymceScriptSrc;
-            ScriptLoader.load(this.element.ownerDocument, scriptSrc, initialise(this));
-        }
-    },
-    beforeDestroy: function () {
-        if (Object(TinyMCE["a" /* getTinymce */])() !== null) {
-            Object(TinyMCE["a" /* getTinymce */])().remove(this.editor);
-        }
-    },
-    deactivated: function () {
-        var _a;
-        if (!this.inlineEditor) {
-            this.cache = this.editor.getContent();
-            (_a = Object(TinyMCE["a" /* getTinymce */])()) === null || _a === void 0 ? void 0 : _a.remove(this.editor);
-        }
-    },
-    activated: function () {
-        if (!this.inlineEditor && this.initialized) {
-            initialise(this)();
-        }
-    },
-    render: function (h) {
-        return this.inlineEditor ? renderInline(h, this.elementId, this.$props.tagName) : renderIframe(h, this.elementId);
-    }
-};
-
-// CONCATENATED MODULE: ./node_modules/@tinymce/tinymce-vue/lib/es2015/main/ts/index.js
-/**
- * Copyright (c) 2018-present, Ephox, Inc.
- *
- * This source code is licensed under the Apache 2 license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-/* harmony default export */ var ts = __webpack_exports__["default"] = (Editor);
-
-
-/***/ })
-
-}]);
-//# sourceMappingURL=super-ui.common.1.js.map