yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'yudao/v-next-dev' into v-next-dev 

# Conflicts:
#	apps/web-antd/src/views/system/notify/my/modules/detail.vue
pull/80/head
puhui999 2025-04-23 13:16:23 +08:00
parent b80b106fdd b012c9c01f
commit 5d3ba20596
17 changed files with 208 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/web-antd/src/api/infra/file/index.ts
View File

@ -27,7 +27,7 @@ export namespace InfraFileApi {
/** 上传文件 */
export interface FileUploadReqVO {
file: File;
file: globalThis.File;
path?: string;
}
}
@ -46,12 +46,9 @@ export function deleteFile(id: number) {
/** 获取文件预签名地址 */
export function getFilePresignedUrl(path: string) {
return requestClient.get<InfraFileApi.FilePresignedUrlRespVO>(
'/infra/file/presigned-url',
{
params: { path },
},
);
return requestClient.get<InfraFileApi.FilePresignedUrlRespVO>('/infra/file/presigned-url', {
params: { path },
});
}
/** 创建文件 */
@ -60,10 +57,6 @@ export function createFile(data: InfraFileApi.File) {
}
/** 上传文件 */
// TODO @芋艿：这里有爆红
export function uploadFile(
data: InfraFileApi.FileUploadReqVO,
onUploadProgress?: AxiosProgressEvent,
) {
export function uploadFile(data: InfraFileApi.FileUploadReqVO, onUploadProgress?: AxiosProgressEvent) {
return requestClient.upload('/infra/file/upload', data, { onUploadProgress });
}

4
apps/web-antd/src/api/system/dict/data/index.ts
View File

@ -1,3 +1,5 @@
import type { PageParam } from '@vben/request';
import { requestClient } from '#/api/request';
export namespace SystemDictDataApi {
@ -22,7 +24,7 @@ export function getSimpleDictDataList() {
}
// 查询字典数据列表
export function getDictDataPage(params: any) {
export function getDictDataPage(params: PageParam) {
return requestClient.get('/system/dict-data/page', { params });
}

28
apps/web-antd/src/components/upload/use-upload.ts
View File

@ -1,17 +1,14 @@
import type { AxiosProgressEvent, InfraFileApi } from '#/api/infra/file';
import type { Ref } from 'vue';
import type { AxiosProgressEvent, InfraFileApi } from '#/api/infra/file';
import { createFile, getFilePresignedUrl, uploadFile } from '#/api/infra/file';
import { baseRequestClient } from '#/api/request';
import { computed, unref } from 'vue';
import { useAppConfig } from '@vben/hooks';
import { $t } from '@vben/locales';
import CryptoJS from 'crypto-js';
import { createFile, getFilePresignedUrl, uploadFile } from '#/api/infra/file';
import { baseRequestClient } from '#/api/request';
const { apiURL } = useAppConfig(import.meta.env, import.meta.env.PROD);
/**
@ -46,9 +43,7 @@ export function useUploadType({
const getStringAccept = computed(() => {
return unref(getAccept)
.map((item) => {
return item.indexOf('/') > 0 || item.startsWith('.')
? item
: `.${item}`;
return item.indexOf('/') > 0 || item.startsWith('.') ? item : `.${item}`;
})
.join(',');
});
@ -85,13 +80,9 @@ export const useUpload = () => {
// 后端上传地址
const uploadUrl = getUploadUrl();
// 是否使用前端直连上传
const isClientUpload =
UPLOAD_TYPE.CLIENT === import.meta.env.VITE_UPLOAD_TYPE;
const isClientUpload = UPLOAD_TYPE.CLIENT === import.meta.env.VITE_UPLOAD_TYPE;
// 重写ElUpload上传方法
const httpRequest = async (
file: File,
onUploadProgress?: AxiosProgressEvent,
) => {
const httpRequest = async (file: File, onUploadProgress?: AxiosProgressEvent) => {
// 模式一：前端上传
if (isClientUpload) {
// 1.1 生成文件名称
@ -113,7 +104,6 @@ export const useUpload = () => {
});
} else {
// 模式二：后端上传
// TODO @芋艿：这里有爆红
return uploadFile({ file }, onUploadProgress);
}
};
@ -138,11 +128,7 @@ export const getUploadUrl = (): string => {
* @param name 文件名称
* @param file 文件
*/
function createFile0(
vo: InfraFileApi.FilePresignedUrlRespVO,
name: string,
file: File,
) {
function createFile0(vo: InfraFileApi.FilePresignedUrlRespVO, name: string, file: File) {
const fileVO = {
configId: vo.configId,
url: vo.url,

9
apps/web-antd/src/router/access.ts
View File

@ -1,7 +1,4 @@
import type {
ComponentRecordType,
GenerateMenuAndRoutesOptions,
} from '@vben/types';
import type { AppRouteRecordRaw, ComponentRecordType, GenerateMenuAndRoutesOptions } from '@vben/types';
import { generateAccessible } from '@vben/access';
import { preferences } from '@vben/preferences';
@ -25,8 +22,8 @@ async function generateAccess(options: GenerateMenuAndRoutesOptions) {
...options,
fetchMenuListAsync: async () => {
// 由于 yudao 通过 accessStore 读取，所以不在进行 message.loading 提示
const accessMenus = accessStore.accessMenus;
// TODO @芋艿：爆红！！！
// 补充说明：accessStore.accessMenus 一开始是 AppRouteRecordRaw 类型（后端加载），后面被赋值成 MenuRecordRaw 类型（前端转换）
const accessMenus = accessStore.accessMenus as AppRouteRecordRaw[];
return convertServerMenuToRouteRecordStringComponent(accessMenus);
},
// 可以指定没有权限跳转403页面

44
apps/web-antd/src/router/routes/modules/demos.ts
View File

@ -1,28 +1,28 @@
import type { RouteRecordRaw } from 'vue-router';
import { $t } from '#/locales';
// import { $t } from '#/locales';
const routes: RouteRecordRaw[] = [
{
meta: {
icon: 'ic:baseline-view-in-ar',
keepAlive: true,
order: 1000,
title: $t('demos.title'),
},
name: 'Demos',
path: '/demos',
children: [
{
meta: {
title: $t('demos.antd'),
},
name: 'AntDesignDemos',
path: '/demos/ant-design',
component: () => import('#/views/demos/antd/index.vue'),
},
],
},
// {
// meta: {
// icon: 'ic:baseline-view-in-ar',
// keepAlive: true,
// order: 1000,
// title: $t('demos.title'),
// },
// name: 'Demos',
// path: '/demos',
// children: [
// {
// meta: {
// title: $t('demos.antd'),
// },
// name: 'AntDesignDemos',
// path: '/demos/ant-design',
// component: () => import('#/views/demos/antd/index.vue'),
// },
// ],
// },
];
// export default routes; // update by 芋艿：不展示
export default routes; // update by 芋艿：不展示

150
apps/web-antd/src/router/routes/modules/vben.ts
View File

@ -1,81 +1,81 @@
import type { RouteRecordRaw } from 'vue-router';
import {
VBEN_DOC_URL,
VBEN_ELE_PREVIEW_URL,
VBEN_GITHUB_URL,
VBEN_LOGO_URL,
VBEN_NAIVE_PREVIEW_URL,
} from '@vben/constants';
import { IFrameView } from '#/layouts';
import { $t } from '#/locales';
// import {
// VBEN_DOC_URL,
// VBEN_ELE_PREVIEW_URL,
// VBEN_GITHUB_URL,
// VBEN_LOGO_URL,
// VBEN_NAIVE_PREVIEW_URL,
// } from '@vben/constants';
//
// import { IFrameView } from '#/layouts';
// import { $t } from '#/locales';
const routes: RouteRecordRaw[] = [
{
meta: {
badgeType: 'dot',
icon: VBEN_LOGO_URL,
order: 9998,
title: $t('demos.vben.title'),
},
name: 'VbenProject',
path: '/vben-admin',
children: [
{
name: 'VbenDocument',
path: '/vben-admin/document',
component: IFrameView,
meta: {
icon: 'lucide:book-open-text',
link: VBEN_DOC_URL,
title: $t('demos.vben.document'),
},
},
{
name: 'VbenGithub',
path: '/vben-admin/github',
component: IFrameView,
meta: {
icon: 'mdi:github',
link: VBEN_GITHUB_URL,
title: 'Github',
},
},
{
name: 'VbenNaive',
path: '/vben-admin/naive',
component: IFrameView,
meta: {
badgeType: 'dot',
icon: 'logos:naiveui',
link: VBEN_NAIVE_PREVIEW_URL,
title: $t('demos.vben.naive-ui'),
},
},
{
name: 'VbenElementPlus',
path: '/vben-admin/ele',
component: IFrameView,
meta: {
badgeType: 'dot',
icon: 'logos:element',
link: VBEN_ELE_PREVIEW_URL,
title: $t('demos.vben.element-plus'),
},
},
],
},
{
name: 'VbenAbout',
path: '/vben-admin/about',
component: () => import('#/views/_core/about/index.vue'),
meta: {
icon: 'lucide:copyright',
title: $t('demos.vben.about'),
order: 9999,
},
},
// {
// meta: {
// badgeType: 'dot',
// icon: VBEN_LOGO_URL,
// order: 9998,
// title: $t('demos.vben.title'),
// },
// name: 'VbenProject',
// path: '/vben-admin',
// children: [
// {
// name: 'VbenDocument',
// path: '/vben-admin/document',
// component: IFrameView,
// meta: {
// icon: 'lucide:book-open-text',
// link: VBEN_DOC_URL,
// title: $t('demos.vben.document'),
// },
// },
// {
// name: 'VbenGithub',
// path: '/vben-admin/github',
// component: IFrameView,
// meta: {
// icon: 'mdi:github',
// link: VBEN_GITHUB_URL,
// title: 'Github',
// },
// },
// {
// name: 'VbenNaive',
// path: '/vben-admin/naive',
// component: IFrameView,
// meta: {
// badgeType: 'dot',
// icon: 'logos:naiveui',
// link: VBEN_NAIVE_PREVIEW_URL,
// title: $t('demos.vben.naive-ui'),
// },
// },
// {
// name: 'VbenElementPlus',
// path: '/vben-admin/ele',
// component: IFrameView,
// meta: {
// badgeType: 'dot',
// icon: 'logos:element',
// link: VBEN_ELE_PREVIEW_URL,
// title: $t('demos.vben.element-plus'),
// },
// },
// ],
// },
// {
// name: 'VbenAbout',
// path: '/vben-admin/about',
// component: () => import('#/views/_core/about/index.vue'),
// meta: {
// icon: 'lucide:copyright',
// title: $t('demos.vben.about'),
// order: 9999,
// },
// },
];
// export default routes; // update by 芋艿：不展示
export default routes; // update by 芋艿：不展示

31
apps/web-antd/src/views/_core/profile/modules/profile-user.vue
View File

@ -1,27 +1,28 @@
<script setup lang="ts">
import {type SystemUserProfileApi, updateUserPassword} from '#/api/system/user/profile';
import type { SystemUserProfileApi } from '#/api/system/user/profile';
import {Descriptions, DescriptionsItem, message, Tooltip} from 'ant-design-vue';
import { IconifyIcon } from '@vben/icons';
import { computed } from 'vue';
import { preferences } from '@vben/preferences';
import { updateUserProfile } from '#/api/system/user/profile';
import { formatDateTime } from '@vben/utils';
import { CropperAvatar } from '#/components/cropper';
import { useUpload } from '#/components/upload/use-upload';
import { IconifyIcon } from '@vben/icons';
import { Descriptions, DescriptionsItem, Tooltip } from 'ant-design-vue';
const props = defineProps<{ profile?: SystemUserProfileApi.UserProfileRespVO }>();
import { updateUserProfile } from '#/api/system/user/profile';
import { computed } from 'vue';
import { preferences } from '@vben/preferences';
import { formatDateTime } from '@vben/utils';
const props = defineProps<{
profile?: SystemUserProfileApi.UserProfileRespVO;
}>();
const emit = defineEmits<{
(e: 'success'): void;
}>();
const avatar = computed(
() => props.profile?.avatar || preferences.app.defaultAvatar,
);
const avatar = computed(() => props.profile?.avatar || preferences.app.defaultAvatar);
async function handelUpload({ file, filename }: { file: Blob; filename: string; }) {
async function handelUpload({ file, filename }: { file: Blob; filename: string }) {
// 1. 上传头像，获取 URL
const { httpRequest } = useUpload();
// 将 Blob 转换为 File
@ -63,7 +64,7 @@ async function handelUpload({ file, filename }: { file: Blob; filename: string;
所属角色
</div>
</template>
{{ profile.roles.map(role => role.name).join(',') }}
{{ profile.roles.map((role) => role.name).join(',') }}
</DescriptionsItem>
<DescriptionsItem>
<template #label>
@ -99,7 +100,7 @@ async function handelUpload({ file, filename }: { file: Blob; filename: string;
所属岗位
</div>
</template>
{{ profile.posts.map(post => post.name).join(',') }}
{{ profile.posts.map((post) => post.name).join(',') }}
</DescriptionsItem>
<DescriptionsItem>
<template #label>

14
apps/web-antd/src/views/bpm/model/index.vue
View File

@ -1,7 +1,6 @@
<script lang="ts" setup>
import { DocAlert } from '#/components/doc-alert';
import { Button } from 'ant-design-vue';
import { Page } from '@vben/common-ui';
import { Button } from 'ant-design-vue';
</script>
<template>
@ -10,8 +9,13 @@ import { Page } from '@vben/common-ui';
该功能支持 Vue3 + element-plus 版本！
</Button>
<br />
<Button type="link" target="_blank" href="https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/bpm/model/index">
可参考 https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/bpm/model/index 代码，pull request 贡献给我们！
<Button
type="link"
target="_blank"
href="https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/bpm/model/index"
>
可参考 https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/bpm/model/index 代码，pull request
贡献给我们！
</Button>
</Page>
</template>
</template>

14
apps/web-antd/src/views/bpm/processInstance/create/index.vue
View File

@ -1,7 +1,6 @@
<script lang="ts" setup>
import { DocAlert } from '#/components/doc-alert';
import { Button } from 'ant-design-vue';
import { Page } from '@vben/common-ui';
import { Button } from 'ant-design-vue';
</script>
<template>
@ -10,8 +9,13 @@ import { Page } from '@vben/common-ui';
该功能支持 Vue3 + element-plus 版本！
</Button>
<br />
<Button type="link" target="_blank" href="https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/bpm/processInstance/create/index">
可参考 https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/bpm/processInstance/create/index 代码，pull request 贡献给我们！
<Button
type="link"
target="_blank"
href="https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/bpm/processInstance/create/index"
>
可参考 https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/bpm/processInstance/create/index
代码，pull request 贡献给我们！
</Button>
</Page>
</template>
</template>

40
apps/web-antd/src/views/infra/apiAccessLog/modules/detail.vue
View File

@ -1,15 +1,14 @@
<script lang="ts" setup>
import type { InfraApiAccessLogApi } from '#/api/infra/api-access-log';
import { ref } from 'vue';
import { DictTag } from '#/components/dict-tag';
import { useVbenModal } from '@vben/common-ui';
import { formatDateTime } from '@vben/utils';
import { Descriptions } from 'ant-design-vue';
import { DictTag } from '#/components/dict-tag';
import { DICT_TYPE } from '#/utils/dict';
import { ref } from 'vue';
import { formatDateTime } from '@vben/utils';
const formData = ref<InfraApiAccessLogApi.ApiAccessLog>();
@ -34,19 +33,8 @@ const [Modal, modalApi] = useVbenModal({
</script>
<template>
<Modal
title="API 访问日志详情"
class="w-1/2"
:show-cancel-button="false"
:show-confirm-button="false"
>
<Descriptions
bordered
:column="1"
size="middle"
class="mx-4"
:label-style="{ width: '110px' }"
>
<Modal title="API 访问日志详情" class="w-1/2" :show-cancel-button="false" :show-confirm-button="false">
<Descriptions bordered :column="1" size="middle" class="mx-4" :label-style="{ width: '110px' }">
<Descriptions.Item label="日志编号">
{{ formData?.id }}
</Descriptions.Item>
@ -66,9 +54,7 @@ const [Modal, modalApi] = useVbenModal({
<Descriptions.Item label="用户UA">
{{ formData?.userAgent }}
</Descriptions.Item>
<Descriptions.Item label="请求信息">
{{ formData?.requestMethod }} {{ formData?.requestUrl }}
</Descriptions.Item>
<Descriptions.Item label="请求信息"> {{ formData?.requestMethod }} {{ formData?.requestUrl }} </Descriptions.Item>
<Descriptions.Item label="请求参数">
{{ formData?.requestParams }}
</Descriptions.Item>
@ -79,13 +65,10 @@ const [Modal, modalApi] = useVbenModal({
{{ formatDateTime(formData?.beginTime || '') }} ~
{{ formatDateTime(formData?.endTime || '') }}
</Descriptions.Item>
<Descriptions.Item label="请求耗时">
{{ formData?.duration }} ms
</Descriptions.Item>
<Descriptions.Item label="请求耗时"> {{ formData?.duration }} ms </Descriptions.Item>
<Descriptions.Item label="操作结果">
<div v-if="formData?.resultCode === 0">正常</div>
<!-- TODO @芋艿：处理爆红 -->
<div v-else-if="formData?.resultCode > 0">
<div v-else-if="formData && formData?.resultCode > 0">
失败 | {{ formData?.resultCode }} | {{ formData?.resultMsg }}
</div>
</Descriptions.Item>
@ -96,10 +79,7 @@ const [Modal, modalApi] = useVbenModal({
{{ formData?.operateName }}
</Descriptions.Item>
<Descriptions.Item label="操作类型">
<DictTag
:type="DICT_TYPE.INFRA_OPERATE_TYPE"
:value="formData?.operateType"
/>
<DictTag :type="DICT_TYPE.INFRA_OPERATE_TYPE" :value="formData?.operateType" />
</Descriptions.Item>
</Descriptions>
</Modal>

24
apps/web-antd/src/views/infra/demo/demo03/inner/modules/form.vue
View File

@ -1,19 +1,13 @@
<script lang="ts" setup>
import type { Demo03StudentApi } from '#/api/infra/demo/demo03/inner';
import { computed, ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { message, Tabs } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import {
createDemo03Student,
getDemo03Student,
updateDemo03Student,
} from '#/api/infra/demo/demo03/inner';
import { createDemo03Student, getDemo03Student, updateDemo03Student } from '#/api/infra/demo/demo03/inner';
import { $t } from '#/locales';
import { computed, ref } from 'vue';
import { useFormSchema } from '../data';
import Demo03CourseForm from './demo03-course-form.vue';
@ -22,9 +16,7 @@ import Demo03GradeForm from './demo03-grade-form.vue';
const emit = defineEmits(['success']);
const formData = ref<Demo03StudentApi.Demo03Student>();
const getTitle = computed(() => {
return formData.value?.id
? $t('ui.actionTitle.edit', ['学生'])
: $t('ui.actionTitle.create', ['学生']);
return formData.value?.id ? $t('ui.actionTitle.edit', ['学生']) : $t('ui.actionTitle.create', ['学生']);
});
/** 子表的表单 */
@ -54,12 +46,11 @@ const [Modal, modalApi] = useVbenModal({
// 提交表单
const data = (await formApi.getValues()) as Demo03StudentApi.Demo03Student;
// 拼接子表的数据
// TODO @puhui999：字段对不上
data.demo03Courses = demo03CourseFormRef.value?.getData();
data.demo03Grade = await demo03GradeFormRef.value?.getValues();
try {
await (formData.value?.id
? updateDemo03Student(data)
: createDemo03Student(data));
await (formData.value?.id ? updateDemo03Student(data) : createDemo03Student(data));
// 关闭并提示
await modalApi.close();
emit('success');
@ -103,10 +94,7 @@ const [Modal, modalApi] = useVbenModal({
<!-- 子表的表单 -->
<Tabs v-model:active-key="subTabsName">
<Tabs.TabPane key="demo03Course" tab="学生课程" force-render>
<Demo03CourseForm
ref="demo03CourseFormRef"
:student-id="formData?.id"
/>
<Demo03CourseForm ref="demo03CourseFormRef" :student-id="formData?.id" />
</Tabs.TabPane>
<Tabs.TabPane key="demo03Grade" tab="学生班级" force-render>
<Demo03GradeForm ref="demo03GradeFormRef" :student-id="formData?.id" />

10
apps/web-antd/src/views/system/dict/data.ts
View File

@ -1,13 +1,15 @@
import type { VbenFormSchema } from '#/adapter/form';
import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
import { useAccess } from '@vben/access';
import type { SystemDictDataApi } from '#/api/system/dict/data';
import type { SystemDictTypeApi } from '#/api/system/dict/type';
import { z } from '#/adapter/form';
import { getSimpleDictTypeList } from '#/api/system/dict/type';
import { CommonStatusEnum } from '#/utils/constants';
import { DICT_TYPE, getDictOptions } from '#/utils/dict';
import { useAccess } from '@vben/access';
const { hasAccessByCodes } = useAccess();
// ============================== 字典类型 ==============================
@ -94,7 +96,7 @@ export function useTypeGridFormSchema(): VbenFormSchema[] {
}
/** 类型列表的字段 */
export function useTypeGridColumns<T = any>(
export function useTypeGridColumns<T = SystemDictTypeApi.DictType>(
onActionClick: OnActionClickFn<T>,
): VxeTableGridOptions['columns'] {
return [
@ -312,7 +314,7 @@ export function useDataGridFormSchema(): VbenFormSchema[] {
/**
* 字典数据表格列
*/
export function useDataGridColumns<T = any>(
export function useDataGridColumns<T = SystemDictDataApi.DictData>(
onActionClick: OnActionClickFn<T>,
): VxeTableGridOptions['columns'] {
return [

30
apps/web-antd/src/views/system/dict/modules/data-grid.vue
View File

@ -1,21 +1,16 @@
<script lang="ts" setup>
import type { OnActionClickParams } from '#/adapter/vxe-table';
import { watch } from 'vue';
import type { OnActionClickParams, VxeTableGridOptions } from '#/adapter/vxe-table';
import type { SystemDictDataApi } from '#/api/system/dict/data';
import { useVbenModal } from '@vben/common-ui';
import { Download, Plus } from '@vben/icons';
import { Button, message } from 'ant-design-vue';
import { useVbenVxeGrid } from '#/adapter/vxe-table';
import {
deleteDictData,
exportDictData,
getDictDataPage,
} from '#/api/system/dict/data';
import { deleteDictData, exportDictData, getDictDataPage } from '#/api/system/dict/data';
import { $t } from '#/locales';
import { downloadByData } from '#/utils/download';
import { watch } from 'vue';
import { useDataGridColumns, useDataGridFormSchema } from '../data';
import DataForm from './data-form.vue';
@ -100,8 +95,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
return await getDictDataPage({
pageNo: page.currentPage,
pageSize: page.pageSize,
...formValues,
dictType: props.dictType,
...formValues,
});
},
},
@ -113,7 +108,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
refresh: { code: 'query' },
search: true,
},
},
} as VxeTableGridOptions<SystemDictDataApi.DictData>,
});
/** 监听 dictType 变化，重新查询 */
@ -133,20 +128,11 @@ watch(
<Grid table-title="字典数据列表">
<template #toolbar-tools>
<Button
type="primary"
@click="onCreate"
v-access:code="['system:dict:create']"
>
<Button type="primary" @click="onCreate" v-access:code="['system:dict:create']">
<Plus class="size-5" />
{{ $t('ui.actionTitle.create', ['字典数据']) }}
</Button>
<Button
type="primary"
class="ml-2"
@click="onExport"
v-access:code="['system:dict:export']"
>
<Button type="primary" class="ml-2" @click="onExport" v-access:code="['system:dict:export']">
<Download class="size-5" />
{{ $t('ui.actionTitle.export') }}
</Button>

29
apps/web-antd/src/views/system/dict/modules/type-grid.vue
View File

@ -1,18 +1,13 @@
<script lang="ts" setup>
import type { OnActionClickParams } from '#/adapter/vxe-table';
import type { OnActionClickParams, VxeGridListeners, VxeTableGridOptions } from '#/adapter/vxe-table';
import type { SystemDictTypeApi } from '#/api/system/dict/type';
import { useVbenModal } from '@vben/common-ui';
import { Download, Plus } from '@vben/icons';
import { Button, message } from 'ant-design-vue';
import { useVbenVxeGrid } from '#/adapter/vxe-table';
import {
deleteDictType,
exportDictType,
getDictTypePage,
} from '#/api/system/dict/type';
import { deleteDictType, exportDictType, getDictTypePage } from '#/api/system/dict/type';
import { $t } from '#/locales';
import { downloadByData } from '#/utils/download';
@ -67,7 +62,7 @@ async function onDelete(row: SystemDictTypeApi.DictType) {
}
/** 表格操作按钮回调 */
function onActionClick({ code, row }: OnActionClickParams) {
function onActionClick({ code, row }: OnActionClickParams<SystemDictTypeApi.DictType>) {
switch (code) {
case 'delete': {
onDelete(row);
@ -81,8 +76,7 @@ function onActionClick({ code, row }: OnActionClickParams) {
}
/** 表格事件 */
// TODO @芋艿：这里有爆红
const gridEvents: VxeGridListeners<RowType> = {
const gridEvents: VxeGridListeners<SystemDictTypeApi.DictType> = {
cellClick: ({ row }) => {
emit('select', row.type);
},
@ -115,7 +109,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
refresh: { code: 'query' },
search: true,
},
},
} as VxeTableGridOptions<SystemDictTypeApi.DictType>,
gridEvents,
});
</script>
@ -126,20 +120,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
<Grid table-title="字典类型列表">
<template #toolbar-tools>
<Button
type="primary"
@click="onCreate"
v-access:code="['system:dict:create']"
>
<Button type="primary" @click="onCreate" v-access:code="['system:dict:create']">
<Plus class="size-5" />
{{ $t('ui.actionTitle.create', ['字典类型']) }}
</Button>
<Button
type="primary"
class="ml-2"
@click="onExport"
v-access:code="['system:dict:export']"
>
<Button type="primary" class="ml-2" @click="onExport" v-access:code="['system:dict:export']">
<Download class="size-5" />
{{ $t('ui.actionTitle.export') }}
</Button>

10
packages/@core/base/shared/src/utils/date.ts
View File

@ -1,6 +1,9 @@
import dayjs from 'dayjs';
export function formatDate(time: number | string | Date, format = 'YYYY-MM-DD') {
export function formatDate(time: Date | number | string | undefined, format = 'YYYY-MM-DD') {
if (!time) {
return time;
}
try {
const date = dayjs(time);
if (!date.isValid()) {
@ -13,7 +16,10 @@ export function formatDate(time: number | string | Date, format = 'YYYY-MM-DD')
}
}
export function formatDateTime(time: number | string | Date) {
export function formatDateTime(time: Date | number | string | undefined) {
if (!time) {
return time;
}
return formatDate(time, 'YYYY-MM-DD HH:mm:ss');
}

28
packages/effects/common-ui/src/components/captcha/verification/Verify/VerifyPoints.vue
View File

@ -1,15 +1,8 @@
<script lang="ts" setup>
import type { VerificationProps } from '../types';
import type { ComponentInternalInstance } from 'vue';
import {
type ComponentInternalInstance,
getCurrentInstance,
nextTick,
onMounted,
reactive,
ref,
toRefs,
} from 'vue';
import { getCurrentInstance, nextTick, onMounted, reactive, ref, toRefs } from 'vue';
import { $t } from '@vben/locales';
@ -127,7 +120,7 @@ onMounted(() => {
const canvas = ref(null);
// 获取坐标
const getMousePos = function (obj: any, e: any) {
const getMousePos = function (_obj: any, e: any) {
const x = e.offsetX;
const y = e.offsetY;
return { x, y };
@ -173,10 +166,7 @@ function canvasClick(e: any) {
// var flag = this.comparePos(this.fontPos, this.checkPosArr);
// 发送后端请求
const captchaVerification = secretKey.value
? aesEncrypt(
`${backToken.value}---${JSON.stringify(checkPosArr)}`,
secretKey.value,
)
? aesEncrypt(`${backToken.value}---${JSON.stringify(checkPosArr)}`, secretKey.value)
: `${backToken.value}---${JSON.stringify(checkPosArr)}`;
const data = {
captchaType: captchaType.value,
@ -211,8 +201,7 @@ function canvasClick(e: any) {
});
}, 400);
}
if (num.value < checkNum.value)
num.value = createPoint(getMousePos(canvas, e));
if (num.value < checkNum.value) num.value = createPoint(getMousePos(canvas, e));
}
// 请求背景图片和验证图片
@ -250,12 +239,7 @@ defineExpose({
}"
class="verify-img-panel"
>
<div
v-show="showRefresh"
class="verify-refresh"
style="z-index: 3"
@click="refresh"
>
<div v-show="showRefresh" class="verify-refresh" style="z-index: 3" @click="refresh">
<i class="iconfont icon-refresh"></i>
</div>
<img

38
packages/effects/plugins/src/vxe-table/extends.ts
View File

@ -1,45 +1,23 @@
import type { VxeGridProps, VxeUIExport } from 'vxe-table';
import type { Recordable } from '@vben/types';
import type { VxeGridApi } from './api';
import type { Recordable } from '@vben/types';
import type { VxeGridProps, VxeUIExport } from 'vxe-table';
import { formatDate, formatDateTime, isFunction } from '@vben/utils';
export function extendProxyOptions(
api: VxeGridApi,
options: VxeGridProps,
getFormValues: () => Recordable<any>,
) {
[
'query',
'querySuccess',
'queryError',
'queryAll',
'queryAllSuccess',
'queryAllError',
].forEach((key) => {
export function extendProxyOptions(api: VxeGridApi, options: VxeGridProps, getFormValues: () => Recordable<any>) {
['query', 'querySuccess', 'queryError', 'queryAll', 'queryAllSuccess', 'queryAllError'].forEach((key) => {
extendProxyOption(key, api, options, getFormValues);
});
}
function extendProxyOption(
key: string,
api: VxeGridApi,
options: VxeGridProps,
getFormValues: () => Recordable<any>,
) {
function extendProxyOption(key: string, api: VxeGridApi, options: VxeGridProps, getFormValues: () => Recordable<any>) {
const { proxyConfig } = options;
const configFn = (proxyConfig?.ajax as Recordable<any>)?.[key];
if (!isFunction(configFn)) {
return options;
}
const wrapperFn = async (
params: Recordable<any>,
customValues: Recordable<any>,
...args: Recordable<any>[]
) => {
const wrapperFn = async (params: Recordable<any>, customValues: Recordable<any>, ...args: Recordable<any>[]) => {
const formValues = getFormValues();
const data = await configFn(
params,
@ -69,13 +47,13 @@ function extendProxyOption(
export function extendsDefaultFormatter(vxeUI: VxeUIExport) {
vxeUI.formats.add('formatDate', {
tableCellFormatMethod({ cellValue }) {
return formatDate(cellValue);
return formatDate(cellValue) as string;
},
});
vxeUI.formats.add('formatDateTime', {
tableCellFormatMethod({ cellValue }) {
return formatDateTime(cellValue);
return formatDateTime(cellValue) as string;
},
});
}