Sfoglia il codice sorgente

Merge branch 'master' into 2.9.0

star7th 4 anni fa
parent
commit
5cf6c484e2

+ 1 - 1
composer.json

@@ -5,7 +5,7 @@
     "description": "ShowDoc is a tool greatly applicable for an IT team to share documents online",
     "keywords": ["showdoc","documents","Api"],
     "homepage": "https://github.com/star7th/showdoc",
-    "version":"v2.8.14", 
+    "version":"v2.8.15", 
     "license": "Apache-2.0",
     "authors": [
         {

+ 1 - 1
web/index.html

@@ -16,4 +16,4 @@
       "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.dce040fa3e0f48279ab876530e0422ef.css rel=stylesheet></head><body class=grey-bg><div id=app></div><div style=display:none>本网站基于开源版showdoc搭建,仅供私人使用。如需访问showdoc官网,请在搜索引擎里搜索showdoc字样或者直接访问showdoc.com.cn</div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1eb6213d11eb61d1bd46.js></script><script type=text/javascript src=./static/js/app.db8af3388f185d5f6dc1.js></script></body></html>
+  }</script><link href=./static/css/app.dce040fa3e0f48279ab876530e0422ef.css rel=stylesheet></head><body class=grey-bg><div id=app></div><div style=display:none>本网站基于开源版showdoc搭建,仅供私人使用。如需访问showdoc官网,请在搜索引擎里搜索showdoc字样或者直接访问showdoc.com.cn</div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1eb6213d11eb61d1bd46.js></script><script type=text/javascript src=./static/js/app.0e27a0df21522c73317a.js></script></body></html>

+ 10 - 10
web/static/editor.md/lib/plantuml.js

@@ -1733,14 +1733,14 @@ return function deflate(str, level) {
 
 })();
 
-onmessage = function worker(m) {
-  postMessage(deflate(m.data, 9));
-};
-
-onconnect = function sharedWorker(e) {
-  var port = e.ports[0];
-  port.onmessage = function(m) {
-    port.postMessage(deflate(m.data, 9));
-  };
-};
+// onmessage = function worker(m) {
+//   postMessage(deflate(m.data, 9));
+// };
+
+// onconnect = function sharedWorker(e) {
+//   var port = e.ports[0];
+//   port.onmessage = function(m) {
+//     port.postMessage(deflate(m.data, 9));
+//   };
+// };
 

File diff suppressed because it is too large
+ 0 - 0
web/static/js/app.0e27a0df21522c73317a.js


File diff suppressed because it is too large
+ 0 - 0
web/static/js/app.db8af3388f185d5f6dc1.js


+ 1 - 1
web_src/src/components/common/Editormd.vue

@@ -253,7 +253,7 @@ export default {
             `${this.editorPath}/lib/sequence-diagram.min.js`,
             `${this.editorPath}/lib/jquery.flowchart.min.js`,
             `${this.editorPath}/lib/jquery.mark.min.js`,
-            `${this.editorPath}/lib/plantuml.js`,
+            `${this.editorPath}/lib/plantuml.js?v=2`,
             `${this.editorPath}/lib/view.min.js`,
             `${this.editorPath}/lib/transform.min.js`
           ],

+ 10 - 11
web_src/static/editor.md/lib/plantuml.js

@@ -1733,14 +1733,13 @@ return function deflate(str, level) {
 
 })();
 
-onmessage = function worker(m) {
-  postMessage(deflate(m.data, 9));
-};
-
-onconnect = function sharedWorker(e) {
-  var port = e.ports[0];
-  port.onmessage = function(m) {
-    port.postMessage(deflate(m.data, 9));
-  };
-};
-
+// onmessage = function worker(m) {
+//   postMessage(deflate(m.data, 9));
+// };
+
+// onconnect = function sharedWorker(e) {
+//   var port = e.ports[0];
+//   port.onmessage = function(m) {
+//     port.postMessage(deflate(m.data, 9));
+//   };
+// };

Some files were not shown because too many files changed in this diff