You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by kr...@apache.org on 2024/02/18 02:19:13 UTC
(incubator-streampark) branch qrcode created (now 3d395431b)
This is an automated email from the ASF dual-hosted git repository.
kriszu pushed a change to branch qrcode
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
at 3d395431b feat: add language header to requests
This branch includes the following new commits:
new 533d61dc0 feat: wechat qrcode
new 3d395431b feat: add language header to requests
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(incubator-streampark) 01/02: feat: wechat qrcode
Posted by kr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kriszu pushed a commit to branch qrcode
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit 533d61dc09d31eadf5973fca2b4978da7a5a1bb9
Author: kriszu <39...@users.noreply.github.com>
AuthorDate: Sun Feb 18 09:56:52 2024 +0800
feat: wechat qrcode
---
.../src/assets/images/join_wechat.png | Bin 0 -> 79574 bytes
.../src/layouts/default/header/index.vue | 14 ++++++++++++--
2 files changed, 12 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,
(incubator-streampark) 02/02: feat: add language header to requests
Posted by kr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kriszu pushed a commit to branch qrcode
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit 3d395431b488b76da941a3f7d275f5dc92640d4b
Author: kriszu <39...@users.noreply.github.com>
AuthorDate: Sun Feb 18 10:17:56 2024 +0800
feat: add language header to requests
---
.../streampark-console-webapp/src/utils/http/axios/index.ts | 3 +++
1 file changed, 3 insertions(+)
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.