diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.css b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.css index f1cba91e6..3ca482d51 100644 --- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.css +++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.css @@ -1,5 +1,5 @@ /*! - * bootstrap-fileinput v5.1.2 + * bootstrap-fileinput v5.1.3 * http://plugins.krajee.com/file-input * * Krajee default styling for bootstrap-fileinput. @@ -200,6 +200,10 @@ .file-preview-image { font: 40px Impact, Charcoal, sans-serif; color: #008000; + width:auto; + height:auto; + max-width:100%; + max-height:100%; } .krajee-default.file-preview-frame { @@ -241,19 +245,14 @@ } .krajee-default .file-preview-text { - display: block; color: #428bca; border: 1px solid #ddd; - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; outline: none; - padding: 8px; resize: none; } .krajee-default .file-preview-html { border: 1px solid #ddd; - padding: 8px; - overflow: auto; } .krajee-default .file-other-icon { @@ -316,7 +315,7 @@ } .kv-upload-progress .progress-bar { - height: 11px; + height: 20px; font-family: Verdana, Helvetica, sans-serif; } @@ -434,7 +433,7 @@ } .file-uploading { - background: url(loading-sm.gif) no-repeat center bottom 10px; + background: url(../img/loading-sm.gif) no-repeat center bottom 10px; opacity: 0.65; } @@ -557,4 +556,8 @@ background-color: #d9edf7; border-color: #17a2b8; box-shadow: none !important; +} + +.file-preview .kv-zoom-cache { + display: none; } \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.js b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.js index 0391d8399..d75554924 100644 --- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.js +++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.js @@ -1,5 +1,5 @@ /*! - * bootstrap-fileinput v5.1.2 + * bootstrap-fileinput v5.1.3 * http://plugins.krajee.com/file-input * * Author: Kartik Visweswaran @@ -111,7 +111,7 @@ if (!relativePath) { return null; } - return (file.size + '_' + relativePath.replace(/\s/img, '_')); + return (file.size + '_' + encodeURIComponent(relativePath).replace(/%/g, '_')); }, getFrameSelector: function (id, selector) { selector = selector || ''; @@ -471,18 +471,8 @@ uniqId: function () { return (new Date().getTime() + Math.floor(Math.random() * Math.pow(10, 15))).toString(36); }, - parseEventCallback: function (str) { - return Function('\'use strict\'; return (function() { ' + str + ' });')(); // jshint ignore:line - }, cspBuffer: { CSP_ATTRIB: 'data-csp-01928735', // a randomly named temporary attribute to store the CSP elem id - domEventsList: [ - 'mousedown', 'mouseup', 'click', 'dblclick', 'mousemove', 'mouseover', 'mousewheel', 'mouseout', - 'contextmenu', 'touchstart', 'touchmove', 'touchend', 'touchcancel', 'keydown', 'keypress', 'keyup', - 'focus', 'blur', 'change', 'submit', 'scroll', 'resize', 'hashchange', 'load', 'unload', - 'cut', 'copy', 'paste' - ], - domElementEvents: {}, domElementsStyles: {}, stash: function (htmlString) { var self = this, outerDom = $.parseHTML('