Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev

.commitlintrc.cjs

@@ -0,0 +1,28 @@
+module.exports = {
+  extends: ['@commitlint/config-conventional'],
+  rules: {
+    'type-enum': [
+      2,
+      'always',
+      [
+        'build', // 编译相关修改（新版本发布）
+        'feat', // 新功能
+        'fix', // 修复bug
+        'update', // 更新某功能
+        'refactor', // 重构
+        'docs', // 文档
+        'chore', // 增加依赖或库
+        'style', // 格式（不影响代码变动）
+        'revert', // 撤销commit 回滚上一版本
+        'perf', // 性能优化
+      ]
+    ],
+    'type-case': [0],
+    'type-empty': [0],
+    'scope-empty': [0],
+    'scope-case': [0],
+    'subject-full-stop': [0, 'never'],
+    'subject-case': [0, 'never'],
+    'header-max-length': [0, 'always', 72]
+  }
+}

.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx --no -- commitlint --edit ${1}

package.json

@@ -8,7 +8,9 @@
     "build": "vite build --mode production",
     "preview": "vite preview",
     "eslint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src",
-    "prettier": "prettier --write"
+    "lint": "eslint src --fix --ext .ts,.tsx,.vue,.js,.jsx",
+    "prettier": "prettier --write",
+    "prepare": "husky install"
   },
   "dependencies": {
     "@vitejs/plugin-vue-jsx": "^3.0.0",
@@ -30,16 +32,31 @@
     "jetlinks-store": "^0.0.3"
   },
   "devDependencies": {
+    "@commitlint/cli": "^17.4.1",
+    "@commitlint/config-conventional": "^17.4.0",
     "@types/lodash-es": "^4.17.6",
     "@types/moment": "^2.13.0",
     "@types/node": "^18.11.17",
     "@vitejs/plugin-vue": "^4.0.0",
     "@vuemap/unplugin-resolver": "^1.0.4",
     "autoprefixer": "^10.4.13",
+    "commitlint": "^17.4.1",
+    "husky": "^8.0.0",
+    "lint-staged": "^13.1.0",
+    "mrm": "^4.1.13",
     "prettier": "^2.8.1",
     "typescript": "^4.9.3",
     "vite": "^4.0.0",
     "vite-plugin-html": "^3.2.0",
     "vue-tsc": "^1.0.11"
+  },
+  "lint-staged": {
+    "**/*.{vue,js,jsx,ts,tsx}": [
+      "npm run lint",
+      "prettier --write"
+    ],
+    "**/*.{html,css,less,md}": [
+      "prettier --write"
+    ]
   }
 }

src/views/user/Login/index.vue

@@ -109,22 +109,25 @@
                                         </a-button>
                                     </a-form-item>
                                 </a-form>
-                                <div style="margin-top: 20">
+                                <div style="margin-top: 20px">
-                                    <a-divider plain style="height: 12">
+                                    <a-divider plain style="height: 12px">
                                         <div
-                                            style="color: '#807676d9', fontSize: 12"
+                                            style="color: #807676d9, font-size: 12px"
                                         >
                                             其他方式登录
                                         </div>
                                     </a-divider>
                                     <div
-                                        style="position: 'relative', bottom: '10px'"
+                                        style="position: relative, bottom: 10px; text-align: center"
-                                        v-for="(item, index) in bindings"
-                                        :key="index"
                                     >
-                                        <Button type="link" @Click="handle">
+                                        <a-button
+                                            v-for="(item, index) in bindings"
+                                            :key="index"
+                                            type="link"
+                                            @Click="handleClickOther(item)"
+                                        >
                                             <img
-                                                style="width: 32, height: 33"
+                                                style="width: 32px, height: 33px"
                                                 :alt="item.name"
                                                 :src="
                                                     iconMap.get(
@@ -132,7 +135,7 @@
                                                     ) || defaultImg
                                                 "
                                             />
