From 66a3d55f14f896ed0fc3b572a61db810ea164133 Mon Sep 17 00:00:00 2001 From: wang_yp Date: Tue, 16 Jul 2024 23:50:13 +0800 Subject: [PATCH] push im model --- src/components/menu/demand.tsx | 24 ++++++++++++++++++++++++ src/components/menu/index.tsx | 3 +++ src/pages/active/index.tsx | 2 +- src/pages/activeType/index.tsx | 2 +- src/pages/app/app-list.tsx | 2 +- src/pages/app/config/im-config.tsx | 1 - src/pages/card/card-list.tsx | 2 +- src/pages/card/character.tsx | 2 +- src/pages/card/currentEvent.tsx | 2 +- src/pages/componsition/componsition.tsx | 2 +- src/pages/dymiticState/index.tsx | 2 +- src/pages/merchants/index.tsx | 2 +- src/pages/merchants/productType.tsx | 2 +- src/pages/merchants/productUnit.tsx | 2 +- src/pages/project/index.tsx | 2 +- src/pages/system/banner.tsx | 2 +- src/pages/system/logs.tsx | 2 +- src/pages/user/user.tsx | 2 +- src/store/app/index.ts | 2 +- src/store/index.ts | 20 ++++++++++---------- src/store/project/index.ts | 2 +- 21 files changed, 54 insertions(+), 28 deletions(-) create mode 100644 src/components/menu/demand.tsx diff --git a/src/components/menu/demand.tsx b/src/components/menu/demand.tsx new file mode 100644 index 0000000..e823b27 --- /dev/null +++ b/src/components/menu/demand.tsx @@ -0,0 +1,24 @@ +import { + UploadOutlined, + UserOutlined, + VideoCameraOutlined, +} from "@ant-design/icons"; +const demand = { + key: "/demand", + icon: , + label: "需求池", + children: [ + { + key: "/shop1", + icon: , + label: "go to home", + }, + { + key: "/shop2", + icon: , + label: "go test", + }, + ], +}; + +export default demand; diff --git a/src/components/menu/index.tsx b/src/components/menu/index.tsx index bab252e..fad6c49 100644 --- a/src/components/menu/index.tsx +++ b/src/components/menu/index.tsx @@ -9,6 +9,8 @@ import merchant from "./merchant"; import dynimacStateMenu from "./dynimac_state"; import rbac from "./rbac"; import app from "./app"; +import demand from "./demand"; +// demand const menuList: ItemType[] = [ { key: "/", @@ -16,6 +18,7 @@ const menuList: ItemType[] = [ label: "首页", }, userMenu, + demand, contentMenu, dynimacStateMenu, activeMenu, diff --git a/src/pages/active/index.tsx b/src/pages/active/index.tsx index d393504..4399b5e 100644 --- a/src/pages/active/index.tsx +++ b/src/pages/active/index.tsx @@ -1,7 +1,7 @@ import { Button, Space, Modal, Switch, Tooltip } from "antd"; import { inject, observer } from "mobx-react"; import type { ColumnsType } from "antd/es/table"; -import BTable from "@/components/BTable"; +import BTable from "@/components/b_table"; import { useEffect, useState } from "react"; import { UserDataType } from "@/model/userModel"; import { Store } from "antd/lib/form/interface"; diff --git a/src/pages/activeType/index.tsx b/src/pages/activeType/index.tsx index cb4d039..7fd114e 100644 --- a/src/pages/activeType/index.tsx +++ b/src/pages/activeType/index.tsx @@ -1,7 +1,7 @@ import { Button, Space, Modal, FormInstance } from "antd"; import { inject, observer } from "mobx-react"; import type { ColumnsType } from "antd/es/table"; -import BTable from "@/components/BTable"; +import BTable from "@/components/b_table"; import { useEffect, useState } from "react"; import UserConfig from "@/service/apiConfig/user_config"; import { UserDataType } from "@/model/userModel"; diff --git a/src/pages/app/app-list.tsx b/src/pages/app/app-list.tsx index 7d24c7a..ed83a2e 100644 --- a/src/pages/app/app-list.tsx +++ b/src/pages/app/app-list.tsx @@ -1,7 +1,7 @@ import { Space, Button, FormInstance } from "antd"; import { inject, observer } from "mobx-react"; import type { ColumnsType } from "antd/es/table"; -import BTable from "@/components/BTable"; +import BTable from "@/components/b_table"; import { useEffect, useState } from "react"; import UserConfig from "@/service/apiConfig/user_config"; import { UserDataType } from "@/model/userModel"; diff --git a/src/pages/app/config/im-config.tsx b/src/pages/app/config/im-config.tsx index b634984..1880c55 100644 --- a/src/pages/app/config/im-config.tsx +++ b/src/pages/app/config/im-config.tsx @@ -3,7 +3,6 @@ import { inject, observer } from "mobx-react"; import { useEffect } from "react"; import { Store } from "antd/lib/form/interface"; const ImConfig = (props: Store) => { - const { appStore } = props; useEffect(() => { console.log("im"); }, []); diff --git a/src/pages/card/card-list.tsx b/src/pages/card/card-list.tsx index 89fa71f..0b95744 100644 --- a/src/pages/card/card-list.tsx +++ b/src/pages/card/card-list.tsx @@ -2,7 +2,7 @@ import { Button, Space, Modal, FormInstance } from "antd"; import type { ColumnsType } from 'antd/es/table'; import { CardDataType } from "@/util/model/interface"; import { inject, observer } from "mobx-react"; -import BTable from "@/components/BTable"; +import BTable from "@/components/b_table"; import SimpleForm from "@/components/form/simple_form"; import "./index.less" import { useEffect, useState } from "react"; diff --git a/src/pages/card/character.tsx b/src/pages/card/character.tsx index a6d083c..e069f94 100644 --- a/src/pages/card/character.tsx +++ b/src/pages/card/character.tsx @@ -2,7 +2,7 @@ import { Button, Space, Modal, FormInstance } from "antd"; import type { ColumnsType } from "antd/es/table"; import { CardDataType } from "@/util/model/interface"; import { inject, observer } from "mobx-react"; -import BTable from "@/components/BTable"; +import BTable from "@/components/b_table"; import SimpleForm from "@/components/form/simple_form"; import "./index.less"; diff --git a/src/pages/card/currentEvent.tsx b/src/pages/card/currentEvent.tsx index 2c0c31d..855c5c0 100644 --- a/src/pages/card/currentEvent.tsx +++ b/src/pages/card/currentEvent.tsx @@ -3,7 +3,7 @@ import "./index.less"; import type { ColumnsType } from "antd/es/table"; import { CardDataType } from "@/util/model/interface"; import { inject, observer } from "mobx-react"; -import BTable from "@/components/BTable"; +import BTable from "@/components/b_table"; import SimpleForm from "@/components/form/simple_form"; import { useEffect, useState } from "react"; import React from "react"; diff --git a/src/pages/componsition/componsition.tsx b/src/pages/componsition/componsition.tsx index b153fe4..ee6c9ae 100644 --- a/src/pages/componsition/componsition.tsx +++ b/src/pages/componsition/componsition.tsx @@ -2,7 +2,7 @@ import { Button, Modal, Popconfirm } from "antd"; import type { ColumnsType } from "antd/es/table"; import { CardDataType } from "@/util/model/interface"; import { inject, observer } from "mobx-react"; -import BTable from "@/components/BTable"; +import BTable from "@/components/b_table"; import "./index.less"; import { useEffect, useState } from "react"; import { useParams } from "react-router-dom"; diff --git a/src/pages/dymiticState/index.tsx b/src/pages/dymiticState/index.tsx index 8a5ab76..09b8871 100644 --- a/src/pages/dymiticState/index.tsx +++ b/src/pages/dymiticState/index.tsx @@ -1,4 +1,4 @@ -import BTable from "@/components/BTable"; +import BTable from "@/components/b_table"; import { Button, Space } from "antd"; import { ColumnsType } from "antd/lib/table"; import { inject, observer } from "mobx-react"; diff --git a/src/pages/merchants/index.tsx b/src/pages/merchants/index.tsx index 05f61c4..5f2dee6 100644 --- a/src/pages/merchants/index.tsx +++ b/src/pages/merchants/index.tsx @@ -1,4 +1,4 @@ -import BTable from "@/components/BTable"; +import BTable from "@/components/b_table"; import { Button, FormInstance, Modal, Space } from "antd"; import { ColumnsType } from "antd/lib/table"; import { inject, observer } from "mobx-react"; diff --git a/src/pages/merchants/productType.tsx b/src/pages/merchants/productType.tsx index 8b7f462..4141c1b 100644 --- a/src/pages/merchants/productType.tsx +++ b/src/pages/merchants/productType.tsx @@ -1,4 +1,4 @@ -import BTable from "@/components/BTable"; +import BTable from "@/components/b_table"; import { Button, FormInstance, Modal, Space } from "antd"; import { ColumnsType } from "antd/lib/table"; import { inject, observer } from "mobx-react"; diff --git a/src/pages/merchants/productUnit.tsx b/src/pages/merchants/productUnit.tsx index aa9f280..2b59f6f 100644 --- a/src/pages/merchants/productUnit.tsx +++ b/src/pages/merchants/productUnit.tsx @@ -1,5 +1,5 @@ -import BTable from "@/components/BTable"; +import BTable from "@/components/b_table"; import { Button, FormInstance, Modal, Space } from "antd"; import { ColumnsType } from "antd/lib/table"; import { inject, observer } from "mobx-react"; diff --git a/src/pages/project/index.tsx b/src/pages/project/index.tsx index b8c1ce6..8ffb00a 100644 --- a/src/pages/project/index.tsx +++ b/src/pages/project/index.tsx @@ -1,4 +1,4 @@ -import BTable from "@/components/BTable"; +import BTable from "@/components/b_table"; import { Button, FormInstance, Modal, Space } from "antd"; import { ColumnsType } from "antd/lib/table"; import { inject, observer } from "mobx-react"; diff --git a/src/pages/system/banner.tsx b/src/pages/system/banner.tsx index a449676..57bc7b2 100644 --- a/src/pages/system/banner.tsx +++ b/src/pages/system/banner.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from "react"; import { inject, observer } from "mobx-react"; import { Store } from "antd/lib/form/interface"; -import AliUpload from "@/components/aliUpload"; +import AliUpload from "@/components/ali_upload"; import { UploadFile } from "antd"; const Banner = (props: Store) => { diff --git a/src/pages/system/logs.tsx b/src/pages/system/logs.tsx index 0735709..e1b54e5 100644 --- a/src/pages/system/logs.tsx +++ b/src/pages/system/logs.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from "react"; import { inject, observer } from "mobx-react"; import { Store } from "antd/lib/form/interface"; -import AliUpload from "@/components/aliUpload"; +import AliUpload from "@/components/ali_upload"; import { UploadFile } from "antd"; const Logs = (props: Store) => { diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx index 1543ee0..640e164 100644 --- a/src/pages/user/user.tsx +++ b/src/pages/user/user.tsx @@ -1,7 +1,7 @@ import { Button, Tooltip, Image, Space, Modal, FormInstance } from "antd"; import { inject, observer } from "mobx-react"; import type { ColumnsType } from "antd/es/table"; -import BTable from "@/components/BTable"; +import BTable from "@/components/b_table"; import { useEffect, useState } from "react"; import UserConfig from "@/service/apiConfig/user_config"; import { UserDataType } from "@/model/userModel"; diff --git a/src/store/app/index.ts b/src/store/app/index.ts index 15df212..b3a8569 100644 --- a/src/store/app/index.ts +++ b/src/store/app/index.ts @@ -2,7 +2,7 @@ import { CardDataType } from "@/util/model/interface"; import BaseStore from "../baseStore"; import baseHttp from "@/service/base"; import { action, makeObservable } from "mobx"; -import AppConfig from "@/service/apiConfig/appConfig"; +import AppConfig from "@/service/apiConfig/app_config"; class AppStore extends BaseStore { constructor() { diff --git a/src/store/index.ts b/src/store/index.ts index 3482596..b6481a2 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -1,17 +1,17 @@ import usrStore from '@/store/user' import projectStore from '@/store/project' -import cardStore from '@/store/cardStore' -import characterStore from '@/store/characterStore' -import currentEventStore from '@/store/currentEventStore' -import componSitionStore from '@/store/componsitionStroe' +import cardStore from '@/store/card' +import characterStore from '@/store/character' +import currentEventStore from '@/store/current_event' +import componSitionStore from '@/store/componsition' import systemStore from '@/store/system' -import merchantStore from '@/store/merchantsStore' -import projectTypeStore from '@/store/projectTypeStore' -import productUnitStore from '@/store/productUnitStore' +import merchantStore from '@/store/merchants' +import projectTypeStore from '@/store/project_type' +import productUnitStore from '@/store/product_unit' import dynamicStore from '@/store/dynamic' -import activityStore from '@/store/activityStore' -import activityTypeStore from '@/store/activityTypeStore' -import appStore from '@/store/appStore' +import activityStore from '@/store/activity' +import activityTypeStore from '@/store/activity_type' +import appStore from '@/store/app' import activeStore from '@/store/active' const store = { diff --git a/src/store/project/index.ts b/src/store/project/index.ts index 03ad81c..e6c3701 100644 --- a/src/store/project/index.ts +++ b/src/store/project/index.ts @@ -1,5 +1,5 @@ import { makeObservable } from "mobx"; -import ProjectConfig from "@/service/apiConfig/projectConfig"; +import ProjectConfig from "@/service/apiConfig/project_config"; import BaseStore from "@/store/baseStore"; class ProjectStore extends BaseStore {