From e5b3e2570afd7e72d7d5704af139300d52e0b5ed Mon Sep 17 00:00:00 2001 From: unknown <18119604035@163.com> Date: Wed, 6 Sep 2023 09:12:32 +0800 Subject: [PATCH 1/4] =?UTF-8?q?tree=E5=88=86=E7=B1=BB=E3=80=81=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E7=BB=84=E4=BB=B6=E5=8F=AA=E6=98=BE=E7=A4=BA=E4=B8=80?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/compenents/tree-category/index.tsx | 2 +- src/compenents/tree-department/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compenents/tree-category/index.tsx b/src/compenents/tree-category/index.tsx index 1e3c2a7..bc01a50 100644 --- a/src/compenents/tree-category/index.tsx +++ b/src/compenents/tree-category/index.tsx @@ -102,7 +102,7 @@ export const TreeCategory = (props: PropInterface) => { selectedKeys={selectKey} onExpand={onExpand} treeData={treeData} - defaultExpandAll={true} + // defaultExpandAll={true} switcherIcon={} /> )} diff --git a/src/compenents/tree-department/index.tsx b/src/compenents/tree-department/index.tsx index f93de74..3bba14d 100644 --- a/src/compenents/tree-department/index.tsx +++ b/src/compenents/tree-department/index.tsx @@ -165,7 +165,7 @@ export const TreeDepartment = (props: PropInterface) => { onSelect={onSelect} onExpand={onExpand} treeData={treeData} - defaultExpandAll={true} + // defaultExpandAll={true} switcherIcon={} /> )} From 780e73c0290b5b42a6bb227ce85ee9467c0647ed Mon Sep 17 00:00:00 2001 From: unknown <18119604035@163.com> Date: Wed, 6 Sep 2023 09:21:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/system/config/index.tsx | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/pages/system/config/index.tsx b/src/pages/system/config/index.tsx index bea40aa..0b4a501 100644 --- a/src/pages/system/config/index.tsx +++ b/src/pages/system/config/index.tsx @@ -287,7 +287,7 @@ const SystemConfigPage = () => { }} > -
+
(推荐尺寸:240x80px,支持JPG、PNG)
@@ -309,7 +309,7 @@ const SystemConfigPage = () => { }} > -
+
(推荐尺寸:240x80px,支持JPG、PNG)
@@ -388,7 +388,7 @@ const SystemConfigPage = () => { -
+
(打开后禁止学员在首次学习中拖动进度条,以防刷课)
@@ -401,7 +401,7 @@ const SystemConfigPage = () => { > -
+
(打开后播放器会随机出现跑马灯水印,以防录屏传播)
@@ -482,7 +482,7 @@ const SystemConfigPage = () => { form.setFieldsValue({ "player.poster": url }); }} > -
+
(推荐尺寸:1920x1080px,视频播放未开始时展示)
@@ -504,7 +504,7 @@ const SystemConfigPage = () => { form.setFieldsValue({ "player.poster": url }); }} > -
+
(推荐尺寸:1920x1080px,视频播放未开始时展示)
@@ -559,7 +559,7 @@ const SystemConfigPage = () => { form.setFieldsValue({ "member.default_avatar": url }); }} > -
(新学员的默认头像)
+
(新学员的默认头像)
@@ -579,7 +579,7 @@ const SystemConfigPage = () => { form.setFieldsValue({ "member.default_avatar": url }); }} > -
(新学员的默认头像)
+
(新学员的默认头像)
@@ -706,8 +706,8 @@ const SystemConfigPage = () => { placeholder="请填写服务地址" /> -
- LDAP的对外服务地址。例如:ldap.example.com +
+ (LDAP的对外服务地址。例如:ldap.example.com)
@@ -720,8 +720,8 @@ const SystemConfigPage = () => { placeholder="请填写用户名" /> -
- 用户登录到LDAP。例子:cn=admin,dc=playedu,dc=xyz +
+ (用户登录到LDAP。例子:cn=admin,dc=playedu,dc=xyz)
@@ -741,7 +741,7 @@ const SystemConfigPage = () => { placeholder="请填写基本DN" /> -
从LDAP根节点搜索用户
+
(从LDAP根节点搜索用户)
@@ -753,8 +753,8 @@ const SystemConfigPage = () => { placeholder="请填写基本DN" /> -
- 搜索用户时,基于基础DN的搜索范围限制 +
+ (搜索用户时,基于基础DN的搜索范围限制)
From fc9682c31dbc13caffcb85d20a02fbf9e82c842c Mon Sep 17 00:00:00 2001 From: unknown <18119604035@163.com> Date: Wed, 6 Sep 2023 09:42:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E8=AF=BE=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E4=B8=8A=E6=9E=B6=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/course/compenents/create.tsx | 2 +- src/pages/course/compenents/update.tsx | 23 ++++++++++++----------- src/pages/course/index.tsx | 4 ++-- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/pages/course/compenents/create.tsx b/src/pages/course/compenents/create.tsx index 07ce256..c0d1dce 100644 --- a/src/pages/course/compenents/create.tsx +++ b/src/pages/course/compenents/create.tsx @@ -695,7 +695,7 @@ export const CourseCreate: React.FC = ({ form.setFieldsValue({ thumb: url }); }} > - + (推荐尺寸:400x300px)
diff --git a/src/pages/course/compenents/update.tsx b/src/pages/course/compenents/update.tsx index 33cc846..485d47c 100644 --- a/src/pages/course/compenents/update.tsx +++ b/src/pages/course/compenents/update.tsx @@ -96,8 +96,8 @@ export const CourseUpdate: React.FC = ({ type: type, short_desc: res.data.course.short_desc, hasChapter: chapterType, - published_at: res.data.published_at - ? dayjs(res.data.published_at, "YYYY-MM-DD HH:mm:ss") + published_at: res.data.course.published_at + ? dayjs(res.data.course.published_at, "YYYY-MM-DD HH:mm:ss") : "", }); setType(type); @@ -188,6 +188,10 @@ export const CourseUpdate: React.FC = ({ setType(e.target.value); }; + const disabledDate = (current: any) => { + return current && current >= moment().add(0, "days"); // 选择时间要大于等于当前天。若今天不能被选择,去掉等号即可。 + }; + return ( <> {open ? ( @@ -388,7 +392,7 @@ export const CourseUpdate: React.FC = ({ form.setFieldsValue({ thumb: url }); }} > - + (推荐尺寸:400x300px)
@@ -403,22 +407,19 @@ export const CourseUpdate: React.FC = ({ maxLength={200} /> - + - + - -
- 上架时间越晚,排序越靠前 +
+ (上架时间越晚,排序越靠前)
diff --git a/src/pages/course/index.tsx b/src/pages/course/index.tsx index 3d433da..42e103c 100644 --- a/src/pages/course/index.tsx +++ b/src/pages/course/index.tsx @@ -200,8 +200,8 @@ const CoursePage = () => { ), }, { - title: "创建时间", - dataIndex: "created_at", + title: "上架时间", + dataIndex: "published_at", render: (text: string) => {dateFormat(text)}, }, { From 84fe2ecab1a3ede8fc81a4a72ceb3c3e659df7cc Mon Sep 17 00:00:00 2001 From: unknown <18119604035@163.com> Date: Wed, 6 Sep 2023 09:53:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=A6=E5=91=98?= =?UTF-8?q?=E9=82=AE=E7=AE=B1=E3=80=81=E5=AF=86=E7=A0=81=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=A1=AB=E5=85=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/member/compenents/create.tsx | 2 ++ src/pages/member/compenents/update.tsx | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/pages/member/compenents/create.tsx b/src/pages/member/compenents/create.tsx index f5deb66..e64d3bb 100644 --- a/src/pages/member/compenents/create.tsx +++ b/src/pages/member/compenents/create.tsx @@ -161,6 +161,7 @@ export const MemberCreate: React.FC = ({ rules={[{ required: true, message: "请输入登录邮箱!" }]} > = ({ rules={[{ required: true, message: "请输入登录密码!" }]} > = ({ rules={[{ required: true, message: "请输入登录邮箱!" }]} > = ({