diff --git a/build/cool/index.ts b/build/cool/index.ts index aea72b8..fbb8abf 100644 --- a/build/cool/index.ts +++ b/build/cool/index.ts @@ -1,6 +1,7 @@ import { Plugin } from "vite"; import { parseJson } from "./utils"; import { createEps, createMenu, createSvg, createTag, getEps } from "./lib"; +import { getModules } from "./lib/module"; export function cool(): Plugin { return { @@ -60,7 +61,8 @@ export function cool(): Plugin { config() { return { define: { - __EPS__: getEps() + __EPS__: getEps(), + __MODULE_DIRS__: getModules() } }; } diff --git a/build/cool/lib/module/index.ts b/build/cool/lib/module/index.ts new file mode 100644 index 0000000..7aee8a8 --- /dev/null +++ b/build/cool/lib/module/index.ts @@ -0,0 +1,10 @@ +import fs from "fs"; + +export function getModules() { + try { + const dirs = fs.readdirSync("./src/modules"); + return dirs.filter((e) => !e.includes(".")); + } catch (e) { + return []; + } +} diff --git a/build/cool/temp/eps.d.ts b/build/cool/temp/eps.d.ts index 1e082e0..0e18526 100644 --- a/build/cool/temp/eps.d.ts +++ b/build/cool/temp/eps.d.ts @@ -780,6 +780,57 @@ declare namespace Eps { */ [key: string]: any; } + + interface UserAddressEntity { + /** + * ID + */ + id?: number; + /** + * 用户ID + */ + userId?: number; + /** + * 联系人 + */ + contact?: string; + /** + * 手机号 + */ + phone?: string; + /** + * 省份 + */ + province?: string; + /** + * 城市 + */ + city?: string; + /** + * 区县 + */ + district?: string; + /** + * 详细地址 + */ + address?: string; + /** + * 是否默认地址 0-否 1-是 + */ + isDefault?: number; + /** + * 创建时间 + */ + createTime?: Date; + /** + * 更新时间 + */ + updateTime?: Date; + /** + * 任意键值 + */ + [key: string]: any; + } interface ChatMessage { /** * list @@ -2334,6 +2385,63 @@ declare namespace Eps { request: Service["request"]; } + interface UserUser_address { + /** + * 删除 + */ + 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: UserAddressEntity[]; + [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; + }; + /** + * 请求 + */ + request: Service["request"]; + } + type Service = { request(options?: { url: string; @@ -2364,5 +2472,6 @@ declare namespace Eps { recycle: { data: RecycleData }; space: { info: SpaceInfo; type: SpaceType }; task: { info: TaskInfo }; + user: { user_address: UserUser_address }; }; } diff --git a/build/cool/temp/eps.json b/build/cool/temp/eps.json index a4deb72..25ac783 100644 --- a/build/cool/temp/eps.json +++ b/build/cool/temp/eps.json @@ -1 +1 @@ -[["/admin/base/comm","",[["/personUpdate","post"],["/uploadMode","get"],["/permmenu","get"],["/person","get"],["/upload","post"],["/logout","post"],["/list"],["/page"],["/info"],["/update"],["/delete"],["/add"]]],["/admin/base/open","",[["/refreshToken","get"],["/captcha","get"],["/login","post"],["/html","get"],["/eps","get"],["/list"],["/page"],["/info"],["/update"],["/delete"],["/add"]]],["/admin/base/sys/department","BaseSysDepartmentEntity",[["/delete","post"],["/update","post"],["/order","post"],["/list","post"],["/add","post"],["/page"],["/info"]]],["/admin/base/sys/log","BaseSysLogEntity",[["/setKeep","post"],["/getKeep","get"],["/clear","post"],["/page","post"],["/list"],["/info"],["/update"],["/delete"],["/add"]]],["/admin/base/sys/menu","BaseSysMenuEntity",[["/create","post"],["/delete","post"],["/update","post"],["/parse","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/base/sys/param","BaseSysParamEntity",[["/delete","post"],["/update","post"],["/html","get"],["/info","get"],["/page","post"],["/add","post"],["/list"]]],["/admin/base/sys/role","BaseSysRoleEntity",[["/delete","post"],["/update","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/base/sys/user","BaseSysUserEntity",[["/delete","post"],["/update","post"],["/move","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/cloud/db","CloudDBEntity",[["/initEntity","post"],["/delete","post"],["/update","post"],["/data","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/cloud/func/info","CloudFuncInfoEntity",[["/invoke","post"],["/delete","post"],["/update","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/cloud/func/log","CloudFuncLogEntity",[["/delete","post"],["/update","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/demo/goods","DemoGoodsEntity",[["/delete","post"],["/update","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/dict/info","DictInfoEntity",[["/delete","post"],["/update","post"],["/data","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/dict/type","DictTypeEntity",[["/delete","post"],["/update","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/iot/device","IotDeviceEntity",[["/delete","post"],["/update","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/iot/message","IotMessageEntity",[["/page","post"],["/list"],["/info"],["/update"],["/delete"],["/add"]]],["/admin/iot/mqtt","",[["/publish","post"],["/config","get"],["/list"],["/page"],["/info"],["/update"],["/delete"],["/add"]]],["/admin/recycle/data","RecycleDataEntity",[["/restore","post"],["/info","get"],["/page","post"],["/list"],["/update"],["/delete"],["/add"]]],["/admin/space/info","SpaceInfoEntity",[["/getConfig","get"],["/delete","post"],["/update","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/space/type","SpaceTypeEntity",[["/delete","post"],["/update","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/task/info","TaskInfoEntity",[["/delete","post"],["/update","post"],["/start","post"],["/once","post"],["/stop","post"],["/info","get"],["/page","post"],["/log","get"],["/add","post"],["/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","",[["/personUpdate","post"],["/uploadMode","get"],["/permmenu","get"],["/person","get"],["/upload","post"],["/logout","post"],["/list"],["/page"],["/info"],["/update"],["/delete"],["/add"]]],["/admin/base/open","",[["/refreshToken","get"],["/captcha","get"],["/login","post"],["/html","get"],["/eps","get"],["/list"],["/page"],["/info"],["/update"],["/delete"],["/add"]]],["/admin/base/sys/department","BaseSysDepartmentEntity",[["/delete","post"],["/update","post"],["/order","post"],["/list","post"],["/add","post"],["/page"],["/info"]]],["/admin/base/sys/log","BaseSysLogEntity",[["/setKeep","post"],["/getKeep","get"],["/clear","post"],["/page","post"],["/list"],["/info"],["/update"],["/delete"],["/add"]]],["/admin/base/sys/menu","BaseSysMenuEntity",[["/create","post"],["/delete","post"],["/update","post"],["/parse","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/base/sys/param","BaseSysParamEntity",[["/delete","post"],["/update","post"],["/html","get"],["/info","get"],["/page","post"],["/add","post"],["/list"]]],["/admin/base/sys/role","BaseSysRoleEntity",[["/delete","post"],["/update","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/base/sys/user","BaseSysUserEntity",[["/delete","post"],["/update","post"],["/move","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/cloud/db","CloudDBEntity",[["/initEntity","post"],["/delete","post"],["/update","post"],["/data","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/cloud/func/info","CloudFuncInfoEntity",[["/invoke","post"],["/delete","post"],["/update","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/cloud/func/log","CloudFuncLogEntity",[["/delete","post"],["/update","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/demo/goods","DemoGoodsEntity",[["/delete","post"],["/update","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/dict/info","DictInfoEntity",[["/delete","post"],["/update","post"],["/data","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/dict/type","DictTypeEntity",[["/delete","post"],["/update","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/iot/device","IotDeviceEntity",[["/delete","post"],["/update","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/iot/message","IotMessageEntity",[["/page","post"],["/list"],["/info"],["/update"],["/delete"],["/add"]]],["/admin/iot/mqtt","",[["/publish","post"],["/config","get"],["/list"],["/page"],["/info"],["/update"],["/delete"],["/add"]]],["/admin/recycle/data","RecycleDataEntity",[["/restore","post"],["/info","get"],["/page","post"],["/list"],["/update"],["/delete"],["/add"]]],["/admin/space/info","SpaceInfoEntity",[["/getConfig","get"],["/delete","post"],["/update","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/space/type","SpaceTypeEntity",[["/delete","post"],["/update","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/admin/task/info","TaskInfoEntity",[["/delete","post"],["/update","post"],["/start","post"],["/once","post"],["/stop","post"],["/info","get"],["/page","post"],["/log","get"],["/add","post"],["/list"]]],["/admin/user/user_address","UserAddressEntity",[["/delete","post"],["/update","post"],["/info","get"],["/list","post"],["/page","post"],["/add","post"]]],["/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 ea99917..673afee 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "lint:eslint": "eslint \"{src}/**/*.{vue,ts,tsx}\" --fix" }, "dependencies": { - "@cool-vue/crud": "^6.1.7", + "@cool-vue/crud": "^6.1.10", "@element-plus/icons-vue": "^2.0.10", "@vueuse/core": "^9.1.0", "@wangeditor/editor": "^5.1.23", diff --git a/src/cool/module/index.ts b/src/cool/module/index.ts index 78daea6..bf93f49 100644 --- a/src/cool/module/index.ts +++ b/src/cool/module/index.ts @@ -1,12 +1,12 @@ import { Module } from "../types"; import { hmr } from "../hook"; -// 数据列表 +// 模块列表 const list: Module[] = hmr.getData("modules", []); -// 模块 const module = { list, + dirs: __MODULE_DIRS__, req: Promise.resolve(), get(name: string): Module { // @ts-ignore diff --git a/src/env.d.ts b/src/env.d.ts index f655e18..7f54fc5 100644 --- a/src/env.d.ts +++ b/src/env.d.ts @@ -2,3 +2,4 @@ /// declare const __EPS__: string; +declare const __MODULE_DIRS__: string[]; diff --git a/src/modules/base/components/select/index.tsx b/src/modules/base/components/select/index.tsx index 225f168..fc89a40 100644 --- a/src/modules/base/components/select/index.tsx +++ b/src/modules/base/components/select/index.tsx @@ -1,4 +1,5 @@ import { useCrud } from "@cool-vue/crud"; +import { isObject } from "lodash-es"; import { computed, defineComponent, isRef, Ref, ref, watch } from "vue"; export default defineComponent({ @@ -59,8 +60,10 @@ export default defineComponent({ return ( {list.value?.map((e) => { - return ( + return isObject(e) ? ( + ) : ( + ); })} diff --git a/src/modules/demo/config.ts b/src/modules/demo/config.ts deleted file mode 100644 index 47ae21a..0000000 --- a/src/modules/demo/config.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { ModuleConfig } from "/@/cool"; - -export default (): ModuleConfig => { - return {}; -}; diff --git a/src/modules/iot/config.ts b/src/modules/iot/config.ts deleted file mode 100644 index 47ae21a..0000000 --- a/src/modules/iot/config.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { ModuleConfig } from "/@/cool"; - -export default (): ModuleConfig => { - return {}; -}; diff --git a/src/modules/magic/components/auto-menu/quick.vue b/src/modules/magic/components/auto-menu/quick.vue index 4f4bd6c..02b1c9e 100644 --- a/src/modules/magic/components/auto-menu/quick.vue +++ b/src/modules/magic/components/auto-menu/quick.vue @@ -15,7 +15,7 @@