diff --git a/.env b/.env index 2eb64c5..4fc23da 100644 --- a/.env +++ b/.env @@ -4,11 +4,13 @@ VITE_PORT = 3100 # spa-title VITE_GLOB_APP_TITLE = 全代码平台 -# spa shortname +# spa shortname(英文缩写) VITE_GLOB_APP_SHORT_NAME = 全代码平台 -# 应用名称 +# 应用名称(仅展示在登录页和左上角logo旁,其他情况用VITE_GLOB_APP_TITLE) VITE_SYSTEM_NAME = 全代码平台 +# 应用名称简写,用于空间不足的界面显示(左上角logo旁,7个字以内,超出变成...) +# VITE_SYSTEM_SHORT_NAME = 全代码平台 # 响应式布局的表单宽度分界 VITE_RESP_LG_WIDTH = 1280 diff --git a/.env.development b/.env.development index 166b4e1..1f34454 100644 --- a/.env.development +++ b/.env.development @@ -17,7 +17,9 @@ VITE_DROP_CONSOLE = false # 接口地址 # 如果没有跨域问题,直接在这里配置即可 -VITE_GLOB_API_URL=http://10.133.96.105:8077 +VITE_GLOB_API_URL=http://10.133.96.137:8090 +# VITE_GLOB_API_URL=http://10.4.126.67:30000 +# VITE_GLOB_API_URL=http://10.0.252.25:8090 #VITE_GLOB_REQUEST_TIMEOUT=20000 # 报表系统地址 VITE_GLOB_REPORT_URL=http://10.133.96.105:3100 @@ -38,11 +40,11 @@ VITE_GLOB_PRINT_BASE_URL = http://114.116.210.204:3300 VITE_GLOB_API_URL_PREFIX = #租户开关 -# VITE_TENANT_ENABLED = true +# VITE_GLOB_TENANT_ENABLED = true #是否需要输入租户 -# VITE_TENANT_INPUT_REQUIRED = true +# VITE_GLOB_TENANT_INPUT_REQUIRED = true # 屏蔽通知消息的轮询 -VITE_DISABLE_NEWS=false +VITE_GLOB_DISABLE_NEWS=false # 禁用关闭页面提示 -# VITE_CLOSE_ALERT_DISABLED=true +# VITE_GLOB_CLOSE_ALERT_DISABLED=true diff --git a/.env.development.example b/.env.development.example index 2f8de6d..40cc05c 100644 --- a/.env.development.example +++ b/.env.development.example @@ -35,4 +35,4 @@ VITE_GLOB_PRINT_BASE_URL = http://114.116.210.204:3300 VITE_GLOB_API_URL_PREFIX = # 屏蔽通知消息的轮询 -VITE_DISABLE_NEWS = true +VITE_GLOB_DISABLE_NEWS = true diff --git a/.env.production b/.env.production index 3cb04fd..f2a7f1f 100644 --- a/.env.production +++ b/.env.production @@ -36,8 +36,12 @@ VITE_GLOB_API_URL_PREFIX = # 打包是否开启pwa功能 VITE_USE_PWA = false - #租户开关 -VITE_TENANT_ENABLED = true +VITE_GLOB_TENANT_ENABLED = true #是否需要输入租户 -# VITE_TENANT_INPUT_REQUIRED = true +# VITE_GLOB_TENANT_INPUT_REQUIRED = true + +# 屏蔽通知消息的轮询 +VITE_GLOB_DISABLE_NEWS=false +# 禁用关闭页面提示 +# VITE_GLOB_CLOSE_ALERT_DISABLED=true diff --git a/.vscode/settings.json b/.vscode/settings.json index 2dd8666..7f2af8d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,144 +1,142 @@ { - "typescript.tsdk": "./node_modules/typescript/lib", - "volar.tsPlugin": true, - "volar.tsPluginStatus": false, - "npm.packageManager": "pnpm", - "editor.tabSize": 2, - "editor.defaultFormatter": "esbenp.prettier-vscode", - "files.eol": "\n", - "search.exclude": { - "**/node_modules": true, - "**/*.log": true, - "**/*.log*": true, - "**/bower_components": true, - "**/dist": true, - "**/elehukouben": true, - "**/.git": true, - "**/.gitignore": true, - "**/.svn": true, - "**/.DS_Store": true, - "**/.idea": true, - "**/.vscode": false, - "**/yarn.lock": true, - "**/tmp": true, - "out": true, - "dist": true, - "node_modules": true, - "CHANGELOG.md": true, - "examples": true, - "res": true, - "screenshots": true, - "yarn-error.log": true, - "**/.yarn": true - }, - "files.exclude": { - "**/.cache": true, - "**/.editorconfig": true, - "**/.eslintcache": true, - "**/bower_components": true, - "**/.idea": true, - "**/tmp": true, - "**/.git": true, - "**/.svn": true, - "**/.hg": true, - "**/CVS": true, - "**/.DS_Store": true - }, - "files.watcherExclude": { - "**/.git/objects/**": true, - "**/.git/subtree-cache/**": true, - "**/.vscode/**": true, - "**/node_modules/**": true, - "**/tmp/**": true, - "**/bower_components/**": true, - "**/dist/**": true, - "**/yarn.lock": true - }, - "stylelint.enable": true, - "stylelint.validate": ["css", "less", "postcss", "scss", "vue", "sass"], - "path-intellisense.mappings": { - "/@/": "${workspaceRoot}/src" - }, - "[javascriptreact]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[typescriptreact]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[html]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[css]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[less]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[scss]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[markdown]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "editor.codeActionsOnSave": { - "source.fixAll.eslint": "explicit" - }, - "[vue]": { - "editor.codeActionsOnSave": { - "source.fixAll.eslint": "explicit", - "source.fixAll.stylelint": "explicit" + "typescript.tsdk": "./node_modules/typescript/lib", + "volar.tsPlugin": true, + "volar.tsPluginStatus": false, + "npm.packageManager": "pnpm", + "editor.tabSize": 2, + "editor.defaultFormatter": "esbenp.prettier-vscode", + "files.eol": "\n", + "search.exclude": { + "**/node_modules": true, + "**/*.log": true, + "**/*.log*": true, + "**/bower_components": true, + "**/dist": true, + "**/elehukouben": true, + "**/.git": true, + "**/.gitignore": true, + "**/.svn": true, + "**/.DS_Store": true, + "**/.idea": true, + "**/.vscode": false, + "**/yarn.lock": true, + "**/tmp": true, + "out": true, + "dist": true, + "node_modules": true, + "CHANGELOG.md": true, + "examples": true, + "res": true, + "screenshots": true, + "yarn-error.log": true, + "**/.yarn": true }, - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "i18n-ally.localesPaths": ["src/locales/lang"], - "i18n-ally.keystyle": "nested", - "i18n-ally.sortKeys": true, - "i18n-ally.namespace": true, - "i18n-ally.pathMatcher": "{locale}/{namespaces}.{ext}", - "i18n-ally.enabledParsers": ["ts"], - "i18n-ally.sourceLanguage": "en", - "i18n-ally.displayLanguage": "zh-CN", - "i18n-ally.enabledFrameworks": ["vue", "react"], - "cSpell.words": [ - "vben", - "windi", - "browserslist", - "tailwindcss", - "esnext", - "antv", - "tinymce", - "qrcode", - "sider", - "pinia", - "sider", - "nprogress", - "INTLIFY", - "stylelint", - "esno", - "vitejs", - "sortablejs", - "mockjs", - "codemirror", - "iconify", - "commitlint", - "vditor", - "echarts", - "cropperjs", - "logicflow", - "vueuse", - "zxcvbn", - "lintstagedrc", - "brotli", - "tailwindcss", - "sider", - "pnpm", - "antd" - ], - "files.autoSave": "onFocusChange", - "editor.formatOnSave": true, - "eslint.codeActionsOnSave.rules": null, - "vue3snippets.enable-compile-vue-file-on-did-save-code": false + "files.exclude": { + "**/.cache": true, + "**/.editorconfig": true, + "**/.eslintcache": true, + "**/bower_components": true, + "**/.idea": true, + "**/tmp": true, + "**/.git": true, + "**/.svn": true, + "**/.hg": true, + "**/CVS": true, + "**/.DS_Store": true + }, + "files.watcherExclude": { + "**/.git/objects/**": true, + "**/.git/subtree-cache/**": true, + "**/.vscode/**": true, + "**/node_modules/**": true, + "**/tmp/**": true, + "**/bower_components/**": true, + "**/dist/**": true, + "**/yarn.lock": true + }, + "stylelint.enable": true, + "stylelint.validate": ["css", "less", "postcss", "scss", "vue", "sass"], + "path-intellisense.mappings": { + "/@/": "${workspaceRoot}/src" + }, + "[javascriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[html]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[css]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[less]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[scss]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[markdown]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "editor.codeActionsOnSave": { + "source.fixAll.eslint": "explicit" + }, + "[vue]": { + "editor.codeActionsOnSave": { + "source.fixAll.eslint": "explicit", + "source.fixAll.stylelint": "explicit" + }, + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "i18n-ally.localesPaths": ["src/locales/lang"], + "i18n-ally.keystyle": "nested", + "i18n-ally.sortKeys": true, + "i18n-ally.namespace": true, + "i18n-ally.pathMatcher": "{locale}/{namespaces}.{ext}", + "i18n-ally.enabledParsers": ["ts"], + "i18n-ally.sourceLanguage": "en", + "i18n-ally.displayLanguage": "zh-CN", + "i18n-ally.enabledFrameworks": ["vue", "react"], + "cSpell.words": [ + "vben", + "windi", + "browserslist", + "tailwindcss", + "esnext", + "antv", + "tinymce", + "qrcode", + "sider", + "pinia", + "sider", + "nprogress", + "INTLIFY", + "stylelint", + "esno", + "vitejs", + "sortablejs", + "mockjs", + "codemirror", + "iconify", + "commitlint", + "vditor", + "echarts", + "cropperjs", + "logicflow", + "vueuse", + "zxcvbn", + "lintstagedrc", + "brotli", + "tailwindcss", + "sider", + "pnpm", + "antd" + ], + "eslint.codeActionsOnSave.rules": null, + "vue3snippets.enable-compile-vue-file-on-did-save-code": false } diff --git a/index.html b/index.html index 46206ca..376de98 100644 --- a/index.html +++ b/index.html @@ -33,9 +33,11 @@ const { data } = await responseStream.json(); if (data.shortName) { document.title = data.shortName; - document.getElementById('app-loading-title').innerText = data.shortName; + if(document.getElementById('app-loading-title')){ + document.getElementById('app-loading-title').innerText = data.shortName; + } } - if (data.refreshLogoUrl) { + if (data.refreshLogoUrl&&document.getElementById('app-loading-logo')) { document.getElementById('app-loading-logo').setAttribute('src', data.refreshLogoUrl); } } catch { diff --git a/src/App.vue b/src/App.vue index 377faad..81fc062 100644 --- a/src/App.vue +++ b/src/App.vue @@ -55,7 +55,7 @@ return '关闭提示'; }; - if(!getAppEnvConfig().VITE_CLOSE_ALERT_DISABLED){ + if(!getAppEnvConfig().VITE_GLOB_CLOSE_ALERT_DISABLED){ window.addEventListener('beforeunload', beforeUnloadHandler); } diff --git a/src/api/auditOpt/auditRecord/index.ts b/src/api/auditOpt/auditRecord/index.ts index 86b9999..2d4cfeb 100644 --- a/src/api/auditOpt/auditRecord/index.ts +++ b/src/api/auditOpt/auditRecord/index.ts @@ -3,12 +3,12 @@ import { defHttp } from '/@/utils/http/axios'; import { ErrorMessageMode } from '/#/axios'; enum Api { - Page = '/auditOpt/auditRecord/page', - List = '/auditOpt/auditRecord/list', - Info = '/auditOpt/auditRecord/info', - XjrWorkflowApproveRecord = '/auditOpt/auditRecord', + Page = '/workflow/workflowApproveRecord/page', + List = '/workflow/workflowApproveRecord/list', + Info = '/workflow/workflowApproveRecord/info', + XjrWorkflowApproveRecord = '/workflow/workflowApproveRecord', GetApproveRecord = '/workflow/adminOperation/getAllApproveRecord', - DelApproveRecord = '/auditOpt/auditRecord', + DelApproveRecord = '/workflow/workflowApproveRecord', AddApproveRcord = '/workflow/adminOperation/addApproveRecord', UpdateApproveRcord = '/workflow/adminOperation/updateApproveRecord', } @@ -151,4 +151,4 @@ export async function updateApproveRecord(params:any, mode: ErrorMessageMode = ' errorMessageMode: mode, }, ); -} \ No newline at end of file +} diff --git a/src/components/Application/src/AppLogo.vue b/src/components/Application/src/AppLogo.vue index 9abb8db..b4d7d7d 100644 --- a/src/components/Application/src/AppLogo.vue +++ b/src/components/Application/src/AppLogo.vue @@ -4,10 +4,10 @@ --> - + diff --git a/src/views/workflow/task/components/flow/ProcessInformation.vue b/src/views/workflow/task/components/flow/ProcessInformation.vue index dfe0897..93552cd 100644 --- a/src/views/workflow/task/components/flow/ProcessInformation.vue +++ b/src/views/workflow/task/components/flow/ProcessInformation.vue @@ -168,7 +168,7 @@ if (props.canClick) { .flow-record-box { width: 100%; - height: 80vh; + height: 65vh; position: relative; margin-top: 50px; } diff --git a/src/views/workflow/task/components/processTasks/Drafts.vue b/src/views/workflow/task/components/processTasks/Drafts.vue index ec06c82..e2e4e69 100644 --- a/src/views/workflow/task/components/processTasks/Drafts.vue +++ b/src/views/workflow/task/components/processTasks/Drafts.vue @@ -43,16 +43,32 @@ const { t } = useI18n(); const configColumns: BasicColumn[] = [ { - title: t('流程名称'), + title: t('流程定义名称'), dataIndex: 'schemaName', align: 'left', }, { - title: t('发起者'), + title: t('任务名称'), + dataIndex: 'taskName', + align: 'left', + }, + { + title: t('流程待办名称'), + dataIndex: 'processName', + align: 'left', + }, + { + title: t('流程发起者'), dataIndex: 'originator', sorter: true, align: 'left', }, + { + title: t('创建人'), + dataIndex: 'createUserName', + sorter: true, + align: 'left', + }, { title: t('发起时间'), dataIndex: 'createDate', diff --git a/src/views/workflow/task/components/processTasks/DraftsV2.vue b/src/views/workflow/task/components/processTasks/DraftsV2.vue index e7c8ab0..b1f2893 100644 --- a/src/views/workflow/task/components/processTasks/DraftsV2.vue +++ b/src/views/workflow/task/components/processTasks/DraftsV2.vue @@ -27,16 +27,32 @@ const { t } = useI18n(); const router = useRouter(); const configColumns = [ { - title: t('流程名称'), + title: t('流程定义名称'), dataIndex: 'schemaName', align: 'left' }, { - title: t('发起者'), + title: t('任务名称'), + dataIndex: 'taskName', + align: 'left', + }, + { + title: t('流程待办名称'), + dataIndex: 'processName', + align: 'left', + }, + { + title: t('流程发起者'), dataIndex: 'originator', sorter: true, align: 'left' }, + { + title: t('创建人'), + dataIndex: 'createUserName', + sorter: true, + align: 'left', + }, { title: t('发起时间'), dataIndex: 'createDate', diff --git a/types/config.d.ts b/types/config.d.ts index 43e0048..5cc77f3 100644 --- a/types/config.d.ts +++ b/types/config.d.ts @@ -163,8 +163,8 @@ export interface GlobEnvConfig { //file preview VITE_GLOB_UPLOAD_PREVIEW?: string; VITE_GLOB_REPORT_URL: string; - VITE_TENANT_ENABLED: boolean; - VITE_CLOSE_ALERT_DISABLED: boolean; + VITE_GLOB_TENANT_ENABLED: boolean; + VITE_GLOB_CLOSE_ALERT_DISABLED: boolean; } export interface LogoConfig {