diff --git a/src/render/views/Home/index.module.scss b/src/render/views/Home/index.module.scss
index 34d14e0..e69de29 100644
--- a/src/render/views/Home/index.module.scss
+++ b/src/render/views/Home/index.module.scss
@@ -1,3 +0,0 @@
-.Home {
- background-color: transparent;
-}
diff --git a/src/render/views/Home/index.tsx b/src/render/views/Home/index.tsx
index 79112e3..8adb5aa 100644
--- a/src/render/views/Home/index.tsx
+++ b/src/render/views/Home/index.tsx
@@ -1,34 +1,33 @@
import { addTodo, removeTodo } from "@/store/action/todo"
import React from "react"
-import { connect } from "react-redux"
+import { connect, useStore } from "react-redux"
import style from "./index.module.scss"
-import { Button } from "@chakra-ui/react"
+import { Icon } from "@blueprintjs/core"
export interface HomeProps {
add(text: string): void
-
todo: ITodo[]
-
remove(id: number): void
}
function Home(props: HomeProps) {
+ const tabs = [
+ {icon: "globe", title:"添加闹钟"}
+ ]
return (
-
-
-
+
sada
)
}
const mapStateToProps = (state: any) => {
return {
- todo: state.todo
+ todo: state.todo,
}
}
const mapDispatchToProps = (dispatch: any) => ({
add: (text: string) => dispatch(addTodo(text)),
- remove: (id: string | number) => dispatch(removeTodo(id))
+ remove: (id: string | number) => dispatch(removeTodo(id)),
})
export default connect(mapStateToProps, mapDispatchToProps)(Home)
diff --git a/src/render/views/Layout/index.module.scss b/src/render/views/Layout/index.module.scss
new file mode 100644
index 0000000..65c8dcf
--- /dev/null
+++ b/src/render/views/Layout/index.module.scss
@@ -0,0 +1,33 @@
+.Layout {
+ height: 100vh;
+ .left {
+ position: fixed;
+ left: 0;
+ top: 0;
+ bottom: 0;
+ background-color: #2c2c2c;
+ width: 45px;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ .leftList,.leftListBottom {
+ width: 100%;
+ .leftItem {
+ text-align: center;
+ padding: 10px 0;
+ color: #808080;
+ cursor: pointer;
+ &:hover {
+ color: #f8ffff;
+ }
+ }
+ }
+ .leftList{
+ flex-grow: 1;
+ flex-shrink: 0;
+ }
+ }
+ .right{
+ margin-left: 45px;
+ }
+}
diff --git a/src/render/views/Layout/index.tsx b/src/render/views/Layout/index.tsx
index 21460e6..e4b9b67 100644
--- a/src/render/views/Layout/index.tsx
+++ b/src/render/views/Layout/index.tsx
@@ -1,16 +1,85 @@
import React, { ReactElement } from "react"
+import style from "./index.module.scss"
import { useLocation } from "react-router-dom"
+import { Icon } from "@blueprintjs/core"
+import route from "@render/route"
// interface IProps {
// render(): ReactElement
// }
+function foundRoute(route:any, name:string, arrIndex?: number[]):any{
+ if(!arrIndex){
+ arrIndex = []
+ }
+ for (let i = 0; i < route.length; i++) {
+ const element = route[i];
+ if(element.root){
+ arrIndex = []
+ }
+ arrIndex.push(i);
+ let lena = element.path.split("/").length
+ let lenb =name.split("/").length
+ console.log(element.path, name,lena,lenb, element.path == name && lena==lenb);
+ if(element.path == name && lena==lenb){
+ return arrIndex
+ } else if(element.children){
+ let a = foundRoute(element.children, name, arrIndex);
+ if(a){
+ return a
+ }
+ }
+ }
+}
+
export default function (props: any) {
+ const {pathname} = useLocation()
+
+ console.log(pathname);
+ console.log(route);
+ let oroute = JSON.parse(JSON.stringify(route))
+ let index = foundRoute(route, pathname)
+ console.log(index);
+ let isLayout = true;
+ if(index&&index.length){
+ let res = oroute[index[0]];
+ let cur = res;
+ for (let i = 1; i < index.length; i++) {
+ const element = index[i];
+ cur.children = [cur.children[element]]
+ cur = cur.children[element]
+ }
+ if(cur){
+ cur.children = [];
+ }
+ console.log(cur);
+ if(cur.layout!=undefined){
+ isLayout = !!cur.layout
+ }
+ console.log(res);
+ }
+
return (
-
-
+ isLayout?(
+
+ ):(
)
)
}