diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue index ffff5681..a8ae601b 100644 --- a/src/components/Search/src/Search.vue +++ b/src/components/Search/src/Search.vue @@ -9,6 +9,8 @@ import { FormSchema } from '@/types/form' const { t } = useI18n() +const slots = useSlots() + const props = defineProps({ // 生成Form的布局结构数组 schema: { @@ -123,6 +125,7 @@ const setVisible = () => { </ElButton> </div> </template> + <template v-for="(slot, name) in slots" #[name]><slot :name="name"></slot></template> </Form> <template v-if="layout === 'bottom'"> diff --git a/src/store/modules/tagsView.ts b/src/store/modules/tagsView.ts index e9fbf371..a60d0e45 100644 --- a/src/store/modules/tagsView.ts +++ b/src/store/modules/tagsView.ts @@ -58,7 +58,7 @@ export const useTagsViewStore = defineStore('tagsView', { // 删除某个 delView(view: RouteLocationNormalizedLoaded) { this.delVisitedView(view) - this.addCachedView() + this.delCachedView() }, // 删除tag delVisitedView(view: RouteLocationNormalizedLoaded) { @@ -80,7 +80,7 @@ export const useTagsViewStore = defineStore('tagsView', { // 删除所有缓存和tag delAllViews() { this.delAllVisitedViews() - this.addCachedView() + this.delCachedView() }, // 删除所有tag delAllVisitedViews() { 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/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..bc21c597 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/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 @@ <IFrame :src="src" /> </ContentWrap> </template> -<script setup lang="ts" name="Server"> +<script setup lang="ts" name="AdminServer"> const BASE_URL = import.meta.env.VITE_BASE_URL const src = ref(BASE_URL + '/admin/applications') </script> diff --git a/src/views/report/jmreport/index.vue b/src/views/report/jmreport/index.vue index 3e33ad3a..bae999f4 100644 --- a/src/views/report/jmreport/index.vue +++ b/src/views/report/jmreport/index.vue @@ -3,7 +3,7 @@ <IFrame :src="src" /> </ContentWrap> </template> -<script setup lang="ts" name="Jmreport"> +<script setup lang="ts" name="JimuReport"> import { getAccessToken } from '@/utils/auth' const BASE_URL = import.meta.env.VITE_BASE_URL diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index 9324f764..713fde97 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'] } 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 })