From c4a28eb509164e52d795e5ffea25bc5027127f9e Mon Sep 17 00:00:00 2001 From: haml-707 <845831435@qq.com> Date: Wed, 29 May 2024 21:37:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=AE=8C=E5=96=84=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 +- components.d.ts | 1 - deploy/entrypoint.sh | 2 +- deploy/nginx/nginx.conf | 4 +- opendesign/button/src/button-types.ts | 1 - opendesign/dialog/ODialog.vue | 5 +- opendesign/search/OSearch.vue | 1 - opendesign/select/OOption.vue | 2 - opendesign/select/OSelect.vue | 1 - opendesign/select/index.ts | 5 +- opendesign/select/src/select.tsx | 16 -- package.json | 10 +- pnpm-lock.yaml | 115 +++++------- src/api/api-quick-issue.ts | 10 -- src/components/AppFooter.vue | 127 +------------ src/components/AppHeader.vue | 8 +- src/components/AppIssue.vue | 68 ++++--- src/components/AppPull.vue | 30 ++-- src/components/AppSlideVerify.vue | 236 ------------------------- src/config/index.ts | 108 +++++++++++ src/shared/axios/index.ts | 5 - src/shared/issue-type.ts | 10 ++ src/shared/styles/markdown.scss | 8 +- src/views/TheQuickIssue.vue | 37 ++-- src/views/pull-request/PullRequest.vue | 38 ++-- src/views/submit-issue/SubmitIssue.vue | 45 +++-- src/vite-env.d.ts | 2 - 27 files changed, 289 insertions(+), 610 deletions(-) delete mode 100644 src/components/AppSlideVerify.vue create mode 100644 src/config/index.ts create mode 100644 src/shared/issue-type.ts diff --git a/.env.production b/.env.production index 79e379e..1bbbb8a 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,3 @@ -VITE_COOKIE_DOMAIN = .openeuler.org +VITE_COOKIE_DOMAIN = .test.osinfra.cn -VITE_LOGIN_ORIGIN = https://id.openeuler.org +VITE_LOGIN_ORIGIN = https://openeuler-usercenter.test.osinfra.cn diff --git a/components.d.ts b/components.d.ts index 0c5defc..d8b8a47 100644 --- a/components.d.ts +++ b/components.d.ts @@ -13,7 +13,6 @@ declare module 'vue' { AppHeader: typeof import('./src/components/AppHeader.vue')['default'] AppIssue: typeof import('./src/components/AppIssue.vue')['default'] AppPull: typeof import('./src/components/AppPull.vue')['default'] - AppSlideVerify: typeof import('./src/components/AppSlideVerify.vue')['default'] DocAnchor: typeof import('./src/components/DocAnchor.vue')['default'] ElCard: typeof import('element-plus/es')['ElCard'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] diff --git a/deploy/entrypoint.sh b/deploy/entrypoint.sh index 9679c15..d72cb30 100644 --- a/deploy/entrypoint.sh +++ b/deploy/entrypoint.sh @@ -1,4 +1,4 @@ #!/bin/bash bash /etc/nginx/monitor.sh $DET_URL $DST_PATH & -/usr/share/nginx/sbin/nginx -g 'daemon off; \ No newline at end of file +/usr/share/nginx/sbin/nginx -g 'daemon off;' \ No newline at end of file diff --git a/deploy/nginx/nginx.conf b/deploy/nginx/nginx.conf index 852f9bf..17b1eb0 100644 --- a/deploy/nginx/nginx.conf +++ b/deploy/nginx/nginx.conf @@ -104,7 +104,7 @@ http { add_header X-Frame-Options DENY; add_header X-Content-Type-Options nosniff; add_header Strict-Transport-Security "max-age=31536000; includeSubDomains"; - add_header Content-Security-Policy "script-src 'self' 'unsafe-inline' 'unsafe-eval'; object-src 'none'; frame-src 'none'"; + add_header Content-Security-Policy "script-src 'self' 'unsafe-inline' 'unsafe-eval' ; object-src 'none'; frame-src 'none'"; add_header Cache-Control "public,max-age=1209600"; } @@ -125,7 +125,7 @@ http { location /api-omapi/ { proxy_set_header X-Forwarded-For $http_x_real_ip; - proxy_pass https://omapi.osinfra.cn/; + proxy_pass https://omapi.test.osinfra.cn/; } diff --git a/opendesign/button/src/button-types.ts b/opendesign/button/src/button-types.ts index 4deb21d..de42891 100644 --- a/opendesign/button/src/button-types.ts +++ b/opendesign/button/src/button-types.ts @@ -3,7 +3,6 @@ import { SizeType } from '../../_utils/common'; type ButtonType = 'outline' | 'primary' | 'secondary' | 'text'; // TODO:status颜色规范待补充 -// type ButtonStatus = 'normal' | 'success' | 'warning' | 'danger'; type ButtonStatus = 'normal'; type ButtonNativeType = 'button' | 'submit' | 'reset'; diff --git a/opendesign/dialog/ODialog.vue b/opendesign/dialog/ODialog.vue index dddf034..9cdfff2 100644 --- a/opendesign/dialog/ODialog.vue +++ b/opendesign/dialog/ODialog.vue @@ -30,8 +30,5 @@ const modalClassNames = computed(() => { diff --git a/opendesign/search/OSearch.vue b/opendesign/search/OSearch.vue index 731ba44..cb07e8a 100644 --- a/opendesign/search/OSearch.vue +++ b/opendesign/search/OSearch.vue @@ -44,7 +44,6 @@ const attrs = useAttrs(); border-radius: 0; padding: 1px 8px; background-color: var(--o-search-color-bg); - // box-shadow: var(--o-search-shadow); .el-input__prefix-inner { font-size: var(--o-font-size-h5); diff --git a/opendesign/select/OOption.vue b/opendesign/select/OOption.vue index 96d713b..4682413 100644 --- a/opendesign/select/OOption.vue +++ b/opendesign/select/OOption.vue @@ -1,6 +1,4 @@