优化子类样式等

src/App.js

@@ -3,7 +3,7 @@ import DataCenter from "./dataCenter/Root";
 import IndexAdmin from "./page/indexAdmin";
 import Index from "./page/index";
 import Login from "./page/login/login";
-import {Route, BrowserRouter as Router, Switch} from "react-router-dom";
+import {BrowserRouter as Router, Route, Switch} from "react-router-dom";
 
 function App() {
     return (

src/component/AdminIndex/AdminIndex.jsx

-
-import React from 'react'
+import React, {useState} from 'react'
 import './AdminIndex.scss'
-import { Layout, Menu, Breadcrumb, Button } from 'antd';
+import {Button} from 'antd';
 import ToolModal from '../../modal/ToolModal'
 import PublishModal from '../../modal/PublishModal'
 import TypeModal from '../../modal/TypeModal'
 import PageModal from '../../modal/PageModal'
 import RemoveType from '../../modal/RemoveType'
-import { useContext, useEffect, useState } from "react";
 
 function AdminIndex() {
     const [visible, setVisible] = useState(false)

src/component/Content/Content.jsx

 import './Content.scss'
 import ContentItem from "./ContentItem";
-import {useContext, useEffect, useState} from "react";
+import {useContext} from "react";
 import {Root} from "../../dataCenter/Root";
 
 function Content(props) {
@@ -8,7 +8,7 @@ function Content(props) {
     return (
         <div className="content">
             {
-                dataCenter.childType?.length ? dataCenter?.toolBox?.filter(v => {
+                dataCenter.toolBox?.length ? dataCenter?.toolBox?.filter(v => {
                         if (dataCenter.childTypeId === 'all') return true
                         else return v.childTypeId === dataCenter.childTypeId
                     }).map(v => {

src/component/ContentAdmin/Content.jsx

 import './Content.scss'
 import ContentItemAdmin from "./ContentItemAdmin";
-import {useContext, useEffect, useState} from "react";
+import {useContext} from "react";
 import {Root} from "../../dataCenter/Root";
+import ContentItem from "../Content/ContentItem";
 
 function Content(props) {
     const {dataCenter} = useContext(Root)
@@ -9,7 +10,10 @@ function Content(props) {
     return (
         <div className="content">
             {
-                dataCenter?.toolBox?.length ? dataCenter.toolBox.map(v => {
+                dataCenter.toolBox?.length ? dataCenter?.toolBox?.filter(v => {
+                        if (dataCenter.childTypeId === 'all') return true
+                        else return v.childTypeId === dataCenter.childTypeId
+                    }).map(v => {
                         return (
                             <ContentItemAdmin key={v['toolBoxId']} value={v}/>
                         )

src/component/ContentAdmin/ContentItemAdmin.jsx

 import './ContentItem.scss'
-import defaultIcon from '../../static/defaultIcon.png'
 import notFollow from '../../static/notFollow.png'
 import followed from '../../static/followed.png'
 import setting from '../../static/setting.svg'

src/component/Pop_addToolBox/Pop_addToolBox.jsx

 import './Pop_addToolBox.scss'
-import {useContext, useEffect, useRef} from "react";
+import {useContext} from "react";
 import {Root} from "../../dataCenter/Root";
 import {useFormState} from "../../utils/hook";
 import PopContainer from "../PopContainer/PopContainer";

src/component/ToolType/ToolType.jsx

@@ -25,14 +25,11 @@ function ToolType(props) {
     return (
         <>
             <div className="tab-tool-type">
-                {/*<div className={dataCenter.typeId === 'all' ? 'item-tool-type item-tool-type-selected' : 'item-tool-type'}*/}
-                {/*     onClick={() => setTypeId('all')}>工具*/}
-                {/*</div>*/}
-                {/*<div className={dataCenter.typeId === 'follow' ? 'item-tool-type item-tool-type-selected' : 'item-tool-type'}*/}
-                {/*     onClick={() => setTypeId('follow')}>我的收藏*/}
-                {/*</div>*/}
+                <div className={dataCenter.typeId === 'follow' ? 'item-tool-type item-tool-type-selected' : 'item-tool-type'}
+                     onClick={() => dispatch(CHANGE_TYPE('follow'))}>我的收藏
+                </div>
                 {
-                    dataCenter?.type?.length && dataCenter.type.map(v => {
+                    dataCenter?.type?.length > 0 && dataCenter.type.map(v => {
                         const classNameArr = ['item-tool-type ']
                         if (v["typeId"] === dataCenter.typeId) classNameArr.push('item-tool-type-selected')
                         return (
@@ -45,7 +42,7 @@ function ToolType(props) {
             <div className="child-type">
                 <ChildTypeItem key={'all'} childTypeId={'all'} childTypeName={'全部'}/>
                 {
-                    dataCenter?.childType?.length && dataCenter?.childType.map(v => {
+                    dataCenter?.childType?.length > 0 && dataCenter?.childType.map(v => {
                         return (
                             <ChildTypeItem key={v.childTypeId} childTypeId={v.childTypeId}
                                            childTypeName={v.childTypeName}/>

src/dataCenter/Root.jsx

 import React, {createContext, useReducer} from "react";
 import {dataReducer, initDataCenter} from "./reducer";
 import apiConfig from "../config/apiConfig";
-import {NEED_UPDATE_INDEX, UPDATE_DATA} from "./action";
+import {UPDATE_DATA} from "./action";
+
 const Root = createContext({})
 const PopContext = createContext({})
 

src/index.js

 import React from 'react';
 import ReactDOM from 'react-dom';
-import { ConfigProvider, DatePicker, message } from 'antd';
+import {ConfigProvider} from 'antd';
 // 由于 antd 组件的默认文案是英文，所以需要修改为中文
 import zhCN from 'antd/lib/locale/zh_CN';
 import moment from 'moment';
 import 'moment/locale/zh-cn';
 import 'antd/dist/antd.css';
 import './index.css';
-import './index.css';
 import App from './App';
 import reportWebVitals from './reportWebVitals';
+
 moment.locale('zh-cn');
 ReactDOM.render(
     <React.StrictMode>

src/modal/PageModal.jsx

-import React, { useState, useEffect, useContext } from 'react';
-import { Root } from "../dataCenter/Root";
-import { Button, Modal, Form, Input, Radio, Select, Table, Space } from 'antd';
+import React, {useContext, useEffect, useState} from 'react';
+import {Root} from "../dataCenter/Root";
+import {Modal, Space, Table} from 'antd';
 import PublishModal from "./PublishModal"
 
 function PageModal({ visible, onCancel, onPublish }) {

src/modal/PublishModal.jsx

 import './PublishModal.scss'
-import React, { useState, useEffect, useContext } from 'react';
-import { Root } from "../dataCenter/Root";
-import { UnControlled as CodeMirror } from 'react-codemirror2'
-import { Button, Modal, Form, Input, Radio, Select, message } from 'antd';
+import React, {useContext, useEffect, useState} from 'react';
+import {Root} from "../dataCenter/Root";
+import {UnControlled as CodeMirror} from 'react-codemirror2'
+import {Form, Input, message, Modal, Select} from 'antd';
 import apiConfig from "../config/apiConfig";
 
 import 'codemirror/addon/display/autorefresh';
@@ -145,4 +145,4 @@ const PublishModal = ({ visible, onCancel, data }) => {
         </Modal>
     );
 };
-export default PublishModal
\ No newline at end of file
+export default PublishModal

src/modal/RemoveType.jsx

-import { Table, Badge, Menu, Dropdown, Popconfirm, Space, Modal } from 'antd';
-import React, { useState, useEffect, useContext } from 'react';
-import { DownOutlined } from '@ant-design/icons';
+import {Menu, Modal, Popconfirm, Space, Table} from 'antd';
+import React, {useContext, useEffect, useState} from 'react';
 import TypeModal from '../modal/TypeModal'
-import { Root } from "../dataCenter/Root";
+import {Root} from "../dataCenter/Root";
 
 const menu = (
     <Menu>
@@ -121,4 +120,4 @@ function RemoveType({ visible, onCancel }) {
 
     );
 }
-export default RemoveType
\ No newline at end of file
+export default RemoveType

src/modal/ToolModal.jsx

-import React, { useState, useEffect, useContext } from 'react';
-import { Root } from "../dataCenter/Root";
-import { Button, Modal, Form, Input, Radio, Select, message } from 'antd';
+import React, {useContext, useEffect} from 'react';
+import {Root} from "../dataCenter/Root";
+import {Form, Input, message, Modal, Select} from 'antd';
+
 const { Option } = Select;
 const ToolModal = ({ visible, onCancel, data }) => {
     const [form] = Form.useForm();
@@ -195,4 +196,4 @@ const ToolModal = ({ visible, onCancel, data }) => {
         </Modal>
     );
 };
-export default ToolModal
\ No newline at end of file
+export default ToolModal

src/modal/TypeModal.jsx

-import React, { useState } from 'react';
-import { Button, Modal, Form, Input, Radio, Select, message, Tabs } from 'antd';
-import { useContext } from "react";
-import { Root } from "../dataCenter/Root";
+import React, {useContext} from 'react';
+import {Form, Input, message, Modal, Radio, Select, Tabs} from 'antd';
+import {Root} from "../dataCenter/Root";
+
 const { Option } = Select;
 const { TabPane } = Tabs;
 const TypeModal = ({ visible, onCancel, data }) => {
@@ -122,4 +122,4 @@ const TypeModal = ({ visible, onCancel, data }) => {
         </Modal>
     );
 };
-export default TypeModal
\ No newline at end of file
+export default TypeModal

src/page/index/index.jsx

@@ -27,7 +27,7 @@ function Index() {
 
     useEffect(() => {
         if (dataCenter.needUpdateIndex) {
-            const _typeId = dataCenter.typeId === 'all' ? {} : dataCenter.typeId === 'follow' ? {
+            const _typeId = dataCenter.typeId === 'follow' ? {
                 isFollow: true,
                 typeId: JSON.stringify(dataCenter.userInfo.follow)
             } : {typeId: dataCenter.typeId}