Browse Source

UserDictTable -> ProList

visuddhinanda 2 years ago
parent
commit
cabed8f7fe

+ 11 - 0
dashboard/src/components/dict/DictContent.tsx

@@ -10,6 +10,9 @@ import DictList from "./DictList";
 import MyCreate from "./MyCreate";
 import MyCreate from "./MyCreate";
 import { useIntl } from "react-intl";
 import { useIntl } from "react-intl";
 import DictGroupTitle from "./DictGroupTitle";
 import DictGroupTitle from "./DictGroupTitle";
+import UserDictList from "./UserDictList";
+import { useAppSelector } from "../../hooks";
+import { currentUser } from "../../reducers/current-user";
 
 
 export interface IDictWords {
 export interface IDictWords {
   pass: string;
   pass: string;
@@ -37,6 +40,8 @@ interface IWidget {
 
 
 const DictContentWidget = ({ word, data, compact }: IWidget) => {
 const DictContentWidget = ({ word, data, compact }: IWidget) => {
   const intl = useIntl();
   const intl = useIntl();
+  const user = useAppSelector(currentUser);
+
   return (
   return (
     <>
     <>
       <Row>
       <Row>
@@ -103,6 +108,12 @@ const DictContentWidget = ({ word, data, compact }: IWidget) => {
                 key: "my",
                 key: "my",
                 children: (
                 children: (
                   <div>
                   <div>
+                    <UserDictList
+                      studioName={user?.realName}
+                      word={word}
+                      compact={true}
+                    />
+                    <Divider>新建</Divider>
                     <MyCreate word={word} />
                     <MyCreate word={word} />
                   </div>
                   </div>
                 ),
                 ),

+ 1 - 1
dashboard/src/pages/admin/dictionary/list.tsx

@@ -1,6 +1,6 @@
 import { ProCard, StatisticCard } from "@ant-design/pro-components";
 import { ProCard, StatisticCard } from "@ant-design/pro-components";
 import { useEffect, useState } from "react";
 import { useEffect, useState } from "react";
-import UserDictList from "../../../components/dict/UserDictList";
+import UserDictList from "../../../components/dict/UserDictTable";
 import { get } from "../../../request";
 import { get } from "../../../request";
 
 
 const { Statistic } = StatisticCard;
 const { Statistic } = StatisticCard;