Merge pull request #28 from Octoveau/dev

sync dev

.eslintrc.js

@@ -40,6 +40,7 @@ module.exports = {
     'vue/no-reserved-component-names': 'off',
     'import/extensions': ['error', { vue: 'never' }],
     'vue/multi-word-component-names': 'off',
+    'no-unused-expressions': 'off',
     // 特别注意：vue/order-in-components，此规则用于矫正vue文件结构顺序乱写问题
     'vue/order-in-components': [
       'error',

.husky/pre-commit

@@ -2,4 +2,4 @@
 . "$(dirname -- "$0")/_/husky.sh"
 
 # 限制git commit的命令
-npx lint-staged
+npx lint-staged

.stylelintignore

@@ -6,4 +6,4 @@
 *.ttf
 *.woff
 *.woff2
-assets/
+assets/

.stylelintrc.js

@@ -12,7 +12,6 @@ module.exports = {
       customSyntax: 'postcss-html',
     },
   ],
-  ignoreFiles: ['**/*.js', '**/*.jsx', '**/*.tsx', '**/*.ts', '**/*.json', '**/*.md', '**/*.yaml'],
   rules: {
     'no-descending-specificity': null, // 禁止在具有较高优先级的选择器后出现被其覆盖的较低优先级的选择器
     'no-duplicate-selectors': null,
@@ -22,6 +21,7 @@ module.exports = {
     'declaration-block-trailing-semicolon': null,
     'string-quotes': null,
     'color-function-notation': 'legacy',
+    'declaration-block-single-line-max-declarations': null,
     'selector-pseudo-element-no-unknown': [
       true,
       {

package.json

@@ -9,7 +9,7 @@
     "build": "vue-cli-service build",
     "lint": "eslint --fix --ext .js,.vue src",
     "lint:fix": "eslint --fix --ext .js,.vue --fix src",
-    "lint:style": "stylelint \"./**/*.{css,less,vue,html}\" --fix src",
+    "lint:style": "stylelint --fix .css, .less, .vue, .html --fix src",
     "dll": "webpack --config ./webpack/webpack.dll.js",
     "prepare": "husky install",
     "commit": "git-cz"

src/api/userInfo.js

@@ -1,4 +1,3 @@
 import service from './index';
-
 // 获取用户信息
 export const getUserInfoData = () => service.get('api/info');

src/router/config/router.guards.js

@@ -17,14 +17,16 @@ class RouterGuards {
 
   beforeEach() {
     return this.router.beforeEach((to, from, next) => {
+      console.log('to', to);
       NProgress.start();
       // 判断是否是白名单，白名单不需要进行登录验证
       if (this.whiteRouter.includes(to.name)) {
         next();
       } else {
         // 判断是否登录，如果没登录，需要先跳转到登录
         if (!authStorage.getUserInfo()) {
-          return next(`/login`);
+          const { fullPath } = to;
+          return next(`/login?redirecturl=${fullPath}`);
         }
         next();
       }

src/utils/auth.js

@@ -1,11 +1,10 @@
 import storage from './storage';
 
 const USERINFO_KEY = 'user_info';
-const TOKEN_INFO = 'user_info';
+const TOKEN_INFO = 'token_info';
 
 class Auth {
   #userInfo = ((e) => {
-    console.log('e', e);
     if (!e) {
       return null;
     }

src/views/login/login.vue

@@ -31,14 +31,22 @@ export default {
             this.getUserInfo(res.data.token);
           }
         });
-      } else {
-        // 需要跳转到单点登录平台
-        window.location.replace(`http://www.octoveau.cn/sso-login/openLogin/${this.loginConfig.siteKey}`);
+        return;
       }
+      // 需要跳转到单点登录平台
+      const fullPath = this.$route.query.redirecturl;
+      fullPath
+        ? window.location.replace(`http://www.octoveau.cn/sso-login/openLogin/${this.loginConfig.siteKey}?redirecturl=${fullPath}`)
+        : window.location.replace(`http://www.octoveau.cn/sso-login/openLogin/${this.loginConfig.siteKey}`);
     },
     getUserInfo(token) {
       getUserInfoByToken(token).then((res) => {
         authStorage.setUserInfo(res.data);
+        const fullPath = this.$route.query.redirecturl;
+        if (fullPath) {
+          this.$router.push(`${fullPath}`);
+          return;
+        }
         this.$router.push({
           name: 'DashBoard',
         });

vue.code-workspace

@@ -5,10 +5,15 @@
     }
   ],
   "settings": {
+    // "editor.fontWeight": "600", //字体粗细
+    // "editor.fontSize": 16, //字体大小
+    "breadcrumbs.enabled": true, //内容上方的面包屑
+    "editor.formatOnPaste": true, //复制时候自动格式化
+    "editor.accessibilityPageSize": 12, //屏幕阅读器的可视区域
+    "editor.tabCompletion": "on", //tab的最佳补全
+    "editor.detectIndentation": true, //检测文件是否启动tabsize
+    "editor.tabSize": 2,
     "eslint.enable": true,
-    "workbench.colorTheme": "Palenight Theme",
-    "window.zoomLevel": 1,
-    "workbench.iconTheme": "material-icon-theme",
     "explorer.confirmDelete": false,
     "[json]": {
       "editor.defaultFormatter": "esbenp.prettier-vscode"