Browse Source

修复粘贴图片上传问题

star7th 7 years ago
parent
commit
24efb770d1

+ 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.0.1",
+    "version":"v2.0.2",
     "license": "Apache-2.0",
     "authors": [
         {

+ 1 - 1
web/index.html

@@ -4,4 +4,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.692c3e9246a2cfb50f236c587f136b2d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.6bbc426b6c9d3fe0c5da.js></script><script type=text/javascript src=./static/js/vendor.6ec312a9f1e4bcc005ef.js></script><script type=text/javascript src=./static/js/app.c294d67280e8e41d9683.js></script></body></html>
+  }</script><link href=./static/css/app.b791e5c0bb481338e7aefc3c81d462ec.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.958296e6619ce92c0b37.js></script><script type=text/javascript src=./static/js/vendor.6ec312a9f1e4bcc005ef.js></script><script type=text/javascript src=./static/js/app.0a39c50ca9fbf21d7e52.js></script></body></html>

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


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


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


+ 1 - 1
web/static/js/manifest.6bbc426b6c9d3fe0c5da.js → web/static/js/manifest.958296e6619ce92c0b37.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,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:"6ec312a9f1e4bcc005ef",1:"c294d67280e8e41d9683"}[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}}([]);
+!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:"6ec312a9f1e4bcc005ef",1:"0a39c50ca9fbf21d7e52"}[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}}([]);

+ 62 - 0
web_src/src/components/page/edit/Index.vue

@@ -414,6 +414,66 @@ export default {
        });
     },
 
+    /** 粘贴上传图片 **/
+    on_paste(){
+      var that = this;
+      var url = DocConfig.server+'/api/page/uploadImg';
+      document.addEventListener('paste', function(e) {
+        var clipboard = e.clipboardData;
+        for (var i = 0, len = clipboard.items.length; i < len; i++) {
+          if (clipboard.items[i].kind == 'file' || clipboard.items[i].type.indexOf('image') > -1) {
+            var imageFile = clipboard.items[i].getAsFile();
+            var form = new FormData;
+            form.append('t', 'ajax-uploadpic');
+            form.append('editormd-image-file', imageFile);
+            var loading = '';
+            var callback = function(type, data) {
+              type = type || 'before';
+              switch (type) {
+                // 开始上传
+                case 'before':
+                  loading = that.$loading();
+                  break;
+                  // 服务器返回错误
+                case 'error':
+                  loading.close();
+                  that.$alert('图片上传失败');
+                  break;
+                  // 上传成功
+                case 'success':
+                  loading.close();
+                  if (data.success == 1) {
+                    var value = '![](' + data.url + ')';
+                    that.insertValue(value);
+                  } else {
+                    that.$alert(data.message);
+                  }
+
+                  break;
+              }
+            };
+            $.ajax({
+              url: url,
+              type: "POST",
+              dataType: "json",
+              data: form,
+              processData: false,
+              contentType: false,
+              beforeSend: function() {
+                callback('before');
+              },
+              error: function() {
+                callback('error');
+              },
+              success: function(data) {
+                callback('success', data);
+              }
+            })
+            e.preventDefault();
+          }
+        }
+      });
+    }
   },
 
   mounted () {
@@ -432,6 +492,8 @@ export default {
     }
     this.get_cat2(this.$route.params.item_id);
     
+    that.on_paste();
+    
     document.onkeydown=function(e){  //对整个页面文档监听 其键盘快捷键
       var keyNum=window.event ? e.keyCode :e.which;  //获取被按下的键值 
       if (keyNum == 83 && e.ctrlKey) {  //Ctrl +S 为保存

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