Merge branch 'master' into mfyx_2.1

src/Material/components/ArticleCard.tsx

@@ -29,14 +29,16 @@ const ArticleCard: React.FC<IArticleCard> = props => {
   if (!item) return null
   return (
     <div className={styles['item-article']} onClick={handleToDetail}>
-      <div
-        className="item-article-title"
-        dangerouslySetInnerHTML={{
-          __html: item?.IsResearch
-            ? `${formatLabel(item.LabelKeywordImgLink)}<span>${title || item?.Title}</span>`
-            : title || item?.Title
-        }}
-      />
+      <div className="item-article-title">
+        <div
+          className="item-article-title-content"
+          dangerouslySetInnerHTML={{
+            __html: item?.IsResearch
+              ? `${formatLabel(item.LabelKeywordImgLink)}<span>${title || item?.Title}</span>`
+              : title || item?.Title
+          }}
+        />
+      </div>
       {(item as IBillBoardItem)?.BodyHighlight?.length > 0 ? (
         <>
           <div className="item-article-annotation line-eight">

src/Material/components/MeetingCard.tsx

@@ -56,12 +56,14 @@ const MeetingCard: React.FC<IMeetingCard> = props => {
   if (!item) return null
   return (
     <div className={styles['item-article']} onClick={handleClickMeeting}>
-      <div
-        className="item-article-title"
-        dangerouslySetInnerHTML={{
-          __html: title || `【${item.IndustryName}】晨会精华`
-        }}
-      />
+      <div className="item-article-title">
+        <div
+          className="item-article-title-content"
+          dangerouslySetInnerHTML={{
+            __html: title || `【${item.IndustryName}】晨会精华`
+          }}
+        />
+      </div>
       <div className={`item-article-annotation line-seven`}>
         <div dangerouslySetInnerHTML={{ __html: item.Content }} />
       </div>

src/Material/components/ProductInteriorCard.tsx

@@ -17,12 +17,14 @@ const ProductInteriorCard: React.FC<IProductInteriorCardProps> = props => {
   if (!item) return null
   return (
     <div className={styles['item-article']} onClick={handleToDetail}>
-      <div
-        className="item-article-title"
-        dangerouslySetInnerHTML={{
-          __html: title || item.Title
-        }}
-      />
+      <div className="item-article-title">
+        <div
+          className="item-article-title-content"
+          dangerouslySetInnerHTML={{
+            __html: title || item.Title
+          }}
+        />
+      </div>
       <div className={`item-article-annotation line-seven`}>
         <div dangerouslySetInnerHTML={{ __html: item.Body }} />
       </div>

src/Material/components/ReportSelectionCard.tsx

@@ -17,12 +17,14 @@ const ReportSelectionCard: React.FC<IReportSelectionCardProps> = props => {
   if (!item) return null
   return (
     <div className={styles['item-article']} onClick={handleToDetail}>
-      <div
-        className="item-article-title"
-        dangerouslySetInnerHTML={{
-          __html: title || item.Title
-        }}
-      />
+      <div className="item-article-title">
+        <div
+          className="item-article-title-content"
+          dangerouslySetInnerHTML={{
+            __html: title || item.Title
+          }}
+        />
+      </div>
       <div className={`item-article-annotation line-seven`}>
         <div dangerouslySetInnerHTML={{ __html: item.MarketStrategy }} />
       </div>

src/Material/components/SearchArticleCard.tsx

@@ -17,14 +17,16 @@ const SearchArticleCard: React.FC<ISearchArticleCard> = props => {
   if (!item) return null
   return (
     <div className={styles['item-article']} onClick={handleToDetail}>
-      <div
-        className="item-article-title"
-        dangerouslySetInnerHTML={{
-          __html: item?.IsResearch
-            ? `<span class="mfyx-label-normal mfyx-label-article no-wrap">买方研选</span><span>${item?.Title}</span>`
-            : item.Title
-        }}
-      />
+      <div className="item-article-title">
+        <div
+          className="item-article-title-content"
+          dangerouslySetInnerHTML={{
+            __html: item?.IsResearch
+              ? `<span class="mfyx-label-normal mfyx-label-article no-wrap">买方研选</span><span>${item?.Title}</span>`
+              : item.Title
+          }}
+        />
+      </div>
       <div className="item-article-annotation line-seven">
         <div dangerouslySetInnerHTML={{ __html: item.Body.join('') }} />
       </div>

src/Material/components/SummaryCard.tsx

@@ -19,12 +19,14 @@ const SummaryCard: React.FC<ISummaryCardProps> = props => {
   if (!item) return null
   return (
     <div className={styles['item-article']} onClick={handleToDetail}>
-      <div
-        className="item-article-title"
-        dangerouslySetInnerHTML={{
-          __html: title || item.Title
-        }}
-      />
+      <div className="item-article-title">
+        <div
+          className="item-article-title-content"
+          dangerouslySetInnerHTML={{
+            __html: title || item.Title
+          }}
+        />
+      </div>
       <div className={`item-article-annotation line-seven`}>
         <div dangerouslySetInnerHTML={{ __html: item.Abstract }} />
       </div>

src/Material/components/YanxuanSpecialCard.tsx

@@ -18,16 +18,18 @@ const YanxuanSpecialCard: React.FC<IYanxuanSpecialCardProps> = props => {
   if (!item) return null
   return (
     <div className={styles['item-article']} onClick={handleToDetail}>
-      <div
-        className="item-article-title"
-        dangerouslySetInnerHTML={{
-          __html: `<img src=${
-            item.LabelKeywordImgLink || 'https://hzstatic.hzinsights.com/cygx_web/config/zhuanlan.png'
-          } alt="标签" class="mfyx-label-img" /><span>【${item.Type === 1 ? '笔记' : '观点'}】${
-            title || item?.Title
-          }</span>`
-        }}
-      />
+      <div className="item-article-title">
+        <div
+          className="item-article-title-content"
+          dangerouslySetInnerHTML={{
+            __html: `<img src=${
+              item.LabelKeywordImgLink || 'https://hzstatic.hzinsights.com/cygx_web/config/zhuanlan.png'
+            } alt="标签" class="mfyx-label-img" /><span>【${item.Type === 1 ? '笔记' : '观点'}】${
+              title || item?.Title
+            }</span>`
+          }}
+        />
+      </div>
       {item?.BodyHighlight?.length > 0 ? (
         <>
           <div className="item-article-annotation line-seven">

src/Material/css/ItemComponent.module.scss

@@ -29,14 +29,16 @@
       font-size: 16px;
       line-height: 24px;
       color: #333333;
-      padding-top: 16px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      display: -webkit-box;
-      -webkit-line-clamp: 2; // 超出多少行
-      -webkit-box-orient: vertical;
-      word-break: break-all;
+      padding-top: 16px;      
       border-bottom: 1px solid #ebebeb;
+      .item-article-title-content{
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2; // 超出多少行
+        -webkit-box-orient: vertical;
+        word-break: break-all;
+      }
     }
     .item-article-annotation {
       flex: auto;

src/NewPageHeader.tsx

@@ -272,6 +272,7 @@ const NewPage: React.FC = props => {
             <HeadSearch
               onSearch={handleToDoSearch}
               defaultKeyword={searchWord}
+              placeholder="搜索"
               className={styles['search-header-max']}
             />
           </Col>