Merge remote-tracking branch 'origin/master'

.env.development

@@ -34,3 +34,6 @@ VITE_GLOB_ONLINE_DOCUMENT_VERSION=wps
 
 # AutoLogin SSO - 指向 demo 网关
 VITE_AUTOLOGIN_URL=http://localhost:9100/api/sys/autoLogin
+
+# 联系我们
+VITE_GLOB_CONTACT_URL=http://localhost:3100/contact

.env.production

@@ -35,3 +35,6 @@ VITE_GLOB_ONLINE_DOCUMENT_VERSION=wps
 
 # AutoLogin SSO - 指向生产网关（地址由运维提供）
 VITE_AUTOLOGIN_URL=http://200.100.65.101:9100/api/sys/autoLogin
+
+# 联系我们
+VITE_GLOB_CONTACT_URL=#

src/design/theme.less

@@ -2,6 +2,11 @@
   background-color: @component-background !important;
 }
 
+::-webkit-scrollbar {
+  height: 14px;
+  width: 14px;
+}
+
 html[data-theme='light'] {
   // update-begin--author:liaozhiyang---date:20240407---for：【QQYUN-8774】给body加上打底的字体颜色
   body{

src/layouts/default/footer/index.vue

@@ -86,7 +86,8 @@
     margin-top: auto;
 
     .footer-text {
-      font-size: 13px;
+      font-size: 15px;
+      font-weight: 700;
     }
   }
 </style>

src/layouts/default/header/components/user-dropdown/index.vue

@@ -10,6 +10,7 @@
         <MenuDivider v-if="getShowDoc" />
         <!-- <MenuItem itemKey="account" :text="t('layout.header.dropdownItemSwitchAccount')" icon="ant-design:setting-outlined" /> -->
         <!-- <MenuItem itemKey="password" :text="t('layout.header.dropdownItemSwitchPassword')" icon="ant-design:edit-outlined" /> -->
+        <MenuItem itemKey="contact" text="联系我们" icon="ant-design:phone-outlined" />
         <MenuItem itemKey="depart" :text="t('layout.header.dropdownItemSwitchDepart')" icon="ant-design:cluster-outlined" />
         <MenuItem itemKey="cache" :text="t('layout.header.dropdownItemRefreshCache')" icon="ion:sync-outline" />
         <!-- <MenuItem
@@ -32,7 +33,7 @@
 
   import { defineComponent, computed, ref } from 'vue';
 
-  import { SITE_URL } from '/@/settings/siteSetting';
+  import { SITE_URL, CONTACT_URL } from '/@/settings/siteSetting';
 
   import { useUserStore } from '/@/store/modules/user';
   import { useHeaderSetting } from '/@/hooks/setting/useHeaderSetting';
@@ -54,7 +55,7 @@ import deptLogo from '/@/assets/images/department-logo.png';
   // import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
   import { getRefPromise } from '/@/utils/index';
 
-  type MenuEvent = 'logout' | 'doc' | 'lock' | 'cache' | 'depart';
+  type MenuEvent = 'logout' | 'doc' | 'lock' | 'cache' | 'depart' | 'contact';
   const { createMessage } = useMessage();
   export default defineComponent({
     name: 'UserDropdown',
@@ -115,6 +116,11 @@ import deptLogo from '/@/assets/images/department-logo.png';
         openWindow(SITE_URL);
       }
 
+      // open contact
+      function openContact() {
+        openWindow(CONTACT_URL);
+      }
+
       // 清除缓存
       async function clearCache() {
         const result = await refreshCache();
@@ -159,6 +165,9 @@ import deptLogo from '/@/assets/images/department-logo.png';
           case 'cache':
             clearCache();
             break;
+          case 'contact':
+            openContact();
+            break;
           case 'depart':
             updateCurrentDepart();
             break;

src/settings/siteSetting.ts

@@ -6,3 +6,6 @@ export const DOC_URL = 'https://help.jeecg.com';
 
 // site url
 export const SITE_URL = 'http://www.jeecg.com';
+
+// contact us url
+export const CONTACT_URL = import.meta.env.VITE_GLOB_CONTACT_URL || '#';

src/views/tasklist/index.vue

@@ -690,6 +690,9 @@
     if (showListGroupView.value) {
       refreshQuickAccessView();
     }
+    if (listId) {
+      await onListSelect(listId);
+    }
   }
 
   async function refreshQuickAccessView() {