Skip to content

Commit 6f09d93

Browse files
committedApr 30, 2025·
fix: 修复 ma-form 支持 children 配置项后,造成组件默认插槽参数丢失以及 render 函数里 jsx 语法的子组件不渲染问题,同时修复 ma-search 兼容 ma-form 的一些问题
1 parent f989ab9 commit 6f09d93

File tree

6 files changed

+43
-5
lines changed

6 files changed

+43
-5
lines changed
 

‎web/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
"dependencies": {
2121
"@imengyu/vue3-context-menu": "^1.4.4",
2222
"@mineadmin/echarts": "^1.0.5",
23-
"@mineadmin/form": "^1.0.33",
23+
"@mineadmin/form": "^1.0.45",
2424
"@mineadmin/pro-table": "^1.0.67",
25-
"@mineadmin/search": "^1.0.33",
25+
"@mineadmin/search": "^1.0.35",
2626
"@mineadmin/table": "^1.0.33",
2727
"@vueuse/core": "^12.7.0",
2828
"@vueuse/integrations": "^12.7.0",

‎web/src/modules/base/views/dashboard/components/workbench/workbench-fast.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const router = useRouter()
2121
<div class="grid grid-cols-3 mt-3 gap-3 lg:grid-cols-4 md:grid-cols-4 xl:grid-cols-6">
2222
<template v-for="(item, idx) in router.getRoutes()">
2323
<div v-if="/^(?!.*\/uc)(?!.*\/login)(?!.*\/:pathMatch\([^)]*\)).*$/.test(item.path) && item.components && idx < 10" class="flex-center">
24-
<el-link :underline="false" @click="() => router.push(item.path)">
24+
<el-link underline="never" @click="() => router.push(item.path)">
2525
<div class="link">
2626
<ma-svg-icon :name="(item.meta?.icon ?? 'i-carbon:unknown') as string" :size="26" />
2727
{{ item.meta?.i18n ? t(item.meta.i18n) : item.meta?.title ?? 'unknown' }}

‎web/src/modules/base/views/permission/role/data/getTableColumns.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t
8282
const response = await deleteByIds([row.id])
8383
if (response.code === ResultCode.SUCCESS) {
8484
msg.success(t('crud.delSuccess'))
85-
proxy.refresh()
85+
await proxy.refresh()
8686
}
8787
})
8888
},
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/**
2+
* MineAdmin is committed to providing solutions for quickly building web applications
3+
* Please view the LICENSE file that was distributed with this source code,
4+
* For the full copyright and license information.
5+
* Thank you very much for using MineAdmin.
6+
*
7+
* @Author X.Mo<root@imoi.cn>
8+
* @Link https://github.com/mineadmin
9+
*/
10+
import type { Plugin } from '#/global'
11+
12+
const pluginConfig: Plugin.PluginConfig = {
13+
install() {
14+
console.log('MineAdmin 远程加载视图插件已启动')
15+
},
16+
config: {
17+
enable: true,
18+
info: {
19+
name: 'mine-admin/remote-load-vue',
20+
version: '1.0.0',
21+
author: 'X.Mo',
22+
description: '提供远程加载Vue文件(服务器端渲染)能力',
23+
},
24+
},
25+
}
26+
27+
export default pluginConfig
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<script setup lang="ts">
2+
defineOptions({ name: 'MaRemoteLoadVue' })
3+
</script>
4+
5+
<template>
6+
<div />
7+
</template>
8+
9+
<style scoped lang="scss">
10+
11+
</style>

‎web/src/provider/mine-core/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import MaTable from '@mineadmin/table'
2323
// maTable样式
2424
import '@mineadmin/table/dist/style.css'
2525
// maSearch样式
26-
import '@mineadmin/search/dist/style.css'
26+
import '@mineadmin/search/dist/search.css'
2727
// MaProTable样式
2828
import '@mineadmin/pro-table/dist/style.css'
2929

0 commit comments

Comments
 (0)
Please sign in to comment.