From c9cebcde41fb0289a6ea945d0fac2f8850fb7ee1 Mon Sep 17 00:00:00 2001 From: bimei <18812666091@163.com> Date: Fri, 17 Feb 2023 15:58:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?topActionSlots:=20false=20=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bpm/task/done/index.vue | 1 + src/views/bpm/task/todo/index.vue | 1 + src/views/system/mail/log/index.vue | 1 + src/views/system/notify/message/index.vue | 1 + 4 files changed, 4 insertions(+) diff --git a/src/views/bpm/task/done/index.vue b/src/views/bpm/task/done/index.vue index 31df7bd9..da05549a 100644 --- a/src/views/bpm/task/done/index.vue +++ b/src/views/bpm/task/done/index.vue @@ -21,6 +21,7 @@ const { push } = useRouter() // 路由 const [registerTable] = useXTable({ allSchemas: allSchemas, + topActionSlots: false, getListApi: TaskApi.getDoneTaskPage }) diff --git a/src/views/bpm/task/todo/index.vue b/src/views/bpm/task/todo/index.vue index 86208602..ab286c0b 100644 --- a/src/views/bpm/task/todo/index.vue +++ b/src/views/bpm/task/todo/index.vue @@ -22,6 +22,7 @@ const { push } = useRouter() // 路由 const [registerTable] = useXTable({ allSchemas: allSchemas, + topActionSlots:false, getListApi: TaskApi.getTodoTaskPage }) diff --git a/src/views/system/mail/log/index.vue b/src/views/system/mail/log/index.vue index 7983e3c8..e147c52c 100644 --- a/src/views/system/mail/log/index.vue +++ b/src/views/system/mail/log/index.vue @@ -59,6 +59,7 @@ const queryParams = reactive({ }) const [registerTable] = useXTable({ allSchemas: allSchemas, + topActionSlots: false, params: queryParams, getListApi: MailLogApi.getMailLogPageApi }) diff --git a/src/views/system/notify/message/index.vue b/src/views/system/notify/message/index.vue index cb904d27..93a8ed68 100644 --- a/src/views/system/notify/message/index.vue +++ b/src/views/system/notify/message/index.vue @@ -37,6 +37,7 @@ const { t } = useI18n() // 国际化 // 列表相关的变量 const [registerTable] = useXTable({ allSchemas: allSchemas, + topActionSlots: false, getListApi: NotifyMessageApi.getNotifyMessagePageApi }) From 9c38c33012189c1ed8097944c52b8576e624f8d8 Mon Sep 17 00:00:00 2001 From: bimei <18812666091@163.com> Date: Fri, 17 Feb 2023 16:52:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=20=E5=AD=97=E5=85=B8=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=BA=A2=E8=89=B2=E6=8A=A5=E9=94=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=202.keepalive=E7=BC=93=E5=AD=98toCamelCase?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=AD=E5=8E=BB=E6=8E=89=E2=80=98-?= =?UTF-8?q?=E2=80=99=EF=BC=8C=E4=BF=9D=E7=95=99=E9=A9=BC=E5=B3=B0=E6=98=8E?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/routerHelper.ts | 8 +++++--- src/views/bpm/task/todo/index.vue | 2 +- src/views/system/dict/index.vue | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/utils/routerHelper.ts b/src/utils/routerHelper.ts index 0ae8e1e2..af6a9c3c 100644 --- a/src/utils/routerHelper.ts +++ b/src/utils/routerHelper.ts @@ -212,9 +212,11 @@ const addToChildren = ( } } const toCamelCase = (str: string, upperCaseFirst: boolean) => { - str = (str || '').toLowerCase().replace(/-(.)/g, function (group1: string) { - return group1.toUpperCase() - }) + str = (str || '') + .replace(/-(.)/g, function (group1: string) { + return group1.toUpperCase() + }) + .replaceAll('-', '') if (upperCaseFirst && str) { str = str.charAt(0).toUpperCase() + str.slice(1) diff --git a/src/views/bpm/task/todo/index.vue b/src/views/bpm/task/todo/index.vue index ab286c0b..bc21c597 100644 --- a/src/views/bpm/task/todo/index.vue +++ b/src/views/bpm/task/todo/index.vue @@ -22,7 +22,7 @@ const { push } = useRouter() // 路由 const [registerTable] = useXTable({ allSchemas: allSchemas, - topActionSlots:false, + topActionSlots: false, getListApi: TaskApi.getTodoTaskPage }) diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index d4cce484..d3b52519 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -179,6 +179,7 @@ const tableTypeSelect = ref(false) const cellClickEvent: VxeTableEvents.CellClick = async ({ row }) => { tableTypeSelect.value = true queryParams.dictType = row['type'] + await nextTick() await dataGetList() parentType.value = row['type'] } From 401794f1bff73a866150ae7bd45837b3304cd80a Mon Sep 17 00:00:00 2001 From: bimei <18812666091@163.com> Date: Fri, 17 Feb 2023 17:23:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=A0=B9=E6=8D=AEkeepalive=E8=A7=84?= =?UTF-8?q?=E5=88=99=E4=BF=AE=E6=94=B9=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/infra/server/index.vue | 2 +- src/views/report/jmreport/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/infra/server/index.vue b/src/views/infra/server/index.vue index 8e748b26..cc7590d6 100644 --- a/src/views/infra/server/index.vue +++ b/src/views/infra/server/index.vue @@ -3,7 +3,7 @@