diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index aa98ebc0..11420a07 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -116,7 +116,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ { path: 'type/data/:dictType', component: () => import('@/views/system/dict/data/index.vue'), - name: 'data', + name: 'SystemDictData', meta: { title: '字典数据', noCache: true, @@ -140,7 +140,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ { path: 'edit', component: () => import('@/views/infra/codegen/EditTable.vue'), - name: 'EditTable', + name: 'InfraCodegenEditTable', meta: { noCache: true, hidden: true, @@ -163,7 +163,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ { path: 'job-log', component: () => import('@/views/infra/job/logger/index.vue'), - name: 'JobLog', + name: 'InfraJobLog', meta: { noCache: true, hidden: true, @@ -226,7 +226,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ { path: '/manager/form/edit', component: () => import('@/views/bpm/form/editor/index.vue'), - name: 'bpmFormEditor', + name: 'BpmFormEditor', meta: { noCache: true, hidden: true, @@ -238,7 +238,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ { path: '/manager/model/edit', component: () => import('@/views/bpm/model/editor/index.vue'), - name: 'modelEditor', + name: 'BpmModelEditor', meta: { noCache: true, hidden: true, @@ -250,7 +250,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ { path: '/manager/definition', component: () => import('@/views/bpm/definition/index.vue'), - name: 'BpmProcessDefinitionList', + name: 'BpmProcessDefinition', meta: { noCache: true, hidden: true, @@ -262,7 +262,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ { path: '/manager/task-assign-rule', component: () => import('@/views/bpm/taskAssignRule/index.vue'), - name: 'BpmTaskAssignRuleList', + name: 'BpmTaskAssignRule', meta: { noCache: true, hidden: true, @@ -305,30 +305,6 @@ const remainingRouter: AppRouteRecordRaw[] = [ title: '发起 OA 请假', activeMenu: 'bpm/oa/leave/create' } - }, - { - path: '/bpm/task/todo', - component: () => import('@/views/bpm/task/todo/index.vue'), - name: 'TaskTodo', - meta: { - noCache: true, - hidden: true, - canTo: true, - title: '代办任务', - activeMenu: 'bpm/task/todo/index' - } - }, - { - path: '/bpm/processInstance', - component: () => import('@/views/bpm/processInstance/index.vue'), - name: 'processInstance', - meta: { - noCache: true, - hidden: true, - canTo: true, - title: '流程办理', - activeMenu: 'bpm/processInstance/index' - } } ] }, @@ -343,7 +319,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ { path: 'value/:propertyId(\\d+)', component: () => import('@/views/mall/product/property/value/index.vue'), - name: 'PropertyValue', + name: 'ProductPropertyValue', meta: { title: '商品属性值', icon: '', activeMenu: '/product/property' } } ] diff --git a/src/types/auto-components.d.ts b/src/types/auto-components.d.ts index c7ff571c..f93f11f6 100644 --- a/src/types/auto-components.d.ts +++ b/src/types/auto-components.d.ts @@ -77,6 +77,7 @@ declare module '@vue/runtime-core' { ElTimeline: typeof import('element-plus/es')['ElTimeline'] ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] + ElTree: typeof import('element-plus/es')['ElTree'] ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] ElUpload: typeof import('element-plus/es')['ElUpload'] Error: typeof import('./../components/Error/src/Error.vue')['default'] diff --git a/src/views/bpm/definition/index.vue b/src/views/bpm/definition/index.vue index 66a6a23b..4fa86db9 100644 --- a/src/views/bpm/definition/index.vue +++ b/src/views/bpm/definition/index.vue @@ -93,7 +93,7 @@ </Dialog> </template> -<script setup lang="ts" name="Form"> +<script setup lang="ts" name="BpmProcessDefinition"> import { DICT_TYPE } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import * as DefinitionApi from '@/api/bpm/definition' diff --git a/src/views/bpm/form/index.vue b/src/views/bpm/form/index.vue index 4fdc37ee..915bd0bd 100644 --- a/src/views/bpm/form/index.vue +++ b/src/views/bpm/form/index.vue @@ -83,12 +83,11 @@ </Dialog> </template> -<script setup lang="ts" name="Form"> +<script setup lang="ts" name="BpmForm"> import { DICT_TYPE } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import * as FormApi from '@/api/bpm/form' import { setConfAndFields2 } from '@/utils/formCreate' - const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 const { push } = useRouter() // 路由 @@ -130,7 +129,7 @@ const resetQuery = () => { /** 添加/修改操作 */ const openForm = (id?: number) => { push({ - name: 'bpmFormEditor', + name: 'BpmFormEditor', query: { id } diff --git a/src/views/bpm/group/index.vue b/src/views/bpm/group/index.vue index 0c731dbe..f2427f71 100644 --- a/src/views/bpm/group/index.vue +++ b/src/views/bpm/group/index.vue @@ -111,7 +111,7 @@ <UserGroupForm ref="formRef" @success="getList" /> </template> -<script setup lang="ts" name="UserGroup"> +<script setup lang="ts" name="BpmUserGroup"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import * as UserGroupApi from '@/api/bpm/userGroup' diff --git a/src/views/bpm/model/editor/index.vue b/src/views/bpm/model/editor/index.vue index 7e3d8413..9eade1ad 100644 --- a/src/views/bpm/model/editor/index.vue +++ b/src/views/bpm/model/editor/index.vue @@ -24,7 +24,7 @@ </ContentWrap> </template> -<script setup lang="ts"> +<script setup lang="ts" name="BpmModelEditor"> // 自定义元素选中时的弹出菜单(修改 默认任务 为 用户任务) import CustomContentPadProvider from '@/components/bpmnProcessDesigner/package/designer/plugins/content-pad' // 自定义左侧菜单(修改 默认任务 为 用户任务) diff --git a/src/views/bpm/model/index.vue b/src/views/bpm/model/index.vue index 9a0d725f..83e9ac77 100644 --- a/src/views/bpm/model/index.vue +++ b/src/views/bpm/model/index.vue @@ -224,7 +224,7 @@ </Dialog> </template> -<script setup lang="ts" name="Form"> +<script setup lang="ts" name="BpmModel"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter, formatDate } from '@/utils/formatTime' import * as ModelApi from '@/api/bpm/model' @@ -319,7 +319,7 @@ const handleChangeState = async (row) => { /** 设计流程 */ const handleDesign = (row) => { push({ - name: 'modelEditor', + name: 'BpmModelEditor', query: { modelId: row.id } @@ -352,7 +352,7 @@ const handleAssignRule = (row) => { /** 跳转到指定流程定义列表 */ const handleDefinitionList = (row) => { push({ - name: 'BpmProcessDefinitionList', + name: 'BpmProcessDefinition', query: { key: row.key } diff --git a/src/views/bpm/processInstance/create/index.vue b/src/views/bpm/processInstance/create/index.vue index d616e495..11cf929b 100644 --- a/src/views/bpm/processInstance/create/index.vue +++ b/src/views/bpm/processInstance/create/index.vue @@ -46,7 +46,7 @@ <ProcessInstanceBpmnViewer :bpmn-xml="bpmnXML" /> </ContentWrap> </template> -<script setup lang="ts"> +<script setup lang="ts" name="BpmProcessInstanceCreate"> import { DICT_TYPE } from '@/utils/dict' import * as DefinitionApi from '@/api/bpm/definition' import * as ProcessInstanceApi from '@/api/bpm/processInstance' diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue index be79f59c..62fe3ab2 100644 --- a/src/views/bpm/processInstance/detail/index.vue +++ b/src/views/bpm/processInstance/detail/index.vue @@ -96,7 +96,7 @@ <TaskUpdateAssigneeForm ref="taskUpdateAssigneeFormRef" @success="getDetail" /> </ContentWrap> </template> -<script setup lang="ts"> +<script setup lang="ts" name="BpmProcessInstanceDetail"> import { useUserStore } from '@/store/modules/user' import { setConfAndFields2 } from '@/utils/formCreate' import type { ApiAttrs } from '@form-create/element-ui/types/config' diff --git a/src/views/bpm/processInstance/index.vue b/src/views/bpm/processInstance/index.vue index e23d023e..6d7fe6d2 100644 --- a/src/views/bpm/processInstance/index.vue +++ b/src/views/bpm/processInstance/index.vue @@ -81,7 +81,7 @@ v-hasPermi="['bpm:process-instance:query']" @click="handleCreate" > - 发起流程 + <Icon icon="ep:plus" class="mr-5px" /> 发起流程 </el-button> </el-form-item> </el-form> @@ -159,7 +159,7 @@ /> </ContentWrap> </template> -<script setup lang="ts"> +<script setup lang="ts" name="BpmProcessInstance"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import { ElMessageBox } from 'element-plus' diff --git a/src/views/bpm/task/done/index.vue b/src/views/bpm/task/done/index.vue index 75ba0fef..ae3352d9 100644 --- a/src/views/bpm/task/done/index.vue +++ b/src/views/bpm/task/done/index.vue @@ -74,7 +74,7 @@ <!-- 表单弹窗:详情 --> <TaskDetail ref="detailRef" @success="getList" /> </template> -<script setup lang="tsx"> +<script setup lang="tsx" name="BpmTodoTask"> import { DICT_TYPE } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import * as TaskApi from '@/api/bpm/task' diff --git a/src/views/bpm/task/todo/index.vue b/src/views/bpm/task/todo/index.vue index c575a020..0bdc3850 100644 --- a/src/views/bpm/task/todo/index.vue +++ b/src/views/bpm/task/todo/index.vue @@ -71,7 +71,7 @@ </ContentWrap> </template> -<script setup lang="tsx"> +<script setup lang="tsx" name="BpmDoneTask"> import { dateFormatter } from '@/utils/formatTime' const { push } = useRouter() // 路由 import * as TaskApi from '@/api/bpm/task' diff --git a/src/views/bpm/taskAssignRule/index.vue b/src/views/bpm/taskAssignRule/index.vue index 4a4e76f8..d54fe168 100644 --- a/src/views/bpm/taskAssignRule/index.vue +++ b/src/views/bpm/taskAssignRule/index.vue @@ -32,7 +32,7 @@ <!-- 添加/修改弹窗 --> <TaskAssignRuleForm ref="formRef" @success="getList" /> </template> -<script setup lang="ts" name="TaskAssignRule"> +<script setup lang="ts" name="BpmTaskAssignRule"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import * as TaskAssignRuleApi from '@/api/bpm/taskAssignRule' import * as RoleApi from '@/api/system/role' diff --git a/src/views/infra/apiAccessLog/index.vue b/src/views/infra/apiAccessLog/index.vue index 7fa4eab4..ec6b546d 100644 --- a/src/views/infra/apiAccessLog/index.vue +++ b/src/views/infra/apiAccessLog/index.vue @@ -139,7 +139,7 @@ <!-- 表单弹窗:详情 --> <ApiAccessLogDetail ref="detailRef" /> </template> -<script setup lang="ts" name="ApiAccessLog"> +<script setup lang="ts" name="InfraApiAccessLog"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import download from '@/utils/download' import { formatDate } from '@/utils/formatTime' diff --git a/src/views/infra/apiErrorLog/index.vue b/src/views/infra/apiErrorLog/index.vue index a20cba1b..1eed5a8c 100644 --- a/src/views/infra/apiErrorLog/index.vue +++ b/src/views/infra/apiErrorLog/index.vue @@ -158,14 +158,13 @@ <ApiErrorLogDetail ref="detailRef" /> </template> -<script setup lang="ts" name="ApiErrorLog"> +<script setup lang="ts" name="InfraApiErrorLog"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import download from '@/utils/download' import * as ApiErrorLogApi from '@/api/infra/apiErrorLog' import ApiErrorLogDetail from './ApiErrorLogDetail.vue' import { InfraApiErrorLogProcessStatusEnum } from '@/utils/constants' - const message = useMessage() // 消息弹窗 const loading = ref(true) // 列表的加载中 diff --git a/src/views/infra/build/index.vue b/src/views/infra/build/index.vue index 00b56fea..c7ff86eb 100644 --- a/src/views/infra/build/index.vue +++ b/src/views/infra/build/index.vue @@ -31,7 +31,7 @@ </div> </Dialog> </template> -<script setup lang="ts" name="Build"> +<script setup lang="ts" name="InfraBuild"> import formCreate from '@form-create/element-ui' import { useClipboard } from '@vueuse/core' const { t } = useI18n() // 国际化 diff --git a/src/views/infra/codegen/index.vue b/src/views/infra/codegen/index.vue index 5e1f78eb..b23c6fd9 100644 --- a/src/views/infra/codegen/index.vue +++ b/src/views/infra/codegen/index.vue @@ -142,7 +142,7 @@ <!-- 弹窗:预览代码 --> <PreviewCode ref="previewRef" /> </template> -<script setup lang="ts" name="Codegen"> +<script setup lang="ts" name="InfraCodegen"> import { dateFormatter } from '@/utils/formatTime' import download from '@/utils/download' import * as CodegenApi from '@/api/infra/codegen' diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue index 414c9153..7d3ac68a 100644 --- a/src/views/infra/config/index.vue +++ b/src/views/infra/config/index.vue @@ -137,7 +137,7 @@ <!-- 表单弹窗:添加/修改 --> <ConfigForm ref="formRef" @success="getList" /> </template> -<script setup lang="ts" name="Config"> +<script setup lang="ts" name="InfraConfig"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import download from '@/utils/download' diff --git a/src/views/infra/dataSourceConfig/index.vue b/src/views/infra/dataSourceConfig/index.vue index 83e757a6..9975b8d0 100644 --- a/src/views/infra/dataSourceConfig/index.vue +++ b/src/views/infra/dataSourceConfig/index.vue @@ -57,7 +57,7 @@ <!-- 表单弹窗:添加/修改 --> <DataSourceConfigForm ref="formRef" @success="getList" /> </template> -<script setup lang="ts" name="DataSourceConfig"> +<script setup lang="ts" name="InfraDataSourceConfig"> import { dateFormatter } from '@/utils/formatTime' import * as DataSourceConfigApi from '@/api/infra/dataSourceConfig' import DataSourceConfigForm from './DataSourceConfigForm.vue' diff --git a/src/views/infra/dbDoc/index.vue b/src/views/infra/dbDoc/index.vue index 6b3e3f8b..58c038b0 100644 --- a/src/views/infra/dbDoc/index.vue +++ b/src/views/infra/dbDoc/index.vue @@ -16,7 +16,7 @@ <IFrame v-if="!loading" v-loading="loading" :src="src" /> </ContentWrap> </template> -<script setup lang="ts" name="DbDoc"> +<script setup lang="ts" name="InfraDBDoc"> import download from '@/utils/download' import * as DbDocApi from '@/api/infra/dbDoc' diff --git a/src/views/infra/druid/index.vue b/src/views/infra/druid/index.vue index 608b318b..9a86eb0a 100644 --- a/src/views/infra/druid/index.vue +++ b/src/views/infra/druid/index.vue @@ -6,7 +6,7 @@ <IFrame v-if="!loading" :src="url" /> </ContentWrap> </template> -<script setup lang="ts" name="Druid"> +<script setup lang="ts" name="InfraDruid"> import * as ConfigApi from '@/api/infra/config' const loading = ref(true) // 是否加载中 diff --git a/src/views/infra/file/FileForm.vue b/src/views/infra/file/FileForm.vue index 36f251e8..5485870d 100644 --- a/src/views/infra/file/FileForm.vue +++ b/src/views/infra/file/FileForm.vue @@ -2,17 +2,19 @@ <Dialog title="上传文件" v-model="dialogVisible"> <el-upload ref="uploadRef" - :limit="1" - accept=".jpg, .png, .gif" - :auto-upload="false" - drag - :headers="headers" :action="url" :data="data" - :disabled="formLoading" + :headers="uploadHeaders" + v-model:file-list="fileList" + drag + accept=".jpg, .png, .gif" + :limit="1" + :on-success="submitFormSuccess" + :on-exceed="handleExceed" + :on-error="submitFormError" :on-change="handleFileChange" - :on-progress="handleFileUploadProgress" - :on-success="handleFileSuccess" + :auto-upload="false" + :disabled="formLoading" > <i class="el-icon-upload"></i> <div class="el-upload__text"> 将文件拖到此处,或 <em>点击上传</em> </div> @@ -29,44 +31,47 @@ </Dialog> </template> <script setup lang="ts"> -import { Dialog } from '@/components/Dialog' -import { getAccessToken } from '@/utils/auth' +import { getAccessToken, getTenantId } from '@/utils/auth' const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 const dialogVisible = ref(false) // 弹窗的是否展示 -const dialogTitle = ref('') // 弹窗的标题 -const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 +const formLoading = ref(false) // 表单的加载中 const url = import.meta.env.VITE_UPLOAD_URL -const headers = { Authorization: 'Bearer ' + getAccessToken() } +const uploadHeaders = ref() // 上传 Header 头 +const fileList = ref([]) // 文件列表 const data = ref({ path: '' }) const uploadRef = ref() /** 打开弹窗 */ const open = async () => { dialogVisible.value = true + resetForm() } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 -/** 提交表单 */ -const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 /** 处理上传的文件发生变化 */ const handleFileChange = (file) => { data.value.path = file.name } -/** 处理文件上传中 */ -const handleFileUploadProgress = () => { - formLoading.value = true // 禁止修改 -} - -/** 发起文件上传 */ +/** 提交表单 */ const submitFileForm = () => { + if (fileList.value.length == 0) { + message.error('请上传文件') + return + } + // 提交请求 + uploadHeaders.value = { + Authorization: 'Bearer ' + getAccessToken(), + 'tenant-id': getTenantId() + } unref(uploadRef)?.submit() } /** 文件上传成功处理 */ -const handleFileSuccess = () => { +const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 +const submitFormSuccess = () => { // 清理 dialogVisible.value = false formLoading.value = false @@ -75,4 +80,22 @@ const handleFileSuccess = () => { message.success(t('common.createSuccess')) emit('success') } + +/** 上传错误提示 */ +const submitFormError = (): void => { + message.error('上传失败,请您重新上传!') + formLoading.value = false +} + +/** 重置表单 */ +const resetForm = () => { + // 重置上传状态和文件 + formLoading.value = false + uploadRef.value?.clearFiles() +} + +/** 文件数超出提示 */ +const handleExceed = (): void => { + message.error('最多只能上传一个文件!') +} </script> diff --git a/src/views/infra/file/index.vue b/src/views/infra/file/index.vue index 6e709ec7..91d7639e 100644 --- a/src/views/infra/file/index.vue +++ b/src/views/infra/file/index.vue @@ -1,9 +1,14 @@ <template> - <doc-alert title="上传下载" url="https://doc.iocoder.cn/file/"/> - + <doc-alert title="上传下载" url="https://doc.iocoder.cn/file/" /> <!-- 搜索 --> <ContentWrap> - <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true"> + <el-form + class="-mb-15px" + :model="queryParams" + ref="queryFormRef" + :inline="true" + label-width="68px" + > <el-form-item label="文件路径" prop="path"> <el-input v-model="queryParams.path" @@ -33,7 +38,7 @@ <el-form-item> <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button> - <el-button type="primary" @click="openForm"> + <el-button type="primary" plain @click="openForm"> <Icon icon="ep:upload" class="mr-5px" /> 上传文件 </el-button> </el-form-item> @@ -86,11 +91,11 @@ <!-- 表单弹窗:添加/修改 --> <FileForm ref="formRef" @success="getList" /> </template> -<script setup lang="ts" name="Config"> +<script setup lang="ts" name="InfraFile"> import { fileSizeFormatter } from '@/utils' import { dateFormatter } from '@/utils/formatTime' import * as FileApi from '@/api/infra/file' -import FileUploadForm from './FileForm.vue' +import FileForm from './FileForm.vue' const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 diff --git a/src/views/infra/fileConfig/index.vue b/src/views/infra/fileConfig/index.vue index 7dd027fa..4fb3f645 100644 --- a/src/views/infra/fileConfig/index.vue +++ b/src/views/infra/fileConfig/index.vue @@ -3,17 +3,29 @@ <!-- 搜索 --> <ContentWrap> - <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true"> + <el-form + class="-mb-15px" + :model="queryParams" + ref="queryFormRef" + :inline="true" + label-width="68px" + > <el-form-item label="配置名" prop="name"> <el-input v-model="queryParams.name" placeholder="请输入配置名" clearable @keyup.enter="handleQuery" + class="!w-240px" /> </el-form-item> <el-form-item label="存储器" prop="storage"> - <el-select v-model="queryParams.storage" placeholder="请选择存储器" clearable> + <el-select + v-model="queryParams.storage" + placeholder="请选择存储器" + clearable + class="!w-240px" + > <el-option v-for="dict in getIntDictOptions(DICT_TYPE.INFRA_FILE_STORAGE)" :key="dict.value" @@ -30,6 +42,7 @@ start-placeholder="开始日期" end-placeholder="结束日期" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" + class="!w-240px" /> </el-form-item> <el-form-item> @@ -113,7 +126,7 @@ <!-- 表单弹窗:添加/修改 --> <FileConfigForm ref="formRef" @success="getList" /> </template> -<script setup lang="ts" name="Config"> +<script setup lang="ts" name="InfraFileConfig"> import * as FileConfigApi from '@/api/infra/fileConfig' import FileConfigForm from './FileConfigForm.vue' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' diff --git a/src/views/infra/job/index.vue b/src/views/infra/job/index.vue index af02133e..4aab3df0 100644 --- a/src/views/infra/job/index.vue +++ b/src/views/infra/job/index.vue @@ -147,7 +147,7 @@ <!-- 表单弹窗:查看 --> <JobDetail ref="detailRef" /> </template> -<script setup lang="ts" name="Job"> +<script setup lang="ts" name="InfraJob"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { checkPermi } from '@/utils/permission' import JobForm from './JobForm.vue' diff --git a/src/views/infra/job/logger/index.vue b/src/views/infra/job/logger/index.vue index 4fc96736..16a4e5ca 100644 --- a/src/views/infra/job/logger/index.vue +++ b/src/views/infra/job/logger/index.vue @@ -121,7 +121,7 @@ <!-- 表单弹窗:查看 --> <JobLogDetail ref="detailRef" /> </template> -<script setup lang="ts" name="JobLog"> +<script setup lang="ts" name="InfraJobLog"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { formatDate } from '@/utils/formatTime' import download from '@/utils/download' diff --git a/src/views/infra/redis/index.vue b/src/views/infra/redis/index.vue index 81603dc3..246b90ee 100644 --- a/src/views/infra/redis/index.vue +++ b/src/views/infra/redis/index.vue @@ -63,7 +63,7 @@ </el-row> </el-scrollbar> </template> -<script setup lang="ts" name="Redis"> +<script setup lang="ts" name="InfraRedis"> import * as echarts from 'echarts' import * as RedisApi from '@/api/infra/redis' import { RedisMonitorInfoVO } from '@/api/infra/redis/types' diff --git a/src/views/infra/server/index.vue b/src/views/infra/server/index.vue index 23aeadd0..57a5bc5c 100644 --- a/src/views/infra/server/index.vue +++ b/src/views/infra/server/index.vue @@ -5,7 +5,7 @@ <IFrame v-if="!loading" v-loading="loading" :src="src" /> </ContentWrap> </template> -<script setup lang="ts" name="AdminServer"> +<script setup lang="ts" name="InfraAdminServer"> import * as ConfigApi from '@/api/infra/config' const loading = ref(true) // 是否加载中 diff --git a/src/views/infra/skywalking/index.vue b/src/views/infra/skywalking/index.vue index f26d8f2c..1869269f 100644 --- a/src/views/infra/skywalking/index.vue +++ b/src/views/infra/skywalking/index.vue @@ -5,7 +5,7 @@ <IFrame v-if="!loading" v-loading="loading" :src="src" /> </ContentWrap> </template> -<script setup lang="ts" name="Skywalking"> +<script setup lang="ts" name="InfraSkyWalking"> import * as ConfigApi from '@/api/infra/config' const loading = ref(true) // 是否加载中 diff --git a/src/views/infra/swagger/index.vue b/src/views/infra/swagger/index.vue index 9de2e984..948b2a72 100644 --- a/src/views/infra/swagger/index.vue +++ b/src/views/infra/swagger/index.vue @@ -5,7 +5,7 @@ <IFrame :src="src" /> </ContentWrap> </template> -<script setup lang="ts" name="Swagger"> +<script setup lang="ts" name="InfraSwagger"> import * as ConfigApi from '@/api/infra/config' const loading = ref(true) // 是否加载中 diff --git a/src/views/mall/product/category/CategoryForm.vue b/src/views/mall/product/category/CategoryForm.vue index db395a66..19bce872 100644 --- a/src/views/mall/product/category/CategoryForm.vue +++ b/src/views/mall/product/category/CategoryForm.vue @@ -50,7 +50,7 @@ </template> </Dialog> </template> -<script setup lang="ts"> +<script setup lang="ts" name="ProductCategory"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { CommonStatusEnum } from '@/utils/constants' import { handleTree } from '@/utils/tree' diff --git a/src/views/mall/product/property/index.vue b/src/views/mall/product/property/index.vue index 6c2e6e97..102ee8a5 100644 --- a/src/views/mall/product/property/index.vue +++ b/src/views/mall/product/property/index.vue @@ -92,7 +92,7 @@ <!-- 表单弹窗:添加/修改 --> <PropertyForm ref="formRef" @success="getList" /> </template> -<script setup lang="ts" name="Config"> +<script setup lang="ts" name="ProductProperty"> import { dateFormatter } from '@/utils/formatTime' import * as PropertyApi from '@/api/mall/product/property' import PropertyForm from './PropertyForm.vue' diff --git a/src/views/mall/product/property/value/index.vue b/src/views/mall/product/property/value/index.vue index 6f5ae5c8..46343934 100644 --- a/src/views/mall/product/property/value/index.vue +++ b/src/views/mall/product/property/value/index.vue @@ -88,7 +88,7 @@ <!-- 表单弹窗:添加/修改 --> <ValueForm ref="formRef" @success="getList" /> </template> -<script setup lang="ts" name="Config"> +<script setup lang="ts" name="ProductPropertyValue"> import { dateFormatter } from '@/utils/formatTime' import * as PropertyApi from '@/api/mall/product/property' import ValueForm from './ValueForm.vue' diff --git a/src/views/mp/freePublish/index.vue b/src/views/mp/freePublish/index.vue index 565d2da5..66f35012 100644 --- a/src/views/mp/freePublish/index.vue +++ b/src/views/mp/freePublish/index.vue @@ -59,7 +59,7 @@ </ContentWrap> </template> -<script setup lang="ts" name="freePublish"> +<script setup lang="ts" name="MpFreePublish"> import * as FreePublishApi from '@/api/mp/freePublish' import * as MpAccountApi from '@/api/mp/account' import WxNews from '@/views/mp/components/wx-news/main.vue' diff --git a/src/views/pay/app/index.vue b/src/views/pay/app/index.vue index 1ac31c41..77b78170 100644 --- a/src/views/pay/app/index.vue +++ b/src/views/pay/app/index.vue @@ -75,7 +75,7 @@ </template> </XModal> </template> -<script setup lang="ts" name="App"> +<script setup lang="ts" name="PayApp"> import type { FormExpose } from '@/components/Form' import { rules, allSchemas } from './app.data' import * as AppApi from '@/api/pay/app' diff --git a/src/views/pay/merchant/index.vue b/src/views/pay/merchant/index.vue index 17be19af..806a0b60 100644 --- a/src/views/pay/merchant/index.vue +++ b/src/views/pay/merchant/index.vue @@ -137,7 +137,7 @@ <!-- 表单弹窗:添加/修改 --> <MerchantForm ref="formRef" @success="getList" /> </template> -<script setup lang="ts" name="Merchant"> +<script setup lang="ts" name="PayMerchant"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { CommonStatusEnum } from '@/utils/constants' import { dateFormatter } from '@/utils/formatTime' diff --git a/src/views/pay/order/index.vue b/src/views/pay/order/index.vue index 3d140ed9..21b8cca4 100644 --- a/src/views/pay/order/index.vue +++ b/src/views/pay/order/index.vue @@ -41,7 +41,7 @@ </template> </XModal> </template> -<script setup lang="ts" name="Order"> +<script setup lang="ts" name="PayOrder"> import { allSchemas } from './order.data' import * as OrderApi from '@/api/pay/order' diff --git a/src/views/pay/refund/index.vue b/src/views/pay/refund/index.vue index 9deea53b..ec8bf12c 100644 --- a/src/views/pay/refund/index.vue +++ b/src/views/pay/refund/index.vue @@ -33,7 +33,7 @@ </template> </XModal> </template> -<script setup lang="ts" name="Refund"> +<script setup lang="ts" name="PayRefund"> import { allSchemas } from './refund.data' import * as RefundApi from '@/api/pay/refund' diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue index a31fd10d..320c2dda 100644 --- a/src/views/system/area/index.vue +++ b/src/views/system/area/index.vue @@ -30,7 +30,7 @@ <!-- 表单弹窗:添加/修改 --> <AreaForm ref="formRef" /> </template> -<script setup lang="tsx" name="Area"> +<script setup lang="tsx" name="SystemArea"> import type { Column } from 'element-plus' import AreaForm from './AreaForm.vue' import * as AreaApi from '@/api/system/area' diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 70633111..36d3ca5c 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -103,7 +103,7 @@ <!-- 表单弹窗:添加/修改 --> <DeptForm ref="formRef" @success="getList" /> </template> -<script setup lang="ts" name="Dept"> +<script setup lang="ts" name="SystemDept"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import { handleTree } from '@/utils/tree' diff --git a/src/views/system/dict/data/index.vue b/src/views/system/dict/data/index.vue index 9677614a..77770dda 100644 --- a/src/views/system/dict/data/index.vue +++ b/src/views/system/dict/data/index.vue @@ -115,7 +115,7 @@ <!-- 表单弹窗:添加/修改 --> <DictDataForm ref="formRef" @success="getList" /> </template> -<script setup lang="ts" name="DictData"> +<script setup lang="ts" name="SystemDictData"> import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import download from '@/utils/download' diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index 79b2aed6..bbcd8a2c 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -132,7 +132,7 @@ <DictTypeForm ref="formRef" @success="getList" /> </template> -<script setup lang="ts" name="DictType"> +<script setup lang="ts" name="SystemDictType"> import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import * as DictTypeApi from '@/api/system/dict/dict.type' diff --git a/src/views/system/errorCode/index.vue b/src/views/system/errorCode/index.vue index e31b252c..b21bef2d 100644 --- a/src/views/system/errorCode/index.vue +++ b/src/views/system/errorCode/index.vue @@ -137,7 +137,7 @@ <ErrorCodeForm ref="formRef" @success="getList" /> </template> -<script setup lang="ts" name="ErrorCode"> +<script setup lang="ts" name="SystemErrorCode"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import download from '@/utils/download' diff --git a/src/views/system/loginlog/index.vue b/src/views/system/loginlog/index.vue index 9c69da14..ed3f20bf 100644 --- a/src/views/system/loginlog/index.vue +++ b/src/views/system/loginlog/index.vue @@ -104,7 +104,7 @@ <!-- 表单弹窗:详情 --> <LoginLogDetail ref="detailRef" /> </template> -<script setup lang="ts" name="LoginLog"> +<script setup lang="ts" name="SystemLoginLog"> import { DICT_TYPE } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import download from '@/utils/download' diff --git a/src/views/system/mail/account/index.vue b/src/views/system/mail/account/index.vue index 878d7d9e..eeaf8bcf 100644 --- a/src/views/system/mail/account/index.vue +++ b/src/views/system/mail/account/index.vue @@ -64,7 +64,7 @@ <!-- 详情弹窗 --> <MailAccountDetail ref="detailRef" /> </template> -<script setup lang="ts" name="MailAccount"> +<script setup lang="ts" name="SystemMailAccount"> import { allSchemas } from './account.data' import * as MailAccountApi from '@/api/system/mail/account' import MailAccountForm from './MailAccountForm.vue' diff --git a/src/views/system/mail/log/index.vue b/src/views/system/mail/log/index.vue index 9ca2b9e8..f039e66e 100644 --- a/src/views/system/mail/log/index.vue +++ b/src/views/system/mail/log/index.vue @@ -34,7 +34,7 @@ <!-- 表单弹窗:详情 --> <mail-log-detail ref="detailRef" /> </template> -<script setup lang="ts" name="MailLog"> +<script setup lang="ts" name="SystemMailLog"> import { allSchemas } from './log.data' import * as MailLogApi from '@/api/system/mail/log' import MailLogDetail from './MailLogDetail.vue' diff --git a/src/views/system/mail/template/index.vue b/src/views/system/mail/template/index.vue index 5babc906..357b028f 100644 --- a/src/views/system/mail/template/index.vue +++ b/src/views/system/mail/template/index.vue @@ -65,7 +65,7 @@ <!-- 表单弹窗:发送测试 --> <MailTemplateSendForm ref="sendFormRef" /> </template> -<script setup lang="ts" name="MailTemplate"> +<script setup lang="ts" name="SystemMailTemplate"> import { allSchemas } from './template.data' import * as MailTemplateApi from '@/api/system/mail/template' import MailTemplateForm from './MailTemplateForm.vue' diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 9b157e84..323126c2 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -111,7 +111,7 @@ <!-- 表单弹窗:添加/修改 --> <MenuForm ref="formRef" @success="getList" /> </template> -<script setup lang="ts" name="Menu"> +<script setup lang="ts" name="SystemMenu"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { handleTree } from '@/utils/tree' import * as MenuApi from '@/api/system/menu' diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue index 26d5ae2a..d7fb9751 100644 --- a/src/views/system/notice/index.vue +++ b/src/views/system/notice/index.vue @@ -102,7 +102,7 @@ <!-- 表单弹窗:添加/修改 --> <NoticeForm ref="formRef" @success="getList" /> </template> -<script setup lang="tsx"> +<script setup lang="tsx" name="SystemNotice"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import * as NoticeApi from '@/api/system/notice' diff --git a/src/views/system/notify/message/index.vue b/src/views/system/notify/message/index.vue index 2a249817..36d9885e 100644 --- a/src/views/system/notify/message/index.vue +++ b/src/views/system/notify/message/index.vue @@ -153,7 +153,7 @@ <!-- 表单弹窗:详情 --> <NotifyMessageDetail ref="detailRef" /> </template> -<script setup lang="ts" name="NotifyMessage"> +<script setup lang="ts" name="SystemNotifyMessage"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import * as NotifyMessageApi from '@/api/system/notify/message' diff --git a/src/views/system/notify/my/index.vue b/src/views/system/notify/my/index.vue index a7711660..5a4afc60 100644 --- a/src/views/system/notify/my/index.vue +++ b/src/views/system/notify/my/index.vue @@ -115,7 +115,7 @@ <MyNotifyMessageDetail ref="detailRef" /> </template> -<script setup lang="ts" name="MyNotifyMessage"> +<script setup lang="ts" name="SystemMyNotify"> import { DICT_TYPE, getBoolDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import * as NotifyMessageApi from '@/api/system/notify/message' diff --git a/src/views/system/notify/template/index.vue b/src/views/system/notify/template/index.vue index de14d5ca..69fda907 100644 --- a/src/views/system/notify/template/index.vue +++ b/src/views/system/notify/template/index.vue @@ -114,7 +114,7 @@ </template> </XModal> </template> -<script setup lang="ts" name="NotifyTemplate"> +<script setup lang="ts" name="SystemNotifyTemplate"> import { FormExpose } from '@/components/Form' // 业务相关的 import import { rules, allSchemas } from './template.data' diff --git a/src/views/system/oauth2/client/index.vue b/src/views/system/oauth2/client/index.vue index 3e7b1253..17ebec3e 100644 --- a/src/views/system/oauth2/client/index.vue +++ b/src/views/system/oauth2/client/index.vue @@ -119,7 +119,7 @@ <!-- 表单弹窗:添加/修改 --> <ClientForm ref="formRef" @success="getList" /> </template> -<script setup lang="ts"> +<script setup lang="ts" name="SystemOAuth2Client"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import * as ClientApi from '@/api/system/oauth2/client' diff --git a/src/views/system/oauth2/token/index.vue b/src/views/system/oauth2/token/index.vue index 13743b2b..803cd7d1 100644 --- a/src/views/system/oauth2/token/index.vue +++ b/src/views/system/oauth2/token/index.vue @@ -98,7 +98,7 @@ </ContentWrap> </template> -<script setup lang="ts" name="Oauth2AccessToken"> +<script setup lang="ts" name="SystemTokenClient"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import * as OAuth2AccessTokenApi from '@/api/system/oauth2/token' diff --git a/src/views/system/operatelog/index.vue b/src/views/system/operatelog/index.vue index 6be32969..87ce2658 100644 --- a/src/views/system/operatelog/index.vue +++ b/src/views/system/operatelog/index.vue @@ -135,7 +135,7 @@ <!-- 表单弹窗:详情 --> <OperateLogDetail ref="detailRef" /> </template> -<script setup lang="ts" name="OperateLog"> +<script setup lang="ts" name="SystemOperateLog"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import download from '@/utils/download' diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue index c94ee747..b94d1c9a 100644 --- a/src/views/system/post/index.vue +++ b/src/views/system/post/index.vue @@ -111,13 +111,12 @@ <!-- 表单弹窗:添加/修改 --> <PostForm ref="formRef" @success="getList" /> </template> -<script setup lang="tsx"> +<script setup lang="tsx" name="SystemPost"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import download from '@/utils/download' import * as PostApi from '@/api/system/post' import PostForm from './PostForm.vue' - const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index f77f17f0..618a4990 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -152,7 +152,7 @@ <!-- 表单弹窗:数据权限 --> <RoleDataPermissionForm ref="dataPermissionFormRef" /> </template> -<script setup lang="tsx"> +<script setup lang="tsx" name="SystemRole"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import download from '@/utils/download' diff --git a/src/views/system/sensitiveWord/index.vue b/src/views/system/sensitiveWord/index.vue index 5b73132b..741d873c 100644 --- a/src/views/system/sensitiveWord/index.vue +++ b/src/views/system/sensitiveWord/index.vue @@ -143,7 +143,7 @@ <!-- 表单弹窗:测试敏感词 --> <SensitiveWordTestForm ref="testFormRef" /> </template> -<script setup lang="ts" name="SensitiveWord"> +<script setup lang="ts" name="SystemSensitiveWordhao"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import download from '@/utils/download' diff --git a/src/views/system/sms/channel/index.vue b/src/views/system/sms/channel/index.vue index b3d572ff..79249702 100644 --- a/src/views/system/sms/channel/index.vue +++ b/src/views/system/sms/channel/index.vue @@ -129,7 +129,7 @@ <!-- 表单弹窗:添加/修改 --> <SmsChannelForm ref="formRef" @success="getList" /> </template> -<script setup lang="ts" name="SmsChannel"> +<script setup lang="ts" name="SystemSmsChannel"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import * as SmsChannelApi from '@/api/system/sms/smsChannel' diff --git a/src/views/system/sms/log/index.vue b/src/views/system/sms/log/index.vue index 8b6d9b48..0be8d841 100644 --- a/src/views/system/sms/log/index.vue +++ b/src/views/system/sms/log/index.vue @@ -184,7 +184,7 @@ <!-- 表单弹窗:详情 --> <SmsLogDetail ref="detailRef" /> </template> -<script setup lang="ts" name="smsLog"> +<script setup lang="ts" name="SystemSmsLog"> import { DICT_TYPE, getIntDictOptions, getDictLabel } from '@/utils/dict' import { dateFormatter, formatDate } from '@/utils/formatTime' import download from '@/utils/download' diff --git a/src/views/system/sms/template/index.vue b/src/views/system/sms/template/index.vue index bba80332..6ed0f029 100644 --- a/src/views/system/sms/template/index.vue +++ b/src/views/system/sms/template/index.vue @@ -211,7 +211,7 @@ <!-- 表单弹窗:测试发送 --> <SmsTemplateSendForm ref="sendFormRef" /> </template> -<script setup lang="ts" name="SmsTemplate"> +<script setup lang="ts" name="SystemSmsTemplate"> import { DICT_TYPE, getIntDictOptions, getDictLabel } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import * as SmsTemplateApi from '@/api/system/sms/smsTemplate' diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue index 3993e985..349fd378 100644 --- a/src/views/system/tenant/index.vue +++ b/src/views/system/tenant/index.vue @@ -171,14 +171,13 @@ <!-- 表单弹窗:添加/修改 --> <TenantForm ref="formRef" @success="getList" /> </template> -<script setup lang="ts" name="Tenant"> +<script setup lang="ts" name="SystemTenant"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import download from '@/utils/download' import * as TenantApi from '@/api/system/tenant' import * as TenantPackageApi from '@/api/system/tenantPackage' import TenantForm from './TenantForm.vue' - const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue index 3f799fbf..51f9b8f7 100644 --- a/src/views/system/tenantPackage/index.vue +++ b/src/views/system/tenantPackage/index.vue @@ -106,7 +106,7 @@ <!-- 表单弹窗:添加/修改 --> <TenantPackageForm ref="formRef" @success="getList" /> </template> -<script setup lang="ts" name="TenantPackage"> +<script setup lang="ts" name="SystemTenantPackage"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import * as TenantPackageApi from '@/api/system/tenantPackage' diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index ed2eea5d..204e262f 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -198,7 +198,7 @@ <!-- 分配角色 --> <UserAssignRoleForm ref="assignRoleFormRef" @success="getList" /> </template> -<script setup lang="ts" name="User"> +<script setup lang="ts" name="SystemUser"> import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { checkPermi } from '@/utils/permission' import { dateFormatter } from '@/utils/formatTime'