!246 发布 5.5.1-2.5.1 日常依赖升级bug修复

Merge pull request !246 from 疯狂的狮子Li/dev

.env.development

@@ -1,5 +1,6 @@
 # 页面标题
 VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
+VITE_APP_LOGO_TITLE = RuoYi-Vue-Plus
 
 # 开发环境配置
 VITE_APP_ENV = 'development'

.env.production

@@ -1,5 +1,6 @@
 # 页面标题
 VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
+VITE_APP_LOGO_TITLE = RuoYi-Vue-Plus
 
 # 生产环境配置
 VITE_APP_ENV = 'production'

index.html

@@ -6,7 +6,7 @@
     <meta name="renderer" content="webkit" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
     <link rel="icon" href="/favicon.ico" />
-    <title>RuoYi-Vue-Plus多租户管理系统</title>
+    <title>%VITE_APP_TITLE%</title>
     <!--[if lt IE 11
       ]><script>
         window.location.href = '/html/ie.html';

package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "ruoyi-vue-plus",
-  "version": "5.5.0-2.5.0",
+  "version": "5.5.1-2.5.1",
   "description": "RuoYi-Vue-Plus多租户管理系统",
   "author": "LionLi",
   "license": "MIT",
@@ -53,9 +53,9 @@
     "@types/js-cookie": "3.0.6",
     "@types/node": "^22.13.4",
     "@types/nprogress": "0.2.3",
-    "@unocss/preset-attributify": "66.0.0",
+    "@unocss/preset-attributify": "66.5.2",
-    "@unocss/preset-icons": "66.0.0",
+    "@unocss/preset-icons": "66.5.2",
-    "@unocss/preset-uno": "66.0.0",
+    "@unocss/preset-uno": "66.5.2",
     "@vitejs/plugin-vue": "5.2.3",
     "@vue/compiler-sfc": "3.5.13",
     "@vue/eslint-config-prettier": "10.2.0",
@@ -68,7 +68,7 @@
     "prettier": "3.5.2",
     "sass": "1.87.0",
     "typescript": "~5.8.3",
-    "unocss": "66.0.0",
+    "unocss": "66.5.2",
     "unplugin-auto-import": "19.1.2",
     "unplugin-icons": "22.1.0",
     "unplugin-vue-components": "28.5.0",

src/api/system/tenant/index.ts

@@ -99,3 +99,11 @@ export function syncTenantDict() {
     method: 'get'
   });
 }
+
+// 同步租户字典
+export function syncTenantConfig() {
+  return request({
+    url: '/system/tenant/syncTenantConfig',
+    method: 'get'
+  });
+}

src/api/workflow/workflowCommon/types.ts

@@ -10,5 +10,5 @@ export interface StartProcessBo {
   businessId: string | number;
   flowCode: string;
   variables: any;
-  flowInstanceBizExtBo: any;
+  bizExt: any;
 }

src/components/Process/submitVerify.vue

