star7th 5 年之前
父节点
当前提交
516ff031a0

+ 4 - 5
web/index.html

@@ -4,16 +4,15 @@
       "server": window.location.protocol +'//'+ window.location.host + window.location.pathname+ '../server/index.php?s=',
       //"lang" :'en'
       "lang" :'zh-cn'
-  }</script><link href=./static/css/app.8f471dbc1a542f85e173761b1e1e6d8f.css rel=stylesheet></head><body class=grey-bg><div id=app></div><script type=text/javascript src=./static/js/manifest.e2b980cf8968a5919fb1.js></script><script type=text/javascript src=./static/js/vendor.e142ae298b8919d4a6df.js></script><script type=text/javascript src=./static/js/app.6746119afa913347cb90.js></script></body></html><script language=JavaScript>var Wwidth = window.innerWidth ;
+  }</script><link href=./static/css/app.484b0ca6952b8b26184d07c363855d77.css rel=stylesheet></head><body class=grey-bg><div id=app></div><script type=text/javascript src=./static/js/manifest.3f793afba939771f8bd5.js></script><script type=text/javascript src=./static/js/vendor.e142ae298b8919d4a6df.js></script><script type=text/javascript src=./static/js/app.d35ccecb538c9ba7d5d6.js></script></body></html><script language=JavaScript>var Wwidth = window.innerWidth ;
   window.addEventListener('resize', function() {
     ///宽度变化大于50像素的时候刷新整个窗口以适应新宽度
     if ( Math.abs(Wwidth - window.innerWidth) > 50 ) {
         //console.log(window.innerWidth + ' ' + window.innerHeight);
-        //如果存在save-page,则保存内容后再刷新以免丢失内容
-        if(document.getElementById("save-page")){
-          document.getElementById("save-page").click();
+        //如果不在编辑页面,则在窗口变化后刷新窗口以适应宽度
+        if(window.location.href.indexOf("/edit") === -1){
+          window.location.reload();
         }
-        window.location.reload();
     };
 
   });</script>

文件差异内容过多而无法显示
+ 0 - 0
web/static/css/app.484b0ca6952b8b26184d07c363855d77.css


文件差异内容过多而无法显示
+ 0 - 0
web/static/js/app.6746119afa913347cb90.js


文件差异内容过多而无法显示
+ 0 - 0
web/static/js/app.d35ccecb538c9ba7d5d6.js


+ 1 - 1
web/static/js/manifest.e2b980cf8968a5919fb1.js → web/static/js/manifest.3f793afba939771f8bd5.js

@@ -1 +1 @@
-!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,a,c){for(var i,u,f,s=0,l=[];s<t.length;s++)u=t[s],o[u]&&l.push(o[u][0]),o[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(r&&r(t,a,c);l.length;)l.shift()();if(c)for(s=0;s<c.length;s++)f=n(n.s=c[s]);return f};var t={},o={2:0};n.e=function(e){function r(){i.onerror=i.onload=null,clearTimeout(u);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var a=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=a;var c=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.timeout=12e4,n.nc&&i.setAttribute("nonce",n.nc),i.src=n.p+"static/js/"+e+"."+{0:"e142ae298b8919d4a6df",1:"6746119afa913347cb90"}[e]+".js";var u=setTimeout(r,12e4);return i.onerror=i.onload=r,c.appendChild(i),a},n.m=e,n.c=t,n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
+!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,c,a){for(var i,u,f,s=0,l=[];s<t.length;s++)u=t[s],o[u]&&l.push(o[u][0]),o[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(t,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=n(n.s=a[s]);return f};var t={},o={2:0};n.e=function(e){function r(){i.onerror=i.onload=null,clearTimeout(u);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var c=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=c;var a=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.timeout=12e4,n.nc&&i.setAttribute("nonce",n.nc),i.src=n.p+"static/js/"+e+"."+{0:"e142ae298b8919d4a6df",1:"d35ccecb538c9ba7d5d6"}[e]+".js";var u=setTimeout(r,12e4);return i.onerror=i.onload=r,a.appendChild(i),c},n.m=e,n.c=t,n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);

+ 13 - 12
web_src/src/components/item/show/show_regular_item/Index.vue

@@ -14,18 +14,19 @@
 
 
         <div id="right-side" >
-
-           <div class="doc-title-box" id="doc-title-box">
-              <span id="doc-title-span" class="dn"></span>
-              <h2 id="doc-title">{{page_title}}</h2>
-              <el-badge :value="attachment_count" class="item"  id="attachment" v-if="attachment_count"   @click.native="ShowAttachment" >
-                <i class="el-icon-upload"></i> 
-              </el-badge>
-          </div>
-          <div id="doc-body" >
-
-          <div id="page_md_content" class="page_content_main"><Editormd v-bind:content="content" v-if="page_id" type="html" :keyword="keyword"></Editormd></div>
-          </div>
+            <div id="p-content">
+                 <div class="doc-title-box" id="doc-title-box">
+                    <span id="doc-title-span" class="dn"></span>
+                    <h2 id="doc-title">{{page_title}}</h2>
+                    <el-badge :value="attachment_count" class="item"  id="attachment" v-if="attachment_count"   @click.native="ShowAttachment" >
+                      <i class="el-icon-upload"></i> 
+                    </el-badge>
+                </div>
+                <div id="doc-body" >
+
+                <div id="page_md_content" class="page_content_main"><Editormd v-bind:content="content" v-if="page_id" type="html" :keyword="keyword"></Editormd></div>
+                </div>
+              </div>
 
             <OpBar   :page_id="page_id" :item_id='item_info.item_id' :item_info='item_info'  :page_info="page_info"  > </OpBar>
 

+ 2 - 2
web_src/src/components/item/show/show_regular_item/LeftMenu.vue

@@ -123,14 +123,14 @@
         element.style.marginLeft = '0px'; 
         element.style.marginTop = '0px'; 
         element.style.position = 'static'; 
-        var element = document.getElementById('right-side') ;
+        var element = document.getElementById('p-content') ;
         element.style.display = 'none'; 
     },
     hide_menu(){
         this.show_menu_btn = true;
         var element = document.getElementById('left-side-menu') ;
         element.style.display = 'none';
-        var element = document.getElementById('right-side') ;
+        var element = document.getElementById('p-content') ;
         element.style.marginLeft = '0px';
         element.style.display = 'block'; 
         var element = document.getElementById('page_md_content') ;

部分文件因为文件数量过多而无法显示