Merge branch 'master' into kitchenmanage

config/routes.js

@@ -213,6 +213,7 @@ export default [
       // },
     ],
   },
+  
   {
     name: '场景管理',
     icon: 'BankFilled',

src/pages/sys/menus/components/CreateForm.jsx

@@ -11,6 +11,7 @@ const CreateForm = (props) => {
       visible={props.modalVisible}
       bodyStyle={{ padding: '32px 40px 1px 48px' }}
       footer={null}
+      maskClosable={false}
       onCancel={() => {
         props.onCancel();
       }}

src/pages/sys/menus/index.jsx

@@ -73,7 +73,10 @@ const handleUpdate = async (fields) => {
       onClick={() => {
         InitTree();
         handleModalVisible(true);
+        console.log("record.type",record.type)
+       if(!Array.isArray(record.type)){
         record.type=record.type.split(',');
+       }
         setStepFormValues(record);
       }}
     >