From f8a6adadf569c7006edaf9dfa040e09374680218 Mon Sep 17 00:00:00 2001 From: icssoa <2570063477@qq.com> Date: Mon, 25 Jul 2022 21:32:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/cool/temp/eps.d.ts | 1453 ++++++----------- build/cool/temp/eps.json | 2 +- package.json | 2 +- src/cool/router/index.ts | 2 +- .../base/components/codemirror/index.vue | 15 +- src/modules/base/views/frame.vue | 42 + src/modules/base/views/iframe/index.vue | 43 - src/modules/base/views/menu.vue | 2 +- 8 files changed, 523 insertions(+), 1038 deletions(-) create mode 100644 src/modules/base/views/frame.vue delete mode 100644 src/modules/base/views/iframe/index.vue diff --git a/build/cool/temp/eps.d.ts b/build/cool/temp/eps.d.ts index acdc852..199db6f 100644 --- a/build/cool/temp/eps.d.ts +++ b/build/cool/temp/eps.d.ts @@ -1,540 +1,5 @@ declare namespace Eps { - interface BaseSysDepartmentEntity { - /** - * ID - */ - id?: number; - /** - * 部门名称 - */ - name?: string; - /** - * 上级部门ID - */ - parentId?: BigInt; - /** - * 排序 - */ - orderNum?: number; - /** - * 创建时间 - */ - createTime?: Date; - /** - * 更新时间 - */ - updateTime?: Date; - /** - * 任意键值 - */ - [key: string]: any; - } - - interface BaseSysLogEntity { - /** - * ID - */ - id?: number; - /** - * 用户ID - */ - userId?: BigInt; - /** - * 行为 - */ - action?: string; - /** - * ip - */ - ip?: string; - /** - * ip地址 - */ - ipAddr?: string; - /** - * 参数 - */ - params?: string; - /** - * 创建时间 - */ - createTime?: Date; - /** - * 更新时间 - */ - updateTime?: Date; - /** - * 任意键值 - */ - [key: string]: any; - } - - interface BaseSysMenuEntity { - /** - * ID - */ - id?: number; - /** - * 父菜单ID - */ - parentId?: BigInt; - /** - * 菜单名称 - */ - name?: string; - /** - * 菜单地址 - */ - router?: string; - /** - * 权限标识 - */ - perms?: string; - /** - * 类型 0：目录 1：菜单 2：按钮 - */ - type?: number; - /** - * 图标 - */ - icon?: string; - /** - * 排序 - */ - orderNum?: number; - /** - * 视图地址 - */ - viewPath?: string; - /** - * 路由缓存 - */ - keepAlive?: boolean; - /** - * 是否显示 - */ - isShow?: boolean; - /** - * 创建时间 - */ - createTime?: Date; - /** - * 更新时间 - */ - updateTime?: Date; - /** - * 任意键值 - */ - [key: string]: any; - } - - interface BaseSysParamEntity { - /** - * ID - */ - id?: number; - /** - * 键位 - */ - keyName?: string; - /** - * 名称 - */ - name?: string; - /** - * 数据 - */ - data?: string; - /** - * 数据类型 0:字符串 1：数组 2：键值对 - */ - dataType?: number; - /** - * 备注 - */ - remark?: string; - /** - * 创建时间 - */ - createTime?: Date; - /** - * 更新时间 - */ - updateTime?: Date; - /** - * 任意键值 - */ - [key: string]: any; - } - - interface BaseSysRoleEntity { - /** - * ID - */ - id?: number; - /** - * 用户ID - */ - userId?: string; - /** - * 名称 - */ - name?: string; - /** - * 角色标签 - */ - label?: string; - /** - * 备注 - */ - remark?: string; - /** - * 数据权限是否关联上下级 - */ - relevance?: number; - /** - * 创建时间 - */ - createTime?: Date; - /** - * 更新时间 - */ - updateTime?: Date; - /** - * 任意键值 - */ - [key: string]: any; - } - - interface BaseSysUserEntity { - /** - * ID - */ - id?: number; - /** - * 部门ID - */ - departmentId?: BigInt; - /** - * 姓名 - */ - name?: string; - /** - * 用户名 - */ - username?: string; - /** - * 密码 - */ - password?: string; - /** - * 密码版本, 作用是改完密码，让原来的token失效 - */ - passwordV?: number; - /** - * 昵称 - */ - nickName?: string; - /** - * 头像 - */ - headImg?: string; - /** - * 手机 - */ - phone?: string; - /** - * 邮箱 - */ - email?: string; - /** - * 备注 - */ - remark?: string; - /** - * 状态 0:禁用 1：启用 - */ - status?: boolean; - /** - * socketId - */ - socketId?: string; - /** - * 创建时间 - */ - createTime?: Date; - /** - * 更新时间 - */ - updateTime?: Date; - /** - * 任意键值 - */ - [key: string]: any; - } - - interface DemoGoodsEntity { - /** - * ID - */ - id?: number; - /** - * 标题 - */ - title?: string; - /** - * 图片 - */ - pic?: string; - /** - * 价格 - */ - price?: number; - /** - * 分类 - */ - type?: number; - /** - * 创建时间 - */ - createTime?: Date; - /** - * 更新时间 - */ - updateTime?: Date; - /** - * 任意键值 - */ - [key: string]: any; - } - - interface DictInfoEntity { - /** - * ID - */ - id?: number; - /** - * 类型ID - */ - typeId?: number; - /** - * 名称 - */ - name?: string; - /** - * 排序 - */ - orderNum?: number; - /** - * 备注 - */ - remark?: string; - /** - * 父ID - */ - parentId?: number; - /** - * 创建时间 - */ - createTime?: Date; - /** - * 更新时间 - */ - updateTime?: Date; - /** - * 任意键值 - */ - [key: string]: any; - } - - interface DictTypeEntity { - /** - * ID - */ - id?: number; - /** - * 名称 - */ - name?: string; - /** - * 标识 - */ - key?: string; - /** - * 创建时间 - */ - createTime?: Date; - /** - * 更新时间 - */ - updateTime?: Date; - /** - * 任意键值 - */ - [key: string]: any; - } - - interface SpaceInfoEntity { - /** - * ID - */ - id?: number; - /** - * 地址 - */ - url?: string; - /** - * 类型 - */ - type?: string; - /** - * 分类ID - */ - classifyId?: BigInt; - /** - * 创建时间 - */ - createTime?: Date; - /** - * 更新时间 - */ - updateTime?: Date; - /** - * 任意键值 - */ - [key: string]: any; - } - - interface SpaceTypeEntity { - /** - * ID - */ - id?: number; - /** - * 类别名称 - */ - name?: string; - /** - * 父分类ID - */ - parentId?: number; - /** - * 创建时间 - */ - createTime?: Date; - /** - * 更新时间 - */ - updateTime?: Date; - /** - * 任意键值 - */ - [key: string]: any; - } - - interface TaskInfoEntity { - /** - * ID - */ - id?: number; - /** - * 任务ID - */ - jobId?: string; - /** - * 任务配置 - */ - repeatConf?: string; - /** - * 名称 - */ - name?: string; - /** - * cron - */ - cron?: string; - /** - * 最大执行次数 不传为无限次 - */ - limit?: number; - /** - * 每间隔多少毫秒执行一次 如果cron设置了 这项设置就无效 - */ - every?: number; - /** - * 备注 - */ - remark?: string; - /** - * 状态 0:停止 1：运行 - */ - status?: boolean; - /** - * 开始时间 - */ - startDate?: Date; - /** - * 结束时间 - */ - endDate?: Date; - /** - * 数据 - */ - data?: string; - /** - * 执行的service实例ID - */ - service?: string; - /** - * 状态 0:系统 1：用户 - */ - type?: number; - /** - * 下一次执行时间 - */ - nextRunTime?: Date; - /** - * 状态 0:cron 1：时间间隔 - */ - taskType?: number; - /** - * 创建时间 - */ - createTime?: Date; - /** - * 更新时间 - */ - updateTime?: Date; - /** - * 任意键值 - */ - [key: string]: any; - } interface BaseComm { - /** - * 修改个人信息 - */ - personUpdate(data?: any): Promise; - /** - * 文件上传模式 - */ - uploadMode(data?: any): Promise; - /** - * 权限与菜单 - */ - permmenu(data?: any): Promise; - /** - * 个人信息 - */ - person(data?: any): Promise; - /** - * 文件上传 - */ - upload(data?: any): Promise; - /** - * 退出 - */ - logout(data?: any): Promise; /** * list */ @@ -563,63 +28,268 @@ declare namespace Eps { * add */ add(data?: any): Promise; + /** + * personUpdate + */ + personUpdate(data?: any): Promise; + /** + * uploadMode + */ + uploadMode(data?: any): Promise; + /** + * permmenu + */ + permmenu(data?: any): Promise; + /** + * logout + */ + logout(data?: any): Promise; /** * 权限标识 */ permission: { - personUpdate: string; - uploadMode: string; - permmenu: string; - person: string; - upload: string; - logout: string; list: string; page: string; info: string; update: string; delete: string; add: string; + personUpdate: string; + uploadMode: string; + permmenu: string; + logout: string; }; /** * 权限状态 */ _permission: { - personUpdate: boolean; - uploadMode: boolean; - permmenu: boolean; - person: boolean; - upload: boolean; - logout: boolean; list: boolean; page: boolean; info: boolean; update: boolean; delete: boolean; add: boolean; + personUpdate: boolean; + uploadMode: boolean; + permmenu: boolean; + logout: boolean; }; } interface BaseOpen { /** - * 刷新token + * list + */ + list(data?: any): Promise; + /** + * page + */ + page(data?: any): Promise<{ + pagination: { size: number; page: number; total: number }; + list: any[]; + [key: string]: any; + }>; + /** + * info + */ + info(data?: any): Promise; + /** + * update + */ + update(data?: any): Promise; + /** + * delete + */ + delete(data?: any): Promise; + /** + * add + */ + add(data?: any): Promise; + /** + * refreshToken */ refreshToken(data?: any): Promise; /** - * 验证码 + * captcha */ captcha(data?: any): Promise; /** - * 登录 + * login */ login(data?: any): Promise; /** - * 获得网页内容的参数值 + * html */ html(data?: any): Promise; /** - * 实体信息与路径 + * eps */ eps(data?: any): Promise; + /** + * 权限标识 + */ + permission: { + list: string; + page: string; + info: string; + update: string; + delete: string; + add: string; + refreshToken: string; + captcha: string; + login: string; + html: string; + eps: string; + }; + /** + * 权限状态 + */ + _permission: { + list: boolean; + page: boolean; + info: boolean; + update: boolean; + delete: boolean; + add: boolean; + refreshToken: boolean; + captcha: boolean; + login: boolean; + html: boolean; + eps: boolean; + }; + } + + interface BaseSysDepartment { + /** + * list + */ + list(data?: any): Promise; + /** + * page + */ + page(data?: any): Promise<{ + pagination: { size: number; page: number; total: number }; + list: any[]; + [key: string]: any; + }>; + /** + * info + */ + info(data?: any): Promise; + /** + * update + */ + update(data?: any): Promise; + /** + * delete + */ + delete(data?: any): Promise; + /** + * add + */ + add(data?: any): Promise; + /** + * order + */ + order(data?: any): Promise; + /** + * 权限标识 + */ + permission: { + list: string; + page: string; + info: string; + update: string; + delete: string; + add: string; + order: string; + }; + /** + * 权限状态 + */ + _permission: { + list: boolean; + page: boolean; + info: boolean; + update: boolean; + delete: boolean; + add: boolean; + order: boolean; + }; + } + + interface BaseSysLog { + /** + * list + */ + list(data?: any): Promise; + /** + * page + */ + page(data?: any): Promise<{ + pagination: { size: number; page: number; total: number }; + list: any[]; + [key: string]: any; + }>; + /** + * info + */ + info(data?: any): Promise; + /** + * update + */ + update(data?: any): Promise; + /** + * delete + */ + delete(data?: any): Promise; + /** + * add + */ + add(data?: any): Promise; + /** + * setKeep + */ + setKeep(data?: any): Promise; + /** + * getKeep + */ + getKeep(data?: any): Promise; + /** + * clear + */ + clear(data?: any): Promise; + /** + * 权限标识 + */ + permission: { + list: string; + page: string; + info: string; + update: string; + delete: string; + add: string; + setKeep: string; + getKeep: string; + clear: string; + }; + /** + * 权限状态 + */ + _permission: { + list: boolean; + page: boolean; + info: boolean; + update: boolean; + delete: boolean; + add: boolean; + setKeep: boolean; + getKeep: boolean; + clear: boolean; + }; + } + + interface BaseSysMenu { /** * list */ @@ -652,11 +322,6 @@ declare namespace Eps { * 权限标识 */ permission: { - refreshToken: string; - captcha: string; - login: string; - html: string; - eps: string; list: string; page: string; info: string; @@ -668,11 +333,6 @@ declare namespace Eps { * 权限状态 */ _permission: { - refreshToken: boolean; - captcha: boolean; - login: boolean; - html: boolean; - eps: boolean; list: boolean; page: boolean; info: boolean; @@ -682,705 +342,522 @@ declare namespace Eps { }; } - interface BaseSysDepartment { - /** - * 删除 - */ - delete(data?: any): Promise; - /** - * 修改 - */ - update(data?: any): Promise; - /** - * 排序 - */ - order(data?: any): Promise; - /** - * 列表查询 - */ - list(data?: any): Promise; - /** - * 新增 - */ - add(data?: any): Promise; - /** - * page - */ - page(data?: any): Promise<{ - pagination: { size: number; page: number; total: number }; - list: BaseSysDepartmentEntity[]; - [key: string]: any; - }>; - /** - * info - */ - info(data?: any): Promise; - /** - * 权限标识 - */ - permission: { - delete: string; - update: string; - order: string; - list: string; - add: string; - page: string; - info: string; - }; - /** - * 权限状态 - */ - _permission: { - delete: boolean; - update: boolean; - order: boolean; - list: boolean; - add: boolean; - page: boolean; - info: boolean; - }; - } - - interface BaseSysLog { - /** - * 日志保存时间 - */ - setKeep(data?: any): Promise; - /** - * 获得日志保存时间 - */ - getKeep(data?: any): Promise; - /** - * 清理 - */ - clear(data?: any): Promise; - /** - * 分页查询 - */ - page(data?: any): Promise<{ - pagination: { size: number; page: number; total: number }; - list: BaseSysLogEntity[]; - [key: string]: any; - }>; - /** - * list - */ - list(data?: any): Promise; - /** - * info - */ - info(data?: any): Promise; - /** - * update - */ - update(data?: any): Promise; - /** - * delete - */ - delete(data?: any): Promise; - /** - * add - */ - add(data?: any): Promise; - /** - * 权限标识 - */ - permission: { - setKeep: string; - getKeep: string; - clear: string; - page: string; - list: string; - info: string; - update: string; - delete: string; - add: string; - }; - /** - * 权限状态 - */ - _permission: { - setKeep: boolean; - getKeep: boolean; - clear: boolean; - page: boolean; - list: boolean; - info: boolean; - update: boolean; - delete: boolean; - add: boolean; - }; - } - - interface BaseSysMenu { - /** - * 删除 - */ - delete(data?: any): Promise; - /** - * 修改 - */ - update(data?: any): Promise; - /** - * 单个信息 - */ - info(data?: any): Promise; - /** - * 列表查询 - */ - list(data?: any): Promise; - /** - * 分页查询 - */ - page(data?: any): Promise<{ - pagination: { size: number; page: number; total: number }; - list: BaseSysMenuEntity[]; - [key: string]: any; - }>; - /** - * 新增 - */ - add(data?: any): Promise; - /** - * 权限标识 - */ - permission: { - delete: string; - update: string; - info: string; - list: string; - page: string; - add: string; - }; - /** - * 权限状态 - */ - _permission: { - delete: boolean; - update: boolean; - info: boolean; - list: boolean; - page: boolean; - add: boolean; - }; - } - interface BaseSysParam { /** - * 删除 + * list */ - delete(data?: any): Promise; + list(data?: any): Promise; /** - * 修改 - */ - update(data?: any): Promise; - /** - * 获得网页内容的参数值 - */ - html(data?: any): Promise; - /** - * 单个信息 - */ - info(data?: any): Promise; - /** - * 分页查询 + * page */ page(data?: any): Promise<{ pagination: { size: number; page: number; total: number }; - list: BaseSysParamEntity[]; + list: any[]; [key: string]: any; }>; /** - * 新增 + * info + */ + info(data?: any): Promise; + /** + * update + */ + update(data?: any): Promise; + /** + * delete + */ + delete(data?: any): Promise; + /** + * add */ add(data?: any): Promise; /** - * list + * html */ - list(data?: any): Promise; + html(data?: any): Promise; /** * 权限标识 */ permission: { - delete: string; - update: string; - html: string; - info: string; - page: string; - add: string; list: string; + page: string; + info: string; + update: string; + delete: string; + add: string; + html: string; }; /** * 权限状态 */ _permission: { - delete: boolean; - update: boolean; - html: boolean; - info: boolean; - page: boolean; - add: boolean; list: boolean; + page: boolean; + info: boolean; + update: boolean; + delete: boolean; + add: boolean; + html: boolean; }; } interface BaseSysRole { /** - * 删除 + * list */ - delete(data?: any): Promise; + list(data?: any): Promise; /** - * 修改 - */ - update(data?: any): Promise; - /** - * 单个信息 - */ - info(data?: any): Promise; - /** - * 列表查询 - */ - list(data?: any): Promise; - /** - * 分页查询 + * page */ page(data?: any): Promise<{ pagination: { size: number; page: number; total: number }; - list: BaseSysRoleEntity[]; + list: any[]; [key: string]: any; }>; /** - * 新增 + * info + */ + info(data?: any): Promise; + /** + * update + */ + update(data?: any): Promise; + /** + * delete + */ + delete(data?: any): Promise; + /** + * add */ add(data?: any): Promise; /** * 权限标识 */ permission: { - delete: string; - update: string; - info: string; list: string; page: string; + info: string; + update: string; + delete: string; add: string; }; /** * 权限状态 */ _permission: { - delete: boolean; - update: boolean; - info: boolean; list: boolean; page: boolean; + info: boolean; + update: boolean; + delete: boolean; add: boolean; }; } interface BaseSysUser { /** - * 删除 + * list */ - delete(data?: any): Promise; + list(data?: any): Promise; /** - * 修改 - */ - update(data?: any): Promise; - /** - * 移动部门 - */ - move(data?: any): Promise; - /** - * 单个信息 - */ - info(data?: any): Promise; - /** - * 列表查询 - */ - list(data?: any): Promise; - /** - * 分页查询 + * page */ page(data?: any): Promise<{ pagination: { size: number; page: number; total: number }; - list: BaseSysUserEntity[]; + list: any[]; [key: string]: any; }>; /** - * 新增 + * info + */ + info(data?: any): Promise; + /** + * update + */ + update(data?: any): Promise; + /** + * delete + */ + delete(data?: any): Promise; + /** + * add */ add(data?: any): Promise; + /** + * move + */ + move(data?: any): Promise; /** * 权限标识 */ permission: { - delete: string; - update: string; - move: string; - info: string; list: string; page: string; + info: string; + update: string; + delete: string; add: string; + move: string; }; /** * 权限状态 */ _permission: { - delete: boolean; - update: boolean; - move: boolean; - info: boolean; list: boolean; page: boolean; + info: boolean; + update: boolean; + delete: boolean; add: boolean; + move: boolean; }; } interface DemoGoods { /** - * 删除 + * list */ - delete(data?: any): Promise; + list(data?: any): Promise; /** - * 修改 - */ - update(data?: any): Promise; - /** - * 单个信息 - */ - info(data?: any): Promise; - /** - * 分页查询 + * page */ page(data?: any): Promise<{ pagination: { size: number; page: number; total: number }; - list: DemoGoodsEntity[]; + list: any[]; [key: string]: any; }>; /** - * 列表查询 + * info */ - list(data?: any): Promise; + info(data?: any): Promise; /** - * 新增 + * update + */ + update(data?: any): Promise; + /** + * delete + */ + delete(data?: any): Promise; + /** + * add */ add(data?: any): Promise; /** * 权限标识 */ permission: { - delete: string; - update: string; - info: string; - page: string; list: string; + page: string; + info: string; + update: string; + delete: string; add: string; }; /** * 权限状态 */ _permission: { - delete: boolean; - update: boolean; - info: boolean; - page: boolean; list: boolean; + page: boolean; + info: boolean; + update: boolean; + delete: boolean; add: boolean; }; } interface DictInfo { /** - * 删除 + * list */ - delete(data?: any): Promise; + list(data?: any): Promise; /** - * 修改 - */ - update(data?: any): Promise; - /** - * 获得字典数据 - */ - data(data?: any): Promise; - /** - * 单个信息 - */ - info(data?: any): Promise; - /** - * 列表查询 - */ - list(data?: any): Promise; - /** - * 分页查询 + * page */ page(data?: any): Promise<{ pagination: { size: number; page: number; total: number }; - list: DictInfoEntity[]; + list: any[]; [key: string]: any; }>; /** - * 新增 + * info + */ + info(data?: any): Promise; + /** + * update + */ + update(data?: any): Promise; + /** + * delete + */ + delete(data?: any): Promise; + /** + * add */ add(data?: any): Promise; + /** + * data + */ + data(data?: any): Promise; /** * 权限标识 */ permission: { - delete: string; - update: string; - data: string; - info: string; list: string; page: string; + info: string; + update: string; + delete: string; add: string; + data: string; }; /** * 权限状态 */ _permission: { - delete: boolean; - update: boolean; - data: boolean; - info: boolean; list: boolean; page: boolean; + info: boolean; + update: boolean; + delete: boolean; add: boolean; + data: boolean; }; } interface DictType { /** - * 删除 + * list */ - delete(data?: any): Promise; + list(data?: any): Promise; /** - * 修改 - */ - update(data?: any): Promise; - /** - * 单个信息 - */ - info(data?: any): Promise; - /** - * 列表查询 - */ - list(data?: any): Promise; - /** - * 分页查询 + * page */ page(data?: any): Promise<{ pagination: { size: number; page: number; total: number }; - list: DictTypeEntity[]; + list: any[]; [key: string]: any; }>; /** - * 新增 + * info + */ + info(data?: any): Promise; + /** + * update + */ + update(data?: any): Promise; + /** + * delete + */ + delete(data?: any): Promise; + /** + * add */ add(data?: any): Promise; /** * 权限标识 */ permission: { - delete: string; - update: string; - info: string; list: string; page: string; + info: string; + update: string; + delete: string; add: string; }; /** * 权限状态 */ _permission: { - delete: boolean; - update: boolean; - info: boolean; list: boolean; page: boolean; + info: boolean; + update: boolean; + delete: boolean; add: boolean; }; } interface SpaceInfo { /** - * 删除 + * list */ - delete(data?: any): Promise; + list(data?: any): Promise; /** - * 修改 - */ - update(data?: any): Promise; - /** - * 单个信息 - */ - info(data?: any): Promise; - /** - * 列表查询 - */ - list(data?: any): Promise; - /** - * 分页查询 + * page */ page(data?: any): Promise<{ pagination: { size: number; page: number; total: number }; - list: SpaceInfoEntity[]; + list: any[]; [key: string]: any; }>; /** - * 新增 + * info + */ + info(data?: any): Promise; + /** + * update + */ + update(data?: any): Promise; + /** + * delete + */ + delete(data?: any): Promise; + /** + * add */ add(data?: any): Promise; /** * 权限标识 */ permission: { - delete: string; - update: string; - info: string; list: string; page: string; + info: string; + update: string; + delete: string; add: string; }; /** * 权限状态 */ _permission: { - delete: boolean; - update: boolean; - info: boolean; list: boolean; page: boolean; + info: boolean; + update: boolean; + delete: boolean; add: boolean; }; } interface SpaceType { /** - * 删除 + * list */ - delete(data?: any): Promise; + list(data?: any): Promise; /** - * 修改 - */ - update(data?: any): Promise; - /** - * 单个信息 - */ - info(data?: any): Promise; - /** - * 列表查询 - */ - list(data?: any): Promise; - /** - * 分页查询 + * page */ page(data?: any): Promise<{ pagination: { size: number; page: number; total: number }; - list: SpaceTypeEntity[]; + list: any[]; [key: string]: any; }>; /** - * 新增 + * info + */ + info(data?: any): Promise; + /** + * update + */ + update(data?: any): Promise; + /** + * delete + */ + delete(data?: any): Promise; + /** + * add */ add(data?: any): Promise; /** * 权限标识 */ permission: { - delete: string; - update: string; - info: string; list: string; page: string; + info: string; + update: string; + delete: string; add: string; }; /** * 权限状态 */ _permission: { - delete: boolean; - update: boolean; - info: boolean; list: boolean; page: boolean; + info: boolean; + update: boolean; + delete: boolean; add: boolean; }; } interface TaskInfo { /** - * 删除 + * list */ - delete(data?: any): Promise; + list(data?: any): Promise; /** - * 修改 - */ - update(data?: any): Promise; - /** - * 开始 - */ - start(data?: any): Promise; - /** - * 执行一次 - */ - once(data?: any): Promise; - /** - * 停止 - */ - stop(data?: any): Promise; - /** - * 单个信息 - */ - info(data?: any): Promise; - /** - * 分页查询 + * page */ page(data?: any): Promise<{ pagination: { size: number; page: number; total: number }; - list: TaskInfoEntity[]; + list: any[]; [key: string]: any; }>; /** - * 日志 + * info */ - log(data?: any): Promise; + info(data?: any): Promise; /** - * 新增 + * update + */ + update(data?: any): Promise; + /** + * delete + */ + delete(data?: any): Promise; + /** + * add */ add(data?: any): Promise; /** - * list + * start */ - list(data?: any): Promise; + start(data?: any): Promise; + /** + * once + */ + once(data?: any): Promise; + /** + * stop + */ + stop(data?: any): Promise; + /** + * log + */ + log(data?: any): Promise; /** * 权限标识 */ permission: { - delete: string; + list: string; + page: string; + info: string; update: string; + delete: string; + add: string; start: string; once: string; stop: string; - info: string; - page: string; log: string; - add: string; - list: string; }; /** * 权限状态 */ _permission: { - delete: boolean; + list: boolean; + page: boolean; + info: boolean; update: boolean; + delete: boolean; + add: boolean; start: boolean; once: boolean; stop: boolean; - info: boolean; - page: boolean; log: boolean; - add: boolean; - list: boolean; }; } diff --git a/build/cool/temp/eps.json b/build/cool/temp/eps.json index ca78d8e..4fc50be 100644 --- a/build/cool/temp/eps.json +++ b/build/cool/temp/eps.json @@ -1 +1 @@ -[["/admin/base/comm",[["post","/personUpdate",""],["get","/uploadMode",""],["get","/permmenu",""],["get","/person",""],["post","/upload",""],["post","/logout",""],["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/base/open",[["get","/refreshToken",""],["get","/captcha",""],["post","/login",""],["get","/html",""],["get","/eps",""],["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/base/sys/department",[["post","/delete",""],["post","/update",""],["post","/order",""],["post","/list",""],["post","/add",""],["","/page",""],["","/info",""]]],["/admin/base/sys/log",[["post","/setKeep",""],["get","/getKeep",""],["post","/clear",""],["post","/page",""],["","/list",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/base/sys/menu",[["post","/delete",""],["post","/update",""],["get","/info",""],["post","/list",""],["post","/page",""],["post","/add",""]]],["/admin/base/sys/param",[["post","/delete",""],["post","/update",""],["get","/html",""],["get","/info",""],["post","/page",""],["post","/add",""],["","/list",""]]],["/admin/base/sys/role",[["post","/delete",""],["post","/update",""],["get","/info",""],["post","/list",""],["post","/page",""],["post","/add",""]]],["/admin/base/sys/user",[["post","/delete",""],["post","/update",""],["post","/move",""],["get","/info",""],["post","/list",""],["post","/page",""],["post","/add",""]]],["/admin/demo/goods",[["post","/delete",""],["post","/update",""],["get","/info",""],["post","/page",""],["post","/list",""],["post","/add",""]]],["/admin/dict/info",[["post","/delete",""],["post","/update",""],["post","/data",""],["get","/info",""],["post","/list",""],["post","/page",""],["post","/add",""]]],["/admin/dict/type",[["post","/delete",""],["post","/update",""],["get","/info",""],["post","/list",""],["post","/page",""],["post","/add",""]]],["/admin/space/info",[["post","/delete",""],["post","/update",""],["get","/info",""],["post","/list",""],["post","/page",""],["post","/add",""]]],["/admin/space/type",[["post","/delete",""],["post","/update",""],["get","/info",""],["post","/list",""],["post","/page",""],["post","/add",""]]],["/admin/task/info",[["post","/delete",""],["post","/update",""],["post","/start",""],["post","/once",""],["post","/stop",""],["get","/info",""],["post","/page",""],["get","/log",""],["post","/add",""],["","/list",""]]],["/chat/message",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/chat/session",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/test",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]]] \ No newline at end of file +[["/admin/base/comm",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/personUpdate",""],["","/uploadMode",""],["","/permmenu",""],["","/logout",""]]],["/admin/base/open",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/refreshToken",""],["","/captcha",""],["","/login",""],["","/html",""],["","/eps",""]]],["/admin/base/sys/department",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/order",""]]],["/admin/base/sys/log",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/setKeep",""],["","/getKeep",""],["","/clear",""]]],["/admin/base/sys/menu",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/base/sys/param",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/html",""]]],["/admin/base/sys/role",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/base/sys/user",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/move",""]]],["/admin/demo/goods",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/dict/info",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/data",""]]],["/admin/dict/type",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/space/info",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/space/type",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/task/info",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/start",""],["","/once",""],["","/stop",""],["","/log",""]]],["/chat/message",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/chat/session",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/test",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]]] \ No newline at end of file diff --git a/package.json b/package.json index 44f03ea..cca562f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "front-next", - "version": "5.7.1", + "version": "5.7.2", "scripts": { "dev": "vite --host", "build": "vite build", diff --git a/src/cool/router/index.ts b/src/cool/router/index.ts index bd0d0ca..72dfc3e 100644 --- a/src/cool/router/index.ts +++ b/src/cool/router/index.ts @@ -66,7 +66,7 @@ router.append = function (data) { d.meta.iframeUrl = url; } - d.component = () => import(`/$/base/views/iframe/index.vue`); + d.component = () => import(`/$/base/views/frame.vue`); } else { d.component = files["/src/" + url.replace("cool/", "")]; } diff --git a/src/modules/base/components/codemirror/index.vue b/src/modules/base/components/codemirror/index.vue index deec05e..041c182 100644 --- a/src/modules/base/components/codemirror/index.vue +++ b/src/modules/base/components/codemirror/index.vue @@ -17,8 +17,9 @@ import { Codemirror } from "vue-codemirror"; import { javascript } from "@codemirror/lang-javascript"; import { oneDark } from "@codemirror/theme-one-dark"; -import { ref, watch } from "vue"; +import { onMounted, ref, watch, computed } from "vue"; import { useDark } from "@vueuse/core"; +import { isNumber } from "lodash"; const props = defineProps({ modelValue: { @@ -30,7 +31,7 @@ const props = defineProps({ default: "请输入" }, height: { - type: String, + type: [String, Number], default: "400px" }, fontSize: { @@ -44,8 +45,11 @@ const emit = defineEmits(["update:modelValue", "change"]); // 是否暗黑模式 const isDark = ref(useDark()); +// 高度 +const height = computed(() => (isNumber(props.height) ? `${props.height}px` : props.height)); + // 插件 -const extensions: any[] = [javascript(), isDark.value && oneDark]; +const extensions = ref(); // 内容 const content = ref(""); @@ -56,6 +60,7 @@ function onChange(value: string) { emit("change", value); } +// 监听值 watch( () => props.modelValue, (val) => { @@ -65,6 +70,10 @@ watch( immediate: true } ); + +onMounted(() => { + extensions.value = [javascript(), isDark.value && oneDark]; +}); diff --git a/src/modules/base/views/iframe/index.vue b/src/modules/base/views/iframe/index.vue deleted file mode 100644 index 21fcbec..0000000 --- a/src/modules/base/views/iframe/index.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - - - diff --git a/src/modules/base/views/menu.vue b/src/modules/base/views/menu.vue index b1c7a0c..4d940e1 100644 --- a/src/modules/base/views/menu.vue +++ b/src/modules/base/views/menu.vue @@ -78,7 +78,7 @@