@@ -259,7 +259,7 @@ const openDialog = async (id?: string) => {
   const response = await getTask(taskId.value);
   task.value = response.data;
   buttonObj.value = {};
-  task.value.buttonList.forEach((e) => {
+  task.value.buttonList?.forEach((e) => {
     buttonObj.value[e.code] = e.show;
   });
   selectCopyUserList.value = task.value.copyList;

src/layout/components/Sidebar/Logo.vue

@@ -34,7 +34,7 @@ defineProps({
   }
 });
 
-const title = ref('RuoYi-Vue-Plus');
+const title = import.meta.env.VITE_APP_LOGO_TITLE;
 const settingsStore = useSettingsStore();
 const sideTheme = computed(() => settingsStore.sideTheme);
 </script>

src/types/module.d.ts

@@ -12,7 +12,7 @@ import type { LanguageType } from '@/lang';
 
 export {};
 
-declare module '@vue/runtime-core' {
+declare module 'vue' {
   interface ComponentCustomProperties {
     // 全局方法声明
     $modal: typeof modal;

src/views/index.vue

@@ -33,7 +33,7 @@
           * 部署方式 Docker 容器编排 一键部署业务集群<br />
           * 国际化 SpringMessage Spring标准国际化方案<br />
         </p>
-        <p><b>当前版本:</b> <span>v5.5.0</span></p>
+        <p><b>当前版本:</b> <span>v5.5.1</span></p>
         <p>
           <el-tag type="danger">&yen;免费开源</el-tag>
         </p>
@@ -77,7 +77,7 @@
           * 分布式监控 Prometheus、Grafana 全方位性能监控<br />
           * 其余与 Vue 版本一致<br />
         </p>
-        <p><b>当前版本:</b> <span>v2.5.0</span></p>
+        <p><b>当前版本:</b> <span>v2.5.1</span></p>
         <p>
           <el-tag type="danger">&yen;免费开源</el-tag>
         </p>

src/views/system/tenant/index.vue

@@ -47,6 +47,9 @@
           <el-col :span="1.5">
             <el-button v-if="userId === 1" type="success" plain icon="Refresh" @click="handleSyncTenantDict">同步租户字典</el-button>
           </el-col>
+          <el-col :span="1.5">
+            <el-button v-if="userId === 1" type="success" plain icon="Refresh" @click="handleSyncTenantConfig">同步租户参数配置</el-button>
+          </el-col>
           <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
@@ -152,7 +155,8 @@ import {
   updateTenant,
   changeTenantStatus,
   syncTenantPackage,
-  syncTenantDict
+  syncTenantDict,
+  syncTenantConfig
 } from '@/api/system/tenant';
 import { selectTenantPackage } from '@/api/system/tenantPackage';
 import { useUserStore } from '@/store/modules/user';
@@ -365,6 +369,13 @@ const handleSyncTenantDict = async () => {
   proxy?.$modal.msgSuccess(res.msg);
 };
 
+/**同步租户参数配置*/
+const handleSyncTenantConfig = async () => {
+  await proxy?.$modal.confirm('确认要同步所有租户参数配置吗？');
+  const res = await syncTenantConfig();
+  proxy?.$modal.msgSuccess(res.msg);
+};
+
 onMounted(() => {
   getList();
 });

src/views/workflow/leave/leaveEdit.vue

@@ -127,10 +127,10 @@ const submitFormData = ref<StartProcessBo>({
   businessId: '',
   flowCode: '',
   variables: {},
-  flowInstanceBizExtBo: {}
+  bizExt: {}
 });
 const taskVariables = ref<Record<string, any>>({});
-const flowInstanceBizExtBo = ref<Record<string, any>>({});
+const bizExt = ref<Record<string, any>>({});
 
 const initFormData: LeaveForm = {
   id: undefined,
@@ -244,12 +244,12 @@ const handleStartWorkFlow = async (data: LeaveForm) => {
       userList: ['1', '3', '4']
     };
     //流程实例业务扩展字段
-    flowInstanceBizExtBo.value = {
+    bizExt.value = {
       businessTitle: '请假申请',
       businessCode: data.applyCode
     };
     submitFormData.value.variables = taskVariables.value;
-    submitFormData.value.flowInstanceBizExtBo = flowInstanceBizExtBo.value;
+    submitFormData.value.bizExt = bizExt.value;
     const resp = await startWorkFlow(submitFormData.value);
     if (submitVerifyRef.value) {
       buttonLoading.value = false;

src/views/workflow/processDefinition/index.vue

@@ -189,7 +189,7 @@
           </el-form-item>
           <el-form-item label="是否动态表单" prop="formCustom">
             <el-radio-group v-model="form.formCustom">
-              <el-radio value="Y" size="large" border>是</el-radio>
+              <el-radio value="Y" size="large" border disabled>是</el-radio>
               <el-radio value="N" size="large" border>否</el-radio>
             </el-radio-group>
           </el-form-item>