Skip to content

Commit 52ea889

Browse files
JavaLionLigitee-org
authored andcommitted
!246 发布 5.5.1-2.5.1 日常依赖升级bug修复
Merge pull request !246 from 疯狂的狮子Li/dev
2 parents 1b46739 + 5e1d44c commit 52ea889

File tree

13 files changed

+39
-18
lines changed

13 files changed

+39
-18
lines changed

.env.development

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# 页面标题
22
VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
3+
VITE_APP_LOGO_TITLE = RuoYi-Vue-Plus
34

45
# 开发环境配置
56
VITE_APP_ENV = 'development'

.env.production

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# 页面标题
22
VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
3+
VITE_APP_LOGO_TITLE = RuoYi-Vue-Plus
34

45
# 生产环境配置
56
VITE_APP_ENV = 'production'

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name="renderer" content="webkit" />
77
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
88
<link rel="icon" href="/favicon.ico" />
9-
<title>RuoYi-Vue-Plus多租户管理系统</title>
9+
<title>%VITE_APP_TITLE%</title>
1010
<!--[if lt IE 11
1111
]><script>
1212
window.location.href = '/html/ie.html';

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://json.schemastore.org/package",
33
"name": "ruoyi-vue-plus",
4-
"version": "5.5.0-2.5.0",
4+
"version": "5.5.1-2.5.1",
55
"description": "RuoYi-Vue-Plus多租户管理系统",
66
"author": "LionLi",
77
"license": "MIT",
@@ -53,9 +53,9 @@
5353
"@types/js-cookie": "3.0.6",
5454
"@types/node": "^22.13.4",
5555
"@types/nprogress": "0.2.3",
56-
"@unocss/preset-attributify": "66.0.0",
57-
"@unocss/preset-icons": "66.0.0",
58-
"@unocss/preset-uno": "66.0.0",
56+
"@unocss/preset-attributify": "66.5.2",
57+
"@unocss/preset-icons": "66.5.2",
58+
"@unocss/preset-uno": "66.5.2",
5959
"@vitejs/plugin-vue": "5.2.3",
6060
"@vue/compiler-sfc": "3.5.13",
6161
"@vue/eslint-config-prettier": "10.2.0",
@@ -68,7 +68,7 @@
6868
"prettier": "3.5.2",
6969
"sass": "1.87.0",
7070
"typescript": "~5.8.3",
71-
"unocss": "66.0.0",
71+
"unocss": "66.5.2",
7272
"unplugin-auto-import": "19.1.2",
7373
"unplugin-icons": "22.1.0",
7474
"unplugin-vue-components": "28.5.0",

src/api/system/tenant/index.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,11 @@ export function syncTenantDict() {
9999
method: 'get'
100100
});
101101
}
102+
103+
// 同步租户字典
104+
export function syncTenantConfig() {
105+
return request({
106+
url: '/system/tenant/syncTenantConfig',
107+
method: 'get'
108+
});
109+
}

src/api/workflow/workflowCommon/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ export interface StartProcessBo {
1010
businessId: string | number;
1111
flowCode: string;
1212
variables: any;
13-
flowInstanceBizExtBo: any;
13+
bizExt: any;
1414
}

src/components/Process/submitVerify.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ const openDialog = async (id?: string) => {
259259
const response = await getTask(taskId.value);
260260
task.value = response.data;
261261
buttonObj.value = {};
262-
task.value.buttonList.forEach((e) => {
262+
task.value.buttonList?.forEach((e) => {
263263
buttonObj.value[e.code] = e.show;
264264
});
265265
selectCopyUserList.value = task.value.copyList;

src/layout/components/Sidebar/Logo.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ defineProps({
3434
}
3535
});
3636
37-
const title = ref('RuoYi-Vue-Plus');
37+
const title = import.meta.env.VITE_APP_LOGO_TITLE;
3838
const settingsStore = useSettingsStore();
3939
const sideTheme = computed(() => settingsStore.sideTheme);
4040
</script>

src/types/module.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import type { LanguageType } from '@/lang';
1212

1313
export {};
1414

15-
declare module '@vue/runtime-core' {
15+
declare module 'vue' {
1616
interface ComponentCustomProperties {
1717
// 全局方法声明
1818
$modal: typeof modal;

src/views/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* 部署方式 Docker 容器编排 一键部署业务集群<br />
3434
* 国际化 SpringMessage Spring标准国际化方案<br />
3535
</p>
36-
<p><b>当前版本:</b> <span>v5.5.0</span></p>
36+
<p><b>当前版本:</b> <span>v5.5.1</span></p>
3737
<p>
3838
<el-tag type="danger">&yen;免费开源</el-tag>
3939
</p>
@@ -77,7 +77,7 @@
7777
* 分布式监控 Prometheus、Grafana 全方位性能监控<br />
7878
* 其余与 Vue 版本一致<br />
7979
</p>
80-
<p><b>当前版本:</b> <span>v2.5.0</span></p>
80+
<p><b>当前版本:</b> <span>v2.5.1</span></p>
8181
<p>
8282
<el-tag type="danger">&yen;免费开源</el-tag>
8383
</p>

0 commit comments

Comments
 (0)