From f2f059007551e01399f4df1afc82ec0abc489a43 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 十一月 2023 21:44:19 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/tabviews/custom/components/timeline/normal-timeline/index.jsx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/tabviews/custom/components/timeline/normal-timeline/index.jsx b/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
index 9801617..698328e 100644
--- a/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
+++ b/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
@@ -559,7 +559,7 @@
     if (config.wrap.empty === 'hidden' && (!data || data.length === 0)) return null
     
     return (
-      <div className="normal-timeline-box" id={'anchor' + config.uuid} style={{...config.style}}>
+      <div className={'normal-timeline-box ' + (config.wrap.btnControl || '')} id={'anchor' + config.uuid} style={{...config.style}}>
         {loading ?
           <div className="loading-mask">
             {data ? <div className="ant-spin-blur"></div> : null}

--
Gitblit v1.8.0