From 30cbecbd72edfd4ed076c49a003c123d0f3f066f Mon Sep 17 00:00:00 2001
From: tanyp <742354529@qq.com>
Date: Thu, 11 May 2023 17:31:21 +0800
Subject: [PATCH] update

---
 tansci-boot-ui/package.json                   |  1 -
 .../src/components/amis/AmisComponent.vue     | 22 +++++++++++++------
 .../components/layout/component/TbNavTabs.vue |  1 -
 .../java/com/tansci/domain/vo/SysMenuVo.java  |  3 +++
 .../service/impl/SysMenuServiceImpl.java      |  1 +
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/tansci-boot-ui/package.json b/tansci-boot-ui/package.json
index 9387c8e..323650e 100644
--- a/tansci-boot-ui/package.json
+++ b/tansci-boot-ui/package.json
@@ -11,7 +11,6 @@
   },
   "dependencies": {
     "amis": "^3.0.0",
-    "amis-ui": "^3.0.0",
     "axios": "^1.3.4",
     "copy-to-clipboard": "^3.3.3",
     "element-plus": "^2.3.3",
diff --git a/tansci-boot-ui/src/components/amis/AmisComponent.vue b/tansci-boot-ui/src/components/amis/AmisComponent.vue
index 4d4d367..82697a5 100644
--- a/tansci-boot-ui/src/components/amis/AmisComponent.vue
+++ b/tansci-boot-ui/src/components/amis/AmisComponent.vue
@@ -1,14 +1,17 @@
 <template> 
-    <div ref="box"></div>
+    <div ref="boxRef"></div>
 </template>
 <script setup lang="ts">
-    import {defineProps,watch,toRaw} from "vue"
+    import {defineProps,onMounted,watch,toRaw,ref} from "vue"
+    import {ElMessage} from 'element-plus'
+    import 'amis/sdk/sdk.js';
+    import 'amis/lib/themes/default.css';
     import axios from 'axios'
     import copy from 'copy-to-clipboard'
-    import {toast} from 'amis-ui'
     import {getPagesInfo} from '@/api/lowcode/lcPages'
     import {getToken} from '@/api/auth'
 
+    const boxRef = ref()
     const props = defineProps({
         formid: {
             type: String,
@@ -28,12 +31,17 @@
         onRendering(newValue)
     })
 
+    onMounted(()=>{
+        onRendering(props.formjson)
+    })
+
+
     function onRendering(data:any){
-        console.log(data)
+        // @ts-ignore
         let amis = amisRequire('amis/embed')
         let theme = 'cxd'
-        let amisScoped = amis.embed(
-            this.$refs.box, 
+        let amisScoped = amis.embed( 
+            boxRef.value,
             toRaw(data),
             {
                 updateLocation: (to, replace) => {},
@@ -91,7 +99,7 @@
                 isCancel: (value) => (axios ).isCancel(value),
                 copy: content => {
                     copy(content);
-                    toast.success('内容已复制到粘贴板');
+                    ElMessage.success('内容已复制到粘贴板');
                 },
                 theme
             }
diff --git a/tansci-boot-ui/src/components/layout/component/TbNavTabs.vue b/tansci-boot-ui/src/components/layout/component/TbNavTabs.vue
index 0ed19f5..3f41a5e 100644
--- a/tansci-boot-ui/src/components/layout/component/TbNavTabs.vue
+++ b/tansci-boot-ui/src/components/layout/component/TbNavTabs.vue
@@ -43,7 +43,6 @@
     }
 
     function onTabMenuClick(tabItem: TabsPaneContext){
-        console.log(tabItem)
         let path = tabItem.props.name as string;
         router.push(path);
     }
diff --git a/tansci-boot/src/main/java/com/tansci/domain/vo/SysMenuVo.java b/tansci-boot/src/main/java/com/tansci/domain/vo/SysMenuVo.java
index 6033c76..bba1756 100644
--- a/tansci-boot/src/main/java/com/tansci/domain/vo/SysMenuVo.java
+++ b/tansci-boot/src/main/java/com/tansci/domain/vo/SysMenuVo.java
@@ -45,6 +45,9 @@ public class SysMenuVo {
     @ApiModelProperty(value = "组件名称")
     private String component;
 
+    @ApiModelProperty(value = "组件类型：0、默认，1、amis")
+    private Integer componentType;
+
     @ApiModelProperty(value = "是否显示：0、不显示，1、显示")
     private Boolean isShow;
 
diff --git a/tansci-boot/src/main/java/com/tansci/service/impl/SysMenuServiceImpl.java b/tansci-boot/src/main/java/com/tansci/service/impl/SysMenuServiceImpl.java
index c3cb65c..0babf6e 100644
--- a/tansci-boot/src/main/java/com/tansci/service/impl/SysMenuServiceImpl.java
+++ b/tansci-boot/src/main/java/com/tansci/service/impl/SysMenuServiceImpl.java
@@ -119,6 +119,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
                             .icon(menu.getIcon())
                             .sort(menu.getSort())
                             .component(Objects.nonNull(menu.getComponent()) && menu.getComponent().length() > 0 ? menu.getComponent() : "Layout")
+                            .componentType(menu.getComponentType())
                             .isShow(Objects.equals(1, menu.getIsShow()) ? true : false)
                             .meta(meta)
                             .build()