diff --git a/package.json b/package.json index c7a365a..0ac65de 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lodash-es": "^4.17.21", "react": "^18.2.0", "react-dom": "^18.2.0", - "zy-react-library": "^1.1.47" + "zy-react-library": "^1.2.6" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/api/toDoList/index.js b/src/api/toDoList/index.js new file mode 100644 index 0000000..7b6983d --- /dev/null +++ b/src/api/toDoList/index.js @@ -0,0 +1,6 @@ +import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; + +export const todoList = declareRequest( + "todoListLoading", + `Post > @/appmenu/todoList`, +); diff --git a/src/enumerate/namespace/index.js b/src/enumerate/namespace/index.js index abf474c..5d2c564 100644 --- a/src/enumerate/namespace/index.js +++ b/src/enumerate/namespace/index.js @@ -9,3 +9,4 @@ export const NS_APP_MENU = defineNamespace("appMenu"); export const NS_NOTICE = defineNamespace("Notice"); export const NS_NoticeReadRecord = defineNamespace("NoticeReadRecord"); export const NS_CORPINFO = defineNamespace("corpInfo"); +export const NS_TODO_LIST = defineNamespace("toDoList"); diff --git a/src/pages/Container/AppMenu/Menu/index.js b/src/pages/Container/AppMenu/Menu/index.js index d1e3626..9ecd348 100644 --- a/src/pages/Container/AppMenu/Menu/index.js +++ b/src/pages/Container/AppMenu/Menu/index.js @@ -1,20 +1,20 @@ import useUrlState from "@ahooksjs/use-url-state"; -import {ApiOutlined} from "@ant-design/icons"; -import {Connect} from "@cqsjjb/jjb-dva-runtime"; -import {Button, Form, message, Modal, Space, Tabs, Tag} from "antd"; -import {useEffect, useRef, useState} from "react"; +import { ApiOutlined } from "@ant-design/icons"; +import { Connect } from "@cqsjjb/jjb-dva-runtime"; +import { Button, Form, message, Modal, Space, Tabs, Tag } from "antd"; +import { useEffect, useRef, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; import Page from "zy-react-library/components/Page"; import Table from "zy-react-library/components/Table"; -import {FORM_ITEM_RENDER_ENUM} from "zy-react-library/enum/formItemRender"; +import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useTable from "zy-react-library/hooks/useTable"; -import {getLabelName, getMatchedItems} from "zy-react-library/utils"; -import {NS_APP_MENU} from "~/enumerate/namespace"; +import { getLabelName, getMatchedItems } from "zy-react-library/utils"; +import { NS_APP_MENU } from "~/enumerate/namespace"; const MENU_TYPE_ENUM = [ - {bianma: 1, name: "菜单"}, - {bianma: 2, name: "按钮"}, + { bianma: 1, name: "菜单" }, + { bianma: 2, name: "按钮" }, ]; function Menu(props) { @@ -32,18 +32,18 @@ function Menu(props) { }, { navigateMode: "replace", }); - const {tableProps, getData} = useTable(props["appMenuListTree"], { - params: {eqMenuAttribution: urlState.menuAttribution}, + const { tableProps, getData } = useTable(props["appMenuListTree"], { + params: { eqMenuAttribution: urlState.menuAttribution }, usePagination: false, manual: true, }); const getMenuAppByTenantId = async () => { - const {data} = await props["appMenuGetMenuAppByTenantId"](); + const { data } = await props["appMenuGetMenuAppByTenantId"](); setMenuAttribution(data); const menuAttribution = data?.[0]?.menuAttribution; const menuAttributionName = data?.[0]?.menuAttributionName; - setUrlState({menuAttribution, menuAttributionName}); + setUrlState({ menuAttribution, menuAttributionName }); menuAttribution && getData(); }; @@ -58,7 +58,7 @@ function Menu(props) { okText: "确定", cancelText: "取消", onOk: async () => { - const {success} = await props["appMenuDelete"]({id}); + const { success } = await props["appMenuDelete"]({ id }); if (success) { message.success("删除成功"); getData(); @@ -78,7 +78,7 @@ function Menu(props) { <>