Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

src/pages/authConfig/memberSystem/memberDetail.tsx

@@ -117,6 +117,7 @@ const MemberDetail: React.FC<{}> = () => {
       }),
   });
 
+
   const actionRef = useRef<any>({});
   const formInitValue = nodeRecord ? getButtonAuth(nodeRecord.key) : {};
   const [errors, setErrors] = useState<boolean>(false);
@@ -126,7 +127,7 @@ const MemberDetail: React.FC<{}> = () => {
   const [buttonInfos, setButtonInfos] = useState<any>([]);
   // 储存的数据权限选项
   const [authInfos, setAuthInfos] = useState<any>({});
-
+  const [plateformTreeList, setplateformTreeList] = useState<any>([])
   // 存储默认勾选的id
   const [checkIds, setcheckIds] = useState<any>({});
   const modalRef = useRef<any>({})
@@ -157,6 +158,11 @@ const MemberDetail: React.FC<{}> = () => {
         menuId: node ? node.id : nodeRecord.id,
         ...params,
       });
+
+      if (!isAdd && data.orgIds) {
+        let plateformTreeDataList = mapkey(plateformTreeData, data.orgIds)
+        setplateformTreeList(plateformTreeDataList)
+      }
       setButtonAuth(node.id, data);
 
       // 该配置由pass平台控制, 如果为1 则表示该角色可以配置数据权限
@@ -382,12 +388,33 @@ const MemberDetail: React.FC<{}> = () => {
     </Space>
   );
 
+  const mapkey = (plateformTreeData: any, selectKeys: any) => {
+    let plateformTreeDataList = [];
+    plateformTreeData.map((item: any) => {
+      if (selectKeys.includes(item.id)) {
+        plateformTreeDataList.push(
+          {
+            id: item.id,
+            title: item.title
+          }
+        )
+        if (item.children) {
+          const arr = mapkey(item.children, selectKeys)
+          plateformTreeDataList = [...plateformTreeDataList, ...arr];
+        }
+
+      }
+
+    })
+    return plateformTreeDataList
+  }
   const handleOrgSuccess = selectKeys => {
-    console.log(selectKeys, 'selectKeys')
+    // console.log(selectKeys, 'selectKeys')
     if (!dataId.includes(nodeRecord.id)) {
       dataId.push(nodeRecord.id)
       setdataId(dataId)
     }
+    // console.log(dataId)
     setAuthInfos({
       ...authInfos,
       [nodeRecord.id]: Object.assign(
@@ -395,6 +422,9 @@ const MemberDetail: React.FC<{}> = () => {
         { orgIds: selectKeys },
       ),
     });
+    let plateformTreeDataList = mapkey(plateformTreeData, selectKeys)
+    setplateformTreeList(plateformTreeDataList)
+    // console.log(plateformTreeDataList, 'plateformTreeData')
     setOrgModalVisible(false);
   };
   const handleOrgCancel = () => {
@@ -507,17 +537,21 @@ const MemberDetail: React.FC<{}> = () => {
                     </Checkbox>
                     <div style={{ marginTop: 16 }}>
                       <p style={{ color: '#909399' }}>{intl.formatMessage({ id: 'authConfig.OrganizationAuthorization' })}</p>
-                      {disabledCheckAuthConfig.orgIds.map(v => {
-                        const node = getTreeNode(plateformTreeData, v);
-                        if (!node || !node.id) return null;
+                      {plateformTreeList.map(v => {
+                        // 
+                        // {disabledCheckAuthConfig.orgIds.map(v => {
+                        // const node = getTreeNode(plateformTreeData, v);
+                        // // console.log(node, '1111')
+                        // if (!node || !node.id) return null;
                         return (
-                          <div className="org-tag-container" key={node.id}>
+                          <div className="org-tag-container" key={v.id}>
                             <Tag color={'#F4F5F7'} className="org-tag">
-                              {node.title}
+                              {v.title}
                             </Tag>
                           </div>
                         );
                       })}
+
                       <Button block type="dashed" onClick={handleOpenOrg}>
                         <PlusOutlined /> {intl.formatMessage({ id: 'authConfig.orientation' })}
                       </Button>