From ea1c226ec2173778c36736718463fef4cba469b8 Mon Sep 17 00:00:00 2001 From: yangjiewei <1658539101@qq.com> Date: Mon, 29 Jul 2024 14:37:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E4=BD=8F?= =?UTF-8?q?=E6=88=B7=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/env.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/utils/env.ts b/src/utils/env.ts index 7d3c307..07d7a4f 100644 --- a/src/utils/env.ts +++ b/src/utils/env.ts @@ -22,7 +22,8 @@ export function getAppEnvConfig() { (import.meta.env as unknown as GlobEnvConfig) : window[ENV_NAME as any]) as unknown as GlobEnvConfig; - const { VITE_GLOB_APP_TITLE, VITE_GLOB_API_URL, VITE_GLOB_APP_SHORT_NAME, VITE_GLOB_API_URL_PREFIX, VITE_GLOB_UPLOAD_URL, VITE_GLOB_UPLOAD_PREVIEW, VITE_GLOB_OUT_LINK_URL, VITE_GLOB_REPORT_URL, VITE_GLOB_PRINT_BASE_URL } = ENV; + const { VITE_GLOB_APP_TITLE, VITE_GLOB_API_URL, VITE_GLOB_APP_SHORT_NAME, VITE_GLOB_API_URL_PREFIX, VITE_GLOB_UPLOAD_URL, VITE_GLOB_UPLOAD_PREVIEW, VITE_GLOB_OUT_LINK_URL, VITE_GLOB_REPORT_URL, VITE_GLOB_PRINT_BASE_URL, VITE_TENANT_ENABLED } = + ENV; if (!/^[a-zA-Z\_]*$/.test(VITE_GLOB_APP_SHORT_NAME)) { warn(`VITE_GLOB_APP_SHORT_NAME Variables can only be characters/underscores, please modify in the environment variables and re-running.`); @@ -37,7 +38,8 @@ export function getAppEnvConfig() { VITE_GLOB_UPLOAD_PREVIEW, VITE_GLOB_OUT_LINK_URL, VITE_GLOB_REPORT_URL, - VITE_GLOB_PRINT_BASE_URL + VITE_GLOB_PRINT_BASE_URL, + VITE_TENANT_ENABLED }; } From 4ef45f933eb09d99fbf100a62d3465143239ae98 Mon Sep 17 00:00:00 2001 From: yangjiewei <1658539101@qq.com> Date: Tue, 6 Aug 2024 10:06:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Dockfile=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..304a7ac --- /dev/null +++ b/Dockerfile @@ -0,0 +1,20 @@ +# 使用 Node.js 18 作为基础镜像 +FROM 10.4.117.234:8082/node:20-alpine + +# 在容器中创建工作目录 +WORKDIR /app + +# 拷贝整个应用程序到工作目录 +COPY . . + +# 安装依赖 +RUN yarn install --registry=http://10.4.117.234:8081/repository/npm-public/ + +# 构建应用程序 +RUN yarn build + +# 暴露端口 +EXPOSE 3100 + +# 运行应用程序 +CMD [ "npm", "run", "serve" ] From 40fbce7e7c83561bf85d0424305c3d7fefd3d424 Mon Sep 17 00:00:00 2001 From: Je <967707@dms.yudean.com> Date: Mon, 17 Feb 2025 17:11:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=97=B6=E9=97=B4=E7=9A=84=E7=BB=84=E4=BB=B6=E6=9C=89?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BD=86=E6=98=AF=E6=8F=90=E4=BA=A4=E5=80=BC?= =?UTF-8?q?=E6=98=AF=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DatePicker/src/DatePicker.vue | 80 ++++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/src/components/DatePicker/src/DatePicker.vue b/src/components/DatePicker/src/DatePicker.vue index 1661dbb..2a12d3c 100644 --- a/src/components/DatePicker/src/DatePicker.vue +++ b/src/components/DatePicker/src/DatePicker.vue @@ -13,46 +13,46 @@ /> From f9410ec0a1b013b5e7a63400dc38f589f1e30504 Mon Sep 17 00:00:00 2001 From: Je <967707@dms.yudean.com> Date: Tue, 25 Feb 2025 14:58:38 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/env.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/utils/env.ts b/src/utils/env.ts index 34b69b9..b5218cf 100644 --- a/src/utils/env.ts +++ b/src/utils/env.ts @@ -22,7 +22,7 @@ export function getAppEnvConfig() { (import.meta.env as unknown as GlobEnvConfig) : window[ENV_NAME as any]) as unknown as GlobEnvConfig; - const { VITE_GLOB_APP_TITLE, VITE_GLOB_API_URL, VITE_GLOB_APP_SHORT_NAME, VITE_GLOB_API_URL_PREFIX, VITE_GLOB_REQUEST_TIMEOUT, VITE_GLOB_UPLOAD_URL, VITE_GLOB_UPLOAD_PREVIEW, VITE_GLOB_OUT_LINK_URL, VITE_GLOB_REPORT_URL, VITE_GLOB_PRINT_BASE_URL } = ENV; + const { VITE_GLOB_APP_TITLE, VITE_GLOB_API_URL, VITE_GLOB_APP_SHORT_NAME, VITE_GLOB_API_URL_PREFIX, VITE_GLOB_REQUEST_TIMEOUT, VITE_GLOB_UPLOAD_URL, VITE_GLOB_UPLOAD_PREVIEW, VITE_GLOB_OUT_LINK_URL, VITE_GLOB_REPORT_URL, VITE_GLOB_PRINT_BASE_URL, VITE_TENANT_ENABLED } = ENV; if (!/^[a-zA-Z\_]*$/.test(VITE_GLOB_APP_SHORT_NAME)) { warn(`VITE_GLOB_APP_SHORT_NAME Variables can only be characters/underscores, please modify in the environment variables and re-running.`); @@ -38,7 +38,8 @@ export function getAppEnvConfig() { VITE_GLOB_UPLOAD_PREVIEW, VITE_GLOB_OUT_LINK_URL, VITE_GLOB_REPORT_URL, - VITE_GLOB_PRINT_BASE_URL + VITE_GLOB_PRINT_BASE_URL, + VITE_TENANT_ENABLED }; } From d1a1386c9d159df3df4765c9bc409a0349aedfe6 Mon Sep 17 00:00:00 2001 From: lvjunzhao <967725@dms.yudean.com> Date: Wed, 26 Feb 2025 14:04:59 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=E8=87=AA=E5=8A=A8=E5=90=8C=E6=84=8F?= =?UTF-8?q?=20@click=3D"onApproveClick()"=20=E5=8A=A0=E4=B8=8A=E6=8B=AC?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E6=97=A0=E5=8F=82=E4=BC=A0=E5=80=BC=E3=80=82?= =?UTF-8?q?=E6=89=8D=E5=8F=AF=E4=BB=A5=E5=BC=95=E5=85=A5=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/secondDev/approveFlowPage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/secondDev/approveFlowPage.vue b/src/views/secondDev/approveFlowPage.vue index 2e8fefe..0c54c0f 100644 --- a/src/views/secondDev/approveFlowPage.vue +++ b/src/views/secondDev/approveFlowPage.vue @@ -9,7 +9,7 @@ 关闭 - +