Merge branch 'dev' of https://fcd.gdyditc.com/itc-framework/ma/2024/front into dev-zhaoDN/version-workflow

This commit is contained in:
lvjunzhao
2025-02-26 15:39:30 +08:00
3 changed files with 24 additions and 3 deletions

20
Dockerfile Normal file
View File

@ -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" ]

View File

@ -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
};
}

View File

@ -9,7 +9,7 @@
</slot>
关闭
</a-button>
<a-button v-if="!readonly && hasBtnApprove" type="primary" @click="onApproveClick">
<a-button v-if="!readonly && hasBtnApprove" type="primary" @click="onApproveClick()">
<slot name="icon">
<check-circle-outlined />
</slot>