From b639779c7152a28c3019047d59733710e5d78dba Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 7 Oct 2023 15:41:35 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E8=80=85=E5=AE=B6=E5=9B=AD=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/home/Index.scss | 7 ++++++- src/home/ThirdEdition.jsx | 11 ++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/home/Index.scss b/src/home/Index.scss index 2a708cd50..daf4c1993 100644 --- a/src/home/Index.scss +++ b/src/home/Index.scss @@ -812,8 +812,13 @@ body{ text-decoration: underline; } } - span{ + span.listboxcount{ + margin-left: 20px; + } + span.listboxtime{ margin-left: 40px; + width: 97px; + text-align: right; } .listboxcount{ min-width: 60px; diff --git a/src/home/ThirdEdition.jsx b/src/home/ThirdEdition.jsx index 7b72060d8..9f6844eaa 100644 --- a/src/home/ThirdEdition.jsx +++ b/src/home/ThirdEdition.jsx @@ -1,5 +1,6 @@ import React,{ useState , useEffect , useMemo } from 'react'; import { Spin , Skeleton } from 'antd'; +import moment from 'moment'; import T311 from './Img/3-1-1.png'; import T312 from './Img/3-1-2.png'; import T321 from './Img/3-2-1.png'; @@ -141,8 +142,8 @@ function ThirdEdition() { return(
  • {i.title} - {i.visits} - {i.created_time && i.created_time.split(" ")[0]} + {i.from !== "other" && {i.visits} } + {i.from !== "other" && {i.created_time && moment(i.created_time).format("YYYY-MM-DD")} }
    • ) }):"" @@ -180,7 +181,7 @@ function ThirdEdition() {
  • {i.title} {i.from !== "other" && {i.visits} } - {i.created_time && i.created_time.split(" ")[0]} + {i.from !== "other" && {i.created_time && moment(i.created_time).format("YYYY-MM-DD")} }
    • ) }):"" @@ -198,8 +199,8 @@ function ThirdEdition() { return(
  • {i.title} - {i.visits} - {i.created_time && i.created_time.split(" ")[0]} + {i.from !== "other" && {i.visits} } + {i.from !== "other" && {i.created_time && moment(i.created_time).format("YYYY-MM-DD")} }
    • ) }):"" From 10360c3e3731b55a9eae341c90f49b0d7b596d4d Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sun, 8 Oct 2023 10:12:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Merge/merge.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index 237a07338..d8d83e155 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -407,7 +407,7 @@ class merge extends Component { -
    +
    {data && data.search_count && data.search_count > 0 ? (
    @@ -427,7 +427,7 @@ class merge extends Component {
    ):""} {search_count > select_params.limit ? ( -
    +
    Date: Sun, 8 Oct 2023 11:02:16 +0800 Subject: [PATCH 3/4] issue #3445 --- src/modules/tpm/challengesnew/css/newquestion.css | 2 +- src/modules/tpm/challengesnew/tpm-md-editor.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/tpm/challengesnew/css/newquestion.css b/src/modules/tpm/challengesnew/css/newquestion.css index 400cd5123..51831434f 100644 --- a/src/modules/tpm/challengesnew/css/newquestion.css +++ b/src/modules/tpm/challengesnew/css/newquestion.css @@ -80,6 +80,6 @@ border: none; margin:0px auto; } -.editormd-editing .quoteBox{ +.editormd-editing.quoteBox .editormd{ overflow: unset; } \ No newline at end of file diff --git a/src/modules/tpm/challengesnew/tpm-md-editor.js b/src/modules/tpm/challengesnew/tpm-md-editor.js index 6b835f373..0f36bda75 100644 --- a/src/modules/tpm/challengesnew/tpm-md-editor.js +++ b/src/modules/tpm/challengesnew/tpm-md-editor.js @@ -762,8 +762,8 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla return ( -
    -
    +
    +
    {quoteVisible && QuoteDiv } {atWhoVisible && atWhoList} From 7df41a704864a95b58f8e417744a0691645333cd Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 11 Oct 2023 11:38:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=BB=84=E7=BB=87-=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=9B=A2=E9=98=9F=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Team/RightBox.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Team/RightBox.jsx b/src/forge/Team/RightBox.jsx index 6a05d6214..df2364503 100644 --- a/src/forge/Team/RightBox.jsx +++ b/src/forge/Team/RightBox.jsx @@ -175,7 +175,7 @@ function RightBox({ OIdentifier , history , admin , showCompeleteDialog ,complet (item.is_admin || item.is_member) ? {item.nickname} : - {item.name} + {item.nickname} } {item.num_users}名成员