This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.3 by this push:
new f65a87762 [Improve]: header bar add Qrcode image & add language header
(#3562)
f65a87762 is described below
commit f65a87762a2129f9d2524b0758eb0e1a7df023fc
Author: Kriszu <[email protected]>
AuthorDate: Sun Feb 18 10:33:42 2024 +0800
[Improve]: header bar add Qrcode image & add language header (#3562)
---
.../src/assets/images/join_wechat.png | Bin 0 -> 79574 bytes
.../src/layouts/default/header/index.vue | 14 ++++++++++++--
.../src/utils/http/axios/index.ts | 3 +++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git
a/streampark-console/streampark-console-webapp/src/assets/images/join_wechat.png
b/streampark-console/streampark-console-webapp/src/assets/images/join_wechat.png
new file mode 100644
index 000000000..c9a891323
Binary files /dev/null and
b/streampark-console/streampark-console-webapp/src/assets/images/join_wechat.png
differ
diff --git
a/streampark-console/streampark-console-webapp/src/layouts/default/header/index.vue
b/streampark-console/streampark-console-webapp/src/layouts/default/header/index.vue
index 8f3c0a742..63f21c8e8 100755
---
a/streampark-console/streampark-console-webapp/src/layouts/default/header/index.vue
+++
b/streampark-console/streampark-console-webapp/src/layouts/default/header/index.vue
@@ -39,7 +39,16 @@
</a-button>
<Divider type="vertical" />
- <Icon icon="ant-design:qrcode-outlined"
:class="`${prefixCls}-action__item`" />
+ <Popover
+ placement="bottom"
+ trigger="hover"
+ arrow-point-at-center
+ >
+ <template #content>
+ <img src="/@/assets/images/join_wechat.png" alt="qrcode"
class="h-150px w-150px"/>
+ </template>
+ <Icon icon="ant-design:qrcode-outlined"
:class="`${prefixCls}-action__item`" />
+ </Popover>
<!-- Github info -->
<Github :class="`${prefixCls}-action__item github-item`" />
@@ -69,7 +78,7 @@
import { defineComponent, unref, computed } from 'vue';
import { propTypes } from '/@/utils/propTypes';
- import { Layout, Divider } from 'ant-design-vue';
+ import { Layout, Divider, Popover } from 'ant-design-vue';
import { AppLogo } from '/@/components/Application';
import LayoutMenu from '../menu/index.vue';
import LayoutTrigger from '../trigger/index.vue';
@@ -121,6 +130,7 @@
LockScreen,
Divider,
AppDarkModeToggle,
+ Popover
},
props: {
fixed: propTypes.bool,
diff --git
a/streampark-console/streampark-console-webapp/src/utils/http/axios/index.ts
b/streampark-console/streampark-console-webapp/src/utils/http/axios/index.ts
index adc025cbe..7123a7ada 100644
--- a/streampark-console/streampark-console-webapp/src/utils/http/axios/index.ts
+++ b/streampark-console/streampark-console-webapp/src/utils/http/axios/index.ts
@@ -15,6 +15,7 @@ import { useErrorLogStoreWithOut } from
'/@/store/modules/errorLog';
import { useI18n } from '/@/hooks/web/useI18n';
import { joinTimestamp, formatRequestDate } from './helper';
import { useUserStoreWithOut } from '/@/store/modules/user';
+import { useLocaleStoreWithOut } from '/@/store/modules/locale';
import { AxiosRetry } from '/@/utils/http/axios/axiosRetry';
import { errorHandler } from './errorHandle';
@@ -93,6 +94,8 @@ const transform: AxiosTransform = {
const data = config.data || false;
formatDate && data && !isString(data) && formatRequestDate(data);
const teamId = getUserTeamId();
+ const localStore = useLocaleStoreWithOut();
+ config.headers = Object.assign(config.headers || {}, { 'language':
localStore.getLocale });
if (config.method?.toUpperCase() === RequestEnum.GET) {
if (!isString(params)) {
// Add a timestamp parameter to the get request to avoid taking data
from the cache.