From 28507236a7ab73ce24abb358e1fe5fee0990b981 Mon Sep 17 00:00:00 2001 From: shizhong <124974919@qq.com> Date: Fri, 16 Jun 2023 19:31:12 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E5=92=8C=E5=A4=9A=E4=BD=99=E7=9A=84?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bpm/definition/index.vue | 1 + src/views/bpm/model/index.vue | 15 +- src/views/bpm/taskAssignRule/index.vue | 1 + .../infra/apiAccessLog/ApiAccessLogDetail.vue | 65 ---- .../infra/apiErrorLog/ApiErrorLogDetail.vue | 79 ----- src/views/infra/codegen/ImportTable.vue | 149 --------- src/views/infra/codegen/PreviewCode.vue | 219 ------------- src/views/infra/config/form.vue | 129 -------- src/views/infra/dataSourceConfig/form.vue | 109 ------ .../infra/{fileList => file}/fileList.data.ts | 0 src/views/infra/file/form.vue | 81 ----- src/views/infra/file/index.vue | 310 ++++++++++-------- src/views/infra/fileConfig/form.vue | 193 ----------- src/views/infra/fileList/index.vue | 190 ----------- src/views/infra/job/JobDetail.vue | 71 ---- src/views/infra/job/JobForm.vue | 128 -------- src/views/infra/job/logger/JobLogDetail.vue | 57 ---- src/views/infra/job/logger/index.vue | 193 ----------- src/views/infra/job/utils.ts | 44 --- src/views/infra/redis/index.vue | 112 +------ src/views/system/mail/log/index.vue | 2 +- src/views/system/mail/template/index.vue | 2 +- src/views/system/post/form.vue | 91 ----- 23 files changed, 200 insertions(+), 2041 deletions(-) delete mode 100644 src/views/infra/apiAccessLog/ApiAccessLogDetail.vue delete mode 100644 src/views/infra/apiErrorLog/ApiErrorLogDetail.vue delete mode 100644 src/views/infra/codegen/ImportTable.vue delete mode 100644 src/views/infra/codegen/PreviewCode.vue delete mode 100644 src/views/infra/config/form.vue delete mode 100644 src/views/infra/dataSourceConfig/form.vue rename src/views/infra/{fileList => file}/fileList.data.ts (100%) delete mode 100644 src/views/infra/file/form.vue delete mode 100644 src/views/infra/fileConfig/form.vue delete mode 100644 src/views/infra/fileList/index.vue delete mode 100644 src/views/infra/job/JobDetail.vue delete mode 100644 src/views/infra/job/JobForm.vue delete mode 100644 src/views/infra/job/logger/JobLogDetail.vue delete mode 100644 src/views/infra/job/logger/index.vue delete mode 100644 src/views/infra/job/utils.ts delete mode 100644 src/views/system/post/form.vue diff --git a/src/views/bpm/definition/index.vue b/src/views/bpm/definition/index.vue index f6df8564..d6e42a1f 100644 --- a/src/views/bpm/definition/index.vue +++ b/src/views/bpm/definition/index.vue @@ -83,6 +83,7 @@ const queryParams = reactive({ }) const [registerTable] = useXTable({ allSchemas: allSchemas, + topActionSlots: false, getListApi: DefinitionApi.getProcessDefinitionPageApi, params: queryParams }) diff --git a/src/views/bpm/model/index.vue b/src/views/bpm/model/index.vue index 5dd420ca..4afd5f4a 100644 --- a/src/views/bpm/model/index.vue +++ b/src/views/bpm/model/index.vue @@ -515,12 +515,15 @@ const handleChangeState = (row) => { // 发布流程 const handleDeploy = (row) => { - message.confirm('是否部署该流程!!').then(async () => { - await ModelApi.deployModelApi(row.id) - message.success(t('部署成功')) - // 刷新列表 - reload() - }) + message + .confirm('是否部署该流程!!') + .then(async () => { + await ModelApi.deployModelApi(row.id) + message.success(t('部署成功')) + // 刷新列表 + reload() + }) + .catch(() => {}) } // ========== 导入流程 ========== diff --git a/src/views/bpm/taskAssignRule/index.vue b/src/views/bpm/taskAssignRule/index.vue index 6a09b147..e981d2d7 100644 --- a/src/views/bpm/taskAssignRule/index.vue +++ b/src/views/bpm/taskAssignRule/index.vue @@ -175,6 +175,7 @@ const queryParams = reactive({ }) const [registerTable, { reload }] = useXTable({ allSchemas: allSchemas, + topActionSlots: false, params: queryParams, getListApi: TaskAssignRuleApi.getTaskAssignRuleList, isList: true diff --git a/src/views/infra/apiAccessLog/ApiAccessLogDetail.vue b/src/views/infra/apiAccessLog/ApiAccessLogDetail.vue deleted file mode 100644 index fac82aa3..00000000 --- a/src/views/infra/apiAccessLog/ApiAccessLogDetail.vue +++ /dev/null @@ -1,65 +0,0 @@ - - - - - {{ detailData.id }} - - - {{ detailData.traceId }} - - - {{ detailData.applicationName }} - - - {{ detailData.userId }} - - - - {{ detailData.userIp }} - - - {{ detailData.userAgent }} - - - {{ detailData.requestMethod }} {{ detailData.requestUrl }} - - - {{ detailData.requestParams }} - - - {{ formatDate(detailData.beginTime) }} ~ {{ formatDate(detailData.endTime) }} - - {{ detailData.duration }} ms - - 正常 - 失败 | {{ detailData.resultCode }} | {{ detailData.resultMsg }} - - - - - - - diff --git a/src/views/infra/apiErrorLog/ApiErrorLogDetail.vue b/src/views/infra/apiErrorLog/ApiErrorLogDetail.vue deleted file mode 100644 index 7fe17570..00000000 --- a/src/views/infra/apiErrorLog/ApiErrorLogDetail.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - - {{ detailData.id }} - - - {{ detailData.traceId }} - - - {{ detailData.applicationName }} - - - {{ detailData.userId }} - - - - {{ detailData.userIp }} - - - {{ detailData.userAgent }} - - - {{ detailData.requestMethod }} {{ detailData.requestUrl }} - - - {{ detailData.requestParams }} - - - {{ formatDate(detailData.exceptionTime) }} - - - {{ detailData.exceptionName }} - - - - - - - - - {{ detailData.processUserId }} - - - {{ formatDate(detailData.processTime) }} - - - - - diff --git a/src/views/infra/codegen/ImportTable.vue b/src/views/infra/codegen/ImportTable.vue deleted file mode 100644 index fb37aa26..00000000 --- a/src/views/infra/codegen/ImportTable.vue +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - - - - - - - - - - - - 搜索 - - - - 重置 - - - - - - - - - - - - - - - 导入 - - 关闭 - - - - diff --git a/src/views/infra/codegen/PreviewCode.vue b/src/views/infra/codegen/PreviewCode.vue deleted file mode 100644 index 12327b99..00000000 --- a/src/views/infra/codegen/PreviewCode.vue +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - - - - - - - - - - {{ t('common.copy') }} - - - - - - - - - - - - diff --git a/src/views/infra/config/form.vue b/src/views/infra/config/form.vue deleted file mode 100644 index 18ecfa3d..00000000 --- a/src/views/infra/config/form.vue +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - {{ dict.label }} - - - - - - - - - 确 定 - 取 消 - - - - diff --git a/src/views/infra/dataSourceConfig/form.vue b/src/views/infra/dataSourceConfig/form.vue deleted file mode 100644 index 33f67c56..00000000 --- a/src/views/infra/dataSourceConfig/form.vue +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - 确 定 - 取 消 - - - - diff --git a/src/views/infra/fileList/fileList.data.ts b/src/views/infra/file/fileList.data.ts similarity index 100% rename from src/views/infra/fileList/fileList.data.ts rename to src/views/infra/file/fileList.data.ts diff --git a/src/views/infra/file/form.vue b/src/views/infra/file/form.vue deleted file mode 100644 index 56dbf25f..00000000 --- a/src/views/infra/file/form.vue +++ /dev/null @@ -1,81 +0,0 @@ - - - - - 将文件拖到此处,或 点击上传 - - - 提示:仅允许导入 jpg、png、gif 格式文件! - - - - - 确 定 - 取 消 - - - - - diff --git a/src/views/infra/file/index.vue b/src/views/infra/file/index.vue index 32b35562..743dbad5 100644 --- a/src/views/infra/file/index.vue +++ b/src/views/infra/file/index.vue @@ -1,154 +1,190 @@ - - - - - + + + + + + + - - - + - - - + + + + + + + - - - 搜索 - 重置 - - 上传文件 - - - - - - - - - - - - {{ row.url }} + + + + + + + + + + + 将文件拖到此处,或点击上传 + + 请上传 .jpg, .png, .gif 标准格式文件 + + + + + - - - - - - 删除 - - - - - - - - - - + + + + - diff --git a/src/views/infra/fileConfig/form.vue b/src/views/infra/fileConfig/form.vue deleted file mode 100644 index 740d29ed..00000000 --- a/src/views/infra/fileConfig/form.vue +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 主动模式 - 主动模式 - - - - - - - - - - - - - - - - - - - - - - - - - - 确 定 - 取 消 - - - - diff --git a/src/views/infra/fileList/index.vue b/src/views/infra/fileList/index.vue deleted file mode 100644 index 743dbad5..00000000 --- a/src/views/infra/fileList/index.vue +++ /dev/null @@ -1,190 +0,0 @@ - - - - - - - - - - - - - - - - - - - - {{ row.url }} - - - - - - - - - - - 将文件拖到此处,或点击上传 - - 请上传 .jpg, .png, .gif 标准格式文件 - - - - - - - - - - - diff --git a/src/views/infra/job/JobDetail.vue b/src/views/infra/job/JobDetail.vue deleted file mode 100644 index 45bc4a5d..00000000 --- a/src/views/infra/job/JobDetail.vue +++ /dev/null @@ -1,71 +0,0 @@ - - - - - {{ detailData.id }} - - - {{ detailData.name }} - - - - - - {{ detailData.handlerName }} - - - {{ detailData.handlerParam }} - - - {{ detailData.cronExpression }} - - - {{ detailData.retryCount }} - - - {{ detailData.retryInterval + ' 毫秒' }} - - - {{ detailData.monitorTimeout > 0 ? detailData.monitorTimeout + ' 毫秒' : '未开启' }} - - - - - 第 {{ index + 1 }} 次 - - - - - - - diff --git a/src/views/infra/job/JobForm.vue b/src/views/infra/job/JobForm.vue deleted file mode 100644 index 9c03bd1c..00000000 --- a/src/views/infra/job/JobForm.vue +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 确 定 - 取 消 - - - - diff --git a/src/views/infra/job/logger/JobLogDetail.vue b/src/views/infra/job/logger/JobLogDetail.vue deleted file mode 100644 index a8ef8d4f..00000000 --- a/src/views/infra/job/logger/JobLogDetail.vue +++ /dev/null @@ -1,57 +0,0 @@ - - - - - {{ detailData.id }} - - - {{ detailData.jobId }} - - - {{ detailData.handlerName }} - - - {{ detailData.handlerParam }} - - - {{ detailData.executeIndex }} - - - {{ formatDate(detailData.beginTime) + ' ~ ' + formatDate(detailData.endTime) }} - - - {{ detailData.duration + ' 毫秒' }} - - - - - - {{ detailData.duration + ' result' }} - - - - - diff --git a/src/views/infra/job/logger/index.vue b/src/views/infra/job/logger/index.vue deleted file mode 100644 index f55a0647..00000000 --- a/src/views/infra/job/logger/index.vue +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - 搜索 - 重置 - - 导出 - - - - - - - - - - - - - - - - {{ formatDate(scope.row.beginTime) + ' ~ ' + formatDate(scope.row.endTime) }} - - - - - {{ scope.row.duration + ' 毫秒' }} - - - - - - - - - - - 详细 - - - - - - - - - - - - diff --git a/src/views/infra/job/utils.ts b/src/views/infra/job/utils.ts deleted file mode 100644 index a3774f22..00000000 --- a/src/views/infra/job/utils.ts +++ /dev/null @@ -1,44 +0,0 @@ -export const parseTime = (time) => { - if (!time) { - return null - } - const format = '{y}-{m}-{d} {h}:{i}:{s}' - let date - if (typeof time === 'object') { - date = time - } else { - if (typeof time === 'string' && /^[0-9]+$/.test(time)) { - time = parseInt(time) - } else if (typeof time === 'string') { - time = time - .replace(new RegExp(/-/gm), '/') - .replace('T', ' ') - .replace(new RegExp(/\.[\d]{3}/gm), '') - } - if (typeof time === 'number' && time.toString().length === 10) { - time = time * 1000 - } - date = new Date(time) - } - const formatObj = { - y: date.getFullYear(), - m: date.getMonth() + 1, - d: date.getDate(), - h: date.getHours(), - i: date.getMinutes(), - s: date.getSeconds(), - a: date.getDay() - } - const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { - let value = formatObj[key] - // Note: getDay() returns 0 on Sunday - if (key === 'a') { - return ['日', '一', '二', '三', '四', '五', '六'][value] - } - if (result.length > 0 && value < 10) { - value = '0' + value - } - return value || 0 - }) - return time_str -} diff --git a/src/views/infra/redis/index.vue b/src/views/infra/redis/index.vue index c3db5ab7..05d065c6 100644 --- a/src/views/infra/redis/index.vue +++ b/src/views/infra/redis/index.vue @@ -61,7 +61,12 @@ - + @@ -105,8 +110,12 @@ 缓存内容 - + @@ -119,7 +128,6 @@