Pre Merge pull request !76 from dhb52/v-next-dev

pull/76/MERGE
dhb52 2025-04-20 12:55:57 +00:00 committed by Gitee
commit 6f752b58df
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
266 changed files with 5742 additions and 2251 deletions

View File

@ -26,6 +26,10 @@
"#/*": "./src/*"
},
"dependencies": {
"@form-create/ant-design-vue": "catalog:",
"@form-create/antd-designer": "catalog:",
"@tinymce/tinymce-vue": "catalog:",
"@types/lodash.clonedeep": "catalog:",
"@vben/access": "workspace:*",
"@vben/common-ui": "workspace:*",
"@vben/constants": "workspace:*",
@ -40,14 +44,16 @@
"@vben/styles": "workspace:*",
"@vben/types": "workspace:*",
"@vben/utils": "workspace:*",
"@tinymce/tinymce-vue": "catalog:",
"@vueuse/core": "catalog:",
"ant-design-vue": "catalog:",
"axios": "catalog:",
"crypto-js": "catalog:",
"dayjs": "catalog:",
"highlight.js": "catalog:",
"lodash.clonedeep": "catalog:",
"pinia": "catalog:",
"vue": "catalog:",
"vue-dompurify-html": "catalog:",
"vue-router": "catalog:"
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@ -115,7 +115,9 @@ export type ComponentType =
| 'DatePicker'
| 'DefaultButton'
| 'Divider'
| 'FileUpload'
| 'IconPicker'
| 'ImageUpload'
| 'Input'
| 'InputNumber'
| 'InputPassword'
@ -125,16 +127,14 @@ export type ComponentType =
| 'RadioGroup'
| 'RangePicker'
| 'Rate'
| 'RichTextarea'
| 'Select'
| 'Space'
| 'Switch'
| 'Textarea'
| 'RichTextarea'
| 'TimePicker'
| 'TreeSelect'
| 'Upload'
| 'FileUpload'
| 'ImageUpload'
| BaseFormComponentType;
async function initComponentAdapter() {

View File

@ -1,3 +1,5 @@
import type { Recordable } from '@vben/types';
import { h } from 'vue';
import { IconifyIcon } from '@vben/icons';
@ -6,12 +8,11 @@ import { setupVbenVxeTable, useVbenVxeGrid } from '@vben/plugins/vxe-table';
import { isFunction, isString } from '@vben/utils';
import { Button, Image, Popconfirm, Switch } from 'ant-design-vue';
import { DictTag } from '#/components/dict-tag';
import { $t } from '#/locales';
import { useVbenForm } from './form';
import type { Recordable } from '@vben/types';
import { $t } from '#/locales';
setupVbenVxeTable({
configVxeTable: (vxeUI) => {
@ -162,10 +163,10 @@ setupVbenVxeTable({
return presets[opt]
? { code: opt, ...presets[opt], ...defaultProps }
: {
code: opt,
text: $te(`common.${opt}`) ? $t(`common.${opt}`) : opt,
...defaultProps,
};
code: opt,
text: $te(`common.${opt}`) ? $t(`common.${opt}`) : opt,
...defaultProps,
};
} else {
return { ...defaultProps, ...presets[opt.code], ...opt };
}
@ -188,10 +189,10 @@ setupVbenVxeTable({
icon: undefined,
onClick: listen
? () =>
attrs?.onClick?.({
code: opt.code,
row,
})
attrs?.onClick?.({
code: opt.code,
row,
})
: undefined,
},
{

View File

@ -15,12 +15,17 @@ export namespace BpmCategoryApi {
/** 查询流程分类分页 */
export async function getCategoryPage(params: PageParam) {
return requestClient.get<PageResult<BpmCategoryApi.CategoryVO>>('/bpm/category/page', { params });
return requestClient.get<PageResult<BpmCategoryApi.CategoryVO>>(
'/bpm/category/page',
{ params },
);
}
/** 查询流程分类详情 */
export async function getCategory(id: number) {
return requestClient.get<BpmCategoryApi.CategoryVO>(`/bpm/category/get?id=${id}`);
return requestClient.get<BpmCategoryApi.CategoryVO>(
`/bpm/category/get?id=${id}`,
);
}
/** 新增流程分类 */

View File

@ -1,6 +1,7 @@
import { baseRequestClient, requestClient } from '#/api/request';
import type { AuthPermissionInfo } from '@vben/types';
import { baseRequestClient, requestClient } from '#/api/request';
export namespace AuthApi {
/** 登录接口参数 */
export interface LoginParams {
@ -41,9 +42,9 @@ export namespace AuthApi {
/** 注册接口参数 */
export interface RegisterParams {
username: string
password: string
captchaVerification: string
username: string;
password: string;
captchaVerification: string;
}
/** 重置密码接口参数 */
@ -68,16 +69,22 @@ export async function loginApi(data: AuthApi.LoginParams) {
/** 刷新 accessToken */
export async function refreshTokenApi(refreshToken: string) {
return baseRequestClient.post(`/system/auth/refresh-token?refreshToken=${refreshToken}`);
return baseRequestClient.post(
`/system/auth/refresh-token?refreshToken=${refreshToken}`,
);
}
/** 退出登录 */
export async function logoutApi(accessToken: string) {
return baseRequestClient.post('/system/auth/logout', {}, {
headers: {
Authorization: `Bearer ${accessToken}`,
}
});
return baseRequestClient.post(
'/system/auth/logout',
{},
{
headers: {
Authorization: `Bearer ${accessToken}`,
},
},
);
}
/** 获取权限信息 */
@ -96,7 +103,9 @@ export async function getTenantSimpleList() {
/** 使用租户域名,获得租户信息 */
export async function getTenantByWebsite(website: string) {
return requestClient.get<AuthApi.TenantResult>(`/system/tenant/get-by-website?website=${website}`);
return requestClient.get<AuthApi.TenantResult>(
`/system/tenant/get-by-website?website=${website}`,
);
}
/** 获取验证码 */
@ -111,23 +120,23 @@ export async function checkCaptcha(data: any) {
/** 获取登录验证码 */
export const sendSmsCode = (data: AuthApi.SmsCodeParams) => {
return requestClient.post('/system/auth/send-sms-code', data )
}
return requestClient.post('/system/auth/send-sms-code', data);
};
/** 短信验证码登录 */
export const smsLogin = (data: AuthApi.SmsLoginParams) => {
return requestClient.post('/system/auth/sms-login', data)
}
return requestClient.post('/system/auth/sms-login', data);
};
/** 注册 */
export const register = (data: AuthApi.RegisterParams) => {
return requestClient.post('/system/auth/register', data)
}
return requestClient.post('/system/auth/register', data);
};
/** 通过短信重置密码 */
export const smsResetPassword = (data: AuthApi.ResetPasswordParams) => {
return requestClient.post('/system/auth/reset-password', data)
}
return requestClient.post('/system/auth/reset-password', data);
};
/** 社交授权的跳转 */
export const socialAuthRedirect = (type: number, redirectUri: string) => {
@ -137,9 +146,12 @@ export const socialAuthRedirect = (type: number, redirectUri: string) => {
redirectUri,
},
});
}
};
/** 社交快捷登录 */
export const socialLogin = (data: AuthApi.SocialLoginParams) => {
return requestClient.post<AuthApi.LoginResult>('/system/auth/social-login', data);
}
return requestClient.post<AuthApi.LoginResult>(
'/system/auth/social-login',
data,
);
};

View File

@ -32,11 +32,13 @@ export namespace InfraApiAccessLogApi {
export function getApiAccessLogPage(params: PageParam) {
return requestClient.get<PageResult<InfraApiAccessLogApi.SystemApiAccessLog>>(
'/infra/api-access-log/page',
{ params }
{ params },
);
}
/** 导出 API 访问日志 */
export function exportApiAccessLog(params: any) {
return requestClient.download('/infra/api-access-log/export-excel', { params });
return requestClient.download('/infra/api-access-log/export-excel', {
params,
});
}

View File

@ -36,16 +36,20 @@ export namespace InfraApiErrorLogApi {
export function getApiErrorLogPage(params: PageParam) {
return requestClient.get<PageResult<InfraApiErrorLogApi.SystemApiErrorLog>>(
'/infra/api-error-log/page',
{ params }
{ params },
);
}
/** 更新 API 错误日志的处理状态 */
export function updateApiErrorLogStatus(id: number, processStatus: number) {
return requestClient.put(`/infra/api-error-log/update-status?id=${id}&processStatus=${processStatus}`);
return requestClient.put(
`/infra/api-error-log/update-status?id=${id}&processStatus=${processStatus}`,
);
}
/** 导出 API 错误日志 */
export function exportApiErrorLog(params: any) {
return requestClient.download('/infra/api-error-log/export-excel', { params });
return requestClient.download('/infra/api-error-log/export-excel', {
params,
});
}

View File

@ -79,21 +79,30 @@ export namespace InfraCodegenApi {
/** 查询列表代码生成表定义 */
export function getCodegenTableList(dataSourceConfigId: number) {
return requestClient.get<InfraCodegenApi.CodegenTable[]>('/infra/codegen/table/list?', {
params: { dataSourceConfigId },
});
return requestClient.get<InfraCodegenApi.CodegenTable[]>(
'/infra/codegen/table/list?',
{
params: { dataSourceConfigId },
},
);
}
/** 查询列表代码生成表定义 */
export function getCodegenTablePage(params: PageParam) {
return requestClient.get<PageResult<InfraCodegenApi.CodegenTable>>('/infra/codegen/table/page', { params });
return requestClient.get<PageResult<InfraCodegenApi.CodegenTable>>(
'/infra/codegen/table/page',
{ params },
);
}
/** 查询详情代码生成表定义 */
export function getCodegenTable(tableId: number) {
return requestClient.get<InfraCodegenApi.CodegenDetail>('/infra/codegen/detail', {
params: { tableId },
});
return requestClient.get<InfraCodegenApi.CodegenDetail>(
'/infra/codegen/detail',
{
params: { tableId },
},
);
}
/** 修改代码生成表定义 */
@ -110,9 +119,12 @@ export function syncCodegenFromDB(tableId: number) {
/** 预览生成代码 */
export function previewCodegen(tableId: number) {
return requestClient.get<InfraCodegenApi.CodegenPreview[]>('/infra/codegen/preview', {
params: { tableId },
});
return requestClient.get<InfraCodegenApi.CodegenPreview[]>(
'/infra/codegen/preview',
{
params: { tableId },
},
);
}
/** 下载生成代码 */
@ -124,11 +136,16 @@ export function downloadCodegen(tableId: number) {
/** 获得表定义 */
export function getSchemaTableList(params: any) {
return requestClient.get<InfraCodegenApi.DatabaseTable[]>('/infra/codegen/db/table/list', { params });
return requestClient.get<InfraCodegenApi.DatabaseTable[]>(
'/infra/codegen/db/table/list',
{ params },
);
}
/** 基于数据库的表结构,创建代码生成器的表定义 */
export function createCodegenList(data: InfraCodegenApi.CodegenCreateListReqVO) {
export function createCodegenList(
data: InfraCodegenApi.CodegenCreateListReqVO,
) {
return requestClient.post('/infra/codegen/create-list', data);
}

View File

@ -1,6 +1,7 @@
import { requestClient } from '#/api/request';
import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
export namespace InfraConfigApi {
/** 参数配置信息 */
export interface InfraConfig {
@ -18,19 +19,26 @@ export namespace InfraConfigApi {
/** 查询参数列表 */
export function getConfigPage(params: PageParam) {
return requestClient.get<PageResult<InfraConfigApi.InfraConfig>>('/infra/config/page', {
params
});
return requestClient.get<PageResult<InfraConfigApi.InfraConfig>>(
'/infra/config/page',
{
params,
},
);
}
/** 查询参数详情 */
export function getConfig(id: number) {
return requestClient.get<InfraConfigApi.InfraConfig>(`/infra/config/get?id=${id}`);
return requestClient.get<InfraConfigApi.InfraConfig>(
`/infra/config/get?id=${id}`,
);
}
/** 根据参数键名查询参数值 */
export function getConfigKey(configKey: string) {
return requestClient.get<string>(`/infra/config/get-value-by-key?key=${configKey}`);
return requestClient.get<string>(
`/infra/config/get-value-by-key?key=${configKey}`,
);
}
/** 新增参数 */
@ -51,6 +59,6 @@ export function deleteConfig(id: number) {
/** 导出参数 */
export function exportConfig(params: any) {
return requestClient.download('/infra/config/export', {
params
params,
});
}

View File

@ -14,21 +14,29 @@ export namespace InfraDataSourceConfigApi {
/** 查询数据源配置列表 */
export function getDataSourceConfigList() {
return requestClient.get<InfraDataSourceConfigApi.InfraDataSourceConfig[]>('/infra/data-source-config/list');
return requestClient.get<InfraDataSourceConfigApi.InfraDataSourceConfig[]>(
'/infra/data-source-config/list',
);
}
/** 查询数据源配置详情 */
export function getDataSourceConfig(id: number) {
return requestClient.get<InfraDataSourceConfigApi.InfraDataSourceConfig>(`/infra/data-source-config/get?id=${id}`);
return requestClient.get<InfraDataSourceConfigApi.InfraDataSourceConfig>(
`/infra/data-source-config/get?id=${id}`,
);
}
/** 新增数据源配置 */
export function createDataSourceConfig(data: InfraDataSourceConfigApi.InfraDataSourceConfig) {
export function createDataSourceConfig(
data: InfraDataSourceConfigApi.InfraDataSourceConfig,
) {
return requestClient.post('/infra/data-source-config/create', data);
}
/** 修改数据源配置 */
export function updateDataSourceConfig(data: InfraDataSourceConfigApi.InfraDataSourceConfig) {
export function updateDataSourceConfig(
data: InfraDataSourceConfigApi.InfraDataSourceConfig,
) {
return requestClient.put('/infra/data-source-config/update', data);
}

View File

@ -16,12 +16,17 @@ export namespace Demo01ContactApi {
/** 查询示例联系人分页 */
export function getDemo01ContactPage(params: PageParam) {
return requestClient.get<PageResult<Demo01ContactApi.Demo01Contact>>('/infra/demo01-contact/page', { params });
return requestClient.get<PageResult<Demo01ContactApi.Demo01Contact>>(
'/infra/demo01-contact/page',
{ params },
);
}
/** 查询示例联系人详情 */
export function getDemo01Contact(id: number) {
return requestClient.get<Demo01ContactApi.Demo01Contact>(`/infra/demo01-contact/get?id=${id}`);
return requestClient.get<Demo01ContactApi.Demo01Contact>(
`/infra/demo01-contact/get?id=${id}`,
);
}
/** 新增示例联系人 */

View File

@ -12,12 +12,17 @@ export namespace Demo02CategoryApi {
/** 查询示例分类列表 */
export function getDemo02CategoryList(params: any) {
return requestClient.get<Demo02CategoryApi.Demo02Category[]>('/infra/demo02-category/list', { params });
return requestClient.get<Demo02CategoryApi.Demo02Category[]>(
'/infra/demo02-category/list',
{ params },
);
}
/** 查询示例分类详情 */
export function getDemo02Category(id: number) {
return requestClient.get<Demo02CategoryApi.Demo02Category>(`/infra/demo02-category/get?id=${id}`);
return requestClient.get<Demo02CategoryApi.Demo02Category>(
`/infra/demo02-category/get?id=${id}`,
);
}
/** 新增示例分类 */

View File

@ -32,12 +32,17 @@ export namespace Demo03StudentApi {
/** 查询学生分页 */
export function getDemo03StudentPage(params: PageParam) {
return requestClient.get<PageResult<Demo03StudentApi.Demo03Student>>('/infra/demo03-student/page', { params });
return requestClient.get<PageResult<Demo03StudentApi.Demo03Student>>(
'/infra/demo03-student/page',
{ params },
);
}
/** 查询学生详情 */
export function getDemo03Student(id: number) {
return requestClient.get<Demo03StudentApi.Demo03Student>(`/infra/demo03-student/get?id=${id}`);
return requestClient.get<Demo03StudentApi.Demo03Student>(
`/infra/demo03-student/get?id=${id}`,
);
}
/** 新增学生 */

View File

@ -31,12 +31,17 @@ export namespace Demo03StudentApi {
/** 查询学生分页 */
export function getDemo03StudentPage(params: PageParam) {
return requestClient.get<PageResult<Demo03StudentApi.Demo03Student>>('/infra/demo03-student/page', { params });
return requestClient.get<PageResult<Demo03StudentApi.Demo03Student>>(
'/infra/demo03-student/page',
{ params },
);
}
/** 查询学生详情 */
export function getDemo03Student(id: number) {
return requestClient.get<Demo03StudentApi.Demo03Student>(`/infra/demo03-student/get?id=${id}`);
return requestClient.get<Demo03StudentApi.Demo03Student>(
`/infra/demo03-student/get?id=${id}`,
);
}
/** 新增学生 */

View File

@ -1,6 +1,7 @@
import { requestClient } from '#/api/request';
import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
export namespace InfraFileConfigApi {
/** 文件客户端配置 */
export interface FileClientConfig {
@ -32,14 +33,19 @@ export namespace InfraFileConfigApi {
/** 查询文件配置列表 */
export function getFileConfigPage(params: PageParam) {
return requestClient.get<PageResult<InfraFileConfigApi.InfraFileConfig>>('/infra/file-config/page', {
params
});
return requestClient.get<PageResult<InfraFileConfigApi.InfraFileConfig>>(
'/infra/file-config/page',
{
params,
},
);
}
/** 查询文件配置详情 */
export function getFileConfig(id: number) {
return requestClient.get<InfraFileConfigApi.InfraFileConfig>(`/infra/file-config/get?id=${id}`);
return requestClient.get<InfraFileConfigApi.InfraFileConfig>(
`/infra/file-config/get?id=${id}`,
);
}
/** 更新文件配置为主配置 */

View File

@ -1,6 +1,6 @@
import type { AxiosRequestConfig, PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
import type { PageParam, PageResult } from '@vben/request';
import type { AxiosRequestConfig } from '@vben/request';
/** Axios 上传进度事件 */
export type AxiosProgressEvent = AxiosRequestConfig['onUploadProgress'];
@ -34,9 +34,12 @@ export namespace InfraFileApi {
/** 查询文件列表 */
export function getFilePage(params: PageParam) {
return requestClient.get<PageResult<InfraFileApi.InfraFile>>('/infra/file/page', {
params
});
return requestClient.get<PageResult<InfraFileApi.InfraFile>>(
'/infra/file/page',
{
params,
},
);
}
/** 删除文件 */
@ -46,9 +49,12 @@ 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 },
},
);
}
/** 创建文件 */
@ -57,6 +63,9 @@ export function createFile(data: InfraFileApi.InfraFile) {
}
/** 上传文件 */
export function uploadFile(data: InfraFileApi.FileUploadReqVO, onUploadProgress?: AxiosProgressEvent) {
export function uploadFile(
data: InfraFileApi.FileUploadReqVO,
onUploadProgress?: AxiosProgressEvent,
) {
return requestClient.upload('/infra/file/upload', data, { onUploadProgress });
}

View File

@ -22,12 +22,17 @@ export namespace InfraJobLogApi {
/** 查询任务日志列表 */
export function getJobLogPage(params: PageParam) {
return requestClient.get<PageResult<InfraJobLogApi.InfraJobLog>>('/infra/job-log/page', { params });
return requestClient.get<PageResult<InfraJobLogApi.InfraJobLog>>(
'/infra/job-log/page',
{ params },
);
}
/** 查询任务日志详情 */
export function getJobLog(id: number) {
return requestClient.get<InfraJobLogApi.InfraJobLog>(`/infra/job-log/get?id=${id}`);
return requestClient.get<InfraJobLogApi.InfraJobLog>(
`/infra/job-log/get?id=${id}`,
);
}
/** 导出定时任务日志 */

View File

@ -20,7 +20,10 @@ export namespace InfraJobApi {
/** 查询任务列表 */
export function getJobPage(params: PageParam) {
return requestClient.get<PageResult<InfraJobApi.InfraJob>>('/infra/job/page', { params });
return requestClient.get<PageResult<InfraJobApi.InfraJob>>(
'/infra/job/page',
{ params },
);
}
/** 查询任务详情 */
@ -52,7 +55,7 @@ export function exportJob(params: any) {
export function updateJobStatus(id: number, status: number) {
const params = {
id,
status
status,
};
return requestClient.put('/infra/job/update-status', { params });
}

View File

@ -1,13 +1,6 @@
import { requestClient } from '#/api/request';
export namespace InfraRedisApi {
/** Redis 监控信息 */
export interface InfraRedisMonitorInfo {
info: InfraRedisInfo;
dbSize: number;
commandStats: InfraRedisCommandStats[];
}
/** Redis 信息 */
export interface InfraRedisInfo {
io_threaded_reads_processed: string;
@ -180,9 +173,18 @@ export namespace InfraRedisApi {
calls: number;
usec: number;
}
/** Redis 监控信息 */
export interface InfraRedisMonitorInfo {
info: InfraRedisInfo;
dbSize: number;
commandStats: InfraRedisCommandStats[];
}
}
/** 获取 Redis 监控信息 */
export function getRedisMonitorInfo() {
return requestClient.get<InfraRedisApi.InfraRedisMonitorInfo>('/infra/redis/get-monitor-info');
return requestClient.get<InfraRedisApi.InfraRedisMonitorInfo>(
'/infra/redis/get-monitor-info',
);
}

View File

@ -19,7 +19,10 @@ import { useAuthStore } from '#/store';
import { refreshTokenApi } from './core';
const { apiURL, tenantEnable } = useAppConfig(import.meta.env, import.meta.env.PROD);
const { apiURL, tenantEnable } = useAppConfig(
import.meta.env,
import.meta.env.PROD,
);
function createRequestClient(baseURL: string, options?: RequestClientOptions) {
const client = new RequestClient({
@ -76,7 +79,9 @@ function createRequestClient(baseURL: string, options?: RequestClientOptions) {
config.headers.Authorization = formatToken(accessStore.accessToken);
config.headers['Accept-Language'] = preferences.app.locale;
// 添加租户编号
config.headers['tenant-id'] = tenantEnable ? accessStore.tenantId : undefined;
config.headers['tenant-id'] = tenantEnable
? accessStore.tenantId
: undefined;
return config;
},
});
@ -130,7 +135,9 @@ baseRequestClient.addRequestInterceptor({
fulfilled: (config) => {
const accessStore = useAccessStore();
// 添加租户编号
config.headers['tenant-id'] = tenantEnable? accessStore.tenantId : undefined;
config.headers['tenant-id'] = tenantEnable
? accessStore.tenantId
: undefined;
return config;
},
});

View File

@ -18,7 +18,9 @@ export namespace SystemDeptApi {
/** 查询部门(精简)列表 */
export async function getSimpleDeptList() {
return requestClient.get<SystemDeptApi.SystemDept[]>('/system/dept/simple-list');
return requestClient.get<SystemDeptApi.SystemDept[]>(
'/system/dept/simple-list',
);
}
/** 查询部门列表 */
@ -28,7 +30,9 @@ export async function getDeptList() {
/** 查询部门详情 */
export async function getDept(id: number) {
return requestClient.get<SystemDeptApi.SystemDept>(`/system/dept/get?id=${id}`);
return requestClient.get<SystemDeptApi.SystemDept>(
`/system/dept/get?id=${id}`,
);
}
/** 新增部门 */

View File

@ -3,16 +3,16 @@ import { requestClient } from '#/api/request';
export namespace SystemDictDataApi {
/** 字典数据 */
export type SystemDictData = {
id?: number;
colorType: string;
createTime: Date;
cssClass: string;
dictType: string;
id?: number;
label: string;
remark: string;
sort?: number;
status: number;
value: string;
createTime: Date;
};
}

View File

@ -1,14 +1,23 @@
import { requestClient } from '#/api/request';
export type DictTypeVO = {
createTime: Date;
id: number | undefined;
name: string;
remark: string;
status: number;
type: string;
};
export namespace SystemDictTypeApi {
/** 字典类型 */
export type SystemDictType = {
createTime: Date;
id?: number;
name: string;
remark: string;
status: number;
type: string;
createTime: Date;
};
}

View File

@ -21,8 +21,9 @@ export namespace SystemLoginLogApi {
/** 查询登录日志列表 */
export function getLoginLogPage(params: PageParam) {
return requestClient.get<PageResult<SystemLoginLogApi.SystemLoginLog>>('/system/login-log/page',
{ params }
return requestClient.get<PageResult<SystemLoginLogApi.SystemLoginLog>>(
'/system/login-log/page',
{ params },
);
}

View File

@ -23,22 +23,28 @@ export namespace SystemMailAccountApi {
export function getMailAccountPage(params: PageParam) {
return requestClient.get<PageResult<SystemMailAccountApi.SystemMailAccount>>(
'/system/mail-account/page',
{ params }
{ params },
);
}
/** 查询邮箱账号详情 */
export function getMailAccount(id: number) {
return requestClient.get<SystemMailAccountApi.SystemMailAccount>(`/system/mail-account/get?id=${id}`);
return requestClient.get<SystemMailAccountApi.SystemMailAccount>(
`/system/mail-account/get?id=${id}`,
);
}
/** 新增邮箱账号 */
export function createMailAccount(data: SystemMailAccountApi.SystemMailAccount) {
export function createMailAccount(
data: SystemMailAccountApi.SystemMailAccount,
) {
return requestClient.post('/system/mail-account/create', data);
}
/** 修改邮箱账号 */
export function updateMailAccount(data: SystemMailAccountApi.SystemMailAccount) {
export function updateMailAccount(
data: SystemMailAccountApi.SystemMailAccount,
) {
return requestClient.put('/system/mail-account/update', data);
}
@ -49,5 +55,7 @@ export function deleteMailAccount(id: number) {
/** 获得邮箱账号精简列表 */
export function getSimpleMailAccountList() {
return requestClient.get<SystemMailAccountApi.SystemMailAccount[]>('/system/mail-account/simple-list');
return requestClient.get<SystemMailAccountApi.SystemMailAccount[]>(
'/system/mail-account/simple-list',
);
}

View File

@ -29,13 +29,15 @@ export namespace SystemMailLogApi {
export function getMailLogPage(params: PageParam) {
return requestClient.get<PageResult<SystemMailLogApi.SystemMailLog>>(
'/system/mail-log/page',
{ params }
{ params },
);
}
/** 查询邮件日志详情 */
export function getMailLog(id: number) {
return requestClient.get<SystemMailLogApi.SystemMailLog>(`/system/mail-log/get?id=${id}`);
return requestClient.get<SystemMailLogApi.SystemMailLog>(
`/system/mail-log/get?id=${id}`,
);
}
/** 重新发送邮件 */

View File

@ -28,24 +28,29 @@ export namespace SystemMailTemplateApi {
/** 查询邮件模版列表 */
export function getMailTemplatePage(params: PageParam) {
return requestClient.get<PageResult<SystemMailTemplateApi.SystemMailTemplate>>(
'/system/mail-template/page',
{ params }
);
return requestClient.get<
PageResult<SystemMailTemplateApi.SystemMailTemplate>
>('/system/mail-template/page', { params });
}
/** 查询邮件模版详情 */
export function getMailTemplate(id: number) {
return requestClient.get<SystemMailTemplateApi.SystemMailTemplate>(`/system/mail-template/get?id=${id}`);
return requestClient.get<SystemMailTemplateApi.SystemMailTemplate>(
`/system/mail-template/get?id=${id}`,
);
}
/** 新增邮件模版 */
export function createMailTemplate(data: SystemMailTemplateApi.SystemMailTemplate) {
export function createMailTemplate(
data: SystemMailTemplateApi.SystemMailTemplate,
) {
return requestClient.post('/system/mail-template/create', data);
}
/** 修改邮件模版 */
export function updateMailTemplate(data: SystemMailTemplateApi.SystemMailTemplate) {
export function updateMailTemplate(
data: SystemMailTemplateApi.SystemMailTemplate,
) {
return requestClient.put('/system/mail-template/update', data);
}

View File

@ -23,17 +23,23 @@ export namespace SystemMenuApi {
/** 查询菜单(精简)列表 */
export async function getSimpleMenusList() {
return requestClient.get<SystemMenuApi.SystemMenu[]>('/system/menu/simple-list');
return requestClient.get<SystemMenuApi.SystemMenu[]>(
'/system/menu/simple-list',
);
}
/** 查询菜单列表 */
export async function getMenuList(params?: Record<string, any>) {
return requestClient.get<SystemMenuApi.SystemMenu[]>('/system/menu/list', { params });
return requestClient.get<SystemMenuApi.SystemMenu[]>('/system/menu/list', {
params,
});
}
/** 获取菜单详情 */
export async function getMenu(id: number) {
return requestClient.get<SystemMenuApi.SystemMenu>(`/system/menu/get?id=${id}`);
return requestClient.get<SystemMenuApi.SystemMenu>(
`/system/menu/get?id=${id}`,
);
}
/** 新增菜单 */

View File

@ -1,6 +1,7 @@
import { requestClient } from '#/api/request';
import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
export namespace SystemNoticeApi {
/** 公告信息 */
export interface SystemNotice {
@ -17,12 +18,17 @@ export namespace SystemNoticeApi {
/** 查询公告列表 */
export function getNoticePage(params: PageParam) {
return requestClient.get<PageResult<SystemNoticeApi.SystemNotice>>('/system/notice/page', { params });
return requestClient.get<PageResult<SystemNoticeApi.SystemNotice>>(
'/system/notice/page',
{ params },
);
}
/** 查询公告详情 */
export function getNotice(id: number) {
return requestClient.get<SystemNoticeApi.SystemNotice>(`/system/notice/get?id=${id}`);
return requestClient.get<SystemNoticeApi.SystemNotice>(
`/system/notice/get?id=${id}`,
);
}
/** 新增公告 */

View File

@ -22,18 +22,16 @@ export namespace SystemNotifyMessageApi {
/** 查询站内信消息列表 */
export function getNotifyMessagePage(params: PageParam) {
return requestClient.get<PageResult<SystemNotifyMessageApi.SystemNotifyMessage>>(
'/system/notify-message/page',
{ params },
);
return requestClient.get<
PageResult<SystemNotifyMessageApi.SystemNotifyMessage>
>('/system/notify-message/page', { params });
}
/** 获得我的站内信分页 */
export function getMyNotifyMessagePage(params: PageParam) {
return requestClient.get<PageResult<SystemNotifyMessageApi.SystemNotifyMessage>>(
'/system/notify-message/my-page',
{ params },
);
return requestClient.get<
PageResult<SystemNotifyMessageApi.SystemNotifyMessage>
>('/system/notify-message/my-page', { params });
}
/** 批量标记已读 */
@ -48,7 +46,9 @@ export function updateAllNotifyMessageRead() {
/** 获取当前用户的最新站内信列表 */
export function getUnreadNotifyMessageList() {
return requestClient.get<SystemNotifyMessageApi.SystemNotifyMessage[]>('/system/notify-message/get-unread-list');
return requestClient.get<SystemNotifyMessageApi.SystemNotifyMessage[]>(
'/system/notify-message/get-unread-list',
);
}
/** 获得当前用户的未读站内信数量 */

View File

@ -26,24 +26,29 @@ export namespace SystemNotifyTemplateApi {
/** 查询站内信模板列表 */
export function getNotifyTemplatePage(params: PageParam) {
return requestClient.get<PageResult<SystemNotifyTemplateApi.SystemNotifyTemplate>>(
'/system/notify-template/page',
{ params },
);
return requestClient.get<
PageResult<SystemNotifyTemplateApi.SystemNotifyTemplate>
>('/system/notify-template/page', { params });
}
/** 查询站内信模板详情 */
export function getNotifyTemplate(id: number) {
return requestClient.get<SystemNotifyTemplateApi.SystemNotifyTemplate>(`/system/notify-template/get?id=${id}`);
return requestClient.get<SystemNotifyTemplateApi.SystemNotifyTemplate>(
`/system/notify-template/get?id=${id}`,
);
}
/** 新增站内信模板 */
export function createNotifyTemplate(data: SystemNotifyTemplateApi.SystemNotifyTemplate) {
export function createNotifyTemplate(
data: SystemNotifyTemplateApi.SystemNotifyTemplate,
) {
return requestClient.post('/system/notify-template/create', data);
}
/** 修改站内信模板 */
export function updateNotifyTemplate(data: SystemNotifyTemplateApi.SystemNotifyTemplate) {
export function updateNotifyTemplate(
data: SystemNotifyTemplateApi.SystemNotifyTemplate,
) {
return requestClient.put('/system/notify-template/update', data);
}
@ -54,10 +59,14 @@ export function deleteNotifyTemplate(id: number) {
/** 导出站内信模板 */
export function exportNotifyTemplate(params: any) {
return requestClient.download('/system/notify-template/export-excel', { params });
return requestClient.download('/system/notify-template/export-excel', {
params,
});
}
/** 发送站内信 */
export function sendNotify(data: SystemNotifyTemplateApi.SystemNotifySendReqVO) {
export function sendNotify(
data: SystemNotifyTemplateApi.SystemNotifySendReqVO,
) {
return requestClient.post('/system/notify-template/send-notify', data);
}

View File

@ -1,6 +1,7 @@
import { requestClient } from '#/api/request';
import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
export namespace SystemOAuth2ClientApi {
/** OAuth2.0 客户端信息 */
export interface SystemOAuth2Client {
@ -27,23 +28,29 @@ export namespace SystemOAuth2ClientApi {
/** 查询 OAuth2.0 客户端列表 */
export function getOAuth2ClientPage(params: PageParam) {
return requestClient.get<PageResult<SystemOAuth2ClientApi.SystemOAuth2Client>>('/system/oauth2-client/page',
{ params }
);
return requestClient.get<
PageResult<SystemOAuth2ClientApi.SystemOAuth2Client>
>('/system/oauth2-client/page', { params });
}
/** 查询 OAuth2.0 客户端详情 */
export function getOAuth2Client(id: number) {
return requestClient.get<SystemOAuth2ClientApi.SystemOAuth2Client>(`/system/oauth2-client/get?id=${id}`);
return requestClient.get<SystemOAuth2ClientApi.SystemOAuth2Client>(
`/system/oauth2-client/get?id=${id}`,
);
}
/** 新增 OAuth2.0 客户端 */
export function createOAuth2Client(data: SystemOAuth2ClientApi.SystemOAuth2Client) {
export function createOAuth2Client(
data: SystemOAuth2ClientApi.SystemOAuth2Client,
) {
return requestClient.post('/system/oauth2-client/create', data);
}
/** 修改 OAuth2.0 客户端 */
export function updateOAuth2Client(data: SystemOAuth2ClientApi.SystemOAuth2Client) {
export function updateOAuth2Client(
data: SystemOAuth2ClientApi.SystemOAuth2Client,
) {
return requestClient.put('/system/oauth2-client/update', data);
}

View File

@ -3,8 +3,8 @@ import { requestClient } from '#/api/request';
/** OAuth2.0 授权信息响应 */
export interface OAuth2OpenAuthorizeInfoRespVO {
client: {
name: string;
logo: string;
name: string;
};
scopes: {
key: string;
@ -14,7 +14,9 @@ export interface OAuth2OpenAuthorizeInfoRespVO {
/** 获得授权信息 */
export function getAuthorize(clientId: string) {
return requestClient.get<OAuth2OpenAuthorizeInfoRespVO>(`/system/oauth2/authorize?clientId=${clientId}`);
return requestClient.get<OAuth2OpenAuthorizeInfoRespVO>(
`/system/oauth2/authorize?clientId=${clientId}`,
);
}
/** 发起授权 */
@ -25,7 +27,7 @@ export function authorize(
state: string,
autoApprove: boolean,
checkedScopes: string[],
uncheckedScopes: string[]
uncheckedScopes: string[],
) {
// 构建 scopes
const scopes: Record<string, boolean> = {};
@ -39,15 +41,15 @@ export function authorize(
// 发起请求
return requestClient.post<string>('/system/oauth2/authorize', null, {
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
'Content-Type': 'application/x-www-form-urlencoded',
},
params: {
response_type: responseType,
client_id: clientId,
redirect_uri: redirectUri,
state: state,
state,
auto_approve: autoApprove,
scope: JSON.stringify(scopes)
}
scope: JSON.stringify(scopes),
},
});
}

View File

@ -1,6 +1,7 @@
import { requestClient } from '#/api/request';
import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
export namespace SystemOAuth2TokenApi {
/** OAuth2.0 令牌信息 */
export interface SystemOAuth2Token {
@ -17,12 +18,17 @@ export namespace SystemOAuth2TokenApi {
/** 查询 OAuth2.0 令牌列表 */
export function getOAuth2TokenPage(params: PageParam) {
return requestClient.get<PageResult<SystemOAuth2TokenApi.SystemOAuth2Token>>('/system/oauth2-token/page', {
params
});
return requestClient.get<PageResult<SystemOAuth2TokenApi.SystemOAuth2Token>>(
'/system/oauth2-token/page',
{
params,
},
);
}
/** 删除 OAuth2.0 令牌 */
export function deleteOAuth2Token(accessToken: string) {
return requestClient.delete(`/system/oauth2-token/delete?accessToken=${accessToken}`);
return requestClient.delete(
`/system/oauth2-token/delete?accessToken=${accessToken}`,
);
}

View File

@ -27,8 +27,9 @@ export namespace SystemOperateLogApi {
/** 查询操作日志列表 */
export function getOperateLogPage(params: PageParam) {
return requestClient.get<PageResult<SystemOperateLogApi.SystemOperateLog>>('/system/operate-log/page',
{ params }
return requestClient.get<PageResult<SystemOperateLogApi.SystemOperateLog>>(
'/system/operate-log/page',
{ params },
);
}

View File

@ -1,5 +1,6 @@
import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
import type {PageParam, PageResult} from '@vben/request';
export namespace SystemPostApi {
/** 岗位信息 */
@ -16,19 +17,26 @@ export namespace SystemPostApi {
/** 查询岗位列表 */
export function getPostPage(params: PageParam) {
return requestClient.get<PageResult<SystemPostApi.SystemPost>>('/system/post/page', {
params
});
return requestClient.get<PageResult<SystemPostApi.SystemPost>>(
'/system/post/page',
{
params,
},
);
}
/** 获取岗位精简信息列表 */
export function getSimplePostList() {
return requestClient.get<SystemPostApi.SystemPost[]>('/system/post/simple-list');
return requestClient.get<SystemPostApi.SystemPost[]>(
'/system/post/simple-list',
);
}
/** 查询岗位详情 */
/** 查询岗位详情 */
export function getPost(id: number) {
return requestClient.get<SystemPostApi.SystemPost>(`/system/post/get?id=${id}`);
return requestClient.get<SystemPostApi.SystemPost>(
`/system/post/get?id=${id}`,
);
}
/** 新增岗位 */
@ -49,6 +57,6 @@ export function deletePost(id: number) {
/** 导出岗位 */
export function exportPost(params: any) {
return requestClient.download('/system/post/export', {
params
params,
});
}

View File

@ -1,6 +1,7 @@
import { requestClient } from '#/api/request';
import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
export namespace SystemRoleApi {
/** 角色信息 */
export interface SystemRole {
@ -18,17 +19,24 @@ export namespace SystemRoleApi {
/** 查询角色列表 */
export function getRolePage(params: PageParam) {
return requestClient.get<PageResult<SystemRoleApi.SystemRole>>('/system/role/page', { params });
return requestClient.get<PageResult<SystemRoleApi.SystemRole>>(
'/system/role/page',
{ params },
);
}
/** 查询角色(精简)列表 */
export function getSimpleRoleList() {
return requestClient.get<SystemRoleApi.SystemRole[]>('/system/role/simple-list');
return requestClient.get<SystemRoleApi.SystemRole[]>(
'/system/role/simple-list',
);
}
/** 查询角色详情 */
export function getRole(id: number) {
return requestClient.get<SystemRoleApi.SystemRole>(`/system/role/get?id=${id}`);
return requestClient.get<SystemRoleApi.SystemRole>(
`/system/role/get?id=${id}`,
);
}
/** 新增角色 */

View File

@ -27,12 +27,16 @@ export function getSmsChannelPage(params: PageParam) {
/** 获得短信渠道精简列表 */
export function getSimpleSmsChannelList() {
return requestClient.get<SystemSmsChannelApi.SystemSmsChannel[]>('/system/sms-channel/simple-list');
return requestClient.get<SystemSmsChannelApi.SystemSmsChannel[]>(
'/system/sms-channel/simple-list',
);
}
/** 查询短信渠道详情 */
export function getSmsChannel(id: number) {
return requestClient.get<SystemSmsChannelApi.SystemSmsChannel>(`/system/sms-channel/get?id=${id}`);
return requestClient.get<SystemSmsChannelApi.SystemSmsChannel>(
`/system/sms-channel/get?id=${id}`,
);
}
/** 新增短信渠道 */

View File

@ -33,7 +33,10 @@ export namespace SystemSmsLogApi {
/** 查询短信日志列表 */
export function getSmsLogPage(params: PageParam) {
return requestClient.get<PageResult<SystemSmsLogApi.SystemSmsLog>>('/system/sms-log/page', { params });
return requestClient.get<PageResult<SystemSmsLogApi.SystemSmsLog>>(
'/system/sms-log/page',
{ params },
);
}
/** 导出短信日志 */

View File

@ -37,16 +37,22 @@ export function getSmsTemplatePage(params: PageParam) {
/** 查询短信模板详情 */
export function getSmsTemplate(id: number) {
return requestClient.get<SystemSmsTemplateApi.SystemSmsTemplate>(`/system/sms-template/get?id=${id}`);
return requestClient.get<SystemSmsTemplateApi.SystemSmsTemplate>(
`/system/sms-template/get?id=${id}`,
);
}
/** 新增短信模板 */
export function createSmsTemplate(data: SystemSmsTemplateApi.SystemSmsTemplate) {
export function createSmsTemplate(
data: SystemSmsTemplateApi.SystemSmsTemplate,
) {
return requestClient.post('/system/sms-template/create', data);
}
/** 修改短信模板 */
export function updateSmsTemplate(data: SystemSmsTemplateApi.SystemSmsTemplate) {
export function updateSmsTemplate(
data: SystemSmsTemplateApi.SystemSmsTemplate,
) {
return requestClient.put('/system/sms-template/update', data);
}
@ -57,7 +63,9 @@ export function deleteSmsTemplate(id: number) {
/** 导出短信模板 */
export function exportSmsTemplate(params: any) {
return requestClient.download('/system/sms-template/export-excel', { params });
return requestClient.download('/system/sms-template/export-excel', {
params,
});
}
/** 发送短信 */

View File

@ -1,6 +1,7 @@
import { requestClient } from '#/api/request';
import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
export namespace SystemSocialClientApi {
/** 社交客户端信息 */
export interface SystemSocialClient {
@ -18,23 +19,29 @@ export namespace SystemSocialClientApi {
/** 查询社交客户端列表 */
export function getSocialClientPage(params: PageParam) {
return requestClient.get<PageResult<SystemSocialClientApi.SystemSocialClient>>('/system/social-client/page',
{ params }
);
return requestClient.get<
PageResult<SystemSocialClientApi.SystemSocialClient>
>('/system/social-client/page', { params });
}
/** 查询社交客户端详情 */
export function getSocialClient(id: number) {
return requestClient.get<SystemSocialClientApi.SystemSocialClient>(`/system/social-client/get?id=${id}`);
return requestClient.get<SystemSocialClientApi.SystemSocialClient>(
`/system/social-client/get?id=${id}`,
);
}
/** 新增社交客户端 */
export function createSocialClient(data: SystemSocialClientApi.SystemSocialClient) {
export function createSocialClient(
data: SystemSocialClientApi.SystemSocialClient,
) {
return requestClient.post('/system/social-client/create', data);
}
/** 修改社交客户端 */
export function updateSocialClient(data: SystemSocialClientApi.SystemSocialClient) {
export function updateSocialClient(
data: SystemSocialClientApi.SystemSocialClient,
) {
return requestClient.put('/system/social-client/update', data);
}

View File

@ -35,14 +35,17 @@ export namespace SystemSocialUserApi {
/** 查询社交用户列表 */
export function getSocialUserPage(params: PageParam) {
return requestClient.get<PageResult<SystemSocialUserApi.SystemSocialUser>>('/system/social-user/page',
{ params }
return requestClient.get<PageResult<SystemSocialUserApi.SystemSocialUser>>(
'/system/social-user/page',
{ params },
);
}
/** 查询社交用户详情 */
export function getSocialUser(id: number) {
return requestClient.get<SystemSocialUserApi.SystemSocialUser>(`/system/social-user/get?id=${id}`);
return requestClient.get<SystemSocialUserApi.SystemSocialUser>(
`/system/social-user/get?id=${id}`,
);
}
/** 社交绑定,使用 code 授权码 */

View File

@ -19,10 +19,9 @@ export namespace SystemTenantPackageApi {
/** 租户套餐列表 */
export function getTenantPackagePage(params: PageParam) {
return requestClient.get<PageResult<SystemTenantPackageApi.SystemTenantPackage>>(
'/system/tenant-package/page',
{ params }
);
return requestClient.get<
PageResult<SystemTenantPackageApi.SystemTenantPackage>
>('/system/tenant-package/page', { params });
}
/** 查询租户套餐详情 */
@ -31,12 +30,16 @@ export function getTenantPackage(id: number) {
}
/** 新增租户套餐 */
export function createTenantPackage(data: SystemTenantPackageApi.SystemTenantPackage) {
export function createTenantPackage(
data: SystemTenantPackageApi.SystemTenantPackage,
) {
return requestClient.post('/system/tenant-package/create', data);
}
/** 修改租户套餐 */
export function updateTenantPackage(data: SystemTenantPackageApi.SystemTenantPackage) {
export function updateTenantPackage(
data: SystemTenantPackageApi.SystemTenantPackage,
) {
return requestClient.put('/system/tenant-package/update', data);
}
@ -47,5 +50,7 @@ export function deleteTenantPackage(id: number) {
/** 获取租户套餐精简信息列表 */
export function getTenantPackageList() {
return requestClient.get<SystemTenantPackageApi.SystemTenantPackage[]>('/system/tenant-package/get-simple-list');
return requestClient.get<SystemTenantPackageApi.SystemTenantPackage[]>(
'/system/tenant-package/get-simple-list',
);
}

View File

@ -19,17 +19,24 @@ export namespace SystemTenantApi {
/** 租户列表 */
export function getTenantPage(params: PageParam) {
return requestClient.get<PageResult<SystemTenantApi.SystemTenant>>('/system/tenant/page', { params });
return requestClient.get<PageResult<SystemTenantApi.SystemTenant>>(
'/system/tenant/page',
{ params },
);
}
/** 获取租户精简信息列表 */
export function getSimpleTenantList() {
return requestClient.get<SystemTenantApi.SystemTenant[]>('/system/tenant/simple-list');
return requestClient.get<SystemTenantApi.SystemTenant[]>(
'/system/tenant/simple-list',
);
}
/** 查询租户详情 */
export function getTenant(id: number) {
return requestClient.get<SystemTenantApi.SystemTenant>(`/system/tenant/get?id=${id}`,);
return requestClient.get<SystemTenantApi.SystemTenant>(
`/system/tenant/get?id=${id}`,
);
}
/** 新增租户 */

View File

@ -1,4 +1,4 @@
import type {PageParam, PageResult} from '@vben/request';
import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
@ -23,12 +23,17 @@ export namespace SystemUserApi {
/** 查询用户管理列表 */
export function getUserPage(params: PageParam) {
return requestClient.get<PageResult<SystemUserApi.SystemUser>>('/system/user/page', { params });
return requestClient.get<PageResult<SystemUserApi.SystemUser>>(
'/system/user/page',
{ params },
);
}
/** 查询用户详情 */
export function getUser(id: number) {
return requestClient.get<SystemUserApi.SystemUser>(`/system/user/get?id=${id}`);
return requestClient.get<SystemUserApi.SystemUser>(
`/system/user/get?id=${id}`,
);
}
/** 新增用户 */
@ -60,7 +65,7 @@ export function importUserTemplate() {
export function importUser(file: File, updateSupport: boolean) {
return requestClient.upload('/system/user/import', {
file,
updateSupport
updateSupport,
});
}
@ -76,5 +81,7 @@ export function updateUserStatus(id: number, status: number) {
/** 获取用户精简信息列表 */
export function getSimpleUserList() {
return requestClient.get<SystemUserApi.SystemUser[]>('/system/user/simple-list');
return requestClient.get<SystemUserApi.SystemUser[]>(
'/system/user/simple-list',
);
}

View File

@ -1,4 +1,5 @@
import { createApp, watchEffect } from 'vue';
import VueDOMPurifyHTML from 'vue-dompurify-html';
import { registerAccessDirective } from '@vben/access';
import { registerLoadingDirective } from '@vben/common-ui/es/loading';
@ -10,6 +11,7 @@ import '@vben/styles/antd';
import { useTitle } from '@vueuse/core';
import { $t, setupI18n } from '#/locales';
import { setupFormCreate } from '#/plugins/formCreate';
import { initComponentAdapter } from './adapter/component';
import App from './app.vue';
@ -39,7 +41,7 @@ async function bootstrap(namespace: string) {
// 国际化 i18n 配置
await setupI18n(app);
// 配置 pinia-tore
// 配置 pinia-store
await initStores(app, { namespace });
// 安装权限指令
@ -52,6 +54,12 @@ async function bootstrap(namespace: string) {
// 配置路由及路由守卫
app.use(router);
// formCreate
setupFormCreate(app);
// vue-dompurify-html
app.use(VueDOMPurifyHTML);
// 配置Motion插件
const { MotionPlugin } = await import('@vben/plugins/motion');
app.use(MotionPlugin);

View File

@ -0,0 +1,3 @@
export { useApiSelect } from './src/components/useApiSelect';
export { useFormCreateDesigner } from './src/useFormCreateDesigner';

View File

@ -0,0 +1,85 @@
<!-- 数据字典 Select 选择器 -->
<script lang="ts" setup>
import { computed, useAttrs } from 'vue';
import {
Checkbox,
CheckboxGroup,
Radio,
RadioGroup,
Select,
SelectOption,
} from 'ant-design-vue';
import {
getBoolDictOptions,
getIntDictOptions,
getStrDictOptions,
} from '#/utils/dict';
//
interface Props {
dictType: string; //
valueType?: 'bool' | 'int' | 'str'; //
selectType?: 'checkbox' | 'radio' | 'select'; // select checkbox radio
// eslint-disable-next-line vue/require-default-prop
formCreateInject?: any;
}
defineOptions({ name: 'DictSelect' });
const props = withDefaults(defineProps<Props>(), {
valueType: 'str',
selectType: 'select',
});
const attrs = useAttrs();
//
const getDictOptions = computed(() => {
switch (props.valueType) {
case 'bool': {
return getBoolDictOptions(props.dictType);
}
case 'int': {
return getIntDictOptions(props.dictType);
}
case 'str': {
return getStrDictOptions(props.dictType);
}
default: {
return [];
}
}
});
</script>
<template>
<Select v-if="selectType === 'select'" class="w-1/1" v-bind="attrs">
<SelectOption
v-for="(dict, index) in getDictOptions"
:key="index"
:value="dict.value"
>
{{ dict.label }}
</SelectOption>
</Select>
<RadioGroup v-if="selectType === 'radio'" class="w-1/1" v-bind="attrs">
<Radio
v-for="(dict, index) in getDictOptions"
:key="index"
:value="dict.value"
>
{{ dict.label }}
</Radio>
</RadioGroup>
<CheckboxGroup v-if="selectType === 'checkbox'" class="w-1/1" v-bind="attrs">
<Checkbox
v-for="(dict, index) in getDictOptions"
:key="index"
:value="dict.value"
>
{{ dict.label }}
</Checkbox>
</CheckboxGroup>
</template>

View File

@ -0,0 +1,280 @@
import type { ApiSelectProps } from '#/components/FormCreate/src/type';
import { defineComponent, onMounted, ref, useAttrs } from 'vue';
import {
Checkbox,
CheckboxGroup,
Radio,
RadioGroup,
Select,
SelectOption,
} from 'ant-design-vue';
import { requestClient } from '#/api/request';
import { isEmpty } from '#/utils/is';
export const useApiSelect = (option: ApiSelectProps) => {
return defineComponent({
name: option.name,
props: {
// 选项标签
labelField: {
type: String,
default: () => option.labelField ?? 'label',
},
// 选项的值
valueField: {
type: String,
default: () => option.valueField ?? 'value',
},
// api 接口
url: {
type: String,
default: () => option.url ?? '',
},
// 请求类型
method: {
type: String,
default: 'GET',
},
// 选项解析函数
parseFunc: {
type: String,
default: '',
},
// 请求参数
data: {
type: String,
default: '',
},
// 选择器类型,下拉框 select、多选框 checkbox、单选框 radio
selectType: {
type: String,
default: 'select',
},
// 是否多选
multiple: {
type: Boolean,
default: false,
},
// 是否远程搜索
remote: {
type: Boolean,
default: false,
},
// 远程搜索时携带的参数
remoteField: {
type: String,
default: 'label',
},
},
setup(props) {
const attrs = useAttrs();
const options = ref<any[]>([]); // 下拉数据
const loading = ref(false); // 是否正在从远程获取数据
const queryParam = ref<any>(); // 当前输入的值
const getOptions = async () => {
options.value = [];
// 接口选择器
if (isEmpty(props.url)) {
return;
}
switch (props.method) {
case 'GET': {
let url: string = props.url;
if (props.remote && queryParam.value !== undefined) {
url = url.includes('?')
? `${url}&${props.remoteField}=${queryParam.value}`
: `${url}?${props.remoteField}=${queryParam.value}`;
}
parseOptions(await requestClient.get(url));
break;
}
case 'POST': {
const data: any = JSON.parse(props.data);
if (props.remote) {
data[props.remoteField] = queryParam.value;
}
parseOptions(await requestClient.post(props.url, data));
break;
}
}
};
function parseOptions(data: any) {
// 情况一:如果有自定义解析函数优先使用自定义解析
if (!isEmpty(props.parseFunc)) {
options.value = parseFunc()?.(data);
return;
}
// 情况二:返回的直接是一个列表
if (Array.isArray(data)) {
parseOptions0(data);
return;
}
// 情况二:返回的是分页数据,尝试读取 list
data = data.list;
if (!!data && Array.isArray(data)) {
parseOptions0(data);
return;
}
// 情况三:不是 yudao-vue-pro 标准返回
console.warn(
`接口[${props.url}] 返回结果不是 yudao-vue-pro 标准返回建议采用自定义解析函数处理`,
);
}
function parseOptions0(data: any[]) {
if (Array.isArray(data)) {
options.value = data.map((item: any) => ({
label: parseExpression(item, props.labelField),
value: parseExpression(item, props.valueField),
}));
return;
}
console.warn(`接口[${props.url}] 返回结果不是一个数组`);
}
function parseFunc() {
let parse: any = null;
if (props.parseFunc) {
// 解析字符串函数
// eslint-disable-next-line no-new-func
parse = new Function(`return ${props.parseFunc}`)();
}
return parse;
}
function parseExpression(data: any, template: string) {
// 检测是否使用了表达式
if (!template.includes('${')) {
return data[template];
}
// 正则表达式匹配模板字符串中的 ${...}
const pattern = /\$\{([^}]*)\}/g;
// 使用replace函数配合正则表达式和回调函数来进行替换
return template.replaceAll(pattern, (_, expr) => {
// expr 是匹配到的 ${} 内的表达式(这里是属性名),从 data 中获取对应的值
const result = data[expr.trim()]; // 去除前后空白,以防用户输入带空格的属性名
if (!result) {
console.warn(
`接口选择器选项模版[${template}][${expr.trim()}] 解析值失败结果为[${result}], 请检查属性名称是否存在于接口返回值中,存在则忽略此条!!!`,
);
}
return result;
});
}
const remoteMethod = async (query: any) => {
if (!query) {
return;
}
loading.value = true;
try {
queryParam.value = query;
await getOptions();
} finally {
loading.value = false;
}
};
onMounted(async () => {
await getOptions();
});
const buildSelect = () => {
if (props.multiple) {
// fix多写此步是为了解决 multiple 属性问题
return (
<Select
class="w-1/1"
loading={loading.value}
mode="multiple"
{...attrs}
// TODO: remote 对等实现
// remote={props.remote}
{...(props.remote && { remoteMethod })}
>
{options.value.map(
(item: { label: any; value: any }, index: any) => (
<SelectOption key={index} value={item.value}>
{item.label}
</SelectOption>
),
)}
</Select>
);
}
return (
<Select
class="w-1/1"
loading={loading.value}
{...attrs}
// remote={props.remote}
{...(props.remote && { remoteMethod })}
>
{options.value.map(
(item: { label: any; value: any }, index: any) => (
<SelectOption key={index} value={item.value}>
{item.label}
</SelectOption>
),
)}
</Select>
);
};
const buildCheckbox = () => {
if (isEmpty(options.value)) {
options.value = [
{ label: '选项1', value: '选项1' },
{ label: '选项2', value: '选项2' },
];
}
return (
<CheckboxGroup class="w-1/1" {...attrs}>
{options.value.map(
(item: { label: any; value: any }, index: any) => (
<Checkbox key={index} value={item.value}>
{item.label}
</Checkbox>
),
)}
</CheckboxGroup>
);
};
const buildRadio = () => {
if (isEmpty(options.value)) {
options.value = [
{ label: '选项1', value: '选项1' },
{ label: '选项2', value: '选项2' },
];
}
return (
<RadioGroup class="w-1/1" {...attrs}>
{options.value.map(
(item: { label: any; value: any }, index: any) => (
<Radio key={index} value={item.value}>
{item.label}
</Radio>
),
)}
</RadioGroup>
);
};
return () => (
<>
{props.selectType === 'select'
? buildSelect()
: props.selectType === 'radio'
? buildRadio()
: // eslint-disable-next-line unicorn/no-nested-ternary
props.selectType === 'checkbox'
? buildCheckbox()
: buildSelect()}
</>
);
},
});
};

View File

@ -0,0 +1,6 @@
export { useDictSelectRule } from './useDictSelectRule';
export { useEditorRule } from './useEditorRule';
export { useSelectRule } from './useSelectRule';
export { useUploadFileRule } from './useUploadFileRule';
export { useUploadImgRule } from './useUploadImgRule';
export { useUploadImgsRule } from './useUploadImgsRule';

View File

@ -0,0 +1,182 @@
/* eslint-disable no-template-curly-in-string */
const selectRule = [
{
type: 'select',
field: 'selectType',
title: '选择器类型',
value: 'select',
options: [
{ label: '下拉框', value: 'select' },
{ label: '单选框', value: 'radio' },
{ label: '多选框', value: 'checkbox' },
],
// 参考 https://www.form-create.com/v3/guide/control 组件联动,单选框和多选框不需要多选属性
control: [
{
value: 'select',
condition: '==',
method: 'hidden',
rule: [
'multiple',
'clearable',
'collapseTags',
'multipleLimit',
'allowCreate',
'filterable',
'noMatchText',
'remote',
'remoteMethod',
'reserveKeyword',
'defaultFirstOption',
'automaticDropdown',
],
},
],
},
{
type: 'switch',
field: 'filterable',
title: '是否可搜索',
},
{ type: 'switch', field: 'multiple', title: '是否多选' },
{
type: 'switch',
field: 'disabled',
title: '是否禁用',
},
{ type: 'switch', field: 'clearable', title: '是否可以清空选项' },
{
type: 'switch',
field: 'collapseTags',
title: '多选时是否将选中值按文字的形式展示',
},
{
type: 'inputNumber',
field: 'multipleLimit',
title: '多选时用户最多可以选择的项目数,为 0 则不限制',
props: { min: 0 },
},
{
type: 'input',
field: 'autocomplete',
title: 'autocomplete 属性',
},
{ type: 'input', field: 'placeholder', title: '占位符' },
{ type: 'switch', field: 'allowCreate', title: '是否允许用户创建新条目' },
{
type: 'input',
field: 'noMatchText',
title: '搜索条件无匹配时显示的文字',
},
{ type: 'input', field: 'noDataText', title: '选项为空时显示的文字' },
{
type: 'switch',
field: 'reserveKeyword',
title: '多选且可搜索时,是否在选中一个选项后保留当前的搜索关键词',
},
{
type: 'switch',
field: 'defaultFirstOption',
title: '在输入框按下回车,选择第一个匹配项',
},
{
type: 'switch',
field: 'popperAppendToBody',
title: '是否将弹出框插入至 body 元素',
value: true,
},
{
type: 'switch',
field: 'automaticDropdown',
title: '对于不可搜索的 Select是否在输入框获得焦点后自动弹出选项菜单',
},
];
const apiSelectRule = [
{
type: 'input',
field: 'url',
title: 'url 地址',
props: {
placeholder: '/system/user/simple-list',
},
},
{
type: 'select',
field: 'method',
title: '请求类型',
value: 'GET',
options: [
{ label: 'GET', value: 'GET' },
{ label: 'POST', value: 'POST' },
],
control: [
{
value: 'GET',
condition: '!=',
method: 'hidden',
rule: [
{
type: 'input',
field: 'data',
title: '请求参数 JSON 格式',
props: {
autosize: true,
type: 'textarea',
placeholder: '{"type": 1}',
},
},
],
},
],
},
{
type: 'input',
field: 'labelField',
title: 'label 属性',
info: '可以使用 el 表达式:${属性},来实现复杂数据组合。如:${nickname}-${id}',
props: {
placeholder: 'nickname',
},
},
{
type: 'input',
field: 'valueField',
title: 'value 属性',
info: '可以使用 el 表达式:${属性},来实现复杂数据组合。如:${nickname}-${id}',
props: {
placeholder: 'id',
},
},
{
type: 'input',
field: 'parseFunc',
title: '选项解析函数',
info: `data 为接口返回值,需要写一个匿名函数解析返回值为选择器 options 列表
(data: any)=>{ label: string; value: any }[]`,
props: {
autosize: true,
rows: { minRows: 2, maxRows: 6 },
type: 'textarea',
placeholder: `
function (data) {
console.log(data)
return data.list.map(item=> ({label: item.nickname,value: item.id}))
}`,
},
},
{
type: 'switch',
field: 'remote',
info: '是否可搜索',
title: '其中的选项是否从服务器远程加载',
},
{
type: 'input',
field: 'remoteField',
title: '请求参数',
info: '远程请求时请求携带的参数名称name',
},
];
export { apiSelectRule, selectRule };

View File

@ -0,0 +1,70 @@
import { onMounted, ref } from 'vue';
import cloneDeep from 'lodash.clonedeep';
import * as DictDataApi from '#/api/system/dict/type';
import { selectRule } from '#/components/FormCreate/src/config/selectRule';
import {
localeProps,
makeRequiredRule,
} from '#/components/FormCreate/src/utils';
import { generateUUID } from '#/utils';
/**
* 使使 useSelectRule
*/
export const useDictSelectRule = () => {
const label = '字典选择器';
const name = 'DictSelect';
const rules = cloneDeep(selectRule);
const dictOptions = ref<{ label: string; value: string }[]>([]); // 字典类型下拉数据
onMounted(async () => {
const data = await DictDataApi.getSimpleDictTypeList();
if (!data || data.length === 0) {
return;
}
dictOptions.value =
data?.map((item: DictDataApi.DictTypeVO) => ({
label: item.name,
value: item.type,
})) ?? [];
});
return {
icon: 'icon-descriptions',
label,
name,
rule() {
return {
type: name,
field: generateUUID(),
title: label,
info: '',
$required: false,
};
},
props(_: any, { t }: any) {
return localeProps(t, `${name}.props`, [
makeRequiredRule(),
{
type: 'select',
field: 'dictType',
title: '字典类型',
value: '',
options: dictOptions.value,
},
{
type: 'select',
field: 'valueType',
title: '字典值类型',
value: 'str',
options: [
{ label: '数字', value: 'int' },
{ label: '字符串', value: 'str' },
{ label: '布尔值', value: 'bool' },
],
},
...rules,
]);
},
};
};

View File

@ -0,0 +1,35 @@
import {
localeProps,
makeRequiredRule,
} from '#/components/FormCreate/src/utils';
import { generateUUID } from '#/utils';
export const useEditorRule = () => {
const label = '富文本';
const name = 'Editor';
return {
icon: 'icon-editor',
label,
name,
rule() {
return {
type: name,
field: generateUUID(),
title: label,
info: '',
$required: false,
};
},
props(_: any, { t }: any) {
return localeProps(t, `${name}.props`, [
makeRequiredRule(),
{
type: 'input',
field: 'height',
title: '高度',
},
{ type: 'switch', field: 'readonly', title: '是否只读' },
]);
},
};
};

View File

@ -0,0 +1,46 @@
import type { SelectRuleOption } from '#/components/FormCreate/src/type';
import cloneDeep from 'lodash.clonedeep';
import { selectRule } from '#/components/FormCreate/src/config/selectRule';
import {
localeProps,
makeRequiredRule,
} from '#/components/FormCreate/src/utils';
import { generateUUID } from '#/utils';
/**
* hook
*
* @param option
*/
export const useSelectRule = (option: SelectRuleOption) => {
const label = option.label;
const name = option.name;
const rules = cloneDeep(selectRule);
return {
icon: option.icon,
label,
name,
event: option.event,
rule() {
return {
type: name,
field: generateUUID(),
title: label,
info: '',
$required: false,
};
},
props(_: any, { t }: any) {
if (!option.props) {
option.props = [];
}
return localeProps(t, `${name}.props`, [
makeRequiredRule(),
...option.props,
...rules,
]);
},
};
};

View File

@ -0,0 +1,83 @@
import {
localeProps,
makeRequiredRule,
} from '#/components/FormCreate/src/utils';
import { generateUUID } from '#/utils';
export const useUploadFileRule = () => {
const label = '文件上传';
const name = 'UploadFile';
return {
icon: 'icon-upload',
label,
name,
rule() {
return {
type: name,
field: generateUUID(),
title: label,
info: '',
$required: false,
};
},
props(_: any, { t }: any) {
return localeProps(t, `${name}.props`, [
makeRequiredRule(),
{
type: 'select',
field: 'fileType',
title: '文件类型',
value: ['doc', 'xls', 'ppt', 'txt', 'pdf'],
options: [
{ label: 'doc', value: 'doc' },
{ label: 'xls', value: 'xls' },
{ label: 'ppt', value: 'ppt' },
{ label: 'txt', value: 'txt' },
{ label: 'pdf', value: 'pdf' },
],
props: {
multiple: true,
},
},
{
type: 'switch',
field: 'autoUpload',
title: '是否在选取文件后立即进行上传',
value: true,
},
{
type: 'switch',
field: 'drag',
title: '拖拽上传',
value: false,
},
{
type: 'switch',
field: 'isShowTip',
title: '是否显示提示',
value: true,
},
{
type: 'inputNumber',
field: 'fileSize',
title: '大小限制(MB)',
value: 5,
props: { min: 0 },
},
{
type: 'inputNumber',
field: 'limit',
title: '数量限制',
value: 5,
props: { min: 0 },
},
{
type: 'switch',
field: 'disabled',
title: '是否禁用',
value: false,
},
]);
},
};
};

View File

@ -0,0 +1,92 @@
import {
localeProps,
makeRequiredRule,
} from '#/components/FormCreate/src/utils';
import { generateUUID } from '#/utils';
export const useUploadImgRule = () => {
const label = '单图上传';
const name = 'UploadImg';
return {
icon: 'icon-image',
label,
name,
rule() {
return {
type: name,
field: generateUUID(),
title: label,
info: '',
$required: false,
};
},
props(_: any, { t }: any) {
return localeProps(t, `${name}.props`, [
makeRequiredRule(),
{
type: 'switch',
field: 'drag',
title: '拖拽上传',
value: false,
},
{
type: 'select',
field: 'fileType',
title: '图片类型限制',
value: ['image/jpeg', 'image/png', 'image/gif'],
options: [
{ label: 'image/apng', value: 'image/apng' },
{ label: 'image/bmp', value: 'image/bmp' },
{ label: 'image/gif', value: 'image/gif' },
{ label: 'image/jpeg', value: 'image/jpeg' },
{ label: 'image/pjpeg', value: 'image/pjpeg' },
{ label: 'image/svg+xml', value: 'image/svg+xml' },
{ label: 'image/tiff', value: 'image/tiff' },
{ label: 'image/webp', value: 'image/webp' },
{ label: 'image/x-icon', value: 'image/x-icon' },
],
props: {
multiple: true,
},
},
{
type: 'inputNumber',
field: 'fileSize',
title: '大小限制(MB)',
value: 5,
props: { min: 0 },
},
{
type: 'input',
field: 'height',
title: '组件高度',
value: '150px',
},
{
type: 'input',
field: 'width',
title: '组件宽度',
value: '150px',
},
{
type: 'input',
field: 'borderradius',
title: '组件边框圆角',
value: '8px',
},
{
type: 'switch',
field: 'disabled',
title: '是否显示删除按钮',
value: true,
},
{
type: 'switch',
field: 'showBtnText',
title: '是否显示按钮文字',
value: true,
},
]);
},
};
};

View File

@ -0,0 +1,87 @@
import {
localeProps,
makeRequiredRule,
} from '#/components/FormCreate/src/utils';
import { generateUUID } from '#/utils';
export const useUploadImgsRule = () => {
const label = '多图上传';
const name = 'UploadImgs';
return {
icon: 'icon-image',
label,
name,
rule() {
return {
type: name,
field: generateUUID(),
title: label,
info: '',
$required: false,
};
},
props(_: any, { t }: any) {
return localeProps(t, `${name}.props`, [
makeRequiredRule(),
{
type: 'switch',
field: 'drag',
title: '拖拽上传',
value: false,
},
{
type: 'select',
field: 'fileType',
title: '图片类型限制',
value: ['image/jpeg', 'image/png', 'image/gif'],
options: [
{ label: 'image/apng', value: 'image/apng' },
{ label: 'image/bmp', value: 'image/bmp' },
{ label: 'image/gif', value: 'image/gif' },
{ label: 'image/jpeg', value: 'image/jpeg' },
{ label: 'image/pjpeg', value: 'image/pjpeg' },
{ label: 'image/svg+xml', value: 'image/svg+xml' },
{ label: 'image/tiff', value: 'image/tiff' },
{ label: 'image/webp', value: 'image/webp' },
{ label: 'image/x-icon', value: 'image/x-icon' },
],
props: {
multiple: true,
},
},
{
type: 'inputNumber',
field: 'fileSize',
title: '大小限制(MB)',
value: 5,
props: { min: 0 },
},
{
type: 'inputNumber',
field: 'limit',
title: '数量限制',
value: 5,
props: { min: 0 },
},
{
type: 'input',
field: 'height',
title: '组件高度',
value: '150px',
},
{
type: 'input',
field: 'width',
title: '组件宽度',
value: '150px',
},
{
type: 'input',
field: 'borderradius',
title: '组件边框圆角',
value: '8px',
},
]);
},
};
};

View File

@ -0,0 +1,52 @@
import type { Rule } from '@form-create/ant-design-vue'; // 左侧拖拽按钮
// 左侧拖拽按钮
// 左侧拖拽按钮
export interface MenuItem {
label: string;
name: string;
icon: string;
}
// 左侧拖拽按钮分类
export interface Menu {
title: string;
name: string;
list: MenuItem[];
}
export type MenuList = Array<Menu>;
// 拖拽组件的规则
export interface DragRule {
icon: string;
name: string;
label: string;
children?: string;
inside?: true;
drag?: string | true;
dragBtn?: false;
mask?: false;
rule(): Rule;
props(v: any, v1: any): Rule[];
}
// 通用下拉组件 Props 类型
export interface ApiSelectProps {
name: string; // 组件名称
labelField?: string; // 选项标签
valueField?: string; // 选项的值
url?: string; // url 接口
isDict?: boolean; // 是否字典选择器
}
// 选择组件规则配置类型
export interface SelectRuleOption {
label: string; // label 名称
name: string; // 组件名称
icon: string; // 组件图标
props?: any[]; // 组件规则
event?: any[]; // 事件配置
}

View File

@ -0,0 +1,116 @@
import type { Ref } from 'vue';
import type { Menu } from '#/components/FormCreate/src/type';
import { nextTick, onMounted } from 'vue';
import { apiSelectRule } from '#/components/FormCreate/src/config/selectRule';
import {
useDictSelectRule,
useEditorRule,
useSelectRule,
useUploadFileRule,
useUploadImgRule,
useUploadImgsRule,
} from './config';
/**
* hook
*
* -
* -
* -
* -
* -
* -
* -
*/
export const useFormCreateDesigner = async (designer: Ref) => {
const editorRule = useEditorRule();
const uploadFileRule = useUploadFileRule();
const uploadImgRule = useUploadImgRule();
const uploadImgsRule = useUploadImgsRule();
/**
*
*/
const buildFormComponents = () => {
// 移除自带的上传组件规则,使用 uploadFileRule、uploadImgRule、uploadImgsRule 替代
designer.value?.removeMenuItem('upload');
// 移除自带的富文本组件规则,使用 editorRule 替代
designer.value?.removeMenuItem('fc-editor');
const components = [
editorRule,
uploadFileRule,
uploadImgRule,
uploadImgsRule,
];
components.forEach((component) => {
// 插入组件规则
designer.value?.addComponent(component);
// 插入拖拽按钮到 `main` 分类下
designer.value?.appendMenuItem('main', {
icon: component.icon,
name: component.name,
label: component.label,
});
});
};
const userSelectRule = useSelectRule({
name: 'UserSelect',
label: '用户选择器',
icon: 'icon-eye',
});
const deptSelectRule = useSelectRule({
name: 'DeptSelect',
label: '部门选择器',
icon: 'icon-tree',
});
const dictSelectRule = useDictSelectRule();
const apiSelectRule0 = useSelectRule({
name: 'ApiSelect',
label: '接口选择器',
icon: 'icon-json',
props: [...apiSelectRule],
event: ['click', 'change', 'visibleChange', 'clear', 'blur', 'focus'],
});
/**
*
*/
const buildSystemMenu = () => {
// 移除自带的下拉选择器组件,使用 currencySelectRule 替代
// designer.value?.removeMenuItem('select')
// designer.value?.removeMenuItem('radio')
// designer.value?.removeMenuItem('checkbox')
const components = [
userSelectRule,
deptSelectRule,
dictSelectRule,
apiSelectRule0,
];
const menu: Menu = {
name: 'system',
title: '系统字段',
list: components.map((component) => {
// 插入组件规则
designer.value?.addComponent(component);
// 插入拖拽按钮到 `system` 分类下
return {
icon: component.icon,
name: component.name,
label: component.label,
};
}),
};
designer.value?.addMenu(menu);
};
onMounted(async () => {
await nextTick();
buildFormComponents();
buildSystemMenu();
});
};

View File

@ -0,0 +1,65 @@
export function makeRequiredRule() {
return {
type: 'Required',
field: 'formCreate$required',
title: '是否必填',
};
}
export const localeProps = (
t: (msg: string) => any,
prefix: string,
rules: any[],
) => {
return rules.map((rule: { field: string; title: any }) => {
if (rule.field === 'formCreate$required') {
rule.title = t('props.required') || rule.title;
} else if (rule.field && rule.field !== '_optionType') {
rule.title = t(`components.${prefix}.${rule.field}`) || rule.title;
}
return rule;
});
};
/**
* field, title
*
* @param rule https://www.form-create.com/v3/guide/rule
* @param fields
* @param parentTitle
*/
export const parseFormFields = (
rule: Record<string, any>,
fields: Array<Record<string, any>> = [],
parentTitle: string = '',
) => {
const { type, field, $required, title: tempTitle, children } = rule;
if (field && tempTitle) {
let title = tempTitle;
if (parentTitle) {
title = `${parentTitle}.${tempTitle}`;
}
let required = false;
if ($required) {
required = true;
}
fields.push({
field,
title,
type,
required,
});
// TODO 子表单 需要处理子表单字段
// if (type === 'group' && rule.props?.rule && Array.isArray(rule.props.rule)) {
// // 解析子表单的字段
// rule.props.rule.forEach((item) => {
// parseFields(item, fieldsPermission, title)
// })
// }
}
if (children && Array.isArray(children)) {
children.forEach((rule) => {
parseFormFields(rule, fields);
});
}
};

View File

@ -1,57 +1,71 @@
<script setup lang="ts">
// TODO @ src
import { computed, defineProps } from 'vue'
import { Tag } from 'ant-design-vue'
import { computed } from 'vue';
import { Tag } from 'ant-design-vue';
// import { isHexColor } from '@/utils/color' // TODO @ cssClass https://gitee.com/yudaocode/yudao-ui-admin-vben/blob/v2.4.1/src/components/DictTag/src/DictTag.vue#L60
import { getDictObj } from '#/utils/dict'
import { getDictObj } from '#/utils/dict';
interface DictTagProps {
/**
* 字典类型
*/
type: string
type: string;
/**
* 字典值
*/
value: any
value: any;
/**
* 图标
*/
icon?: string
icon?: string;
}
const props = defineProps<DictTagProps>()
const props = defineProps<DictTagProps>();
/** 获取字典标签 */
const dictTag = computed(() => {
//
if (!props.type || props.value === undefined || props.value === null) {
return null
return null;
}
//
const dict = getDictObj(props.type, String(props.value))
const dict = getDictObj(props.type, String(props.value));
if (!dict) {
return null
return null;
}
//
let colorType = dict.colorType
if (colorType === 'primary') {
colorType = 'processing'
} else if (colorType === 'danger') {
colorType = 'error'
} else if (colorType === 'info') {
colorType = 'default'
} else if (!colorType) {
colorType = 'default'
let colorType = dict.colorType;
switch (colorType) {
case 'danger': {
colorType = 'error';
break;
}
case 'info': {
colorType = 'default';
break;
}
case 'primary': {
colorType = 'processing';
break;
}
default: {
if (!colorType) {
colorType = 'default';
}
}
}
return {
label: dict.label || '',
colorType
}
})
colorType,
};
});
</script>
<template>

View File

@ -1,3 +1 @@
import DictTag from './dict-tag.vue'
export { DictTag }
export { default as DictTag } from './dict-tag.vue';

View File

@ -1,6 +1,7 @@
<script lang="ts" setup>
// TODO @ src
import { computed } from 'vue';
import { Alert, Typography } from 'ant-design-vue';
export interface DocAlertProps {
@ -28,12 +29,7 @@ const isEnabled = computed(() => {
</script>
<template>
<Alert
v-if="isEnabled"
type="info"
show-icon
class="mb-2 rounded"
>
<Alert v-if="isEnabled" type="info" show-icon class="mb-2 rounded">
<template #message>
<Typography.Link @click="goToUrl">
{{ title }}文档地址{{ url }}

View File

@ -1,3 +1 @@
import DocAlert from './doc-alert.vue'
export { DocAlert }
export { default as DocAlert } from './doc-alert.vue';

View File

@ -1,35 +1,41 @@
<script setup lang="ts">
// TODO @ src
import { onMounted, ref } from 'vue'
import { onMounted, ref } from 'vue';
interface IFrameProps {
/**
* iframe 的源地址
*/
src: string
src: string;
}
const props = defineProps<IFrameProps>()
const props = defineProps<IFrameProps>();
const loading = ref(true)
const height = ref('')
const frameRef = ref<HTMLElement | null>(null)
const loading = ref(true);
const height = ref('');
const frameRef = ref<HTMLElement | null>(null);
function init() {
height.value = `${document.documentElement.clientHeight - 94.5}px`
loading.value = false
height.value = `${document.documentElement.clientHeight - 94.5}px`;
loading.value = false;
}
onMounted(() => {
setTimeout(() => {
init()
}, 300)
})
init();
}, 300);
});
// TODO @使 vben
</script>
<template>
<div v-loading="loading" :style="`height:${height}`">
<iframe ref="frameRef" :src="props.src" style="width: 100%; height: 100%" frameborder="no" scrolling="auto" />
<iframe
ref="frameRef"
:src="props.src"
style="width: 100%; height: 100%"
frameborder="no"
scrolling="auto"
></iframe>
</div>
</template>

View File

@ -1,3 +1 @@
import IFrame from './iframe.vue'
export { IFrame }
export { default as IFrame } from './iframe.vue';

View File

@ -1,11 +1,8 @@
<script lang="ts" setup>
import type { Editor as EditorType } from 'tinymce/tinymce';
import type { IPropTypes } from '@tinymce/tinymce-vue/lib/cjs/main/ts/components/EditorPropTypes';
type InitOptions = IPropTypes['init'];
import type { PropType } from 'vue';
import type { Editor as EditorType } from 'tinymce/tinymce';
import Editor from '@tinymce/tinymce-vue';
import ImgUpload from './img-upload.vue';
import type { PropType } from 'vue';
import {
computed,
@ -21,12 +18,21 @@ import {
} from 'vue';
import { preferences, usePreferences } from '@vben/preferences';
import { buildShortUUID, isNumber } from '@vben/utils';
import Editor from '@tinymce/tinymce-vue';
import { isNumber, buildShortUUID } from '@vben/utils';
import { bindHandlers } from './helper';
import { plugins as defaultPlugins, toolbar as defaultToolbar } from './tinymce';
import { useUpload } from '#/components/upload/use-upload';
import { bindHandlers } from './helper';
import ImgUpload from './img-upload.vue';
import {
plugins as defaultPlugins,
toolbar as defaultToolbar,
} from './tinymce';
type InitOptions = IPropTypes['init'];
defineOptions({ inheritAttrs: false });
const props = defineProps({
@ -151,11 +157,11 @@ const initOptions = computed((): InitOptions => {
const { httpRequest } = useUpload();
httpRequest(file)
.then((url) => {
console.log('tinymce 上传图片成功:', url);
// console.log('tinymce :', url);
resolve(url);
})
.catch((error) => {
console.error('tinymce 上传图片失败:', error);
// console.error('tinymce :', error);
reject(error.message);
});
});
@ -300,8 +306,8 @@ function handleError(name: string) {
if (!editor) {
return;
}
const content = editor?.getContent()?? '';
const val = content?.replace(getUploadingImgName(name), '')?? '';
const content = editor?.getContent() ?? '';
const val = content?.replace(getUploadingImgName(name), '') ?? '';
setValue(editor, val);
}
</script>

View File

@ -1,10 +1,12 @@
<script lang="ts" setup>
import type { UploadRequestOption } from 'ant-design-vue/lib/vc-upload/interface';
import { Upload, Button } from 'ant-design-vue';
import { computed, ref } from 'vue';
import { $t } from '@vben/locales';
import { computed, ref } from 'vue';
import { Button, Upload } from 'ant-design-vue';
import { useUpload } from '#/components/upload/use-upload';
defineOptions({ name: 'TinymceImageUpload' });
@ -14,7 +16,8 @@ const props = defineProps({
default: false,
type: Boolean,
},
fullscreen: { //
fullscreen: {
//
default: false,
type: Boolean,
},
@ -45,7 +48,7 @@ async function customRequest(info: UploadRequestOption<any>) {
try {
const url = await httpRequest(file);
emit('done', name, url);
} catch (e) {
} catch {
emit('error', name);
} finally {
uploading.value = false;

View File

@ -1,15 +1,19 @@
<script lang="ts" setup>
import type { UploadFile, UploadProps } from 'ant-design-vue';
import type { UploadRequestOption } from 'ant-design-vue/lib/vc-upload/interface';
import type { AxiosProgressEvent } from '#/api/infra/file';
import type { AxiosResponse } from '@vben/request';
import { CloudUpload } from '@vben/icons';
import { message, Upload, Button } from 'ant-design-vue';
import type { AxiosProgressEvent } from '#/api/infra/file';
import { $t } from '@vben/locales';
import { ref, toRefs, watch } from 'vue';
import { CloudUpload } from '@vben/icons';
import { $t } from '@vben/locales';
import { isFunction, isObject, isString } from '@vben/utils';
import { Button, message, Upload } from 'ant-design-vue';
import { checkFileType } from './helper';
import { UploadResultStatus } from './typing';
import { useUpload, useUploadType } from './use-upload';
@ -36,7 +40,7 @@ const props = withDefaults(
resultField?: string;
//
showDescription?: boolean;
value?: string[] | string;
value?: string | string[];
}>(),
{
value: () => [],

View File

@ -3,7 +3,7 @@ export function checkFileType(file: File, accepts: string[]) {
return true;
}
const newTypes = accepts.join('|');
const reg = new RegExp('\\.(' + newTypes + ')$', 'i');
const reg = new RegExp(`${String.raw`\.(` + newTypes})$`, 'i');
return reg.test(file.name);
}
@ -12,6 +12,9 @@ export function checkFileType(file: File, accepts: string[]) {
*/
export const defaultImageAccepts = ['jpg', 'jpeg', 'png', 'gif', 'webp'];
export function checkImgType(file: File, accepts: string[] = defaultImageAccepts) {
export function checkImgType(
file: File,
accepts: string[] = defaultImageAccepts,
) {
return checkFileType(file, accepts);
}

View File

@ -1,19 +1,25 @@
<script lang="ts" setup>
import type { UploadFile, UploadProps } from 'ant-design-vue';
import type { UploadRequestOption } from 'ant-design-vue/lib/vc-upload/interface';
import type { AxiosProgressEvent } from '#/api/infra/file';
import type { AxiosResponse } from '@vben/request';
import { CloudUpload } from '@vben/icons';
import { message, Upload, Modal } from 'ant-design-vue';
import type { AxiosProgressEvent } from '#/api/infra/file';
import { $t } from '@vben/locales';
import { ref, toRefs, watch } from 'vue';
import { CloudUpload } from '@vben/icons';
import { $t } from '@vben/locales';
import { isFunction, isObject, isString } from '@vben/utils';
import { message, Modal, Upload } from 'ant-design-vue';
import { checkImgType, defaultImageAccepts } from './helper';
import { UploadResultStatus } from './typing';
import { useUpload, useUploadType } from './use-upload';
type ListType = 'picture' | 'picture-card' | 'text';
defineOptions({ name: 'ImageUpload', inheritAttrs: false });
const props = withDefaults(
@ -37,7 +43,7 @@ const props = withDefaults(
resultField?: string;
//
showDescription?: boolean;
value?: string[] | string;
value?: string | string[];
}>(),
{
value: () => [],
@ -54,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<boolean>(false);
const { getStringAccept } = useUploadType({
@ -231,7 +236,10 @@ function getValue() {
@preview="handlePreview"
@remove="handleRemove"
>
<div v-if="fileList && fileList.length < maxNumber" class="flex flex-col items-center justify-center">
<div
v-if="fileList && fileList.length < maxNumber"
class="flex flex-col items-center justify-center"
>
<CloudUpload />
<div class="mt-2">{{ $t('ui.upload.imgUpload') }}</div>
</div>
@ -241,7 +249,7 @@ function getValue() {
class="mt-2 flex flex-wrap items-center text-[14px]"
>
请上传不超过
<div class="mx-1 font-bold text-primary">{{ maxSize }}MB</div>
<div class="text-primary mx-1 font-bold">{{ maxSize }}MB</div>
<div class="text-primary mx-1 font-bold">{{ accept.join('/') }}</div>
格式文件

View File

@ -1,11 +1,25 @@
import type { Ref } from 'vue';
import type { AxiosProgressEvent, InfraFileApi } from '#/api/infra/file';
import { computed, unref } from 'vue';
import { $t } from '@vben/locales';
import CryptoJS from 'crypto-js'
import axios from 'axios'
import { uploadFile, getFilePresignedUrl, createFile } from '#/api/infra/file';
import axios from 'axios';
import CryptoJS from 'crypto-js';
import { createFile, getFilePresignedUrl, uploadFile } from '#/api/infra/file';
/**
*
*/
enum UPLOAD_TYPE {
// 客户端直接上传只支持S3服务
CLIENT = 'client',
// 客户端发送到后端上传
SERVER = 'server',
}
export function useUploadType({
acceptRef,
@ -66,48 +80,54 @@ export function useUploadType({
// TODO @芋艿:目前保持和 admin-vue3 一致,后续可能重构
export const useUpload = () => {
// 后端上传地址
const uploadUrl = getUploadUrl()
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 生成文件名称
const fileName = await generateFileName(file)
const fileName = await generateFileName(file);
// 1.2 获取文件预签名地址
const presignedInfo = await getFilePresignedUrl(fileName)
const presignedInfo = await getFilePresignedUrl(fileName);
// 1.3 上传文件
return axios
.put(presignedInfo.uploadUrl, file, {
headers: {
'Content-Type': file.type
}
'Content-Type': file.type,
},
})
.then(() => {
// 1.4. 记录文件信息到后端(异步)
createFile0(presignedInfo, fileName, file)
createFile0(presignedInfo, fileName, file);
// 通知成功,数据格式保持与后端上传的返回结果一致
return { data: presignedInfo.url }
})
return { data: presignedInfo.url };
});
} else {
// 模式二:后端上传
return uploadFile({ file }, onUploadProgress);
}
}
};
return {
uploadUrl,
httpRequest
}
}
httpRequest,
};
};
/**
* URL
*/
export const getUploadUrl = (): string => {
return import.meta.env.VITE_BASE_URL + import.meta.env.VITE_GLOB_API_URL + '/infra/file/upload'
}
return `${
import.meta.env.VITE_BASE_URL + import.meta.env.VITE_GLOB_API_URL
}/infra/file/upload`;
};
/**
*
@ -116,17 +136,21 @@ 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,
path: name,
name: file.name,
type: file.type,
size: file.size
}
createFile(fileVO)
return fileVO
size: file.size,
};
createFile(fileVO);
return fileVO;
}
/**
@ -136,21 +160,11 @@ function createFile0(vo: InfraFileApi.FilePresignedUrlRespVO, name: string, file
*/
async function generateFileName(file: File) {
// 读取文件内容
const data = await file.arrayBuffer()
const wordArray = CryptoJS.lib.WordArray.create(data)
const data = await file.arrayBuffer();
const wordArray = CryptoJS.lib.WordArray.create(data);
// 计算SHA256
const sha256 = CryptoJS.SHA256(wordArray).toString()
const sha256 = CryptoJS.SHA256(wordArray).toString();
// 拼接后缀
const ext = file.name.substring(file.name.lastIndexOf('.'))
return `${sha256}${ext}`
}
/**
*
*/
enum UPLOAD_TYPE {
// 客户端直接上传只支持S3服务
CLIENT = 'client',
// 客户端发送到后端上传
SERVER = 'server'
const ext = file.name.slice(Math.max(0, file.name.lastIndexOf('.')));
return `${sha256}${ext}`;
}

View File

@ -0,0 +1,5 @@
{
"copy": "Copy",
"copySuccess": "Copy Success",
"copyError": "Copy Error"
}

View File

@ -0,0 +1,5 @@
{
"copy": "复制",
"copySuccess": "复制成功",
"copyError": "复制失败"
}

View File

@ -0,0 +1,47 @@
import type { App } from 'vue';
// import install from '@form-create/ant-design-vue/auto-import';
import FcDesigner from '@form-create/antd-designer';
import Antd from 'ant-design-vue';
// ======================= 自定义组件 =======================
import { useApiSelect } from '#/components/FormCreate';
// import { UploadFile, UploadImg, UploadImgs } from '#/components/UploadFile';
// import DictSelect from '#/components/FormCreate/src/components/DictSelect.vue';
const UserSelect = useApiSelect({
name: 'UserSelect',
labelField: 'nickname',
valueField: 'id',
url: '/system/user/simple-list',
});
const DeptSelect = useApiSelect({
name: 'DeptSelect',
labelField: 'name',
valueField: 'id',
url: '/system/dept/simple-list',
});
const ApiSelect = useApiSelect({
name: 'ApiSelect',
});
const components = [
// UploadImg,
// UploadImgs,
// UploadFile,
// DictSelect,
UserSelect,
DeptSelect,
ApiSelect,
];
// 参考 http://www.form-create.com/v3/ant-design-vue/auto-import.html 文档
export const setupFormCreate = (app: App<Element>) => {
components.forEach((component) => {
app.component(component.name as string, component);
});
app.use(Antd);
app.use(FcDesigner);
// formCreate.use(install);
app.use(FcDesigner.formCreate);
};

View File

@ -5,11 +5,11 @@ import type {
import { generateAccessible } from '@vben/access';
import { preferences } from '@vben/preferences';
import { BasicLayout, IFrameView } from '#/layouts';
import { useAccessStore } from '@vben/stores';
import { convertServerMenuToRouteRecordStringComponent } from '@vben/utils';
import { BasicLayout, IFrameView } from '#/layouts';
const forbiddenComponent = () => import('#/views/_core/fallback/forbidden.vue');
async function generateAccess(options: GenerateMenuAndRoutesOptions) {

View File

@ -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

View File

@ -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'),
},
}
},
],
},
];

View File

@ -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 };

View File

@ -2,6 +2,7 @@ import type { RouteRecordRaw } from 'vue-router';
import { $t } from '#/locales';
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const routes: RouteRecordRaw[] = [
{
meta: {

View File

@ -11,6 +11,7 @@ import {
import { IFrameView } from '#/layouts';
import { $t } from '#/locales';
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const routes: RouteRecordRaw[] = [
{
meta: {

View File

@ -1,4 +1,6 @@
import type { AuthPermissionInfo, Recordable, UserInfo} from '@vben/types';
import type { AuthPermissionInfo, Recordable, UserInfo } from '@vben/types';
import type { AuthApi } from '#/api';
import { ref } from 'vue';
import { useRouter } from 'vue-router';
@ -9,7 +11,14 @@ import { resetAllStores, useAccessStore, useUserStore } from '@vben/stores';
import { notification } from 'ant-design-vue';
import { defineStore } from 'pinia';
import { type AuthApi, getAuthPermissionInfoApi, loginApi, logoutApi, smsLogin, register, socialLogin } from '#/api';
import {
getAuthPermissionInfoApi,
loginApi,
logoutApi,
register,
smsLogin,
socialLogin,
} from '#/api';
import { $t } from '#/locales';
export const useAuthStore = defineStore('auth', () => {
@ -27,7 +36,7 @@ export const useAuthStore = defineStore('auth', () => {
* @param onSuccess
*/
async function authLogin(
type: 'mobile' | 'username' | 'register' | 'social',
type: 'mobile' | 'register' | 'social' | 'username',
params: Recordable<any>,
onSuccess?: () => Promise<void> | void,
) {
@ -35,10 +44,26 @@ export const useAuthStore = defineStore('auth', () => {
let userInfo: null | UserInfo = null;
try {
loginLoading.value = true;
const { accessToken, refreshToken } = type === 'mobile' ? await smsLogin(params as AuthApi.SmsLoginParams)
: type === 'register' ? await register(params as AuthApi.RegisterParams)
: type === 'social' ? await socialLogin(params as AuthApi.SocialLoginParams)
: await loginApi(params);
let loginResult: AuthApi.LoginResult;
switch (type) {
case 'mobile': {
loginResult = await smsLogin(params as AuthApi.SmsLoginParams);
break;
}
case 'register': {
loginResult = await register(params as AuthApi.RegisterParams);
break;
}
case 'social': {
loginResult = await socialLogin(params as AuthApi.SocialLoginParams);
break;
}
default: {
loginResult = await loginApi(params);
break;
}
}
const { accessToken, refreshToken } = loginResult;
// 如果成功获取到 accessToken
if (accessToken) {

View File

@ -9,14 +9,14 @@
// 全局通用状态枚举
export const CommonStatusEnum = {
ENABLE: 0, // 开启
DISABLE: 1 // 禁用
}
DISABLE: 1, // 禁用
};
// 全局用户类型枚举
export const UserTypeEnum = {
MEMBER: 1, // 会员
ADMIN: 2 // 管理员
}
ADMIN: 2, // 管理员
};
// ========== SYSTEM 模块 ==========
/**
@ -25,16 +25,16 @@ export const UserTypeEnum = {
export const SystemMenuTypeEnum = {
DIR: 1, // 目录
MENU: 2, // 菜单
BUTTON: 3 // 按钮
}
BUTTON: 3, // 按钮
};
/**
*
*/
export const SystemRoleTypeEnum = {
SYSTEM: 1, // 内置角色
CUSTOM: 2 // 自定义角色
}
CUSTOM: 2, // 自定义角色
};
/**
*
@ -44,8 +44,8 @@ export const SystemDataScopeEnum = {
DEPT_CUSTOM: 2, // 指定部门数据权限
DEPT_ONLY: 3, // 部门数据权限
DEPT_AND_CHILD: 4, // 部门及以下数据权限
DEPT_SELF: 5 // 仅本人数据权限
}
DEPT_SELF: 5, // 仅本人数据权限
};
/**
*
@ -55,15 +55,15 @@ export const SystemUserSocialTypeEnum = {
title: '钉钉',
type: 20,
source: 'dingtalk',
img: 'https://s1.ax1x.com/2022/05/22/OzMDRs.png'
img: 'https://s1.ax1x.com/2022/05/22/OzMDRs.png',
},
WECHAT_ENTERPRISE: {
title: '企业微信',
type: 30,
source: 'wechat_enterprise',
img: 'https://s1.ax1x.com/2022/05/22/OzMrzn.png'
}
}
img: 'https://s1.ax1x.com/2022/05/22/OzMrzn.png',
},
};
// ========== INFRA 模块 ==========
/**
@ -72,8 +72,8 @@ export const SystemUserSocialTypeEnum = {
export const InfraCodegenTemplateTypeEnum = {
CRUD: 1, // 基础 CRUD
TREE: 2, // 树形 CRUD
SUB: 15 // 主子表 CRUD
}
SUB: 15, // 主子表 CRUD
};
/**
*
@ -81,8 +81,8 @@ export const InfraCodegenTemplateTypeEnum = {
export const InfraJobStatusEnum = {
INIT: 0, // 初始化中
NORMAL: 1, // 运行中
STOP: 2 // 暂停运行
}
STOP: 2, // 暂停运行
};
/**
* API
@ -90,8 +90,8 @@ export const InfraJobStatusEnum = {
export const InfraApiErrorLogProcessStatusEnum = {
INIT: 0, // 未处理
DONE: 1, // 已处理
IGNORE: 2 // 已忽略
}
IGNORE: 2, // 已忽略
};
// ========== PAY 模块 ==========
/**
@ -100,78 +100,78 @@ export const InfraApiErrorLogProcessStatusEnum = {
export const PayChannelEnum = {
WX_PUB: {
code: 'wx_pub',
name: '微信 JSAPI 支付'
name: '微信 JSAPI 支付',
},
WX_LITE: {
code: 'wx_lite',
name: '微信小程序支付'
name: '微信小程序支付',
},
WX_APP: {
code: 'wx_app',
name: '微信 APP 支付'
name: '微信 APP 支付',
},
WX_NATIVE: {
code: 'wx_native',
name: '微信 Native 支付'
name: '微信 Native 支付',
},
WX_WAP: {
code: 'wx_wap',
name: '微信 WAP 网站支付'
name: '微信 WAP 网站支付',
},
WX_BAR: {
code: 'wx_bar',
name: '微信条码支付'
name: '微信条码支付',
},
ALIPAY_PC: {
code: 'alipay_pc',
name: '支付宝 PC 网站支付'
name: '支付宝 PC 网站支付',
},
ALIPAY_WAP: {
code: 'alipay_wap',
name: '支付宝 WAP 网站支付'
name: '支付宝 WAP 网站支付',
},
ALIPAY_APP: {
code: 'alipay_app',
name: '支付宝 APP 支付'
name: '支付宝 APP 支付',
},
ALIPAY_QR: {
code: 'alipay_qr',
name: '支付宝扫码支付'
name: '支付宝扫码支付',
},
ALIPAY_BAR: {
code: 'alipay_bar',
name: '支付宝条码支付'
name: '支付宝条码支付',
},
WALLET: {
code: 'wallet',
name: '钱包支付'
name: '钱包支付',
},
MOCK: {
code: 'mock',
name: '模拟支付'
}
}
name: '模拟支付',
},
};
/**
*
*/
export const PayDisplayModeEnum = {
URL: {
mode: 'url'
mode: 'url',
},
IFRAME: {
mode: 'iframe'
mode: 'iframe',
},
FORM: {
mode: 'form'
mode: 'form',
},
QR_CODE: {
mode: 'qr_code'
mode: 'qr_code',
},
APP: {
mode: 'app'
}
}
mode: 'app',
},
};
/**
*
@ -179,8 +179,8 @@ export const PayDisplayModeEnum = {
export const PayType = {
WECHAT: 'WECHAT',
ALIPAY: 'ALIPAY',
MOCK: 'MOCK'
}
MOCK: 'MOCK',
};
/**
*
@ -188,17 +188,17 @@ export const PayType = {
export const PayOrderStatusEnum = {
WAITING: {
status: 0,
name: '未支付'
name: '未支付',
},
SUCCESS: {
status: 10,
name: '已支付'
name: '已支付',
},
CLOSED: {
status: 20,
name: '未支付'
}
}
name: '未支付',
},
};
// ========== MALL - 商品模块 ==========
/**
@ -207,17 +207,17 @@ export const PayOrderStatusEnum = {
export const ProductSpuStatusEnum = {
RECYCLE: {
status: -1,
name: '回收站'
name: '回收站',
},
DISABLE: {
status: 0,
name: '下架'
name: '下架',
},
ENABLE: {
status: 1,
name: '上架'
}
}
name: '上架',
},
};
// ========== MALL - 营销模块 ==========
/**
@ -226,13 +226,13 @@ export const ProductSpuStatusEnum = {
export const CouponTemplateValidityTypeEnum = {
DATE: {
type: 1,
name: '固定日期可用'
name: '固定日期可用',
},
TERM: {
type: 2,
name: '领取之后可用'
}
}
name: '领取之后可用',
},
};
/**
*
@ -240,17 +240,17 @@ export const CouponTemplateValidityTypeEnum = {
export const CouponTemplateTakeTypeEnum = {
USER: {
type: 1,
name: '直接领取'
name: '直接领取',
},
ADMIN: {
type: 2,
name: '指定发放'
name: '指定发放',
},
REGISTER: {
type: 3,
name: '新人券'
}
}
name: '新人券',
},
};
/**
*
@ -258,17 +258,17 @@ export const CouponTemplateTakeTypeEnum = {
export const PromotionProductScopeEnum = {
ALL: {
scope: 1,
name: '通用劵'
name: '通用劵',
},
SPU: {
scope: 2,
name: '商品劵'
name: '商品劵',
},
CATEGORY: {
scope: 3,
name: '品类劵'
}
}
name: '品类劵',
},
};
/**
*
@ -276,13 +276,13 @@ export const PromotionProductScopeEnum = {
export const PromotionConditionTypeEnum = {
PRICE: {
type: 10,
name: '满 N 元'
name: '满 N 元',
},
COUNT: {
type: 20,
name: '满 N 件'
}
}
name: '满 N 件',
},
};
/**
*
@ -290,13 +290,13 @@ export const PromotionConditionTypeEnum = {
export const PromotionDiscountTypeEnum = {
PRICE: {
type: 1,
name: '满减'
name: '满减',
},
PERCENT: {
type: 2,
name: '折扣'
}
}
name: '折扣',
},
};
// ========== MALL - 交易模块 ==========
/**
@ -305,89 +305,89 @@ export const PromotionDiscountTypeEnum = {
export const BrokerageBindModeEnum = {
ANYTIME: {
mode: 1,
name: '首次绑定'
name: '首次绑定',
},
REGISTER: {
mode: 2,
name: '注册绑定'
name: '注册绑定',
},
OVERRIDE: {
mode: 3,
name: '覆盖绑定'
}
}
name: '覆盖绑定',
},
};
/**
*
*/
export const BrokerageEnabledConditionEnum = {
ALL: {
condition: 1,
name: '人人分销'
name: '人人分销',
},
ADMIN: {
condition: 2,
name: '指定分销'
}
}
name: '指定分销',
},
};
/**
*
*/
export const BrokerageRecordBizTypeEnum = {
ORDER: {
type: 1,
name: '获得推广佣金'
name: '获得推广佣金',
},
WITHDRAW: {
type: 2,
name: '提现申请'
}
}
name: '提现申请',
},
};
/**
*
*/
export const BrokerageWithdrawStatusEnum = {
AUDITING: {
status: 0,
name: '审核中'
name: '审核中',
},
AUDIT_SUCCESS: {
status: 10,
name: '审核通过'
name: '审核通过',
},
AUDIT_FAIL: {
status: 20,
name: '审核不通过'
name: '审核不通过',
},
WITHDRAW_SUCCESS: {
status: 11,
name: '提现成功'
name: '提现成功',
},
WITHDRAW_FAIL: {
status: 21,
name: '提现失败'
}
}
name: '提现失败',
},
};
/**
*
*/
export const BrokerageWithdrawTypeEnum = {
WALLET: {
type: 1,
name: '钱包'
name: '钱包',
},
BANK: {
type: 2,
name: '银行卡'
name: '银行卡',
},
WECHAT: {
type: 3,
name: '微信'
name: '微信',
},
ALIPAY: {
type: 4,
name: '支付宝'
}
}
name: '支付宝',
},
};
/**
*
@ -395,38 +395,38 @@ export const BrokerageWithdrawTypeEnum = {
export const DeliveryTypeEnum = {
EXPRESS: {
type: 1,
name: '快递发货'
name: '快递发货',
},
PICK_UP: {
type: 2,
name: '到店自提'
}
}
name: '到店自提',
},
};
/**
* -
*/
export const TradeOrderStatusEnum = {
UNPAID: {
status: 0,
name: '待支付'
name: '待支付',
},
UNDELIVERED: {
status: 10,
name: '待发货'
name: '待发货',
},
DELIVERED: {
status: 20,
name: '已发货'
name: '已发货',
},
COMPLETED: {
status: 30,
name: '已完成'
name: '已完成',
},
CANCELED: {
status: 40,
name: '已取消'
}
}
name: '已取消',
},
};
// ========== ERP - 企业资源计划 ==========
@ -436,31 +436,31 @@ export const ErpBizType = {
PURCHASE_RETURN: 12,
SALE_ORDER: 20,
SALE_OUT: 21,
SALE_RETURN: 22
}
SALE_RETURN: 22,
};
// ========== BPM 模块 ==========
export const BpmModelType = {
BPMN: 10, // BPMN 设计器
SIMPLE: 20 // 简易设计器
}
SIMPLE: 20, // 简易设计器
};
export const BpmModelFormType = {
NORMAL: 10, // 流程表单
CUSTOM: 20 // 业务表单
}
CUSTOM: 20, // 业务表单
};
export const BpmProcessInstanceStatus = {
NOT_START: -1, // 未开始
RUNNING: 1, // 审批中
APPROVE: 2, // 审批通过
REJECT: 3, // 审批不通过
CANCEL: 4 // 已取消
}
CANCEL: 4, // 已取消
};
export const BpmAutoApproveType = {
NONE: 0, // 不自动通过
APPROVE_ALL: 1, // 仅审批一次,后续重复的审批节点均自动通过
APPROVE_SEQUENT: 2, // 仅针对连续审批的节点自动通过
}
};

View File

@ -7,7 +7,10 @@ export function getRangePickerDefaultProps() {
return {
showTime: {
format: 'HH:mm:ss',
defaultValue: [dayjs('00:00:00', 'HH:mm:ss'), dayjs('23:59:59', 'HH:mm:ss')],
defaultValue: [
dayjs('00:00:00', 'HH:mm:ss'),
dayjs('23:59:59', 'HH:mm:ss'),
],
},
valueFormat: 'YYYY-MM-DD HH:mm:ss',
format: 'YYYY-MM-DD HH:mm:ss',

View File

@ -6,6 +6,19 @@ import { isObject } from '@vben/utils';
import { useDictStore } from '#/store';
export interface DictDataType {
dictType: string;
label: string;
value: boolean | number | string;
// TODO: type
colorType: '' | 'error' | 'info' | 'success' | 'warning';
cssClass: string;
}
export interface NumberDictDataType extends DictDataType {
value: number;
}
const dictStore = useDictStore();
/**
@ -17,7 +30,7 @@ const dictStore = useDictStore();
*/
function getDictLabel(dictType: string, value: any) {
const dictObj = dictStore.getDictData(dictType, value);
return isObject(dictObj)? dictObj.label : '';
return isObject(dictObj) ? dictObj.label : '';
}
/**
@ -71,6 +84,48 @@ function getDictOptions(
return dictOptions.length > 0 ? dictOptions : [];
}
export const getIntDictOptions = (dictType: string): NumberDictDataType[] => {
// 获得通用的 DictDataType 列表
const dictOptions = getDictOptions(dictType) as DictDataType[];
// 转换成 number 类型的 NumberDictDataType 类型
// why 需要特殊转换:避免 IDEA 在 v-for="dict in getIntDictOptions(...)" 时el-option 的 key 会告警
const dictOption: NumberDictDataType[] = [];
dictOptions.forEach((dict: DictDataType) => {
dictOption.push({
...dict,
value: Number.parseInt(`${dict.value}`),
});
});
return dictOption;
};
export const getStrDictOptions = (dictType: string) => {
// 获得通用的 DictDataType 列表
const dictOptions = getDictOptions(dictType) as DictDataType[];
// 转换成 string 类型的 StringDictDataType 类型
// why 需要特殊转换:避免 IDEA 在 v-for="dict in getStrDictOptions(...)" 时el-option 的 key 会告警
const dictOption: StringDictDataType[] = [];
dictOptions.forEach((dict: DictDataType) => {
dictOption.push({
...dict,
value: `${dict.value}`,
});
});
return dictOption;
};
export const getBoolDictOptions = (dictType: string) => {
const dictOption: DictDataType[] = [];
const dictOptions = getDictOptions(dictType) as DictDataType[];
dictOptions.forEach((dict: DictDataType) => {
dictOption.push({
...dict,
value: `${dict.value}` === 'true',
});
});
return dictOption;
};
enum DICT_TYPE {
AI_GENERATE_MODE = 'ai_generate_mode', // AI 生成模式
AI_IMAGE_STATUS = 'ai_image_status', // AI 图片状态
@ -205,4 +260,4 @@ enum DICT_TYPE {
TRADE_ORDER_TYPE = 'trade_order_type', // 订单 - 类型
USER_TYPE = 'user_type',
}
export { DICT_TYPE, getDictObj, getDictLabel, getDictOptions };
export { DICT_TYPE, getDictLabel, getDictObj, getDictOptions };

View File

@ -0,0 +1,43 @@
/**
* UUID
*/
export const generateUUID = () => {
if (typeof crypto === 'object') {
if (typeof crypto.randomUUID === 'function') {
return crypto.randomUUID();
}
if (
typeof crypto.getRandomValues === 'function' &&
typeof Uint8Array === 'function'
) {
const callback = (c: any) => {
const num = Number(c);
return (
num ^
(crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (num / 4)))
).toString(16);
};
return '10000000-1000-4000-8000-100000000000'.replaceAll(
/[018]/g,
callback,
);
}
}
let timestamp = Date.now();
let performanceNow =
(typeof performance !== 'undefined' &&
performance.now &&
performance.now() * 1000) ||
0;
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replaceAll(/[xy]/g, (c) => {
let random = Math.random() * 16;
if (timestamp > 0) {
random = Math.trunc((timestamp + random) % 16);
timestamp = Math.floor(timestamp / 16);
} else {
random = Math.trunc((performanceNow + random) % 16);
performanceNow = Math.floor(performanceNow / 16);
}
return (c === 'x' ? random : (random & 0x3) | 0x8).toString(16);
});
};

View File

@ -0,0 +1,125 @@
/* eslint-disable @typescript-eslint/no-unsafe-function-type */
const toString = Object.prototype.toString;
export const is = (val: unknown, type: string) => {
return toString.call(val) === `[object ${type}]`;
};
export const isDef = <T = unknown>(val?: T): val is T => {
return val !== undefined;
};
export const isUnDef = <T = unknown>(val?: T): val is T => {
return !isDef(val);
};
export const isObject = (val: any): val is Record<any, any> => {
return val !== null && is(val, 'Object');
};
export const isEmpty = (val: any): boolean => {
if (val === null || val === undefined || val === undefined) {
return true;
}
if (isArray(val) || isString(val)) {
return val.length === 0;
}
if (val instanceof Map || val instanceof Set) {
return val.size === 0;
}
if (isObject(val)) {
return Object.keys(val).length === 0;
}
return false;
};
export const isDate = (val: unknown): val is Date => {
return is(val, 'Date');
};
export const isNull = (val: unknown): val is null => {
return val === null;
};
export const isNullAndUnDef = (val: unknown): val is null | undefined => {
return isUnDef(val) && isNull(val);
};
export const isNullOrUnDef = (val: unknown): val is null | undefined => {
return isUnDef(val) || isNull(val);
};
export const isNumber = (val: unknown): val is number => {
return is(val, 'Number');
};
export const isPromise = <T = any>(val: unknown): val is Promise<T> => {
return (
is(val, 'Promise') &&
isObject(val) &&
isFunction(val.then) &&
isFunction(val.catch)
);
};
export const isString = (val: unknown): val is string => {
return is(val, 'String');
};
export const isFunction = (val: unknown): val is Function => {
return typeof val === 'function';
};
export const isBoolean = (val: unknown): val is boolean => {
return is(val, 'Boolean');
};
export const isRegExp = (val: unknown): val is RegExp => {
return is(val, 'RegExp');
};
export const isArray = (val: any): val is Array<any> => {
return val && Array.isArray(val);
};
export const isWindow = (val: any): val is Window => {
return typeof window !== 'undefined' && is(val, 'Window');
};
export const isElement = (val: unknown): val is Element => {
return isObject(val) && !!val.tagName;
};
export const isMap = (val: unknown): val is Map<any, any> => {
return is(val, 'Map');
};
export const isServer = typeof window === 'undefined';
export const isClient = !isServer;
export const isUrl = (path: string): boolean => {
// fix:修复hash路由无法跳转的问题
const reg =
// eslint-disable-next-line regexp/no-unused-capturing-group, regexp/no-useless-quantifier, regexp/no-super-linear-backtracking
/(((^https?:(?:\/\/)?)(?:[-:&=+$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-:&=+$,\w]+@)[A-Za-z0-9.-]+)((?:\/[+~%#/.\w-]*)?\??[-+=&%@.\w]*(?:#\w*)?)?)$/;
return reg.test(path);
};
export const isDark = (): boolean => {
return window.matchMedia('(prefers-color-scheme: dark)').matches;
};
// 是否是图片链接
export const isImgPath = (path: string): boolean => {
return /(?:https?:\/\/|data:image\/).*?\.(?:png|jpg|jpeg|gif|svg|webp|ico)/i.test(
path,
);
};
export const isEmptyVal = (val: any): boolean => {
return val === '' || val === null || val === undefined;
};

View File

@ -16,7 +16,7 @@ export const handleTree = (
data: TreeNode[],
id: string = 'id',
parentId: string = 'parentId',
children: string = 'children'
children: string = 'children',
): TreeNode[] => {
if (!Array.isArray(data)) {
console.warn('data must be an array');
@ -25,10 +25,10 @@ export const handleTree = (
const config = {
id,
parentId,
childrenList: children
childrenList: children,
};
const childrenListMap: Record<string | number, TreeNode[]> = {};
const nodeIds: Record<string | number, TreeNode> = {};
const childrenListMap: Record<number | string, TreeNode[]> = {};
const nodeIds: Record<number | string, TreeNode> = {};
const tree: TreeNode[] = [];
// 1. 数据预处理
@ -67,4 +67,4 @@ export const handleTree = (
}
return tree;
}
};

View File

@ -9,10 +9,9 @@ const MOBILE_REGEX = /(?:0|86|\+86)?1[3-9]\d{9}/;
* @param value
* @returns
*/
export function isMobile(value?: string | null): boolean {
export function isMobile(value?: null | string): boolean {
if (!value) {
return false;
}
return MOBILE_REGEX.test(value);
}

View File

@ -2,21 +2,25 @@
import type { VbenFormSchema } from '@vben/common-ui';
import type { Recordable } from '@vben/types';
import { computed, ref, onMounted } from 'vue';
import type { AuthApi } from '#/api';
import { computed, onMounted, ref } from 'vue';
import { AuthenticationCodeLogin, z } from '@vben/common-ui';
import { $t } from '@vben/locales';
import { type AuthApi, sendSmsCode } from '#/api';
import { useAppConfig } from '@vben/hooks';
import { $t } from '@vben/locales';
import { useAccessStore } from '@vben/stores';
import { message } from 'ant-design-vue';
import { getTenantSimpleList, getTenantByWebsite } from '#/api/core/auth';
import { useAccessStore } from '@vben/stores';
import { sendSmsCode } from '#/api';
import { getTenantByWebsite, getTenantSimpleList } from '#/api/core/auth';
import { useAuthStore } from '#/store';
const { tenantEnable } = useAppConfig(import.meta.env, import.meta.env.PROD);
defineOptions({ name: 'CodeLogin' });
const { tenantEnable } = useAppConfig(import.meta.env, import.meta.env.PROD);
const authStore = useAuthStore();
const accessStore = useAccessStore();
@ -37,7 +41,7 @@ const fetchTenantList = async () => {
tenantList.value = await getTenantSimpleList();
// > store >
let tenantId: number | null = null;
let tenantId: null | number = null;
const websiteTenant = await websiteTenantPromise;
if (websiteTenant?.id) {
tenantId = websiteTenant.id;
@ -80,7 +84,10 @@ const formSchema = computed((): VbenFormSchema[] => {
rules: z
.number()
.nullable()
.refine((val) => val != null && val > 0, $t('authentication.tenantTip'))
.refine(
(val) => val !== null && val > 0,
$t('authentication.tenantTip'),
)
.default(null),
dependencies: {
triggerFields: ['tenantId'],
@ -140,7 +147,7 @@ const formSchema = computed((): VbenFormSchema[] => {
} finally {
loading.value = false;
}
}
},
},
fieldName: 'code',
label: $t('authentication.code'),

View File

@ -2,18 +2,21 @@
import type { VbenFormSchema } from '@vben/common-ui';
import type { Recordable } from '@vben/types';
import { computed, ref, onMounted, h } from 'vue';
import type { AuthApi } from '#/api';
import { AuthenticationForgetPassword, z } from '@vben/common-ui';
import { $t } from '@vben/locales';
import { type AuthApi, sendSmsCode, smsResetPassword } from '#/api';
import { useAppConfig } from '@vben/hooks';
import { message } from 'ant-design-vue';
import { computed, onMounted, ref } from 'vue';
import { useRouter } from 'vue-router';
import { getTenantSimpleList, getTenantByWebsite } from '#/api/core/auth';
import { AuthenticationForgetPassword, z } from '@vben/common-ui';
import { useAppConfig } from '@vben/hooks';
import { $t } from '@vben/locales';
import { useAccessStore } from '@vben/stores';
import { message } from 'ant-design-vue';
import { sendSmsCode, smsResetPassword } from '#/api';
import { getTenantByWebsite, getTenantSimpleList } from '#/api/core/auth';
defineOptions({ name: 'ForgetPassword' });
const { tenantEnable } = useAppConfig(import.meta.env, import.meta.env.PROD);
@ -36,7 +39,7 @@ const fetchTenantList = async () => {
tenantList.value = await getTenantSimpleList();
// > store >
let tenantId: number | null = null;
let tenantId: null | number = null;
const websiteTenant = await websiteTenantPromise;
if (websiteTenant?.id) {
tenantId = websiteTenant.id;
@ -79,7 +82,10 @@ const formSchema = computed((): VbenFormSchema[] => {
rules: z
.number()
.nullable()
.refine((val) => val != null && val > 0, $t('authentication.tenantTip'))
.refine(
(val) => val !== null && val > 0,
$t('authentication.tenantTip'),
)
.default(null),
dependencies: {
triggerFields: ['tenantId'],
@ -139,7 +145,7 @@ const formSchema = computed((): VbenFormSchema[] => {
} finally {
loading.value = false;
}
}
},
},
fieldName: 'code',
label: $t('authentication.code'),

View File

@ -1,24 +1,32 @@
<script lang="ts" setup>
import type { VbenFormSchema } from '@vben/common-ui';
import { type AuthApi, checkCaptcha, getCaptcha, socialAuthRedirect } from '#/api/core/auth';
import type { AuthApi } from '#/api/core/auth';
import { computed, onMounted, ref } from 'vue';
import { AuthenticationLogin, Verification, z } from '@vben/common-ui';
import { $t } from '@vben/locales';
import { useAppConfig } from '@vben/hooks';
import { useAuthStore } from '#/store';
import { useAccessStore } from '@vben/stores';
import { useRoute } from 'vue-router';
import { getTenantSimpleList, getTenantByWebsite } from '#/api/core/auth';
import {message} from 'ant-design-vue';
import { AuthenticationLogin, Verification, z } from '@vben/common-ui';
import { useAppConfig } from '@vben/hooks';
import { $t } from '@vben/locales';
import { useAccessStore } from '@vben/stores';
const { tenantEnable, captchaEnable } = useAppConfig(import.meta.env, import.meta.env.PROD);
import {
checkCaptcha,
getCaptcha,
getTenantByWebsite,
getTenantSimpleList,
socialAuthRedirect,
} from '#/api/core/auth';
import { useAuthStore } from '#/store';
defineOptions({ name: 'Login' });
const { tenantEnable, captchaEnable } = useAppConfig(
import.meta.env,
import.meta.env.PROD,
);
const { query } = useRoute();
const authStore = useAuthStore();
const accessStore = useAccessStore();
@ -40,7 +48,7 @@ const fetchTenantList = async () => {
tenantList.value = await getTenantSimpleList();
// > store >
let tenantId: number | null = null;
let tenantId: null | number = null;
const websiteTenant = await websiteTenantPromise;
if (websiteTenant?.id) {
tenantId = websiteTenant.id;
@ -72,7 +80,7 @@ const handleLogin = async (values: any) => {
//
await authStore.authLogin('username', values);
}
};
/** 验证码通过,执行登录 */
const handleVerifySuccess = async ({ captchaVerification }: any) => {
@ -95,13 +103,14 @@ const handleThirdLogin = async (type: number) => {
try {
// redirectUri
// tricky: typeredirect encode social-login.vue#getUrlValue() 使
const redirectUri =
location.origin +
'/auth/social-login?' +
encodeURIComponent(`type=${type}&redirect=${redirect || '/'}`)
const redirectUri = `${
location.origin
}/auth/social-login?${encodeURIComponent(
`type=${type}&redirect=${redirect || '/'}`,
)}`;
//
window.location.href = await socialAuthRedirect(type, redirectUri)
window.location.href = await socialAuthRedirect(type, redirectUri);
} catch (error) {
console.error('第三方登录处理失败:', error);
}
@ -128,7 +137,10 @@ const formSchema = computed((): VbenFormSchema[] => {
rules: z
.number()
.nullable()
.refine((val) => val != null && val > 0, $t('authentication.tenantTip'))
.refine(
(val) => val !== null && val > 0,
$t('authentication.tenantTip'),
)
.default(null),
dependencies: {
triggerFields: ['tenantId'],

View File

@ -1,21 +1,30 @@
<script lang="ts" setup>
import type { VbenFormSchema } from '@vben/common-ui';
import { type AuthApi, checkCaptcha, getCaptcha } from '#/api/core/auth';
import type { AuthApi } from '#/api/core/auth';
import { computed, h, onMounted, ref } from 'vue';
import { AuthenticationRegister, Verification, z } from '@vben/common-ui';
import { $t } from '@vben/locales';
import { useAppConfig } from '@vben/hooks';
import { $t } from '@vben/locales';
import { useAccessStore } from '@vben/stores';
import { useAuthStore } from '#/store';
import { getTenantSimpleList, getTenantByWebsite } from '#/api/core/auth';
const { tenantEnable, captchaEnable } = useAppConfig(import.meta.env, import.meta.env.PROD);
import {
checkCaptcha,
getCaptcha,
getTenantByWebsite,
getTenantSimpleList,
} from '#/api/core/auth';
import { useAuthStore } from '#/store';
defineOptions({ name: 'Register' });
const { tenantEnable, captchaEnable } = useAppConfig(
import.meta.env,
import.meta.env.PROD,
);
const loading = ref(false);
const registerRef = ref();
const verifyRef = ref();
@ -36,7 +45,7 @@ const fetchTenantList = async () => {
tenantList.value = await getTenantSimpleList();
// > store >
let tenantId: number | null = null;
let tenantId: null | number = null;
const websiteTenant = await websiteTenantPromise;
if (websiteTenant?.id) {
tenantId = websiteTenant.id;
@ -103,7 +112,10 @@ const formSchema = computed((): VbenFormSchema[] => {
rules: z
.number()
.nullable()
.refine((val) => val != null && val > 0, $t('authentication.tenantTip'))
.refine(
(val) => val !== null && val > 0,
$t('authentication.tenantTip'),
)
.default(null),
dependencies: {
triggerFields: ['tenantId'],

View File

@ -1,23 +1,31 @@
<script lang="ts" setup>
import type { VbenFormSchema } from '@vben/common-ui';
import { type AuthApi, checkCaptcha, getCaptcha } from '#/api/core/auth';
import type { AuthApi } from '#/api/core/auth';
import { computed, onMounted, ref } from 'vue';
import { AuthenticationLogin, Verification, z } from '@vben/common-ui';
import { $t } from '@vben/locales';
import { useAppConfig } from '@vben/hooks';
import { useAuthStore } from '#/store';
import { useAccessStore } from '@vben/stores';
import { useRoute, useRouter } from 'vue-router';
import { getTenantSimpleList, getTenantByWebsite } from '#/api/core/auth';
import { AuthenticationLogin, Verification, z } from '@vben/common-ui';
import { useAppConfig } from '@vben/hooks';
import { $t } from '@vben/locales';
import { useAccessStore } from '@vben/stores';
const { tenantEnable, captchaEnable } = useAppConfig(import.meta.env, import.meta.env.PROD);
import {
checkCaptcha,
getCaptcha,
getTenantByWebsite,
getTenantSimpleList,
} from '#/api/core/auth';
import { useAuthStore } from '#/store';
defineOptions({ name: 'SocialLogin' });
const { tenantEnable, captchaEnable } = useAppConfig(
import.meta.env,
import.meta.env.PROD,
);
const authStore = useAuthStore();
const accessStore = useAccessStore();
const { query } = useRoute();
@ -41,7 +49,7 @@ const fetchTenantList = async () => {
tenantList.value = await getTenantSimpleList();
// > store >
let tenantId: number | null = null;
let tenantId: null | number = null;
const websiteTenant = await websiteTenantPromise;
if (websiteTenant?.id) {
tenantId = websiteTenant.id;
@ -74,8 +82,8 @@ const tryLogin = async () => {
await router.replace({
query: {
...query,
redirect: encodeURIComponent(redirect)
}
redirect: encodeURIComponent(redirect),
},
});
}
@ -85,7 +93,7 @@ const tryLogin = async () => {
code: socialCode,
state: socialState,
});
}
};
/** 处理登录 */
const handleLogin = async (values: any) => {
@ -102,7 +110,7 @@ const handleLogin = async (values: any) => {
socialCode,
socialState,
});
}
};
/** 验证码通过,执行登录 */
const handleVerifySuccess = async ({ captchaVerification }: any) => {
@ -121,8 +129,8 @@ const handleVerifySuccess = async ({ captchaVerification }: any) => {
/** tricky: 配合 login.vue 中redirectUri 需要对参数进行 encode需要在回调后进行decode */
function getUrlValue(key: string): string {
const url = new URL(decodeURIComponent(location.href))
return url.searchParams.get(key) ?? ''
const url = new URL(decodeURIComponent(location.href));
return url.searchParams.get(key) ?? '';
}
/** 组件挂载时获取租户信息 */
@ -148,7 +156,10 @@ const formSchema = computed((): VbenFormSchema[] => {
rules: z
.number()
.nullable()
.refine((val) => val != null && val > 0, $t('authentication.tenantTip'))
.refine(
(val) => val !== null && val > 0,
$t('authentication.tenantTip'),
)
.default(null),
dependencies: {
triggerFields: ['tenantId'],

View File

@ -1,11 +1,12 @@
<script lang="ts" setup>
import type { VbenFormSchema } from '#/adapter/form';
import { computed, onMounted, reactive, ref } from 'vue';
import { useRoute } from 'vue-router';
import { AuthenticationAuthTitle, VbenButton } from '@vben/common-ui';
import { useVbenForm } from '#/adapter/form';
import { computed, reactive, ref, onMounted } from 'vue';
import { useRoute } from 'vue-router';
import { authorize, getAuthorize } from '#/api/system/oauth2/open';
defineOptions({ name: 'SSOLogin' });
@ -14,7 +15,7 @@ const { query } = useRoute(); // 路由参数
const client = ref({
name: '',
logo: ''
logo: '',
}); //
const queryParams = reactive({
@ -22,7 +23,7 @@ const queryParams = reactive({
clientId: '',
redirectUri: '',
state: '',
scopes: [] as string[] // query
scopes: [] as string[], // query
}); // URL client_idscope
const loading = ref(false); //
@ -30,7 +31,7 @@ const loading = ref(false); // 表单是否提交中
/** 初始化授权信息 */
const init = async () => {
//
if (typeof query.client_id === 'undefined') {
if (query.client_id === undefined) {
return;
}
//
@ -60,15 +61,20 @@ const init = async () => {
let scopes;
// params.scope scopes
if (queryParams.scopes.length > 0) {
scopes = data.scopes.filter(scope => queryParams.scopes.includes(scope.key));
scopes = data.scopes.filter((scope) =>
queryParams.scopes.includes(scope.key),
);
// params.scope 使 scopes
} else {
scopes = data.scopes;
queryParams.scopes = scopes.map(scope => scope.key);
queryParams.scopes = scopes.map((scope) => scope.key);
}
// 2.
formApi.setFieldValue('scopes', scopes.filter(scope => scope.value).map(scope => scope.key));
formApi.setFieldValue(
'scopes',
scopes.filter((scope) => scope.value).map((scope) => scope.key),
);
};
/** 处理授权的提交 */
@ -78,8 +84,11 @@ const handleSubmit = async (approved: boolean) => {
let uncheckedScopes: string[];
if (approved) {
//
checkedScopes = (await formApi.getValues()).scopes;
uncheckedScopes = queryParams.scopes.filter((item) => checkedScopes.indexOf(item) === -1);
const { scopes } = await formApi.getValues();
checkedScopes = scopes;
uncheckedScopes = queryParams.scopes.filter(
(item) => !checkedScopes.includes(item),
);
} else {
//
checkedScopes = [];
@ -101,7 +110,11 @@ const handleSubmit = async (approved: boolean) => {
};
/** 调用授权 API 接口 */
const doAuthorize = (autoApprove: boolean, checkedScopes: string[], uncheckedScopes: string[]) => {
const doAuthorize = (
autoApprove: boolean,
checkedScopes: string[],
uncheckedScopes: string[],
) => {
return authorize(
queryParams.responseType,
queryParams.clientId,
@ -109,7 +122,7 @@ const doAuthorize = (autoApprove: boolean, checkedScopes: string[], uncheckedSco
queryParams.state,
autoApprove,
checkedScopes,
uncheckedScopes
uncheckedScopes,
);
};
@ -118,12 +131,15 @@ const formatScope = (scope: string) => {
// scope 便
// demo "system_oauth2_scope" scope
switch (scope) {
case 'user.read':
case 'user.read': {
return '访问你的个人信息';
case 'user.write':
}
case 'user.write': {
return '修改你的个人信息';
default:
}
default: {
return scope;
}
}
};
@ -134,11 +150,11 @@ const formSchema = computed((): VbenFormSchema[] => {
label: '授权范围',
component: 'CheckboxGroup',
componentProps: {
options: queryParams.scopes.map(scope => ({
options: queryParams.scopes.map((scope) => ({
label: formatScope(scope),
value: scope
value: scope,
})),
class: 'flex flex-col gap-2'
class: 'flex flex-col gap-2',
},
},
];
@ -158,7 +174,7 @@ const [Form, formApi] = useVbenForm(
/** 初始化 */
onMounted(() => {
init();
})
});
</script>
<template>

View File

@ -3,6 +3,7 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
import type { BpmCategoryApi } from '#/api/bpm/category';
import { useAccess } from '@vben/access';
import { z } from '#/adapter/form';
import { CommonStatusEnum } from '#/utils/constants';
import { DICT_TYPE, getDictOptions } from '#/utils/dict';

View File

@ -1,16 +1,20 @@
<script lang="ts" setup>
import type { OnActionClickParams, VxeTableGridOptions } from '#/adapter/vxe-table';
import type {
OnActionClickParams,
VxeTableGridOptions,
} from '#/adapter/vxe-table';
import type { BpmCategoryApi } from '#/api/bpm/category';
import { Page, useVbenModal } from '@vben/common-ui';
import { Button, message } from 'ant-design-vue';
import Form from './modules/form.vue';
import { useVbenVxeGrid } from '#/adapter/vxe-table';
import { deleteCategory, getCategoryPage } from '#/api/bpm/category';
import { $t } from '#/locales';
import { useGridColumns, useGridFormSchema } from './data';
import Form from './modules/form.vue';
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,

View File

@ -1,12 +1,18 @@
<script lang="ts" setup>
import type { BpmCategoryApi } from '#/api/bpm/category';
import { computed, ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { message } from 'ant-design-vue';
import { computed, ref } from 'vue';
import { useVbenForm } from '#/adapter/form';
import {createCategory, getCategory, updateCategory } from '#/api/bpm/category';
import {
createCategory,
getCategory,
updateCategory,
} from '#/api/bpm/category';
import { $t } from '#/locales';
import { useFormSchema } from '../data';

Some files were not shown because too many files have changed in this diff Show More