From d4108c8e491a3442c31c33620e0b923f40a3a674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=95=E9=87=91=E6=B3=BD?= <1098696801@qq.com>
Date: Fri, 8 Apr 2022 21:30:01 +0800
Subject: [PATCH] =?UTF-8?q?magic-api=E4=B8=AD=E7=9A=84component=20?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=94=A8=E4=BA=8Emb-form=EF=BC=8C=E5=8D=95?=
 =?UTF-8?q?=E7=8B=ACmagic-import.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/magic/advanced/mb-form.vue          |  2 +-
 magic-boot-ui/src/main.js                              | 10 ++--------
 magic-boot-ui/src/scripts/global.js                    |  3 ++-
 magic-boot-ui/src/scripts/magic-import.js              | 10 ++++++++++
 4 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 magic-boot-ui/src/scripts/magic-import.js

diff --git a/magic-boot-ui/src/components/magic/advanced/mb-form.vue b/magic-boot-ui/src/components/magic/advanced/mb-form.vue
index d0fc073..8d261d5 100644
--- a/magic-boot-ui/src/components/magic/advanced/mb-form.vue
+++ b/magic-boot-ui/src/components/magic/advanced/mb-form.vue
@@ -9,7 +9,7 @@
       <el-col v-for="(col,j) in row.cols" :key="j" :span="col.span" v-bind="col.colProps">
         <el-form-item :label="col.label" :label-width="col.labelWidth" :prop="col.name" v-bind="col.formItemProps">
           <component
-            :is="!col.component ? 'mb-input' : col.component.startsWith('el-') ? col.component : 'mb-' + col.component"
+            :is="!col.component ? 'mb-input' : col.component.startsWith('el-') || $global.dynamicComponentNames.indexOf(col.component) != -1 ? col.component : 'mb-' + col.component"
             v-model="formData[col.name]"
             :item-label="col.label"
             v-bind="col.props"
diff --git a/magic-boot-ui/src/main.js b/magic-boot-ui/src/main.js
index 9707542..078533c 100644
--- a/magic-boot-ui/src/main.js
+++ b/magic-boot-ui/src/main.js
@@ -1,4 +1,3 @@
-import * as vue from 'vue'
 import {createApp} from 'vue'
 const app = createApp(App)
 import ElementPlus from 'element-plus'
@@ -14,13 +13,7 @@ import hasPermission from './scripts/hasPermission'
 import { appComponent } from './scripts/dynamicComponent'
 import '@/permission'
 import global from '@/scripts/global.js'
-const libs = {
-  vue,
-  'element-plus': ElementPlus
-}
-window.___magic__import__ = function(lib, name){
-  return (libs[lib] || {})[name]
-}
+import '@/scripts/magic-import'
 app.use(globalProperties)
 
 var loadDynamicComponent = false
@@ -37,6 +30,7 @@ router.beforeEach(async (to, from) => {
       })
       await app.config.globalProperties.$post('/system/component/list').then((res) => {
         res.data.forEach(it => {
+          global.dynamicComponentNames.push(it.name)
           appComponent(app, it)
         })
         loading.close()
diff --git a/magic-boot-ui/src/scripts/global.js b/magic-boot-ui/src/scripts/global.js
index fcdce63..d1035e3 100644
--- a/magic-boot-ui/src/scripts/global.js
+++ b/magic-boot-ui/src/scripts/global.js
@@ -10,5 +10,6 @@ export default {
   },
   baseApi: import.meta.env.VITE_APP_BASE_API,
   visitedViews: reactive([]),
-  tabValue: ref('')
+  tabValue: ref(''),
+  dynamicComponentNames: []
 }
diff --git a/magic-boot-ui/src/scripts/magic-import.js b/magic-boot-ui/src/scripts/magic-import.js
new file mode 100644
index 0000000..b6f6ec3
--- /dev/null
+++ b/magic-boot-ui/src/scripts/magic-import.js
@@ -0,0 +1,10 @@
+import * as vue from "vue";
+import ElementPlus from "element-plus";
+
+const libs = {
+    vue,
+    'element-plus': ElementPlus
+}
+window.___magic__import__ = function(lib, name){
+    return (libs[lib] || {})[name]
+}