Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

src/pages/database/InitDataBase.jsx

@@ -590,6 +590,7 @@ const InitDataBase = props => {
             setInitContent('');
           }}
           width={800}
+          maskClosable={false}
           bodyStyle={{
             height: '600px',
             // overflowY: 'auto',

src/pages/userCenter/roleManage/RoleManage.jsx

@@ -71,6 +71,7 @@ const SiteManage = () => {
 
   // 点击树的回调
   const handleTreeSelect = (e, treenode) => {
+    console.log(treenode);
     if (treenode) {
       console.log(e, node, 'node');
       const { node } = treenode;
@@ -81,7 +82,8 @@ const SiteManage = () => {
         setRoleID(id);
         setValueList([...valueList]);
       } else {
-        setRoleID(saveTreeId);
+        // setRoleID(saveTreeId);
+        setRoleID('');
       }
     }
 
@@ -190,7 +192,6 @@ const SiteManage = () => {
           item.roleList.unshift(itemC);
         });
       }
-      console.log(iconStyles);
       // if (item.visibleTitle === '手持系统') {
       //   item.icon = <span className="iconfont iconanzhuo1" />;
       //   newArr[0] = item;
@@ -263,8 +264,8 @@ const SiteManage = () => {
   const confirmModal = e => {
     console.log(e, typeof e, 'e');
     setModalVisible(false);
-    setRoleID(`${e}`);
-    setCurrentSelectId([`${e}`]);
+    // setRoleID(`${e}`);
+    // setCurrentSelectId([`${e}`]);
     setFlag(flag + 1);
     setItemObj('');
   };
@@ -272,6 +273,7 @@ const SiteManage = () => {
   const delModal = () => {
     setDelVisible(false);
     setFlag(flag + 1);
+    setRoleID('');
     setItemObj('');
   };
   // 编辑弹窗回调