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 db414e55..b6c0062b 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,11 +1,11 @@ /*! - * bootstrap-fileinput v5.2.4 + * bootstrap-fileinput v5.5.2 * http://plugins.krajee.com/file-input * * Krajee default styling for bootstrap-fileinput. * * Author: Kartik Visweswaran - * Copyright: 2014 - 2021, Kartik Visweswaran, Krajee.com + * Copyright: 2014 - 2022, Kartik Visweswaran, Krajee.com * * Licensed under the BSD-3-Clause * https://github.com/kartik-v/bootstrap-fileinput/blob/master/LICENSE.md @@ -50,6 +50,10 @@ input[type=file].file-loading { display: none; } +.file-caption .input-group { + align-items: center; +} + .btn-file input[type=file], .file-caption-icon, .file-preview .fileinput-remove, @@ -274,6 +278,7 @@ input[type=file].file-loading { padding: 6px; float: left; text-align: center; + } .krajee-default.file-preview-frame .kv-file-content { @@ -281,12 +286,6 @@ input[type=file].file-loading { height: 160px; } -.krajee-default .file-preview-other-frame { - display: flex; - align-items: center; - justify-content: center; -} - .krajee-default.file-preview-frame .kv-file-content.kv-pdf-rendered { width: 400px; } @@ -330,7 +329,7 @@ input[type=file].file-loading { text-align: center; padding-top: 4px; font-size: 11px; - color: #777; + color: #999; margin-bottom: 30px; } @@ -406,7 +405,7 @@ input[type=file].file-loading { height: 2.4rem; top: 50%; border-radius: 50%; - text-align:center; + text-align: center; } .btn-navigate * { @@ -426,19 +425,12 @@ input[type=file].file-loading { right: 0; } -.file-zoom-dialog .kv-zoom-caption { - max-width: 50%; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; -} - .file-zoom-dialog .kv-zoom-header { padding: 0.5rem; } .file-zoom-dialog .kv-zoom-body { - padding: 0.25rem 0.5rem 0.25rem 0; + padding: 0.25rem; } .file-zoom-dialog .kv-zoom-description { @@ -554,6 +546,10 @@ input[type=file].file-loading { z-index: 3000; } +.kv-zoom-actions { + min-width: 140px; +} + .kv-zoom-actions .btn-kv { margin-left: 3px; } @@ -568,15 +564,6 @@ input[type=file].file-loading { background: transparent; } -.file-zoom-content > * { - display: inline-block; - vertical-align: middle; -} - -.file-zoom-content .kv-spacer { - height: 100%; -} - .file-zoom-content .file-preview-image { max-height: 100%; } @@ -668,4 +655,34 @@ input[type=file].file-loading { .file-preview .kv-zoom-cache { display: none; +} + +.file-preview-other-frame, .file-preview-object, .kv-file-content, .kv-zoom-body { + display: flex; + align-items: center; + justify-content: center; +} + +.btn-kv-rotate, +.kv-file-rotate { + display: none; +} + +.rotatable:not(.hide-rotate) .btn-kv-rotate, +.rotatable:not(.hide-rotate) .kv-file-rotate { + display: inline-block; +} + +.rotatable .file-zoom-detail, +.rotatable .kv-file-content, +.rotatable .kv-file-content > :first-child { + transform-origin: center center; +} + +.rotate-animate { + transition: transform 0.3s ease; +} + +.kv-overflow-hidden { + overflow: hidden; } \ 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 f52cf3d7..75466c06 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,9 +1,9 @@ /*! - * bootstrap-fileinput v5.2.4 + * bootstrap-fileinput v5.5.2 * http://plugins.krajee.com/file-input * * Author: Kartik Visweswaran - * Copyright: 2014 - 2021, Kartik Visweswaran, Krajee.com + * Copyright: 2014 - 2022, Kartik Visweswaran, Krajee.com * * Licensed under the BSD-3-Clause * https://github.com/kartik-v/bootstrap-fileinput/blob/master/LICENSE.md @@ -12,22 +12,22 @@ 'use strict'; if (typeof define === 'function' && define.amd) { define(['jquery'], factory); + } else if (typeof module === 'object' && typeof module.exports === 'object') { + factory(require('jquery')); } else { - if (typeof module === 'object' && module.exports) { - //noinspection NpmUsedModulesInstalled - module.exports = factory(require('jquery')); - } else { - factory(window.jQuery); - } + factory(window.jQuery); } }(function ($) { 'use strict'; + $.fn.fileinputLocales = {}; $.fn.fileinputThemes = {}; + if (!$.fn.fileinputBsVersion) { - $.fn.fileinputBsVersion = (window.Alert && window.Alert.VERSION) || - (window.bootstrap && window.bootstrap.Alert && bootstrap.Alert.VERSION) || '3.x.x'; + $.fn.fileinputBsVersion = (window.bootstrap && window.bootstrap.Alert && window.bootstrap.Alert.VERSION) || + (window.Alert && window.Alert.VERSION) || '3.x.x'; } + String.prototype.setTokens = function (replacePairs) { var str = this.toString(), key, re; for (key in replacePairs) { @@ -44,25 +44,15 @@ return [].concat(this.map(lambda)); }; } - - if (!document.currentScript) { - document.currentScript = function() { - var scripts = document.getElementsByTagName('script'); - return scripts[scripts.length - 1]; - }(); - } - var $h, FileInput, getLoadingUrl = function () { - var src = document.currentScript.src, srcPath = src.substring(0, src.lastIndexOf("/")); - return srcPath + '/loading.gif' - }; + var $h, FileInput; // fileinput helper object for all global variables and internal helper methods $h = { FRAMES: '.kv-preview-thumb', SORT_CSS: 'file-sortable', INIT_FLAG: 'init-', - ZOOM_VAR: getLoadingUrl() + '?kvTemp__2873389129__=', // used to prevent 404 errors in URL parsing + SCRIPT_SRC: document && document.currentScript && document.currentScript.src || null, OBJECT_PARAMS: '\n' + '\n' + '\n' + @@ -94,6 +84,14 @@ }, objUrl: window.URL || window.webkitURL, + getZoomPlaceholder: function () { // used to prevent 404 errors in URL parsing + var src = $h.SCRIPT_SRC, srcPath, zoomVar = '?kvTemp__2873389129__='; + if (!src) { + return zoomVar; + } + srcPath = src.substring(0, src.lastIndexOf("/")); + return srcPath.substring(0, srcPath.lastIndexOf("/") + 1) + 'img/loading.gif' + zoomVar; + }, isBs: function (ver) { var chk = $.trim(($.fn.fileinputBsVersion || '') + ''); ver = parseInt(ver, 10); @@ -269,7 +267,7 @@ return value.length === 0; } if ($.isPlainObject(value) && $.isEmptyObject(value)) { - return true + return true; } return false; }, @@ -357,7 +355,7 @@ }, dataURI2Blob: function (dataURI) { var BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder || - window.MSBlobBuilder, canBlob = $h.hasBlobSupport(), byteStr, arrayBuffer, intArray, i, mimeStr, bb, + window.MSBlobBuilder, canBlob = $h.hasBlobSupport(), byteStr, arrayBuffer, intArray, i, mimeStr, bb, canProceed = (canBlob || BlobBuilder) && window.atob && window.ArrayBuffer && window.Uint8Array; if (!canProceed) { return null; @@ -428,10 +426,27 @@ } return false; }, + isPdf: function (str) { + if ($h.isEmpty(str)) { + return false; + } + str = str.toString().trim().replace(/\n/g, ' '); + if (str.length === 0) { + return false; + } + }, isSvg: function (str) { + if ($h.isEmpty(str)) { + return false; + } + str = str.toString().trim().replace(/\n/g, ' '); + if (str.length === 0) { + return false; + } return str.match(/^\s*<\?xml/i) && (str.match(/\n' + $h.DEFAULT_PREVIEW + '\n\n'; }, defBtnCss1 = 'btn btn-sm btn-kv ' + $h.defaultButtonCss(); @@ -1700,7 +1719,7 @@ ' {upload}\n' + ' {browse}\n' + ($h.isBs(5) ? '' : ' \n') + - ' ' + ' '; ''; tMain2 = '{preview}\n
\n\n' + '{remove}\n{cancel}\n{upload}\n{browse}\n'; @@ -1759,7 +1778,7 @@ ''; tActions = '