From 180553283d3bfa2397e7b6f1427c586eff5ac001 Mon Sep 17 00:00:00 2001 From: icssoa <615206459@qq.com> Date: Tue, 14 Jun 2022 17:54:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=81=8A=E5=A4=A9?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/modules/chat/components/index.vue | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d2c60e7..29b1bb7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "front-next", - "version": "5.3.0", + "version": "5.4.0", "scripts": { "dev": "vite --host", "build": "vite build", diff --git a/src/modules/chat/components/index.vue b/src/modules/chat/components/index.vue index 6083314..22f00aa 100644 --- a/src/modules/chat/components/index.vue +++ b/src/modules/chat/components/index.vue @@ -176,7 +176,9 @@ async function refresh() { } provide("chat", { - socket, + get socket() { + return socket; + }, send, scrollToBottom }); From 490f797e9b0c57e04df96b6509bb93f5bfb151c0 Mon Sep 17 00:00:00 2001 From: icssoa <615206459@qq.com> Date: Wed, 22 Jun 2022 15:28:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/cool/temp/eps.json | 2 +- build/cool/temp/service.d.ts | 288 ++++++++++++------ package.json | 4 +- src/cool/service/request.ts | 9 +- .../base/pages/layout/components/topbar.vue | 3 +- src/modules/base/store/user.ts | 4 - src/modules/demo/views/crud.vue | 36 ++- src/modules/excel/components/export-btn.vue | 20 +- yarn.lock | 78 +---- 9 files changed, 247 insertions(+), 197 deletions(-) diff --git a/build/cool/temp/eps.json b/build/cool/temp/eps.json index 132537f..28a7a91 100644 --- a/build/cool/temp/eps.json +++ b/build/cool/temp/eps.json @@ -1 +1 @@ -[["/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/fbMall/account",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/publishGoods",""],["","/refreshGoods",""],["","/republish",""],["","/addMore",""],["","/close",""],["","/open",""],["","/getAccountGoods",""]]],["/admin/fbMall/area",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/fbMall/areaItem",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/order",""]]],["/admin/fbMall/goods",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/fbMall/goodsItem",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/readAll",""]]],["/admin/fbMall/photo",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/fbMall/photoItem",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/order",""]]],["/admin/fbMall/promote",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/getLog",""]]],["/admin/fbMall/proxy",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/fbMall/server",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/fbMall/thesaurus",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/order",""]]],["/admin/fbMall/thesaurusItem",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/readAll",""]]],["/admin/multimedia/multimediaData",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/deleteAllPermission",""]]],["/admin/multimedia/multimediaItem",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/updateeAllPermission",""],["","/deleteAllPermission",""],["","/order",""]]],["/admin/shop/reply",[["","/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/sys/area",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/sys/channel",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/sys/country",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/sys/express",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/sys/goods",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/sys/goodsItem",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/order",""]]],["/admin/sys/label",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/sys/shop",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/readAll",""]]],["/admin/sys/shop_warehouse",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/sys/sku",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/synchronize",""]]],["/admin/sys/stock",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/synchronize",""]]],["/admin/sys/warehouse",[["","/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 +[["/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/chat/chat",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/getChatChannelUser",""],["","/checkingSetReply",""],["","/changePrincipal",""],["","/getChatMsgPage",""],["","/leaveHelper",""],["","/addHelper",""],["","/setBlack",""],["","/setReply",""],["","/setWork",""],["","/setStar",""],["","/inChat",""]]],["/chat/message",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/chat/session",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/demo/goods",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/fbMall/account",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/publishGoods",""],["","/refreshGoods",""],["","/republish",""],["","/addMore",""],["","/close",""],["","/open",""],["","/getAccountGoods",""]]],["/admin/fbMall/area",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/fbMall/areaItem",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/order",""]]],["/admin/fbMall/goods",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/fbMall/goodsItem",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/readAll",""]]],["/admin/fbMall/photo",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/fbMall/photoItem",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/order",""]]],["/admin/fbMall/promote",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/getLog",""]]],["/admin/fbMall/proxy",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/fbMall/server",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/fbMall/thesaurus",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/order",""]]],["/admin/fbMall/thesaurusItem",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/readAll",""]]],["/admin/multimedia/multimediaData",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/deleteAllPermission",""]]],["/admin/multimedia/multimediaItem",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/updateeAllPermission",""],["","/deleteAllPermission",""],["","/order",""]]],["/admin/shop/reply",[["","/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/sys/area",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/sys/channel",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/sys/country",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/sys/express",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/sys/goods",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/sys/goodsItem",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/order",""]]],["/admin/sys/label",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/sys/shop",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/readAll",""]]],["/admin/sys/shop_warehouse",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/sys/sku",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/synchronize",""]]],["/admin/sys/stock",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/synchronize",""]]],["/admin/sys/warehouse",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]],["/admin/task/info",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""],["","/start",""],["","/once",""],["","/stop",""],["","/log",""]]],["/test",[["","/list",""],["","/page",""],["","/info",""],["","/update",""],["","/delete",""],["","/add",""]]]] \ No newline at end of file diff --git a/build/cool/temp/service.d.ts b/build/cool/temp/service.d.ts index 56f3a86..e55ea34 100644 --- a/build/cool/temp/service.d.ts +++ b/build/cool/temp/service.d.ts @@ -491,6 +491,204 @@ declare interface BaseSysUser { }; } +declare interface ChatChat { + /** + * list + * @returns Promise + */ + list(data?: any): Promise; + /** + * page + * @returns Promise + */ + page(data?: any): Promise; + /** + * info + * @returns Promise + */ + info(data?: any): Promise; + /** + * update + * @returns Promise + */ + update(data?: any): Promise; + /** + * delete + * @returns Promise + */ + delete(data?: any): Promise; + /** + * add + * @returns Promise + */ + add(data?: any): Promise; + /** + * getChatChannelUser + * @returns Promise + */ + getChatChannelUser(data?: any): Promise; + /** + * checkingSetReply + * @returns Promise + */ + checkingSetReply(data?: any): Promise; + /** + * changePrincipal + * @returns Promise + */ + changePrincipal(data?: any): Promise; + /** + * getChatMsgPage + * @returns Promise + */ + getChatMsgPage(data?: any): Promise; + /** + * leaveHelper + * @returns Promise + */ + leaveHelper(data?: any): Promise; + /** + * addHelper + * @returns Promise + */ + addHelper(data?: any): Promise; + /** + * setBlack + * @returns Promise + */ + setBlack(data?: any): Promise; + /** + * setReply + * @returns Promise + */ + setReply(data?: any): Promise; + /** + * setWork + * @returns Promise + */ + setWork(data?: any): Promise; + /** + * setStar + * @returns Promise + */ + setStar(data?: any): Promise; + /** + * inChat + * @returns Promise + */ + inChat(data?: any): Promise; + /** + * 权限 + */ + permission: { + list: string; + page: string; + info: string; + update: string; + delete: string; + add: string; + getChatChannelUser: string; + checkingSetReply: string; + changePrincipal: string; + getChatMsgPage: string; + leaveHelper: string; + addHelper: string; + setBlack: string; + setReply: string; + setWork: string; + setStar: string; + inChat: string; + }; +} + +declare interface ChatMessage { + /** + * list + * @returns Promise + */ + list(data?: any): Promise; + /** + * page + * @returns Promise + */ + page(data?: any): Promise; + /** + * info + * @returns Promise + */ + info(data?: any): Promise; + /** + * update + * @returns Promise + */ + update(data?: any): Promise; + /** + * delete + * @returns Promise + */ + delete(data?: any): Promise; + /** + * add + * @returns Promise + */ + add(data?: any): Promise; + /** + * 权限 + */ + permission: { + list: string; + page: string; + info: string; + update: string; + delete: string; + add: string; + }; +} + +declare interface ChatSession { + /** + * list + * @returns Promise + */ + list(data?: any): Promise; + /** + * page + * @returns Promise + */ + page(data?: any): Promise; + /** + * info + * @returns Promise + */ + info(data?: any): Promise; + /** + * update + * @returns Promise + */ + update(data?: any): Promise; + /** + * delete + * @returns Promise + */ + delete(data?: any): Promise; + /** + * add + * @returns Promise + */ + add(data?: any): Promise; + /** + * 权限 + */ + permission: { + list: string; + page: string; + info: string; + update: string; + delete: string; + add: string; + }; +} + declare interface DemoGoods { /** * list @@ -2005,94 +2203,6 @@ declare interface TaskInfo { }; } -declare interface ChatMessage { - /** - * list - * @returns Promise - */ - list(data?: any): Promise; - /** - * page - * @returns Promise - */ - page(data?: any): Promise; - /** - * info - * @returns Promise - */ - info(data?: any): Promise; - /** - * update - * @returns Promise - */ - update(data?: any): Promise; - /** - * delete - * @returns Promise - */ - delete(data?: any): Promise; - /** - * add - * @returns Promise - */ - add(data?: any): Promise; - /** - * 权限 - */ - permission: { - list: string; - page: string; - info: string; - update: string; - delete: string; - add: string; - }; -} - -declare interface ChatSession { - /** - * list - * @returns Promise - */ - list(data?: any): Promise; - /** - * page - * @returns Promise - */ - page(data?: any): Promise; - /** - * info - * @returns Promise - */ - info(data?: any): Promise; - /** - * update - * @returns Promise - */ - update(data?: any): Promise; - /** - * delete - * @returns Promise - */ - delete(data?: any): Promise; - /** - * add - * @returns Promise - */ - add(data?: any): Promise; - /** - * 权限 - */ - permission: { - list: string; - page: string; - info: string; - update: string; - delete: string; - add: string; - }; -} - declare interface Test { /** * list @@ -2151,6 +2261,7 @@ declare type Service = { user: BaseSysUser; }; }; + chat: { chat: ChatChat; message: ChatMessage; session: ChatSession }; demo: { goods: DemoGoods }; fbMall: { account: FbMallAccount; @@ -2187,6 +2298,5 @@ declare type Service = { warehouse: SysWarehouse; }; task: { info: TaskInfo }; - chat: { message: ChatMessage; session: ChatSession }; test: Test; }; diff --git a/package.json b/package.json index 29b1bb7..0890d61 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "front-next", - "version": "5.4.0", + "version": "5.4.1", "scripts": { "dev": "vite --host", "build": "vite build", @@ -9,7 +9,7 @@ "lint:eslint": "eslint \"{src,mock}/**/*.{vue,ts,tsx}\" --fix" }, "dependencies": { - "@cool-vue/crud": "^5.0.13", + "@cool-vue/crud": "^5.2.2", "@element-plus/icons-vue": "^1.1.3", "@vueuse/core": "^8.2.5", "axios": "^0.27.2", diff --git a/src/cool/service/request.ts b/src/cool/service/request.ts index efa5a81..566979c 100644 --- a/src/cool/service/request.ts +++ b/src/cool/service/request.ts @@ -119,15 +119,16 @@ axios.interceptors.response.use( if (error.response) { const { status, config } = error.response; + const { user } = useBase(); + + if (status == 401) { + user.logout(); + } if (isDev) { ElMessage.error(`${config.url} ${status}`); } else { switch (status) { - case 401: - router.href("401"); - break; - case 403: router.href("403"); break; diff --git a/src/modules/base/pages/layout/components/topbar.vue b/src/modules/base/pages/layout/components/topbar.vue index 2e41854..c60f259 100644 --- a/src/modules/base/pages/layout/components/topbar.vue +++ b/src/modules/base/pages/layout/components/topbar.vue @@ -59,7 +59,7 @@ import { useCool } from "/@/cool"; import RouteNav from "./route-nav.vue"; import AMenu from "./amenu.vue"; -const { router } = useCool(); +const { router, service } = useCool(); const { user, app } = useBase(); // 跳转 @@ -69,6 +69,7 @@ function onCommand(name: string) { router.push("/my/info"); break; case "exit": + service.base.comm.logout(); user.logout(); break; } diff --git a/src/modules/base/store/user.ts b/src/modules/base/store/user.ts index 0f89d5d..5c45e4d 100644 --- a/src/modules/base/store/user.ts +++ b/src/modules/base/store/user.ts @@ -76,10 +76,6 @@ export const useUserStore = defineStore("user", function () { // 退出 async function logout() { - try { - await service.base.comm.logout(); - } catch {} - clear(); router.href("login"); } diff --git a/src/modules/demo/views/crud.vue b/src/modules/demo/views/crud.vue index 6cdb4ea..58ac9fd 100644 --- a/src/modules/demo/views/crud.vue +++ b/src/modules/demo/views/crud.vue @@ -4,12 +4,10 @@ - Open Form - - - - + 自定义表单 + + @@ -63,10 +61,7 @@ const Upsert = useUpsert({ prop: "name", required: true, component: { - name: "el-input", - props: { - type: "textarea" - } + name: "el-input" } }, { @@ -85,10 +80,19 @@ const Upsert = useUpsert({ } }, { - label: "crud", + label: "内嵌Crud", + group: "1", component: { name: "slot-crud" } + }, + { + label: "年龄", + group: "2", + prop: "age", + component: { + name: "el-input-number" + } } ], onInfo(data, { next, close, done }) { @@ -134,6 +138,10 @@ const Table = useTable({ } ] }, + { + label: "创建时间", + prop: "createTime" + }, { type: "op", buttons: ["edit", "delete"] @@ -150,7 +158,7 @@ const filter = { }, items: [ { - label: "A", + label: "关键字", prop: "keyWord", component: { name: "el-input", @@ -177,7 +185,7 @@ const Crud2 = useCrud( const Table2 = useTable({ columns: [ { - label: "姓名2", + label: "姓名", prop: "name" }, { @@ -220,10 +228,10 @@ const AdvSearch = useAdvSearch({ function openForm() { Form.value?.open({ - title: "自定义4", + title: "自定义表单", items: [ { - label: "name", + label: "姓名", prop: "name", required: true, component: { diff --git a/src/modules/excel/components/export-btn.vue b/src/modules/excel/components/export-btn.vue index 1f5a678..3e9b648 100644 --- a/src/modules/excel/components/export-btn.vue +++ b/src/modules/excel/components/export-btn.vue @@ -16,9 +16,8 @@ + +