Merge branch '2018-09-12-diff'

reymont · Sep 13, 2018 · 62bc4f4 · 62bc4f4
2 parents 8cfe5e3 + f77f79c
commit 62bc4f4
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 48 deletions.
diff --git a/suixingpay-config-front/src/pages/base-information/application-config/Diff.jsx b/suixingpay-config-front/src/pages/base-information/application-config/Diff.jsx
@@ -31,16 +31,16 @@ class Diff extends Component {
                 this.setState({
                     historyConfigText: rsp.data.propertySource,
                     historyVersionId: rsp.data.version
+                }, () => {
+                    const iframe = document.createElement('iframe');
+                    iframe.src = '/static/diffhtml.html';
+                    iframe.width = '100%';
+                    iframe.setAttribute("frameborder", 0);
+                    iframe.setAttribute("id", 'diffIframe');
+                    document.getElementById('prettydiff').appendChild(iframe);
                 });
             }
         });
-
-        const iframe = document.createElement('iframe');
-        iframe.src = '/static/diffhtml.html';
-        iframe.width = '100%';
-        iframe.setAttribute("frameborder", 0);
-        iframe.setAttribute("id", 'diffIframe');
-        document.getElementById('prettydiff').appendChild(iframe);
     }
 
     /**

diff --git a/suixingpay-config-front/src/pages/base-information/application-config/DiffComponent.jsx b/suixingpay-config-front/src/pages/base-information/application-config/DiffComponent.jsx
@@ -24,6 +24,13 @@ class DiffComponent extends Component {
                 this.setState({
                     historyConfigText: rsp.data.propertySource,
                     historyVersionId: rsp.data.version
+                }, () => {
+                    const iframe = document.createElement('iframe');
+                    iframe.src = '/static/diffhtml.html';
+                    iframe.width = '100%';
+                    iframe.setAttribute("frameborder", 0);
+                    iframe.setAttribute("id", 'diffIframe');
+                    document.getElementById('prettydiff').appendChild(iframe);
                 });
             }
         });
@@ -32,13 +39,6 @@ class DiffComponent extends Component {
             currentConfigText: editText,
             currentVersionId: '当前修改内容',
         });
-
-        const iframe = document.createElement('iframe');
-        iframe.src = '/static/diffhtml.html';
-        iframe.width = '100%';
-        iframe.setAttribute("frameborder", 0);
-        iframe.setAttribute("id", 'diffIframe');
-        document.getElementById('prettydiff').appendChild(iframe);
     }
 
     render() {

diff --git a/suixingpay-config-front/src/pages/base-information/global-config/Diff.jsx b/suixingpay-config-front/src/pages/base-information/global-config/Diff.jsx
@@ -33,16 +33,16 @@ class Diff extends Component {
                 this.setState({
                     historyConfigText: rsp.data.propertySource,
                     historyVersionId: rsp.data.version
+                }, () => {
+                    const iframe = document.createElement('iframe');
+                    iframe.src = '/static/diffhtml.html';
+                    iframe.width = '100%';
+                    iframe.setAttribute("frameborder", 0);
+                    iframe.setAttribute("id", 'diffIframe');
+                    document.getElementById('prettydiff').appendChild(iframe);
                 });
             }
         });
-
-        const iframe = document.createElement('iframe');
-        iframe.src = '/static/diffhtml.html';
-        iframe.width = '100%';
-        iframe.setAttribute("frameborder", 0);
-        iframe.setAttribute("id", 'diffIframe');
-        document.getElementById('prettydiff').appendChild(iframe);
     }
 
     /**

diff --git a/suixingpay-config-front/src/pages/base-information/global-config/DiffComponent.jsx b/suixingpay-config-front/src/pages/base-information/global-config/DiffComponent.jsx
@@ -20,6 +20,13 @@ class DiffComponent extends Component {
                 this.setState({
                     historyConfigText: rsp.data.propertySource,
                     historyVersionId: rsp.data.version
+                }, () => {
+                    const iframe = document.createElement('iframe');
+                    iframe.src = '/static/diffhtml.html';
+                    iframe.width = '100%';
+                    iframe.setAttribute("frameborder", 0);
+                    iframe.setAttribute("id", 'diffIframe');
+                    document.getElementById('prettydiff').appendChild(iframe);
                 });
             }
         });
@@ -28,13 +35,6 @@ class DiffComponent extends Component {
             currentConfigText: editText,
             currentVersionId: '当前修改内容',
         });
-
-        const iframe = document.createElement('iframe');
-        iframe.src = '/static/diffhtml.html';
-        iframe.width = '100%';
-        iframe.setAttribute("frameborder", 0);
-        iframe.setAttribute("id", 'diffIframe');
-        document.getElementById('prettydiff').appendChild(iframe);
     }
 
     render() {

diff --git a/suixingpay-config-front/static/diffhtml.html b/suixingpay-config-front/static/diffhtml.html
@@ -16,23 +16,26 @@
 <script src="js/diffview.js" type="application/javascript"></script>
 <script src="js/prettydiff.js" type="application/javascript"></script>
 <script src="js/jquery.min.js"></script>
+<div class="btn-view">
+    <button type="button" value="Execute" onclick="viewDiffLine()">只查看被修改行</button>
+    <button type="button" value="Execute" onclick="viewAllLine()">查看全部行</button>
+</div>
+<div id="prettydiff"></div>
 
 <script type="text/javascript">
-    setTimeout(function () {
-        var historyConfigText = window.parent.document.getElementById('historyConfigText').defaultValue;
-        var currentConfigText = window.parent.document.getElementById('currentConfigText').defaultValue;
-        args = {
-            source: historyConfigText,
-            diff: currentConfigText,
-            lang: "text"
-        };
-        var output = global.prettydiff.prettydiff(args);
-        document.getElementById("prettydiff").innerHTML = output;
+    var historyConfigText = window.parent.document.getElementById('historyConfigText').defaultValue;
+    var currentConfigText = window.parent.document.getElementById('currentConfigText').defaultValue;
+    args = {
+        source: historyConfigText,
+        diff: currentConfigText,
+        lang: "text"
+    };
+    var output = global.prettydiff.prettydiff(args);
+    document.getElementById("prettydiff").innerHTML = output;
 
-        // 设置 iframe 高度
-        var iframeHeight = document.getElementById('prettydiff').clientHeight;
-        window.parent.document.getElementById('diffIframe').setAttribute("height", iframeHeight + 40);
-    }, 100);
+    // 设置 iframe 高度
+    var iframeHeight = document.getElementById('prettydiff').clientHeight;
+    window.parent.document.getElementById('diffIframe').setAttribute("height", iframeHeight + 40);
 
     // 只查看修改行内容
     function viewDiffLine() {
@@ -45,23 +48,19 @@
         }
         setIframeHeight();
     }
+
     // 查看全部内容
     function viewAllLine() {
         $(".data .equal").show();
         $(".diff ol.count").find("li").show();
         setIframeHeight();
     }
-    
+
     //设置 iframe 高度
     function setIframeHeight() {
         var iframeHeight = document.getElementById('prettydiff').clientHeight;
         window.parent.document.getElementById('diffIframe').setAttribute("height", iframeHeight + 40);
     }
 </script>
-<div class="btn-view">
-    <button type="button" value="Execute" onclick="viewDiffLine()">只查看被修改行</button>
-    <button type="button" value="Execute" onclick="viewAllLine()">查看全部行</button>
-</div>
-<div id="prettydiff"></div>
 </body>
 </html>