diff --git a/apps/web-antd/src/components/upload/image-upload.vue b/apps/web-antd/src/components/upload/image-upload.vue index 6d1d576fc..412d93560 100644 --- a/apps/web-antd/src/components/upload/image-upload.vue +++ b/apps/web-antd/src/components/upload/image-upload.vue @@ -4,6 +4,8 @@ import type { UploadRequestOption } from 'ant-design-vue/lib/vc-upload/interface import type { AxiosResponse } from '@vben/request'; +import type { UploadListType } from './typing'; + import type { AxiosProgressEvent } from '#/api/infra/file'; import { ref, toRefs, watch } from 'vue'; @@ -30,7 +32,7 @@ const props = withDefaults( ) => Promise>; disabled?: boolean; helpText?: string; - listType?: ListType; + listType?: UploadListType; // 最大数量的文件,Infinity不限制 maxNumber?: number; // 文件最大多少MB @@ -58,7 +60,6 @@ const props = withDefaults( }, ); const emit = defineEmits(['change', 'update:value', 'delete']); -type ListType = 'picture' | 'picture-card' | 'text'; const { accept, helpText, maxNumber, maxSize } = toRefs(props); const isInnerOperate = ref(false); const { getStringAccept } = useUploadType({ diff --git a/apps/web-antd/src/components/upload/typing.ts b/apps/web-antd/src/components/upload/typing.ts index c48d5fd69..a6b54d479 100644 --- a/apps/web-antd/src/components/upload/typing.ts +++ b/apps/web-antd/src/components/upload/typing.ts @@ -4,3 +4,5 @@ export enum UploadResultStatus { SUCCESS = 'success', UPLOADING = 'uploading', } + +export type UploadListType = 'picture' | 'picture-card' | 'text'; diff --git a/apps/web-antd/src/router/index.ts b/apps/web-antd/src/router/index.ts index 3d0d43654..5acec55ea 100644 --- a/apps/web-antd/src/router/index.ts +++ b/apps/web-antd/src/router/index.ts @@ -7,8 +7,8 @@ import { import { resetStaticRoutes } from '@vben/utils'; import { createRouterGuard } from './guard'; -import { setupBaiduTongJi } from './tongji'; import { routes } from './routes'; +import { setupBaiduTongJi } from './tongji'; /** * @zh_CN 创建vue-router实例 diff --git a/apps/web-antd/src/router/routes/core.ts b/apps/web-antd/src/router/routes/core.ts index 5058a2d5b..1f6f28f8e 100644 --- a/apps/web-antd/src/router/routes/core.ts +++ b/apps/web-antd/src/router/routes/core.ts @@ -92,7 +92,8 @@ const coreRoutes: RouteRecordRaw[] = [ { name: 'SocialLogin', path: 'social-login', - component: () => import('#/views/_core/authentication/social-login.vue'), + component: () => + import('#/views/_core/authentication/social-login.vue'), meta: { title: $t('page.auth.login'), }, @@ -104,7 +105,7 @@ const coreRoutes: RouteRecordRaw[] = [ meta: { title: $t('page.auth.login'), }, - } + }, ], }, ]; diff --git a/apps/web-antd/src/router/routes/index.ts b/apps/web-antd/src/router/routes/index.ts index 4b5c0ecd3..738f9d3d9 100644 --- a/apps/web-antd/src/router/routes/index.ts +++ b/apps/web-antd/src/router/routes/index.ts @@ -44,4 +44,4 @@ const componentKeys: string[] = Object.keys( const path = v.replace('../../views/', '/'); return path.endsWith('.vue') ? path.slice(0, -4) : path; }); -export { accessRoutes, coreRouteNames, routes, componentKeys }; +export { accessRoutes, componentKeys, coreRouteNames, routes }; diff --git a/apps/web-antd/src/router/routes/modules/system.ts b/apps/web-antd/src/router/routes/modules/system.ts index c75059b29..47e6b1682 100644 --- a/apps/web-antd/src/router/routes/modules/system.ts +++ b/apps/web-antd/src/router/routes/modules/system.ts @@ -13,4 +13,4 @@ const routes: RouteRecordRaw[] = [ }, ]; -export default routes; +export default routes; diff --git a/apps/web-antd/src/views/dashboard/workspace/index.vue b/apps/web-antd/src/views/dashboard/workspace/index.vue index f80e449a7..01a21c6e5 100644 --- a/apps/web-antd/src/views/dashboard/workspace/index.vue +++ b/apps/web-antd/src/views/dashboard/workspace/index.vue @@ -149,7 +149,7 @@ const todoItems = ref([ content: `国内使用最广泛的快速开发平台,远超 10w+ 企业使用`, date: '2024-07-10 11:15:00', title: '广泛企业认可', - } + }, ]); const trendItems: WorkbenchTrendItem[] = [ { diff --git a/apps/web-antd/src/views/infra/codegen/index.vue b/apps/web-antd/src/views/infra/codegen/index.vue index 11ceba829..f2431f863 100644 --- a/apps/web-antd/src/views/infra/codegen/index.vue +++ b/apps/web-antd/src/views/infra/codegen/index.vue @@ -6,11 +6,12 @@ import type { import type { InfraCodegenApi } from '#/api/infra/codegen'; import type { InfraDataSourceConfigApi } from '#/api/infra/data-source-config'; -import { DocAlert } from '#/components/doc-alert'; -import ImportTable from './modules/import-table.vue'; -import PreviewCode from './modules/preview-code.vue'; +import { ref } from 'vue'; +import { useRouter } from 'vue-router'; + import { Page, useVbenModal } from '@vben/common-ui'; import { Plus } from '@vben/icons'; + import { Button, message } from 'ant-design-vue'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; @@ -21,12 +22,12 @@ import { syncCodegenFromDB, } from '#/api/infra/codegen'; import { getDataSourceConfigList } from '#/api/infra/data-source-config'; +import { DocAlert } from '#/components/doc-alert'; import { $t } from '#/locales'; -import { ref } from 'vue'; import { useGridColumns, useGridFormSchema } from './data'; - -import { useRouter } from 'vue-router'; +import ImportTable from './modules/import-table.vue'; +import PreviewCode from './modules/preview-code.vue'; const router = useRouter(); const dataSourceConfigList = ref( @@ -139,14 +140,14 @@ function onActionClick({ row, }: OnActionClickParams) { switch (code) { - case 'edit': { - onEdit(row); - break; - } case 'delete': { onDelete(row); break; } + case 'edit': { + onEdit(row); + break; + } case 'generate': { onGenerate(row); break; diff --git a/apps/web-antd/src/views/infra/job/data.ts b/apps/web-antd/src/views/infra/job/data.ts index d66f3f91f..4be98ecb0 100644 --- a/apps/web-antd/src/views/infra/job/data.ts +++ b/apps/web-antd/src/views/infra/job/data.ts @@ -196,7 +196,7 @@ export function useGridColumns( text: '暂停', show: (row: any) => hasAccessByCodes(['infra:job:update']) && - row.status == InfraJobStatusEnum.NORMAL, + row.status === InfraJobStatusEnum.NORMAL, }, { code: 'trigger', diff --git a/apps/web-antd/src/views/infra/redis/modules/info.vue b/apps/web-antd/src/views/infra/redis/modules/info.vue index 8b1822a96..f04907978 100644 --- a/apps/web-antd/src/views/infra/redis/modules/info.vue +++ b/apps/web-antd/src/views/infra/redis/modules/info.vue @@ -19,7 +19,7 @@ defineProps<{ {{ redisData?.info?.redis_version }} - {{ redisData?.info?.redis_mode == 'standalone' ? '单机' : '集群' }} + {{ redisData?.info?.redis_mode === 'standalone' ? '单机' : '集群' }} {{ redisData?.info?.tcp_port }} @@ -44,7 +44,7 @@ defineProps<{ {{ redisData?.info?.maxmemory_human }} - {{ redisData?.info?.aof_enabled == '0' ? '否' : '是' }} + {{ redisData?.info?.aof_enabled === '0' ? '否' : '是' }} {{ redisData?.info?.rdb_last_bgsave_status }} diff --git a/apps/web-antd/src/views/system/notify/template/modules/form.vue b/apps/web-antd/src/views/system/notify/template/modules/form.vue index 8b30f2f91..42c12f820 100644 --- a/apps/web-antd/src/views/system/notify/template/modules/form.vue +++ b/apps/web-antd/src/views/system/notify/template/modules/form.vue @@ -1,7 +1,10 @@