!2 遇到多个问题并修改

Merge pull request !2 from 毕梅/master

src/components/Search/src/Search.vue

@@ -9,6 +9,8 @@ import { FormSchema } from '@/types/form'
 
 
 const { t } = useI18n()
 const { t } = useI18n()
 
 
+const slots = useSlots()
+
 const props = defineProps({
 const props = defineProps({
   // 生成Form的布局结构数组
   // 生成Form的布局结构数组
   schema: {
   schema: {
@@ -123,6 +125,7 @@ const setVisible = () => {
         </ElButton>
         </ElButton>
       </div>
       </div>
     </template>
     </template>
+    <template v-for="(slot, name) in slots" #[name]><slot :name="name"></slot></template>
   </Form>
   </Form>
 
 
   <template v-if="layout === 'bottom'">
   <template v-if="layout === 'bottom'">

src/store/modules/tagsView.ts

@@ -58,7 +58,7 @@ export const useTagsViewStore = defineStore('tagsView', {
     // 删除某个
     // 删除某个
     delView(view: RouteLocationNormalizedLoaded) {
     delView(view: RouteLocationNormalizedLoaded) {
       this.delVisitedView(view)
       this.delVisitedView(view)
-      this.addCachedView()
+      this.delCachedView()
     },
     },
     // 删除tag
     // 删除tag
     delVisitedView(view: RouteLocationNormalizedLoaded) {
     delVisitedView(view: RouteLocationNormalizedLoaded) {
@@ -80,7 +80,7 @@ export const useTagsViewStore = defineStore('tagsView', {
     // 删除所有缓存和tag
     // 删除所有缓存和tag
     delAllViews() {
     delAllViews() {
       this.delAllVisitedViews()
       this.delAllVisitedViews()
-      this.addCachedView()
+      this.delCachedView()
     },
     },
     // 删除所有tag
     // 删除所有tag
     delAllVisitedViews() {
     delAllVisitedViews() {

src/utils/routerHelper.ts

@@ -212,9 +212,11 @@ const addToChildren = (
   }
   }
 }
 }
 const toCamelCase = (str: string, upperCaseFirst: boolean) => {
 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) {
   if (upperCaseFirst && str) {
     str = str.charAt(0).toUpperCase() + str.slice(1)
     str = str.charAt(0).toUpperCase() + str.slice(1)

src/views/bpm/task/done/index.vue

@@ -21,6 +21,7 @@ const { push } = useRouter() // 路由
 
 
 const [registerTable] = useXTable({
 const [registerTable] = useXTable({
   allSchemas: allSchemas,
   allSchemas: allSchemas,
+  topActionSlots: false,
   getListApi: TaskApi.getDoneTaskPage
   getListApi: TaskApi.getDoneTaskPage
 })
 })
 
 

src/views/bpm/task/todo/index.vue

@@ -22,6 +22,7 @@ const { push } = useRouter() // 路由
 
 
 const [registerTable] = useXTable({
 const [registerTable] = useXTable({
   allSchemas: allSchemas,
   allSchemas: allSchemas,
+  topActionSlots: false,
   getListApi: TaskApi.getTodoTaskPage
   getListApi: TaskApi.getTodoTaskPage
 })
 })
 
 

src/views/infra/server/index.vue

@@ -3,7 +3,7 @@
     <IFrame :src="src" />
     <IFrame :src="src" />
   </ContentWrap>
   </ContentWrap>
 </template>
 </template>
-<script setup lang="ts" name="Server">
+<script setup lang="ts" name="AdminServer">
 const BASE_URL = import.meta.env.VITE_BASE_URL
 const BASE_URL = import.meta.env.VITE_BASE_URL
 const src = ref(BASE_URL + '/admin/applications')
 const src = ref(BASE_URL + '/admin/applications')
 </script>
 </script>

src/views/report/jmreport/index.vue

@@ -3,7 +3,7 @@
     <IFrame :src="src" />
     <IFrame :src="src" />
   </ContentWrap>
   </ContentWrap>
 </template>
 </template>
-<script setup lang="ts" name="Jmreport">
+<script setup lang="ts" name="JimuReport">
 import { getAccessToken } from '@/utils/auth'
 import { getAccessToken } from '@/utils/auth'
 
 
 const BASE_URL = import.meta.env.VITE_BASE_URL
 const BASE_URL = import.meta.env.VITE_BASE_URL

src/views/system/dict/index.vue

@@ -179,6 +179,7 @@ const tableTypeSelect = ref(false)
 const cellClickEvent: VxeTableEvents.CellClick = async ({ row }) => {
 const cellClickEvent: VxeTableEvents.CellClick = async ({ row }) => {
   tableTypeSelect.value = true
   tableTypeSelect.value = true
   queryParams.dictType = row['type']
   queryParams.dictType = row['type']
+  await nextTick()
   await dataGetList()
   await dataGetList()
   parentType.value = row['type']
   parentType.value = row['type']
 }
 }

src/views/system/mail/log/index.vue

@@ -59,6 +59,7 @@ const queryParams = reactive({
 })
 })
 const [registerTable] = useXTable({
 const [registerTable] = useXTable({
   allSchemas: allSchemas,
   allSchemas: allSchemas,
+  topActionSlots: false,
   params: queryParams,
   params: queryParams,
   getListApi: MailLogApi.getMailLogPageApi
   getListApi: MailLogApi.getMailLogPageApi
 })
 })

src/views/system/notify/message/index.vue

@@ -37,6 +37,7 @@ const { t } = useI18n() // 国际化
 // 列表相关的变量
 // 列表相关的变量
 const [registerTable] = useXTable({
 const [registerTable] = useXTable({
   allSchemas: allSchemas,
   allSchemas: allSchemas,
+  topActionSlots: false,
   getListApi: NotifyMessageApi.getNotifyMessagePageApi
   getListApi: NotifyMessageApi.getNotifyMessagePageApi
 })
 })