Merge remote-tracking branch 'origin/develop' into develop

src/pages/Memory/components/MyQuill.tsx

@@ -37,7 +37,9 @@ const MyQuill: React.FC<Props> = (props) => {
   useEffect(()=>{
     let images = document.querySelectorAll(".ql-container img");
     for (let i = 0; i < images.length; i++) {
+      // @ts-ignore
       let url = images[i].src;
+      // @ts-ignore
       images[i].ondblclick = function () {
         window.open(url);
       };

src/pages/Memory/index.tsx

@@ -29,6 +29,7 @@ const practice = "practice";
 const TableList: React.FC<{}> = () => {
   const [btnDisable, setBtnDisable] = useState(false);
   const [showMore, setShowMore] = useState(false);
+  const [refresh, setRefresh] = useState(true);
 
   const [backPractice, setBackPractice] = useState("");
   let counting = false;
@@ -216,6 +217,7 @@ const TableList: React.FC<{}> = () => {
   }, [state.step]);
 
   useEffect(() => {
+    setRefresh(false);
     // 判断是否为主页面刷新
     if (memory.front.length === 0) {
       return;
@@ -230,6 +232,7 @@ const TableList: React.FC<{}> = () => {
     // 隐藏更多按钮
     setShowMore(false);
     setBackPractice("")
+    setRefresh(true);
   }, [memory.front]);
 
   return (
@@ -260,12 +263,11 @@ const TableList: React.FC<{}> = () => {
         </div>
       ) : null}
 
-      {state.step === Step.MEMORY ? (
+      {state.step === Step.MEMORY && refresh ? (
         <div>
           正面：
           <p/>
-          <MyQuill theme="bubble" readonly onChange={() => {
-          }} value={memory.front}/>
+          <MyQuill theme="bubble" readonly onChange={() => {}} value={memory.front}/>
           <p/>
           {state.showBack ? (
             <div>

src/pages/document.ejs

@@ -8,12 +8,16 @@
       name="keywords"
       content="antd,umi,umijs,ant design,脚手架,布局, Ant Design,项目,Pro,admin,控制台,主页,开箱即用,中后台,解决方案,组件库"
     />
+    <!--解决资源跨域-->
     <meta name="referrer" content="no-referrer">
 
+    <!--解决缓存问题-->
     <meta http-equiv="pragma" content="no-cache">
     <meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
     <meta http-equiv="expires" content="0">
 
+    <!--解决https加载http失败问题-->
+    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
     <meta
       name="viewport"
       content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"