Merge branch 'master' into positec

king

2022-05-17 2ae980243b7ad705dea575eadcfc4cf4e24073bd

 src/tabviews/custom/components/timeline/normal-timeline/index.jsx

@@ -318,7 +318,7 @@
    const { config, loading, data } = this.state

    return (
      <div className="normal-timeline-box" style={{...config.style}}>
      <div className="normal-timeline-box" id={'anchor' + config.uuid} style={{...config.style}}>
        {loading ?
          <div className="loading-mask">
            {data ? <div className="ant-spin-blur"></div> : null}