-                                        </Button>
+                                        </a-button>
                                     </div>
                                 </div>
                             </div>
@@ -174,7 +177,7 @@ import {
 import Cookies from 'js-cookie';
 import { useUserInfo } from '@/store/userInfo';
 import { LocalStore } from '@/utils/comm';
-import { TOKEN_KEY, Version_Code } from '@/utils/variable';
+import { BASE_API_PATH, TOKEN_KEY, Version_Code } from '@/utils/variable';
 
 const store = useUserInfo();
 const router = useRouter();
@@ -203,6 +206,11 @@ const codeConfig = ref(false);
 const loading = ref(false);
 const bindings = ref<any[]>();
 
+const defaultImg = getImage('/apply/provider1.png');
+const iconMap = new Map();
+iconMap.set('dingtalk-ent-app', getImage('/bind/dingtalk.png'));
+iconMap.set('wechat-webapp', getImage('/bind/wechat-webapp.png'));
+
 const onFinish = async () => {
     form.remember
         ? Cookies.set('user', encodeURIComponent(JSON.stringify(form)), {
@@ -213,18 +221,20 @@ const onFinish = async () => {
     try {
         loading.value = true;
         const res: any = await authLogin(form);
-        if (res.status === 200) {
+        if (res.success) {
             store.$patch({
                 ...res.result,
                 username: form.username,
             });
             LocalStore.set(TOKEN_KEY, res?.result.token);
             const resp: any = await getInitSet();
-            if (resp.status === 200) {
+            if (resp.success) {
                 router.push('/demo');
             }
         }
     } catch (error) {
+        form.verifyCode = '';
+        getCode();
         loading.value = false;
     }
 };
@@ -253,11 +263,11 @@ const getCookie = () => {
 
 const getOpen = () => {
     systemVersion().then((res: any) => {
-        if (res.status === 200 && res.result) {
+        if (res.success && res.result) {
             LocalStore.set(Version_Code, res.result.edition);
             if (res.result.edition !== 'community') {
                 bindInfo().then((res: any) => {
-                    if (res.status === 200) {
+                    if (res.success) {
                         bindings.value = res.result;
                     }
                 });
@@ -266,6 +276,16 @@ const getOpen = () => {
     });
 };
 
+const handleClickOther = (item: any) => {
+    LocalStore.set('onLogin', 'no');
+    window.open(`${BASE_API_PATH}/application/sso/${item.id}/login`);
+    window.onstorage = (e) => {
+        if (e.newValue) {
+            window.location.href = '/';
+        }
+    };
+};
+
 const screenRotation = (width: number, height: number) => {
     LoginWarpStyle.backgroundImage = `url(${bgImage})`;
 };
@@ -335,11 +355,12 @@ screenRotation(screenWidth.value, screenHeight.value);
 
             .top {
                 width: 100%;
-                text-align: center;
+                // text-align: center;
 
                 .header {
                     height: 44px;
                     line-height: 44px;
+                    text-align: center;
 
                     a {
                         text-decoration: none;
@@ -371,6 +392,7 @@ screenRotation(screenWidth.value, screenHeight.value);
                     font-size: 22px;
                     font-family: Avenir, 'Helvetica Neue', Arial, Helvetica,
                         sans-serif;
+                    text-align: center;
                 }
 
                 .main {
@@ -426,6 +448,27 @@ screenRotation(screenWidth.value, screenHeight.value);
                         flex-direction: row;
                         margin-bottom: 30px;
                     }
+
+                    .verifyCode {
+                        .login-code-input {
+                            width: 70%;
+                            float: left;
+                        }
+                        .login-code {
+                            width: 30%;
+                            height: 32px;
+                            float: left;
+                            background-color: #e4e6e7;
+                            img {
+                                cursor: pointer;
+                                vertical-align: middle;
+                            }
+                            .login-code-img {
+                                width: 100%;
+                                height: 100%;
+                            }
+                        }
+                    }
                 }
             }
         }