Parcourir la source

fix: 修改通知配置保存按钮权限

100011797 il y a 3 ans
Parent
commit
3561276551

+ 1 - 1
src/pages/notice/Config/Detail/index.tsx

@@ -722,7 +722,7 @@ const Detail = observer(() => {
     }
   };
 
-  const { getOtherPermission } = usePermissions('notice');
+  const { getOtherPermission } = usePermissions('notice/Config');
 
   return (
     <PageContainer>

+ 1 - 1
src/pages/notice/Template/Detail/index.tsx

@@ -1656,7 +1656,7 @@ const Detail = observer(() => {
       },
     },
   };
-  const { permission } = usePermissions('notice');
+  const { permission } = usePermissions('notice/Template');
   return (
     <PageContainer>
       <Card>

+ 16 - 7
src/pages/system/Role/Detail/Permission/Allocate/index.tsx

@@ -15,6 +15,7 @@ const Allocate = (props: Props) => {
     name: '菜单权限',
     children: [],
   });
+  const [dataOldSource, setDataOldSource] = useState<any>({});
   const [assetsList, setAssetsList] = useState<any[]>([]);
 
   const getDataList: any = (data1: any[]) => {
@@ -128,18 +129,26 @@ const Allocate = (props: Props) => {
           level={1}
           assetsList={assetsList}
           checkChange={(data: any) => {
-            const dt = {
-              ...dataSource,
-              children: getAccessData(dataSource.children || [], data),
-            };
-            setDataSource(dt);
-            if (props.onChange) {
-              props.onChange(dt);
+            if (data) {
+              const dt = {
+                ...dataSource,
+                children: getAccessData(dataSource.children || [], data),
+              };
+              setDataSource(dt);
+              if (props.onChange) {
+                props.onChange(dt);
+              }
+            } else {
+              setDataSource(dataOldSource);
+              if (props.onChange) {
+                props.onChange(dataOldSource);
+              }
             }
           }}
           change={(data: any) => {
             setDataSource(data);
             if (props.onChange) {
+              setDataOldSource(data);
               props.onChange(data);
             }
           }}