From bfc6e7b8da0d65a7fd4dfb719c149e7881c2cd72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Mon, 20 Jan 2025 12:44:27 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B=E5=AE=9A=E4=B9=89=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/workflow/processDefinition/index.vue | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index a45e484..cd40266 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -116,7 +116,7 @@
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
:total="total"
- @pagination="handleQuery"
+ @pagination="getPageList"
/>
@@ -323,6 +323,14 @@ const handleSelectionChange = (selection: any) => {
multiple.value = !selection.length;
};
//分页
+const getPageList = async () => {
+ if (activeName.value === '0') {
+ getList();
+ } else {
+ getUnPublishList();
+ }
+};
+//分页
const getList = async () => {
loading.value = true;
const resp = await listDefinition(queryParams.value);
From aef170f3747af544426db66af325f9ab83728350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Mon, 20 Jan 2025 13:35:21 +0800
Subject: [PATCH 2/6] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B=E8=AE=BE=E8=AE=A1=E5=85=B3=E9=97=AD=E5=90=8E=20?=
=?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=9B=9E=E6=89=93=E5=BC=80=E7=9A=84=E5=9C=B0?=
=?UTF-8?q?=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/workflow/processDefinition/design.vue | 2 +-
src/views/workflow/processDefinition/index.vue | 14 ++++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/views/workflow/processDefinition/design.vue b/src/views/workflow/processDefinition/design.vue
index 3ec44f7..05e6538 100644
--- a/src/views/workflow/processDefinition/design.vue
+++ b/src/views/workflow/processDefinition/design.vue
@@ -29,7 +29,7 @@ const open = async (definitionId, disabled) => {
};
/** 关闭按钮 */
function close() {
- const obj = { path: '/workflow/processDefinition' };
+ const obj = { path: '/workflow/processDefinition', query: {activeName: proxy.$route.query.activeName}};
proxy.$tab.closeOpenPage(obj);
}
diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index cd40266..9888892 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -56,7 +56,7 @@
导出
-
+
@@ -261,7 +261,7 @@ const form = ref({
formPath: ''
});
onMounted(() => {
- handleQuery();
+ getPageList();
getTreeselect();
});
@@ -324,6 +324,10 @@ const handleSelectionChange = (selection: any) => {
};
//分页
const getPageList = async () => {
+ console.log(proxy.$route.query.activeName)
+ if (proxy.$route.query.activeName) {
+ activeName.value = proxy.$route.query.activeName;
+ }
if (activeName.value === '0') {
getList();
} else {
@@ -430,7 +434,8 @@ const design = async (row: FlowDefinitionVo) => {
path: `/workflow/design/index`,
query: {
definitionId: row.id,
- disabled: false
+ disabled: false,
+ activeName: activeName.value
}
});
};
@@ -444,7 +449,8 @@ const designView = async (row: FlowDefinitionVo) => {
path: `/workflow/design/index`,
query: {
definitionId: row.id,
- disabled: true
+ disabled: true,
+ activeName: activeName.value
}
});
};
From 060f99dee5dd082c46a6a51478040aaff4edf26a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Mon, 20 Jan 2025 18:08:37 +0800
Subject: [PATCH 3/6] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=88=A0?=
=?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 1 -
1 file changed, 1 deletion(-)
diff --git a/README.md b/README.md
index 531f64b..ebc088b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
## 平台简介
- 本仓库为前端技术栈 [Vue3](https://v3.cn.vuejs.org) + [TS](https://www.typescriptlang.org/) + [Element Plus](https://element-plus.org/zh-CN) + [Vite](https://cn.vitejs.dev) 版本。
-- 成员项目: 基于 vben(ant-design-vue) 的前端项目 [ruoyi-plus-vben](https://gitee.com/dapppp/ruoyi-plus-vben)
- 成员项目: 基于 vben5(ant-design-vue) 的前端项目 [ruoyi-plus-vben5](https://gitee.com/dapppp/ruoyi-plus-vben5)
- 配套后端代码仓库地址
- [RuoYi-Vue-Plus 5.X(注意版本号)](https://gitee.com/dromara/RuoYi-Vue-Plus)
From 8994e3ad3e9d60eafbfa0abb124ed86edc686941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Wed, 22 Jan 2025 11:13:38 +0800
Subject: [PATCH 4/6] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E9=A9=B3?=
=?UTF-8?q?=E5=9B=9E=E5=A2=9E=E5=8A=A0=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Process/submitVerify.vue | 3 +++
src/views/workflow/leave/leaveEdit.vue | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index 4c2ea88..1c985de 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -71,6 +71,9 @@
短信
+
+
+
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index 8ef66a5..a8c1bfd 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -242,7 +242,7 @@ const submitFlow = async () => {
dialogVisible.visible = false;
};
//提交申请
-const handleStartWorkFlow = async (data: LeaveVO) => {
+const handleStartWorkFlow = async (data: LeaveForm) => {
try {
submitFormData.value.flowCode = flowCode.value;
submitFormData.value.businessId = data.id;
From a4eab941885110b37022c79eba3f4f752461fba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Fri, 24 Jan 2025 11:17:48 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E9=80=89?=
=?UTF-8?q?=E6=8B=A9=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E6=9C=AA=E6=B8=85=E9=99=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/workflow/task/allTaskWaiting.vue | 1 +
src/views/workflow/task/taskFinish.vue | 1 +
src/views/workflow/task/taskWaiting.vue | 1 +
3 files changed, 3 insertions(+)
diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue
index 1a01be2..0c6c46e 100644
--- a/src/views/workflow/task/allTaskWaiting.vue
+++ b/src/views/workflow/task/allTaskWaiting.vue
@@ -168,6 +168,7 @@ const resetQuery = () => {
queryParams.value.pageSize = 10;
queryParams.value.createByIds = [];
userSelectCount.value = 0;
+ selectUserIds.value = [];
handleQuery();
};
// 多选框选中数据
diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue
index 298ddcf..0f5758e 100644
--- a/src/views/workflow/task/taskFinish.vue
+++ b/src/views/workflow/task/taskFinish.vue
@@ -133,6 +133,7 @@ const resetQuery = () => {
queryParams.value.pageSize = 10;
queryParams.value.createByIds = [];
userSelectCount.value = 0;
+ selectUserIds.value = [];
handleQuery();
};
// 多选框选中数据
diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue
index 876e335..339077d 100644
--- a/src/views/workflow/task/taskWaiting.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -134,6 +134,7 @@ const resetQuery = () => {
queryParams.value.pageSize = 10;
queryParams.value.createByIds = [];
userSelectCount.value = 0;
+ selectUserIds.value = [];
handleQuery();
};
// 多选框选中数据
From 5682b5f9c26a0ac31e017dfce7d86d13ce118761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Fri, 24 Jan 2025 13:07:42 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=A7=A8=F0=9F=A7=A8=F0=9F=A7=A8?=
=?UTF-8?q?=E5=8F=91=E5=B8=83=205.3.0=20=E6=96=B0=E6=98=A5=E7=89=88=20?=
=?UTF-8?q?=E7=A5=9D=E5=A4=A7=E5=AE=B6=E6=96=B0=E5=B9=B4=E5=BF=AB=E4=B9=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
src/views/index.vue | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index caac7c0..26d0862 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"$schema": "https://json.schemastore.org/tsconfig",
"name": "ruoyi-vue-plus",
- "version": "5.3.0-BETA",
+ "version": "5.3.0",
"description": "RuoYi-Vue-Plus多租户管理系统",
"author": "LionLi",
"license": "MIT",
diff --git a/src/views/index.vue b/src/views/index.vue
index 8e6b23d..9168123 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -33,7 +33,7 @@
* 部署方式 Docker 容器编排 一键部署业务集群
* 国际化 SpringMessage Spring标准国际化方案
- 当前版本: v5.3.0-BETA
+ 当前版本: v5.3.0
¥免费开源
@@ -77,7 +77,7 @@
* 分布式监控 Prometheus、Grafana 全方位性能监控
* 其余与 Vue 版本一致
- 当前版本: v2.2.2
+ 当前版本: v2.3.0
¥免费开源