From 0108df13340210bebd5ad6c693fc1a6bd1b061ff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 05 三月 2024 22:57:51 +0800
Subject: [PATCH] !88 合并flowable工作流功能 * merge 合并dev * add 添加抄送查询 * add 添加我的已办 * add 添加抄送 * add 添加附件下载 * update 优化类型 * Merge remote-tracking branch 'origin/future/flowable' into future/flowable * fix 修复 流程设计器打包部署报错问题 * add 添加审批附件上传 * update 修复固定值未在xml显示问题 * update 修复跳转条件回显Object问题 * update 优化面板文件名称 * update 调整key * remove 移除旧设计器，添加xml保存 * update 增加任务面板提示 * update 优化xml预览和svg预览 * update 优化xml预览和svg预览 * update 优化模型设计 * update 优化设计器 * update 优化设计器 * update 优化设计器 * update 删除旧设计器 * update 删除console.log * add 添加模型接口 * update 优化预览xml和svg样式被修改问题 * update 优化属性面板，增加展开动画 * update 去除开发模式 * update 优化任务栏样式 * update 优化图标渲染样式 * update 增加BpmnFactory类型 * update 增加BpmnFactory * update 移除users和group * update 移除无用类型 * update 优化页面类型 * update 去除多余属性 * update 完善流程线 * update 增加复杂网关 * update 完善流程 * update 完善网关 * update 优化网关汉化 * update 优化过期时间选择 * update 支持多实例 * update 增加类容提示 * update 支持选择组 * update 新增角色api * update 优化roleSelect 选中未确定，再次打开还保留选中的问题 * update 优化userSelect 选中未确定，再次打开还保留选中的问题 * update 优化userSelect 选中未确定，再次打开还保留选中的问题 * update 去掉modeler store多余属性 bpmnModel * update 优化属性面板，当面板未选中时默认展示流程面板 * update 优化TaskPanel类型，去掉roles属性 * update 优化用户api * update 优化用户选择器 * update 优化执行监听器 * update 优化任务监听器 * update 优化usePanel方法 * update 选人优化 * update 增加扩展节点信息 * update 增加usePanel默认方法 * update 去除处理事件 * update 扩展flowable userinfo属性 * update 全局modeler 改为非响应式 * update 增加hooks方法 * update 修改命名 * update 修改面板formData来源 * update 重写用户任务面板选择逻辑 * update 重写用户任务面板选择逻辑 * update 修改用户选择组件获取数据逻辑 * update 修改枚举类型 * update 修改默认配置列 * update 增加修改节点方法 * update 调整预览窗口大小 * update 优化用户选择组件 返回值 * update 优化用户选择组件 * update 新增通过ids 获取用户信息 * update 重写task面板选人 未完成 * update 升级用户选择 支持多选配置 * update 升级bpmnjs依赖版本 * update 增加useDialog类型 * update 调整全局样式 * update 代码高亮设置 * update 优化领用，归还加载 * update 增加选择角色 * update 新增角色选择组件 * update 新增过期时间选择组件 * update 调整任务面板样式 * update 调整全局dialog header 增加分割线 * update 代码高亮设置 * update 调整面板位置 * update 封装用户选择组件 * update 移除所有的节点描述 * update 删除分类 * update 调整面板位置 * update 修改命名，增加自定义渲染 * update 修改命名，增加自定义渲染 * update 增加 Element类型定义 * update 调整样式 * update 移除bpmn panel依赖，升级bpmn.js依赖到最新，修改汉化包 * update 调整类型声明文件 * update 调整类型声明文件 * update 优化面板工具 * update 优化面板工具 * Merge remote-tracking branch 'origin/future/flowable' into future/flowable * update 优化面板工具 * Merge branch 'future/flowable' of https://gitee.com/JavaLionLi/plus-ui… * add 添加修改办理人 * update 优化面板工具 * update 初始化流程数据 * Merge remote-tracking branch 'origin/future/flowable' into future/flowable * add 流程设计面板 * update 调整初始化xml * add 任务面板 * add 新增bpmn.js * update 优化request请求类判断请求头方式 * update 流程定义预览 优化 * update 流程定义预览 优化 * update 去掉console.log * update 优化工作流代码 * fix 修复待办任务 重置查询条件失效问题 * add 增加待办任务 接口类型，优化页面 * add 增加vite 启动预编译css * fix 修复i18n无感刷新问题 * Merge branch 'dev' into future/flowable * update 调整选择请假事件 * Merge branch 'dev' into future/flowable * 同步dev代码 * Merge branch 'dev' into future/flowable * 合并dev * remove 设计器无用代码 调整请假查询 * update 调整请假申请 * update 移动请假表单包结构，调整设计器选择引用表单请求错误 * remove 移除动态表单 * update 调整流程办理 * Merge branch 'dev' into future/flowable * Merge branch 'dev' into future/flowable * Merge branch 'dev' into future/flowable * Merge branch 'dev' into future/flowable * 合并 * update 调整请假申请流程提交 * update 修改业务单据流程提交 * update 调整业务单据流程提交 * 优化代码 * 优化工作流代码缩进 * 项目格式化配置修改 * 调整代码缩进 * Merge branch 'ts' into future/flowable * add 添加动态表单提交流程 * add 添加动态表单单据 * add 新增流程定义与表单关联 * update 调整点击左侧部门查询人员，部门刷新问题 * update 调整按钮图标 * 调整错别字 * update 调整流程定义图片预览 * add 添加流程实例迁移版本 * fix 修复我的单据无法提交问题 * Merge branch 'ts' into future/flowable * remove 还原代码后端解决 * update 流程设计器中分配发起人变量错误，先移除 * fix 修复设计器无法编辑问题 * update 调整设计器请求头 * Merge branch 'ts' into future/flowable * Merge branch 'ts' into future/flowable * add 添加流程定义历史列表 * update 审批记录v2改为v3 * update 调整请假必填项 * add 添加请假申请示例，添加流程定义文件部署 * update 移除流程表单 formConfig 属性，表单配置信息都放一起便于使用。 * add 添加任务加签，减签 * update 调整流程作废 * update 优化流程状态 * add 添加任务驳回 * add 添加查询当前租户所有待办，已办任务 * add 增加审批意见 * add 添加流程办理弹窗确认组件 * add 添加任务作废理由 * update 调整流程实例，流程定义检索 * add 添加我的单据页面 * add 添加任务归还认领 * add 添加流程实例，流程定义分类查询 * add 添加模型分类查询 * add 添加流程分类 * Merge remote-tracking branch 'origin/future/flowable' into future/flowable * add 添加流程表单管理页面 * add 集成vForm动态表单组件 * update xml调整超出滚动 * add 添加已办列表 * add 添加单据状态 * update 优化流程实例删除 * fix 修复流程实例查询挂起状态错误 * update 调整流程实例挂起激活状态 * add 添加流程实例列表 * update 调整流程定义弹窗提示 * add 添加流程定义列表，添加流程图，xml预览，添加简单流程启动，办理 * 调整审批记录悬浮逻辑 * 删除无用代码 * add 添加节点悬浮信息 * 调整流程预览 * 调整流程追踪 * add 添加审批记录 * add 模型设计的types * update 修改排版 * add lang=ts * update 修改ele的废弃api * fix调整审批记录图片不显示问题 * add 添加任务待办,流程图 * 调整设计器关闭 * add 添加待办 * remove 删除无用代码 * update types * 添加模型token验证 * 隐藏设计器验证按钮，隐藏表单，案例，应用程序等 * 添加模型部署 * 添加画图接口token，优化画图接口 * 添加工作流模型新增，修改，查询，删除,画图工具
---
src/views/login.vue | 271 +++++++++++++++++++++++++++++++----------------------
1 files changed, 158 insertions(+), 113 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 4174090..d8c79b0 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -2,192 +2,229 @@
<div class="login">
<el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</h3>
- <el-form-item prop="tenantId">
+ <el-form-item v-if="tenantEnabled" prop="tenantId">
<el-select v-model="loginForm.tenantId" filterable placeholder="璇烽�夋嫨/杈撳叆鍏徃鍚嶇О" style="width: 100%">
- <el-option
- v-for="item in tenantList"
- :key="item.tenantId"
- :label="item.companyName"
- :value="item.tenantId">
- </el-option>
+ <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>
<template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
</el-select>
</el-form-item>
<el-form-item prop="username">
- <el-input
- v-model="loginForm.username"
- type="text"
- size="large"
- auto-complete="off"
- placeholder="璐﹀彿"
- >
+ <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" placeholder="璐﹀彿">
<template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
</el-input>
</el-form-item>
<el-form-item prop="password">
- <el-input
- v-model="loginForm.password"
- type="password"
- size="large"
- auto-complete="off"
- placeholder="瀵嗙爜"
- @keyup.enter="handleLogin"
- >
+ <el-input v-model="loginForm.password" type="password" size="large" auto-complete="off" placeholder="瀵嗙爜" @keyup.enter="handleLogin">
<template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
</el-input>
</el-form-item>
- <el-form-item prop="code" v-if="captchaEnabled">
- <el-input
- v-model="loginForm.code"
- size="large"
- auto-complete="off"
- placeholder="楠岃瘉鐮�"
- style="width: 63%"
- @keyup.enter="handleLogin"
- >
+ <el-form-item v-if="captchaEnabled" prop="code">
+ <el-input v-model="loginForm.code" size="large" auto-complete="off" placeholder="楠岃瘉鐮�" style="width: 63%" @keyup.enter="handleLogin">
<template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
</el-input>
<div class="login-code">
- <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+ <img :src="codeUrl" class="login-code-img" @click="getCode" />
</div>
</el-form-item>
- <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">璁颁綇瀵嗙爜</el-checkbox>
- <el-form-item style="width:100%;">
- <el-button
- :loading="loading"
- size="large"
- type="primary"
- style="width:100%;"
- @click.prevent="handleLogin"
- >
+ <el-checkbox v-model="loginForm.rememberMe" style="margin: 0px 0px 25px 0px">璁颁綇瀵嗙爜</el-checkbox>
+ <el-form-item style="float: right">
+ <el-button circle title="寰俊鐧诲綍" @click="doSocialLogin('wechat')">
+ <svg-icon icon-class="wechat" />
+ </el-button>
+ <el-button circle title="MaxKey鐧诲綍" @click="doSocialLogin('maxkey')">
+ <svg-icon icon-class="maxkey" />
+ </el-button>
+ <el-button circle title="TopIam鐧诲綍" @click="doSocialLogin('topiam')">
+ <svg-icon icon-class="topiam" />
+ </el-button>
+ <el-button circle title="Gitee鐧诲綍" @click="doSocialLogin('gitee')">
+ <svg-icon icon-class="gitee" />
+ </el-button>
+ <el-button circle title="Github鐧诲綍" @click="doSocialLogin('github')">
+ <svg-icon icon-class="github" />
+ </el-button>
+ </el-form-item>
+ <el-form-item style="width: 100%">
+ <el-button :loading="loading" size="large" type="primary" style="width: 100%" @click.prevent="handleLogin">
<span v-if="!loading">鐧� 褰�</span>
<span v-else>鐧� 褰� 涓�...</span>
</el-button>
- <div style="float: right;" v-if="register">
+ <div v-if="register" style="float: right">
<router-link class="link-type" :to="'/register'">绔嬪嵆娉ㄥ唽</router-link>
</div>
</el-form-item>
</el-form>
<!-- 搴曢儴 -->
<div class="el-login-footer">
- <span>Copyright 漏 2018-2023 ruoyi.vip All Rights Reserved.</span>
+ <span>Copyright 漏 2018-2023 鐤媯鐨勭嫯瀛怢i All Rights Reserved.</span>
</div>
</div>
</template>
-<script setup>
-import { getCodeImg, getTenantList } from "@/api/login";
-import Cookies from "js-cookie";
-import { encrypt, decrypt } from "@/utils/jsencrypt";
-import useUserStore from '@/store/modules/user'
+<script setup lang="ts">
+import { getCodeImg, getTenantList } from '@/api/login';
+import { authBinding } from '@/api/system/social/auth';
+import { useUserStore } from '@/store/modules/user';
+import { LoginData, TenantVO } from '@/api/types';
+import { to } from 'await-to-js';
+import { HttpStatus } from '@/enums/RespEnum';
-const userStore = useUserStore()
+const userStore = useUserStore();
const router = useRouter();
-const { proxy } = getCurrentInstance();
-const loginForm = ref({
- tenantId: "000000",
- username: "admin",
- password: "admin123",
+const loginForm = ref<LoginData>({
+ tenantId: '000000',
+ username: 'admin',
+ password: 'admin123',
rememberMe: false,
- code: "",
- uuid: ""
-});
+ code: '',
+ uuid: ''
+} as LoginData);
-const loginRules = {
- tenantId: [{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勭鎴风紪鍙�" }],
- username: [{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勮处鍙�" }],
- password: [{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勫瘑鐮�" }],
- code: [{ required: true, trigger: "change", message: "璇疯緭鍏ラ獙璇佺爜" }]
+const loginRules: ElFormRules = {
+ tenantId: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勭鎴风紪鍙�' }],
+ username: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勮处鍙�' }],
+ password: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勫瘑鐮�' }],
+ code: [{ required: true, trigger: 'change', message: '璇疯緭鍏ラ獙璇佺爜' }]
};
-const codeUrl = ref("");
+const codeUrl = ref('');
const loading = ref(false);
// 楠岃瘉鐮佸紑鍏�
const captchaEnabled = ref(true);
+// 绉熸埛寮�鍏�
+const tenantEnabled = ref(true);
+
// 娉ㄥ唽寮�鍏�
const register = ref(false);
const redirect = ref(undefined);
+const loginRef = ref<ElFormInstance>();
// 绉熸埛鍒楄〃
-const tenantList = ref([]);
+const tenantList = ref<TenantVO[]>([]);
-function handleLogin() {
- proxy.$refs.loginRef.validate(valid => {
+watch(
+ () => router.currentRoute.value,
+ (newRoute: any) => {
+ redirect.value = newRoute.query && newRoute.query.redirect;
+ },
+ { immediate: true }
+);
+
+const handleLogin = () => {
+ loginRef.value?.validate(async (valid: boolean, fields: any) => {
if (valid) {
loading.value = true;
- // 鍕鹃�変簡闇�瑕佽浣忓瘑鐮佽缃湪 cookie 涓缃浣忕敤鎴峰悕鍜屽瘑鐮�
+ // 鍕鹃�変簡闇�瑕佽浣忓瘑鐮佽缃湪 localStorage 涓缃浣忕敤鎴峰悕鍜屽瘑鐮�
if (loginForm.value.rememberMe) {
- Cookies.set("tenantId", loginForm.value.tenantId, { expires: 30 });
- Cookies.set("username", loginForm.value.username, { expires: 30 });
- Cookies.set("password", encrypt(loginForm.value.password), { expires: 30 });
- Cookies.set("rememberMe", loginForm.value.rememberMe, { expires: 30 });
+ localStorage.setItem('tenantId', String(loginForm.value.tenantId));
+ localStorage.setItem('username', String(loginForm.value.username));
+ localStorage.setItem('password', String(loginForm.value.password));
+ localStorage.setItem('rememberMe', String(loginForm.value.rememberMe));
} else {
// 鍚﹀垯绉婚櫎
- Cookies.remove("tenantId");
- Cookies.remove("username");
- Cookies.remove("password");
- Cookies.remove("rememberMe");
+ localStorage.removeItem('tenantId');
+ localStorage.removeItem('username');
+ localStorage.removeItem('password');
+ localStorage.removeItem('rememberMe');
}
// 璋冪敤action鐨勭櫥褰曟柟娉�
- userStore.login(loginForm.value).then(() => {
- router.push({ path: redirect.value || "/" });
- }).catch(() => {
+ const [err] = await to(userStore.login(loginForm.value));
+ if (!err) {
+ await router.push({ path: redirect.value || '/' });
+ loading.value = false;
+ } else {
loading.value = false;
// 閲嶆柊鑾峰彇楠岃瘉鐮�
if (captchaEnabled.value) {
- getCode();
+ await getCode();
}
- });
+ }
+ } else {
+ console.log('error submit!', fields);
}
});
-}
+};
-function getCode() {
- getCodeImg().then(res => {
- captchaEnabled.value = res.data.captchaEnabled === undefined ? true : res.data.captchaEnabled;
- if (captchaEnabled.value) {
- codeUrl.value = "data:image/gif;base64," + res.data.img;
- loginForm.value.uuid = res.data.uuid;
- }
- });
-}
+/**
+ * 鑾峰彇楠岃瘉鐮�
+ */
+const getCode = async () => {
+ const res = await getCodeImg();
+ const { data } = res;
+ captchaEnabled.value = data.captchaEnabled === undefined ? true : data.captchaEnabled;
+ if (captchaEnabled.value) {
+ codeUrl.value = 'data:image/gif;base64,' + data.img;
+ loginForm.value.uuid = data.uuid;
+ }
+};
-function initTenantList() {
- getTenantList().then(res => {
- tenantList.value = res.data;
+const getLoginData = () => {
+ const tenantId = localStorage.getItem('tenantId');
+ const username = localStorage.getItem('username');
+ const password = localStorage.getItem('password');
+ const rememberMe = localStorage.getItem('rememberMe');
+ loginForm.value = {
+ tenantId: tenantId === null ? String(loginForm.value.tenantId) : tenantId,
+ username: username === null ? String(loginForm.value.username) : username,
+ password: password === null ? String(loginForm.value.password) : String(password),
+ rememberMe: rememberMe === null ? false : Boolean(rememberMe)
+ } as LoginData;
+};
+
+/**
+ * 鑾峰彇绉熸埛鍒楄〃
+ */
+const initTenantList = async () => {
+ const { data } = await getTenantList();
+ tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
+ if (tenantEnabled.value) {
+ tenantList.value = data.voList;
if (tenantList.value != null && tenantList.value.length !== 0) {
loginForm.value.tenantId = tenantList.value[0].tenantId;
}
+ }
+};
+
+//妫�娴嬬鎴烽�夋嫨妗嗙殑鍙樺寲
+watch(
+ () => loginForm.value.tenantId,
+ () => {
+ localStorage.setItem('tenantId', String(loginForm.value.tenantId));
+ }
+);
+
+/**
+ * 绗笁鏂圭櫥褰�
+ * @param type
+ */
+const doSocialLogin = (type: string) => {
+ authBinding(type).then((res: any) => {
+ if (res.code === HttpStatus.SUCCESS) {
+ // 鑾峰彇鎺堟潈鍦板潃璺宠浆
+ window.location.href = res.data;
+ } else {
+ ElMessage.error(res.msg);
+ }
});
-}
+};
-function getCookie() {
- const tenantId = Cookies.get("tenantId");
- const username = Cookies.get("username");
- const password = Cookies.get("password");
- const rememberMe = Cookies.get("rememberMe");
- loginForm.value = {
- tenantId: tenantId === undefined ? loginForm.value.tenantId : tenantId,
- username: username === undefined ? loginForm.value.username : username,
- password: password === undefined ? loginForm.value.password : decrypt(password),
- rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
- };
-}
-
-getCode();
-initTenantList();
-getCookie();
+onMounted(() => {
+ getCode();
+ initTenantList();
+ getLoginData();
+});
</script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
.login {
display: flex;
justify-content: center;
align-items: center;
height: 100%;
- background-image: url("../assets/images/login-background.jpg");
+ background-image: url('../assets/images/login-background.jpg');
background-size: cover;
}
+
.title {
margin: 0px auto 30px auto;
text-align: center;
@@ -199,32 +236,39 @@
background: #ffffff;
width: 400px;
padding: 25px 25px 5px 25px;
+
.el-input {
height: 40px;
+
input {
height: 40px;
}
}
+
.input-icon {
height: 39px;
width: 14px;
margin-left: 0px;
}
}
+
.login-tip {
font-size: 13px;
text-align: center;
color: #bfbfbf;
}
+
.login-code {
width: 33%;
height: 40px;
float: right;
+
img {
cursor: pointer;
vertical-align: middle;
}
}
+
.el-login-footer {
height: 40px;
line-height: 40px;
@@ -233,10 +277,11 @@
width: 100%;
text-align: center;
color: #fff;
- font-family: Arial;
+ font-family: Arial, serif;
font-size: 12px;
letter-spacing: 1px;
}
+
.login-code-img {
height: 40px;
padding-left: 12px;
--
Gitblit v1.9.3