From 13a9830aa62853eb4046e28ea82fb3ae4e5567c8 Mon Sep 17 00:00:00 2001 From: shixiaohua Date: Sun, 4 Feb 2024 09:29:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=96=87=E4=BB=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8C=81=E4=B9=85=E5=8C=96=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 6 +-- src/pages/Note/index.jsx | 67 +++++++++++++++++-------------- src/redux/store.js | 12 ++++-- src/redux/tableBarItem_reducer.js | 18 ++++++--- 4 files changed, 61 insertions(+), 42 deletions(-) diff --git a/main.js b/main.js index 11e56af..462ed43 100644 --- a/main.js +++ b/main.js @@ -65,18 +65,18 @@ app.whenReady().then(() => { return dialog.showSaveDialog({"title":"保存文件",}) }) ipcMain.handle("electronStoreSave",(listen,key,value)=>{ - console.log("electronStoreSave") + console.log("electronStoreSave",key,value) return store.set(key,value) }) ipcMain.handle("electronStoreGet",(listen,args)=>{ - console.log("electronStoreGet") + console.log("electronStoreGet:",store.get(args)) return store.get(args) }) ipcMain.handle("electronStoreDelete",(listen,args)=>{ console.log("electronStoreDelete") return store.delete(args) }) - console.log("app.getPath('userData')",app.getPath('userData')) + console.log("配置文件地址",app.getPath('userData')+"/config.json") }) // 除了 macOS 外，当所有窗口都被关闭的时候退出程序。 因此, 通常 // 对应用程序和它们的菜单栏来说应该时刻保持激活状态, diff --git a/src/pages/Note/index.jsx b/src/pages/Note/index.jsx index 00d4c71..57be386 100644 --- a/src/pages/Note/index.jsx +++ b/src/pages/Note/index.jsx @@ -1,10 +1,6 @@ import React, {useEffect, useRef, useState} from 'react'; import { - MenuFoldOutlined, - MenuUnfoldOutlined, - UploadOutlined, UserOutlined, - VideoCameraOutlined, } from '@ant-design/icons'; import {Layout, Menu, Button, theme, Avatar, Tabs} from 'antd'; import Hlexical from './Hlexical'; @@ -12,46 +8,57 @@ import ItemTree from "../../components/ItemTree"; import './index.less' import {store} from "../../redux/store"; import {isEmpty} from "../../utils/ObjectUtils"; +import {useSelector, useDispatch} from "react-redux"; +import {addTableBarItem} from "../../redux/tableBarItem_reducer" const {Header, Sider, Content} = Layout; const Note = () => { + const dispatch = useDispatch() const [collapsed, setCollapsed] = useState(false); // const { // token: { colorBgContainer }, // } = theme.useToken(); const colorBgContainer = '#800080' const [activeKey, setActiveKey] = useState(); - const [items, setItems] = useState([]); const newTabIndex = useRef(0); - store.subscribe(() => { - const openFile = store.getState().clickFileMessage.data; - console.log("store.getState().clickFileMessage.data:",openFile,items) - if (!isEmpty(openFile)&&activeKey!==openFile.filePath){ - setActiveKey(openFile.filePath) + const items = useSelector(state => state.tableBarItem.data) + const openFile = useSelector(state => state.clickFileMessage.data) + console.log("store.getState().clickFileMessage.data:",openFile) + if (!isEmpty(openFile) && activeKey !== openFile.filePath&&isEmpty(activeKey)) { + setActiveKey(openFile.filePath) + } + if (items.filter(fileItem => fileItem.key === openFile.filePath).length === 0 && !isEmpty(openFile)) { + console.log("items.filter(fileItem => fileItem.key === openFile.filePath)",items) + dispatch(addTableBarItem( + { + label: openFile.fileName, + children: openFile.filePath, + key: openFile.filePath, } - if (items.filter(fileItem => fileItem.key === openFile.filePath).length === 0&& !isEmpty(openFile)) { - setItems([...items, - { - label: openFile.fileName, - children:
, - key: openFile.filePath, - } - ]) - } - } - ) + )) + } + + const onChange = (newActiveKey) => { + console.log("setActiveKey(newActiveKey)",newActiveKey) setActiveKey(newActiveKey); }; const add = () => { const newActiveKey = `newTab${newTabIndex.current++}`; - const newPanes = [...items]; - newPanes.push({ - label: 'New Tab', - children:
, - key: newActiveKey, - }); - setItems(newPanes); + // const newPanes = [...items]; + // newPanes.push({ + // label: 'New Tab', + // children:
, + // key: newActiveKey, + // }); + // setItems(newPanes); + dispatch(addTableBarItem( + { + label: 'New Tab', + children: "", + key: newActiveKey, + } + )); setActiveKey(newActiveKey); }; const remove = (targetKey) => { @@ -70,7 +77,7 @@ const Note = () => { newActiveKey = newPanes[0].key; } } - setItems(newPanes); + // setItems(newPanes); setActiveKey(newActiveKey); }; const onEdit = (targetKey, action) => { @@ -100,7 +107,7 @@ const Note = () => { onChange={onChange} activeKey={activeKey} onEdit={onEdit} - items={items} + items={items.map(item=>{return {label:item.label,children:
,key:item.key}})} /> diff --git a/src/redux/store.js b/src/redux/store.js index 75e921d..bde4d7e 100644 --- a/src/redux/store.js +++ b/src/redux/store.js @@ -1,4 +1,4 @@ -import {combineReducers, configureStore} from '@reduxjs/toolkit' +import {configureStore} from '@reduxjs/toolkit' import historyReducer from './historyRecord_reducer' import redirectReducer from './redirectUrl_reducer' import dirMessageReducer from './dirMessage_reducer' @@ -7,8 +7,8 @@ import pushHotkeysReducer from "./pushHotkeys_reducer"; import tableBarItemReducer from "./tableBarItem_reducer"; import {electronStorage} from "../utils/LocalStorage"; import { persistStore, persistReducer } from 'redux-persist' +import {FLUSH, PAUSE, PERSIST, PURGE, REGISTER, REHYDRATE} from "redux-persist/es/constants"; // 持久化配置 - const historyRecordPersistConfig = { key: 'historyRecord', storage: electronStorage() @@ -49,7 +49,11 @@ export const store = configureStore({ dirMessage:dirMessagePersistedReducer, pushHotkeys:pushHotkeysPersistedReducer, clickFileMessage:clickFileMessagePersistedReducer, - tableBarItem:tableBarItemPersistedReducer - } + tableBarItem:tableBarItemPersistedReducer, + }, + middleware: (getDefaultMiddleware) => + getDefaultMiddleware({ + serializableCheck: false + }), }) export const persistor = persistStore(store); diff --git a/src/redux/tableBarItem_reducer.js b/src/redux/tableBarItem_reducer.js index 0c40c02..75e73e3 100644 --- a/src/redux/tableBarItem_reducer.js +++ b/src/redux/tableBarItem_reducer.js @@ -4,14 +4,22 @@ export const tableBarItemSlice = createSlice({ name: 'tableBarItem', initialState: { type:"tableBarItem", - data: [] + data: [], + activeKey:"" }, reducers: { - tableBarItem: (state, action) => { - console.log("tableBarItemSlice:tableBarItem", state, action) - state.data=action.payload + addTableBarItem: (state, action) => { + console.log("tableBarItemSlice:tableBarItem=====", state, action,) + if (state.data.filter(file=>file.key===action.payload.key).length===0){ + state.data.push(action.payload) + } + }, + setActiveKey:(state,action)=>{ + if (state.activeKey!==action.payload){ + state.activeKey=action.payload; + } } } }) -export const { tableBarItem } = tableBarItemSlice.actions +export const { addTableBarItem,setActiveKey } = tableBarItemSlice.actions export default tableBarItemSlice.reducer