diff --git a/package.json b/package.json index 9c8fc8603e77cc98f1f567cff26ff722edff06bd..c6ddcf9c0e534a55a310e0bfee314e9f6a7ae406 100644 --- a/package.json +++ b/package.json @@ -19,11 +19,12 @@ "@element-plus/icons-vue": "^2.0.4", "@opensig/open-analytics": "^0.0.9", "@types/d3": "^7.4.0", - "axios": "^0.26.0", + "axios": "^1.7.4", "d3": "^7.4.4", "echarts": "^5.3.2", "element-plus": "^2.1.4", "html2canvas": "^1.4.1", + "js-cookie": "^3.0.5", "lodash-es": "^4.17.21", "normalize.css": "^8.0.1", "pinia": "^2.0.11", @@ -33,11 +34,13 @@ "vue-router": "^4.0.13" }, "devDependencies": { + "@types/js-cookie": "^3.0.6", "@types/lodash-es": "^4.17.6", "@types/node": "^17.0.21", "@typescript-eslint/eslint-plugin": "^5.13.0", "@typescript-eslint/parser": "^5.13.0", "@vitejs/plugin-vue": "^4.6.2", + "@vitejs/plugin-vue-jsx": "^4.1.1", "@vue/eslint-config-prettier": "^7.0.0", "@vue/eslint-config-typescript": "^10.0.0", "eslint": "^8.9.0", @@ -47,7 +50,7 @@ "typescript": "^4.5.4", "unplugin-auto-import": "^0.11.5", "unplugin-vue-components": "^0.26.0", - "vite": "^4.5.3", + "vite": "^4.5.6", "vue-tsc": "^1.8.25" } } diff --git a/packages/euler/.env.development b/packages/euler/.env.development index d5a75c74803f55f386b0b745dada3e7367c07696..a4fe0c34fdee6116dc6e9bbf6b24db7374fac8e1 100644 --- a/packages/euler/.env.development +++ b/packages/euler/.env.development @@ -1,3 +1,3 @@ VITE_COOKIE_DOMAIN = localhost - +VITE_COOKIE_VER = "20240830" VITE_LOGIN_ORIGIN = https://id.openeuler.org diff --git a/packages/euler/.env.production b/packages/euler/.env.production index 79e379e6cfc388457ae92c706e79625c7ed410a8..709ca2dc8d65f6e1c9a18574e055b16794271e54 100644 --- a/packages/euler/.env.production +++ b/packages/euler/.env.production @@ -1,3 +1,3 @@ +VITE_COOKIE_VER = "20240830" VITE_COOKIE_DOMAIN = .openeuler.org - VITE_LOGIN_ORIGIN = https://id.openeuler.org diff --git a/packages/euler/components.d.ts b/packages/euler/components.d.ts index 6ffaf080bc321b9f7025ef01ab816688e0eda63d..9d0d9de7f20ec0369a490ae62b3142395ef099f4 100644 --- a/packages/euler/components.d.ts +++ b/packages/euler/components.d.ts @@ -11,6 +11,7 @@ declare module 'vue' { AppHeader: typeof import('./src/components/AppHeader.vue')['default'] AppHeaderMobile: typeof import('./src/components/AppHeaderMobile.vue')['default'] AppMobileMenu: typeof import('./src/components/AppMobileMenu.vue')['default'] + CookieNotice: typeof import('./src/components/CookieNotice.vue')['default'] ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete'] ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElButton: typeof import('element-plus/es')['ElButton'] diff --git a/packages/euler/src/App.vue b/packages/euler/src/App.vue index df9bcaf8cbddc1165093a32e8d479a936d31f01a..29f4124cbbd3dd34245176b937d844b4fe83493e 100644 --- a/packages/euler/src/App.vue +++ b/packages/euler/src/App.vue @@ -2,6 +2,7 @@ import AppHeader from '@/components/AppHeader.vue'; import { setStoreData, useStoreData } from 'shared/utils/login'; import { openCommunityInfo } from './api'; +import CookieNotice from './components/CookieNotice.vue'; setStoreData(openCommunityInfo.name); const { loginIframeSrc } = useStoreData(); @@ -15,6 +16,7 @@ const { loginIframeSrc } = useStoreData(); +