Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.css

@@ -1,16 +1,18 @@
 /*!
- * bootstrap-fileinput v5.1.3
+ * bootstrap-fileinput v5.5.2
  * http://plugins.krajee.com/file-input
  *
  * Krajee default styling for bootstrap-fileinput.
  *
  * Author: Kartik Visweswaran
- * Copyright: 2014 - 2020, 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
  */
-.file-loading input[type=file], input[type=file].file-loading {
+
+.file-loading input[type=file],
+input[type=file].file-loading {
     width: 0;
     height: 0;
 }
@@ -29,11 +31,35 @@
     box-shadow: none;
 }
 
-.kv-hidden, .file-caption-icon, .file-zoom-dialog .modal-header:before, .file-zoom-dialog .modal-header:after, .file-input-new .file-preview, .file-input-new .close, .file-input-new .glyphicon-file, .file-input-new .fileinput-remove-button, .file-input-new .fileinput-upload-button, .file-input-new .no-browse .input-group-btn, .file-input-ajax-new .fileinput-remove-button, .file-input-ajax-new .fileinput-upload-button, .file-input-ajax-new .no-browse .input-group-btn, .hide-content .kv-file-content, .is-locked .fileinput-upload-button, .is-locked .fileinput-remove-button {
+.kv-hidden,
+.file-caption-icon,
+.file-zoom-dialog .modal-header:before,
+.file-zoom-dialog .modal-header:after,
+.file-input-new .file-preview,
+.file-input-new .close,
+.file-input-new .glyphicon-file,
+.file-input-new .fileinput-remove-button,
+.file-input-new .fileinput-upload-button,
+.file-input-new .no-browse .input-group-btn,
+.file-input-ajax-new .fileinput-remove-button,
+.file-input-ajax-new .fileinput-upload-button,
+.file-input-ajax-new .no-browse .input-group-btn,
+.hide-content .kv-file-content,
+.is-locked .fileinput-upload-button,
+.is-locked .fileinput-remove-button {
     display: none;
 }
 
-.btn-file input[type=file], .file-caption-icon, .file-preview .fileinput-remove, .krajee-default .file-thumb-progress, .file-zoom-dialog .btn-navigate, .file-zoom-dialog .floating-buttons {
+.file-caption .input-group {
+    align-items: center;
+}
+
+.btn-file input[type=file],
+.file-caption-icon,
+.file-preview .fileinput-remove,
+.krajee-default .file-thumb-progress,
+.file-zoom-dialog .btn-navigate,
+.file-zoom-dialog .floating-buttons {
     position: absolute;
 }
 
@@ -41,35 +67,50 @@
     line-height: inherit;
 }
 
-.file-input, .file-loading:before, .btn-file, .file-caption, .file-preview, .krajee-default.file-preview-frame, .krajee-default .file-thumbnail-footer, .file-zoom-dialog .modal-dialog {
+.file-input,
+.file-loading:before,
+.btn-file,
+.file-caption,
+.file-preview,
+.krajee-default.file-preview-frame,
+.krajee-default .file-thumbnail-footer,
+.file-zoom-dialog .modal-dialog {
     position: relative;
 }
 
-.file-error-message pre, .file-error-message ul, .krajee-default .file-actions, .krajee-default .file-other-error {
+.file-error-message pre,
+.file-error-message ul,
+.krajee-default .file-actions,
+.krajee-default .file-other-error {
     text-align: left;
 }
 
-.file-error-message pre, .file-error-message ul {
+.file-error-message pre,
+.file-error-message ul {
     margin: 0;
 }
 
-.krajee-default .file-drag-handle, .krajee-default .file-upload-indicator {
+.krajee-default .file-drag-handle,
+.krajee-default .file-upload-indicator {
     float: left;
     margin-top: 10px;
     width: 16px;
     height: 16px;
 }
 
-.file-thumb-progress .progress, .file-thumb-progress .progress-bar {
+.file-thumb-progress .progress,
+.file-thumb-progress .progress-bar {
     font-family: Verdana, Helvetica, sans-serif;
     font-size: 0.7rem;
 }
 
-.krajee-default .file-thumb-progress .progress, .kv-upload-progress .progress {
+.krajee-default .file-thumb-progress .progress,
+.kv-upload-progress .progress {
     background-color: #ccc;
 }
 
-.krajee-default .file-caption-info, .krajee-default .file-size-info {
+.krajee-default .file-caption-info,
+.krajee-default .file-size-info {
     display: block;
     white-space: nowrap;
     overflow: hidden;
@@ -79,17 +120,23 @@
     margin: auto;
 }
 
-.file-zoom-content > .file-object.type-video, .file-zoom-content > .file-object.type-flash, .file-zoom-content > .file-object.type-image {
+.file-zoom-content > .file-object.type-video,
+.file-zoom-content > .file-object.type-flash,
+.file-zoom-content > .file-object.type-image {
     max-width: 100%;
     max-height: 100%;
     width: auto;
 }
 
-.file-zoom-content > .file-object.type-video, .file-zoom-content > .file-object.type-flash {
+.file-zoom-content > .file-object.type-video,
+.file-zoom-content > .file-object.type-flash {
     height: 100%;
 }
 
-.file-zoom-content > .file-object.type-pdf, .file-zoom-content > .file-object.type-html, .file-zoom-content > .file-object.type-text, .file-zoom-content > .file-object.type-default {
+.file-zoom-content > .file-object.type-pdf,
+.file-zoom-content > .file-object.type-html,
+.file-zoom-content > .file-object.type-text,
+.file-zoom-content > .file-object.type-default {
     width: 100%;
 }
 
@@ -131,26 +178,44 @@
     height: 100%;
 }
 
-.file-caption .file-caption-name {
-    width: 100%;
-    margin: 0;
-    padding: 0;
-    box-shadow: none;
-    border: none;
-    background: none;
-    outline: none;
-}
-
 .file-caption.icon-visible .file-caption-icon {
     display: inline-block;
 }
 
 .file-caption.icon-visible .file-caption-name {
-    padding-left: 15px;
+    padding-left: 25px;
+}
+
+.file-caption.icon-visible > .input-group-lg .file-caption-name {
+    padding-left: 30px;
+}
+
+.file-caption.icon-visible > .input-group-sm .file-caption-name {
+    padding-left: 22px;
+}
+
+.file-caption-name:not(.file-caption-disabled) {
+    background-color: transparent;
+}
+
+.file-caption-name.file-processing {
+    font-style: italic;
+    border-color: #bbb;
+    opacity: 0.5;
 }
 
 .file-caption-icon {
-    left: 8px;
+    padding: 7px 5px;
+    left: 4px;
+}
+
+.input-group-lg .file-caption-icon {
+    font-size: 1.25rem;
+}
+
+.input-group-sm .file-caption-icon {
+    font-size: 0.875rem;
+    padding: 0.25rem;
 }
 
 .file-error-message {
@@ -200,10 +265,10 @@
 .file-preview-image {
     font: 40px Impact, Charcoal, sans-serif;
     color: #008000;
-    width:auto;
+    width: auto;
-    height:auto;
+    height: auto;
-    max-width:100%;
+    max-width: 100%;
-    max-height:100%;
+    max-height: 100%;
 }
 
 .krajee-default.file-preview-frame {
@@ -213,6 +278,7 @@
     padding: 6px;
     float: left;
     text-align: center;
+
 }
 
 .krajee-default.file-preview-frame .kv-file-content {
@@ -220,12 +286,6 @@
     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;
 }
@@ -269,7 +329,7 @@
     text-align: center;
     padding-top: 4px;
     font-size: 11px;
-    color: #777;
+    color: #999;
     margin-bottom: 30px;
 }
 
@@ -319,7 +379,9 @@
     font-family: Verdana, Helvetica, sans-serif;
 }
 
+
 /*noinspection CssOverwrittenProperties*/
+
 .file-zoom-dialog .file-other-icon {
     font-size: 22em;
     font-size: 50vmin;
@@ -336,21 +398,18 @@
 }
 
 .file-zoom-dialog .btn-navigate {
+    margin: 0 0.1rem;
     padding: 0;
-    margin: -60px 0 0;
+    font-size: 1.2rem;
-    font-size: 60px;
+    width: 2.4rem;
-    background: transparent;
+    height: 2.4rem;
-    text-decoration: none;
-    outline: none;
-    opacity: 0.7;
     top: 50%;
-    color: #1c94c4;
+    border-radius: 50%;
+    text-align: center;
 }
 
-.file-zoom-dialog .btn-navigate:not([disabled]):hover {
+.btn-navigate * {
-    outline: none;
+    width: auto;
-    box-shadow: none;
-    opacity: 0.6;
 }
 
 .file-zoom-dialog .floating-buttons {
@@ -358,25 +417,50 @@
     right: 10px;
 }
 
-.file-zoom-dialog .btn-navigate[disabled] {
+.file-zoom-dialog .btn-kv-prev {
-    opacity: 0.3;
+    left: 0;
 }
 
-.file-zoom-dialog .btn-prev {
+.file-zoom-dialog .btn-kv-next {
-    left: 1px;
+    right: 0;
 }
 
-.file-zoom-dialog .btn-next {
+.file-zoom-dialog .kv-zoom-header {
-    right: 1px;
+    padding: 0.5rem;
 }
 
-.file-zoom-dialog .kv-zoom-title {
+.file-zoom-dialog .kv-zoom-body {
-    font-weight: 300;
+    padding: 0.25rem;
-    color: #999;
+}
-    max-width: 50%;
+
-    overflow: hidden;
+.file-zoom-dialog .kv-zoom-description {
-    white-space: nowrap;
+    position: absolute;
-    text-overflow: ellipsis;
+    opacity: 0.8;
+    font-size: 0.8rem;
+    background-color: #1a1a1a;
+    padding: 1rem;
+    text-align: center;
+    border-radius: 0.5rem;
+    color: #fff;
+    left: 15%;
+    right: 15%;
+    bottom: 15%;
+}
+
+.file-zoom-dialog .kv-desc-hide {
+    float: right;
+    color: #fff;
+    padding: 0 0.1rem;
+    background: none;
+    border: none;
+}
+
+.file-zoom-dialog .kv-desc-hide:hover {
+    opacity: 0.7;
+}
+
+.file-zoom-dialog .kv-desc-hide:focus {
+    opacity: 0.9;
 }
 
 .file-input-new .no-browse .form-control {
@@ -389,8 +473,9 @@
     border-bottom-right-radius: 4px;
 }
 
-.file-caption-main {
+.file-caption {
     width: 100%;
+    position: relative;
 }
 
 .file-thumb-loading {
@@ -422,7 +507,7 @@
 .file-drop-zone-title {
     color: #aaa;
     font-size: 1.6em;
-    text-align:center;
+    text-align: center;
     padding: 85px 10px;
     cursor: default;
 }
@@ -448,7 +533,7 @@
     min-height: 100vh;
 }
 
-.file-zoom-fullscreen .modal-body {
+.file-zoom-fullscreen .kv-zoom-body {
     overflow-y: auto;
 }
 
@@ -461,15 +546,24 @@
     z-index: 3000;
 }
 
+.kv-zoom-actions {
+    min-width: 140px;
+}
+
 .kv-zoom-actions .btn-kv {
     margin-left: 3px;
 }
 
 .file-zoom-content {
     text-align: center;
+    white-space: nowrap;
     min-height: 300px;
 }
 
+.file-zoom-content:hover {
+    background: transparent;
+}
+
 .file-zoom-content .file-preview-image {
     max-height: 100%;
 }
@@ -544,7 +638,8 @@
     opacity: 1;
 }
 
-.file-grabbing, .file-grabbing * {
+.file-grabbing,
+.file-grabbing * {
     cursor: not-allowed !important;
 }
 
@@ -560,4 +655,34 @@
 
 .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;
 }

ruoyi-admin/src/main/resources/templates/include.html

@@ -120,14 +120,24 @@
     <script th:src="@{/ajax/libs/jasny/jasny-bootstrap.min.js}"></script>
 </div>
 
+<!-- fileinput文件上传插件 -->
+<!--<div th:fragment="bootstrap-fileinput-css">-->
+<!--    <link th:href="@{/ajax/libs/bootstrap-fileinput/fileinput.min.css?v=20201202}" rel="stylesheet"/>-->
+<!--</div>-->
+<!--<div th:fragment="bootstrap-fileinput-js">-->
+<!--    <script th:src="@{/ajax/libs/bootstrap-fileinput/fileinput.min.js?v=20201202}"></script>-->
+<!--</div>-->
 <!-- fileinput文件上传插件 -->
 <div th:fragment="bootstrap-fileinput-css">
-    <link th:href="@{/ajax/libs/bootstrap-fileinput/fileinput.min.css?v=20201202}" rel="stylesheet"/>
+	<link th:href="@{/ajax/libs/bootstrap-fileinput/fileinput.min.css?v=5.5.2}" rel="stylesheet"/>
 </div>
 <div th:fragment="bootstrap-fileinput-js">
-    <script th:src="@{/ajax/libs/bootstrap-fileinput/fileinput.min.js?v=20201202}"></script>
+	<script th:src="@{/ajax/libs/bootstrap-fileinput/fileinput.min.js?v=5.5.2}"></script>
 </div>
 
+
+
+
 <!-- duallistbox双列表框插件 -->
 <div th:fragment="bootstrap-duallistbox-css">
     <link th:href="@{/ajax/libs/duallistbox/bootstrap-duallistbox.min.css}" rel="stylesheet"/>