From 4d577b2473cd217310275b2a3f02b419764045e6 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Thu, 4 Aug 2022 11:46:37 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Form/src/components/RadioButtonGroup.vue  |  1 +
 src/views/system/menu/MenuModal.vue           | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/Form/src/components/RadioButtonGroup.vue b/src/components/Form/src/components/RadioButtonGroup.vue
index 0c98988..42bf835 100644
--- a/src/components/Form/src/components/RadioButtonGroup.vue
+++ b/src/components/Form/src/components/RadioButtonGroup.vue
@@ -37,6 +37,7 @@
     },
     setup(props) {
       const attrs = useAttrs();
+      console.log('村上春树', attrs);
       // Embedded in the form, just use the hook binding to perform form verification
       const [state] = useRuleFormItem(props);
 
diff --git a/src/views/system/menu/MenuModal.vue b/src/views/system/menu/MenuModal.vue
index 8479107..e7d9266 100644
--- a/src/views/system/menu/MenuModal.vue
+++ b/src/views/system/menu/MenuModal.vue
@@ -14,7 +14,7 @@
    * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
    * author entfrm开发团队-王翔
    */
-  import { ref, unref, reactive, toRaw } from 'vue';
+  import { reactive, toRaw } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema } from './menu.data';
   import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
@@ -26,8 +26,6 @@
     tag: '',
     menuTree: []
   });
-  const tag = ref<Nullable<string>>('');
-  const menuTree = ref<Recordable[]>([]);
   /** https://v3.cn.vuejs.org/api/options-data.html#emits */
   const emit = defineEmits(['success', 'register']);
   const [registerForm, { resetFields, setFieldsValue, updateSchema, validate, clearValidate }] = useForm({
@@ -41,20 +39,25 @@
     await resetFields();
     await clearValidate();
     // 处理设置数据
-    tag.value = data._tag;
+    state.tag = data._tag;
     const topMenu = { id: '0', name: '顶级菜单', children: [] };
     state.menuTree = listToTree(await listMenu());
     topMenu.children = state.menuTree;
-    await updateSchema({
+    await updateSchema([{
       field: 'parentId',
       componentProps: {
         treeData: [topMenu]
       }
-    });
+    }, {
+      field: 'type',
+      componentProps: {
+        disabled: state.tag == 'edit'
+      }
+    }]);
     const menuId = data.record?.id;
     const props: Partial<ModalProps> = { confirmLoading: false };
     // 采用tag标签区分操作
-    switch (unref(tag)) {
+    switch (state.tag) {
       case 'add':
         props.title = '新增菜单';
         menuId && await setFieldsValue({ parentId: menuId });
@@ -76,7 +79,7 @@
       // 处理提交之前逻辑
       setModalProps({ confirmLoading: true });
       // 采用tag标签区分操作
-      switch (unref(tag)) {
+      switch (state.tag) {
         case 'add':
           // 处理拿取当前菜单所有父级进行修改角色模块的勾选类型
           const superMenus = findPath(toRaw(state.menuTree),(node) => node.id == formData?.parentId);