From 63a89923121816759a239abd12f00c1018c6b547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com> Date: Tue, 14 Mar 2023 15:17:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E3=80=81=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E5=9B=BE=E6=A0=87=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/iconfont/iconfont.css | 18 ++- src/assets/iconfont/iconfont.ttf | Bin 3800 -> 4496 bytes src/assets/iconfont/iconfont.woff | Bin 2552 -> 2948 bytes src/assets/iconfont/iconfont.woff2 | Bin 2064 -> 2456 bytes src/index.less | 10 ++ src/pages/department/compenents/update.tsx | 4 +- src/pages/department/index.tsx | 103 +++++++++--------- .../resource-category/compenents/update.tsx | 4 +- .../resource/resource-category/index.tsx | 103 +++++++++--------- 9 files changed, 135 insertions(+), 107 deletions(-) diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css index a99ab4e..609f846 100644 --- a/src/assets/iconfont/iconfont.css +++ b/src/assets/iconfont/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 3943555 */ - src: url('iconfont.woff2?t=1678435002469') format('woff2'), - url('iconfont.woff?t=1678435002469') format('woff'), - url('iconfont.ttf?t=1678435002469') format('truetype'); + src: url('iconfont.woff2?t=1678776813161') format('woff2'), + url('iconfont.woff?t=1678776813161') format('woff'), + url('iconfont.ttf?t=1678776813161') format('truetype'); } .iconfont { @@ -13,6 +13,18 @@ -moz-osx-font-smoothing: grayscale; } +.icon-icon-drag:before { + content: "\e740"; +} + +.icon-icon-edit:before { + content: "\e741"; +} + +.icon-icon-delete:before { + content: "\e742"; +} + .icon-icon-video:before { content: "\e73f"; } diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf index 7c1f6492caf3bca428572dc581c9a37d0d239952..179ff6e084bcc14974f2bb823630f3c8563b14c9 100644 GIT binary patch delta 1268 zcmZWnO>7%Q6n<~^cXsXBdcD~=KlZx*3(!(h*Ih$uyEGsbp&qEzasffD#N^LzA_!7A zfR#(rK&b+jkbnaqK%zgOO1*H%fddzM>WyBIICZ6};)cY@=Iw6b(s}#My!YmNKQpuU zvU|n7V&4Y9D*$j|q1WE{%zbzPfaM9sQun>L&RuK13?RP*U^vU2_F{4O-tWZyli)9t zL;FLzO8P#bwA|a=s=;VP`5uy8>#i@fEkE@$#UCbny4T*?Ko35o{S4Xpi|t%c-UjW8|=AAmk6;Ey;zxQlaxAwGG2HQE7K1S!%E(`pcX6=ZmpVq_AE4d%m> z1odzxJ1nYz3K~`5#5W-k@fbw|s)KFz&tQ+4{RHsw+u|4GsbVTZx<{cs{9Jiw_K;e`bAF~Vk}@gjVR zPvI*5#eR@-(ie2*4S8QN!UljyY@3$wm}zhz3ptpfltss_`n5_yRsPo=^Yv+)-FUTn zx=P;&&c_Nq=3$3QA){K1m*Gw^GE4D7#iLi04zU~H!VxN7shz|YbH{Tyel&*yEmRB7 zV5OkNy5_jYd}8#mj(%;1y~}w{*9~2-Glo0TYxf*YL3To=ufXSobV3za6;d@a08GU-~6r`;1+9d~0P)m3K>7AiHL)Vd!_ zsJ3Va%M39o_%!;{Mp7V4D3W5P3${15)gSZhLfTX$8HFK)Bg7lw_qfP8rmyYFgIqg#3i2jvh!KN#d4VR m6BC$30eod){o>P$Z?~6Xt+TkYX~w=zx3k$9tcf1|Q~v^<{nU{F delta 578 zcmXw#KWGzC9LK-E_pZ6*5*q_02H~_d7Bi@bh=1y71i`I#adAORJ$^}eF5cN&WP(-oH+ZFT zZT=&!$H@+6*_#sIC_JA+1%ww;V$G0mh@mRNiz(Dc=%jEG!b>TfiSTktqF<*?l2>2= zSMX8hWk{Uwt-j*trl8kNK>|a)8OO$9aq)#$pN>*}WNglya$^Q@AWqJ|- diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff index c14bf3c313b1b4f5f3e19e6c35c81f8fef95d4f6..0bf57d53bdbe6d94dbaa82de365b073ce8e8c20b 100644 GIT binary patch delta 2478 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 UbKXn*s|lEOYaIEi%K`uZ0Im6{AOHXW delta 2059 zcmV+m2=w=u6Oa%XcTYw#00961000OO01E&B000iy000NUkr*9+gJ24eK#UmyHUcCA zC<_(<1Rw>3X9s~K8(9odlrB=1?B{^Hxy-D8c|RlN3%jEDeqWhUnWOYgxgLY6hOK8W zq)!oCj2=gM6cVK9B550hMH(IKSK)p)LGJF?FQy1v6iLzofWQLn|1MK^ z?k=r?wKf))oxS?6)kbNwU=cl_w9>)Cd7%J>Ibs}@+9X%-3F7veTm^yZ#evCoarX$T zQ*r}qrs=bVs94h)3GXkZ&Lw0c(Ph#oAyRh4^I#H9}dTZzw8JYM-UKAvhw`n zsiMm!sQZzY0~1&nhVF^s(7iA`x;I8Z_rZwhz8DGJ4Qrt3Yhat{ zKfU#X#R!alfgJJ9a>PX448I^ZGR>W6h$GPHR#@-dD6#iw9SDmY9AK1N`GDi|VqT~^EifkU?f$0NCM+92SOd(nLgv@P{7q;>nr}CegiXli$cwlHK z6q`1+2s9r;I-0=Ma-fMLZFFG(t5c@bf(zqd$;NlEBR<=Q;eEG$Gs!fSzoKs5l&Ls) z!9v7;eZhUe`muhSaob||)h!Q`hSjX6@Tn7#J?=eFYR`)Gu$lHS>Na15&ZI49dffr@ z9+H4AWZAqRKgq?x^FyC&-HD&l3BcZli1IRA7TgD=&REYNfil}*(fe z%gjb+q@snic#i76Dv%)x77_E&jKer|a&Z|G>1+a)VQ6iErw-dkND z^XC7wb6Pb1+=5*-P4X6JjC?(X1BWaz zQw?AIT}beEq4<0jqoEi0kQr@OT7>9-##M{CpsnPspgD`x#%O|;RU3os19}@6tbBZE z?cXiNt1-n{4*vffTm*@YT{@US*K49((KS~lhy3IF^LLo+9PzQ$^=UUVG(%fi+ty)v zyFXJbjIC#J4o2!f@BYE;AK|Oi=1IO*nLp}XJJp}aDyay+Ag)O^zQ|U^w`muDIT|O| ze7h`TC0^RPLyu!NtNt=9h8Bpt(bJe|#t!jE&@H0b$6NKL%aZM!jz$2b`%l07;kzYw ze`Yq*-+f8^Z?t~oCs_`XdW&tcuRU3s_qQwDadTNoNgZ`@Y}9yT7|qE!>Nb+R<9ro# zV##G^&N6%Rn?u3>V>;ii#^P^(T>8$WFWIxW!?fhwz3(pFh+SFNoxCkJ{9(GdEr0oc zpJaS43IsZ(tuEJX5uJ1GW6YKBRo+wPdu00F`P}Vh-SYbpE+F(0NDYX6cR7D^-vylF zTfY2S@gs63BRnqEE=n!}Ke?ZX?<_%0oYc7R+s{IeUDQxoCva3| zhc*WXH-~~yThkouPD-5jaWkc?>joUzOYV#8xY2#gzO>gJf6e3?-o3Z9`T?2C?1=0m z_eR1}rTww)8{oLf34D{ez)#;T^%mxVfo9R>n&v^~Aj~jCTglcSZavm8m78bWFxIA? zVYqIXWyuxZTy&YTqry>tIZH)F!S)2IncA-vAkMV*ilxl#Y0Xtp^lOfG>5z`^wf0J! z=@;*o#$~y*R;bXwe{DUj1`vQ-; zpMhX!3=wsI1Jzf5tn9713U%sHG8UpU5>`>8O(lD^-lJ(N>GQ(R=z~R2WO15KUSfm3 zk99)diC3z=Bj0A0$OMpG`NGUzjM%q*I)z_UbZO}LO~KqbbA;EE$XNIh(^ zZik4oBQe-?Q&~K{qQ2FlKcs2&gVr!Pc?Cr!WffI5>hb4BeOn+cgt0EwxWa?F48I{i pD)MVvVa-6`ws`fo0sV3wGTX*<>UJ`Ofv;GRkyKTYp_Tyv007Bl{OJGy diff --git a/src/index.less b/src/index.less index 3a0d426..3ff8f33 100644 --- a/src/index.less +++ b/src/index.less @@ -406,6 +406,16 @@ textarea.ant-input { } } +.ant-tree-title { + .iconfont { + color: rgba(0, 0, 0, 0.3); + cursor: pointer; + &:hover { + opacity: 0.8; + } + } +} + .ant-modal-confirm-btns > .ant-btn-default:hover { color: #ff4d4f !important; border-color: #ff4d4f; diff --git a/src/pages/department/compenents/update.tsx b/src/pages/department/compenents/update.tsx index 4aa94ae..8c03db7 100644 --- a/src/pages/department/compenents/update.tsx +++ b/src/pages/department/compenents/update.tsx @@ -24,6 +24,7 @@ export const DepartmentUpdate: React.FC = ({ const [loading, setLoading] = useState(true); const [departments, setDepartments] = useState([]); const [parent_id, setParentId] = useState(0); + const [sort, setSort] = useState(0); useEffect(() => { getParams(); @@ -63,6 +64,7 @@ export const DepartmentUpdate: React.FC = ({ parent_id: new_arr, }); setParentId(data.parent_id); + setSort(data.sort); }); }; @@ -90,7 +92,7 @@ export const DepartmentUpdate: React.FC = ({ const onFinish = (values: any) => { department - .updateDepartment(id, values.name, parent_id || 0, 0) + .updateDepartment(id, values.name, parent_id || 0, sort) .then((res: any) => { message.success("保存成功！"); onCancel(); diff --git a/src/pages/department/index.tsx b/src/pages/department/index.tsx index baf5f70..c9683c6 100644 --- a/src/pages/department/index.tsx +++ b/src/pages/department/index.tsx @@ -1,13 +1,13 @@ import React, { useState, useEffect } from "react"; -import { Button, Space, Tree, Modal, message } from "antd"; +import { Button, Tree, Modal, message } from "antd"; import styles from "./index.module.less"; import { PlusOutlined, ExclamationCircleFilled } from "@ant-design/icons"; import { department } from "../../api/index"; -import { useNavigate } from "react-router-dom"; import { PerButton } from "../../compenents"; import type { DataNode, TreeProps } from "antd/es/tree"; import { DepartmentCreate } from "./compenents/create"; import { DepartmentUpdate } from "./compenents/update"; +import { useSelector } from "../../store/hooks"; const { confirm } = Modal; @@ -25,7 +25,7 @@ interface DataType { } export const DepartmentPage: React.FC = () => { - const navigate = useNavigate(); + const permisssions = useSelector((state: any) => state.permisssions); const [loading, setLoading] = useState(true); const [refresh, setRefresh] = useState(false); const [treeData, setTreeData] = useState([]); @@ -40,6 +40,13 @@ export const DepartmentPage: React.FC = () => { console.log(selectedKeys); }; + const through = (p: string) => { + if (!permisssions) { + return false; + } + return typeof permisssions[p] !== "undefined"; + }; + useEffect(() => { getData(); }, [refresh]); @@ -65,30 +72,27 @@ export const DepartmentPage: React.FC = () => { title: (
{departments[id][i].name}
- - { - setDid(departments[id][i].id); - setUpdateVisible(true); - }} - disabled={null} - /> -
- delUser(departments[id][i].id)} - disabled={null} - /> - + + {through("department-cud") && ( + <> + { + setDid(departments[id][i].id); + setUpdateVisible(true); + }} + /> + delUser(departments[id][i].id)} + /> + + )}
), key: departments[id][i].id, @@ -99,30 +103,27 @@ export const DepartmentPage: React.FC = () => { title: (
{departments[id][i].name}
- - { - setDid(departments[id][i].id); - setUpdateVisible(true); - }} - disabled={null} - /> -
- delUser(departments[id][i].id)} - disabled={null} - /> - + + {through("department-cud") && ( + <> + { + setDid(departments[id][i].id); + setUpdateVisible(true); + }} + /> + delUser(departments[id][i].id)} + /> + + )}
), key: departments[id][i].id, diff --git a/src/pages/resource/resource-category/compenents/update.tsx b/src/pages/resource/resource-category/compenents/update.tsx index c6d4968..a8dbd76 100644 --- a/src/pages/resource/resource-category/compenents/update.tsx +++ b/src/pages/resource/resource-category/compenents/update.tsx @@ -24,6 +24,7 @@ export const ResourceCategoryUpdate: React.FC = ({ const [loading, setLoading] = useState(true); const [categories, setCategories] = useState([]); const [parent_id, setParentId] = useState(0); + const [sort, setSort] = useState(0); useEffect(() => { getParams(); @@ -63,6 +64,7 @@ export const ResourceCategoryUpdate: React.FC = ({ parent_id: new_arr, }); setParentId(data.parent_id); + setSort(data.sort); }); }; @@ -88,7 +90,7 @@ export const ResourceCategoryUpdate: React.FC = ({ const onFinish = (values: any) => { resourceCategory - .updateResourceCategory(id, values.name, parent_id || 0, 0) + .updateResourceCategory(id, values.name, parent_id || 0, sort) .then((res: any) => { message.success("保存成功！"); onCancel(); diff --git a/src/pages/resource/resource-category/index.tsx b/src/pages/resource/resource-category/index.tsx index 77de8dd..36cefe1 100644 --- a/src/pages/resource/resource-category/index.tsx +++ b/src/pages/resource/resource-category/index.tsx @@ -1,13 +1,13 @@ import React, { useState, useEffect } from "react"; -import { Button, Space, Tree, Modal, message } from "antd"; +import { Button, Tree, Modal, message } from "antd"; import styles from "./index.module.less"; import { PlusOutlined, ExclamationCircleFilled } from "@ant-design/icons"; import { resourceCategory } from "../../../api/index"; -import { useNavigate } from "react-router-dom"; import { PerButton } from "../../../compenents"; import type { DataNode, TreeProps } from "antd/es/tree"; import { ResourceCategoryCreate } from "./compenents/create"; import { ResourceCategoryUpdate } from "./compenents/update"; +import { useSelector } from "../../../store/hooks"; const { confirm } = Modal; @@ -25,7 +25,7 @@ interface DataType { } export const ResourceCategoryPage: React.FC = () => { - const navigate = useNavigate(); + const permisssions = useSelector((state: any) => state.permisssions); const [loading, setLoading] = useState(true); const [refresh, setRefresh] = useState(false); const [treeData, setTreeData] = useState([]); @@ -42,6 +42,13 @@ export const ResourceCategoryPage: React.FC = () => { setSelectKey(selectedKeys); }; + const through = (p: string) => { + if (!permisssions) { + return false; + } + return typeof permisssions[p] !== "undefined"; + }; + const getData = () => { setLoading(true); resourceCategory.resourceCategoryList().then((res: any) => { @@ -62,30 +69,27 @@ export const ResourceCategoryPage: React.FC = () => { title: (
{categories[id][i].name}
- - { - setCid(categories[id][i].id); - setUpdateVisible(true); - }} - disabled={null} - /> -
- delUser(categories[id][i].id)} - disabled={null} - /> - + + {through("resource-category") && ( + <> + { + setCid(categories[id][i].id); + setUpdateVisible(true); + }} + /> + delUser(categories[id][i].id)} + /> + + )}
), key: categories[id][i].id, @@ -96,30 +100,27 @@ export const ResourceCategoryPage: React.FC = () => { title: (
{categories[id][i].name}
- - { - setCid(categories[id][i].id); - setUpdateVisible(true); - }} - disabled={null} - /> -
- delUser(categories[id][i].id)} - disabled={null} - /> - + + {through("resource-category") && ( + <> + { + setCid(categories[id][i].id); + setUpdateVisible(true); + }} + /> + delUser(categories[id][i].id)} + /> + + )}
), key: categories[id][i].id,