系统全局存储部门和分类

src/compenents/tree-category/index.tsx

@@ -1,6 +1,6 @@
 import { Tree } from "antd";
 import { useState, useEffect } from "react";
-import { resourceCategory } from "../../api/index";
+import { useSelector } from "react-redux";
 
 interface Option {
   key: string | number;
@@ -19,6 +19,9 @@ export const TreeCategory = (props: PropInterface) => {
   const [treeData, setTreeData] = useState<any>([]);
   const [loading, setLoading] = useState<boolean>(true);
   const [selectKey, setSelectKey] = useState<number[]>([]);
+  const resourceCategories = useSelector(
+    (state: any) => state.systemConfig.value.resourceCategories
+  );
 
   useEffect(() => {
     if (props.selected && props.selected.length > 0) {
@@ -27,21 +30,17 @@ export const TreeCategory = (props: PropInterface) => {
   }, [props.selected]);
 
   useEffect(() => {
-    resourceCategory.resourceCategoryList().then((res: any) => {
+    if (JSON.stringify(resourceCategories) !== "{}") {
-      const categories: CategoriesBoxModel = res.data.categories;
+      const new_arr: Option[] = checkArr(resourceCategories, 0);
-      if (JSON.stringify(categories) !== "{}") {
+      if (props.type === "no-cate") {
-        const new_arr: Option[] = checkArr(categories, 0);
+        new_arr.unshift({
-        if (props.type === "no-cate") {
+          key: 0,
-          new_arr.unshift({
+          title: <span className="tree-title-elli">未分类</span>,
-            key: 0,
+        });
-            title: <span className="tree-title-elli">未分类</span>,
-          });
-        }
-
-        setTreeData(new_arr);
       }
-    });
+      setTreeData(new_arr);
-  }, []);
+    }
+  }, [resourceCategories]);
 
   const checkArr = (categories: CategoriesBoxModel, id: number) => {
     const arr = [];

src/compenents/tree-department/index.tsx

@@ -1,6 +1,7 @@
 import { Button, Input, message, Tree } from "antd";
 import { useState, useEffect } from "react";
 import { department } from "../../api/index";
+import { useSelector } from "react-redux";
 
 interface Option {
   key: string | number;
@@ -22,6 +23,9 @@ export const TreeDepartment = (props: PropInterface) => {
   const [loading, setLoading] = useState<boolean>(true);
   const [selectKey, setSelectKey] = useState<number[]>([]);
   const [userTotal, setUserTotal] = useState(0);
+  const localDepartments = useSelector(
+    (state: any) => state.systemConfig.value.departments
+  );
 
   useEffect(() => {
     if (props.selected && props.selected.length > 0) {
@@ -31,18 +35,30 @@ export const TreeDepartment = (props: PropInterface) => {
 
   useEffect(() => {
     setLoading(true);
-    department.departmentList().then((res: any) => {
+    if (props.showNum) {
-      const departments: DepartmentsBoxModel = res.data.departments;
+      department.departmentList().then((res: any) => {
-      const departCount: DepIdsModel = res.data.dep_user_count;
+        const departments: DepartmentsBoxModel = res.data.departments;
-      setUserTotal(res.data.user_total);
+        const departCount: DepIdsModel = res.data.dep_user_count;
-      if (JSON.stringify(departments) !== "{}") {
+        setUserTotal(res.data.user_total);
-        if (props.showNum) {
+        if (JSON.stringify(departments) !== "{}") {
           const new_arr: any[] = checkNewArr(departments, 0, departCount);
           setTreeData(new_arr);
         } else {
-          const new_arr: any[] = checkArr(departments, 0);
+          const new_arr: Option[] = [
+            {
+              key: "",
+              title: "全部",
+              children: [],
+            },
+          ];
           setTreeData(new_arr);
         }
+        setLoading(false);
+      });
+    } else {
+      if (JSON.stringify(localDepartments) !== "{}") {
+        const new_arr: any[] = checkArr(localDepartments, 0);
+        setTreeData(new_arr);
       } else {
         const new_arr: Option[] = [
           {
@@ -54,8 +70,8 @@ export const TreeDepartment = (props: PropInterface) => {
         setTreeData(new_arr);
       }
       setLoading(false);
-    });
+    }
-  }, [props.refresh]);
+  }, [props.refresh, localDepartments]);
 
   const checkNewArr = (
     departments: DepartmentsBoxModel,

src/pages/init/index.tsx

@@ -27,6 +27,8 @@ const InitPage = (props: Props) => {
       systemH5Url: props.configData["system.h5_url"],
       memberDefaultAvatar: props.configData["member.default_avatar"],
       courseDefaultThumbs: props.configData["default.course_thumbs"],
+      departments: props.configData["departments"],
+      resourceCategories: props.configData["resource_categories"],
     };
     dispatch(saveConfigAction(config));
   }

src/pages/login/index.tsx

@@ -67,6 +67,8 @@ const LoginPage = () => {
       systemH5Url: res.data["system.h5_url"],
       memberDefaultAvatar: res.data["member.default_avatar"],
       courseDefaultThumbs: res.data["default.course_thumbs"],
+      departments: res.data["departments"],
+      resourceCategories: res.data["resource_categories"],
     };
     dispatch(saveConfigAction(data));
   };

src/pages/system/config/index.tsx

@@ -259,6 +259,8 @@ const SystemConfigPage = () => {
         systemH5Url: res.data["system.h5_url"],
         memberDefaultAvatar: res.data["member.default_avatar"],
         courseDefaultThumbs: res.data["default.course_thumbs"],
+        departments: res.data["departments"],
+        resourceCategories: res.data["resource_categories"],
       };
       dispatch(saveConfigAction(data));
     });

src/store/system/systemConfigSlice.ts

@@ -9,6 +9,8 @@ type SystemConfigStoreInterface = {
   systemName?: string;
   memberDefaultAvatar?: string;
   courseDefaultThumbs?: string[];
+  departments: any;
+  resourceCategories: any;
 };
 
 const systemConfigSlice = createSlice({