From a5d4fc1c67947ce1569a6b842f2e6ed7ab48e324 Mon Sep 17 00:00:00 2001 From: deartibers <947466799@qq.com> Date: Wed, 9 Nov 2022 11:08:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/install/components/adminModal.jsx | 2 ++ web/client/src/sections/install/components/memberModal.jsx | 3 +++ web/client/src/sections/install/containers/system.jsx | 2 +- web/client/src/sections/service/containers/emPush.jsx | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/web/client/src/sections/install/components/adminModal.jsx b/web/client/src/sections/install/components/adminModal.jsx index 4417bac..262838a 100644 --- a/web/client/src/sections/install/components/adminModal.jsx +++ b/web/client/src/sections/install/components/adminModal.jsx @@ -117,6 +117,7 @@ function adminModal (props) { style={{ width: 417 }} rules={[{ required: true, message: "请选择部门" }]} initValue={departmentId || ""} + filter showClear > { @@ -139,6 +140,7 @@ function adminModal (props) { rules={[{ required: true, message: "请选择人员" }]} initValue={peopleId || ""} showClear + filter disabled={disablePeople} > { diff --git a/web/client/src/sections/install/components/memberModal.jsx b/web/client/src/sections/install/components/memberModal.jsx index 48b6808..72fb389 100644 --- a/web/client/src/sections/install/components/memberModal.jsx +++ b/web/client/src/sections/install/components/memberModal.jsx @@ -139,6 +139,7 @@ function memberModal (props) { style={{ width: 417 }} rules={[{ required: true, message: "请选择部门" }]} showClear + filter initValue={departmentId || ""} disabled={memberEdit} > @@ -157,6 +158,7 @@ function memberModal (props) { { diff --git a/web/client/src/sections/install/containers/system.jsx b/web/client/src/sections/install/containers/system.jsx index 69a80d1..79de903 100644 --- a/web/client/src/sections/install/containers/system.jsx +++ b/web/client/src/sections/install/containers/system.jsx @@ -56,7 +56,7 @@ const Example = (props) => { dispatch(install.getProjectAppList(query)).then((res) => {//获取应用列表 setAppList(res.payload.data) }) - + console.log('user',user); }, []) useEffect(() => { getProjectPomsList(); diff --git a/web/client/src/sections/service/containers/emPush.jsx b/web/client/src/sections/service/containers/emPush.jsx index f8df1e4..2017936 100644 --- a/web/client/src/sections/service/containers/emPush.jsx +++ b/web/client/src/sections/service/containers/emPush.jsx @@ -188,7 +188,7 @@ const EmPush = (props) => { record.structure?.map((item, index) => { return ( {item.name} @@ -513,7 +513,7 @@ const EmPush = (props) => { dataIndex: "pushCount", key: "pushCount", render: (_, r, index) => { - return r.pushCount + '次' + return (r.pushCount||0) + '次' }, }, ];