styles

getrebuild · Nov 9, 2023 · d70394c · d70394c
1 parent 93027be
commit d70394c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/main/java/com/rebuild/web/files/FileListController.java b/src/main/java/com/rebuild/web/files/FileListController.java
@@ -251,8 +251,8 @@ private Integer[] getAllowEntities(ID user, boolean inQuery) {
 
     private JSONObject formatEntityJson(Entity entity) {
         return JSONUtils.toJSONObject(
-                new String[] { "id", "text" },
-                new Object[] { entity.getEntityCode(), Language.L(entity) });
+                new String[] { "id", "text", "icon" },
+                new Object[] { entity.getEntityCode(), Language.L(entity), EasyMetaFactory.valueOf(entity).getIcon() });
     }
 
     private boolean hasAttachmentFields(Entity entity) {

diff --git a/src/main/resources/web/assets/css/rb-page.css b/src/main/resources/web/assets/css/rb-page.css
@@ -1172,6 +1172,12 @@ a.link.link-icon::after {
   height: 18px;
 }
 
+.img-field.avatar label.img-upload b {
+  width: 100%;
+  top: auto;
+  bottom: 0;
+}
+
 .img-field label.img-upload b .zmdi {
   font-size: 1.2rem;
   color: #fff;

diff --git a/src/main/resources/web/assets/js/file-preview.js b/src/main/resources/web/assets/js/file-preview.js
@@ -152,7 +152,7 @@ class RbPreview extends React.Component {
           {this.state.previewText || this.state.previewText === '' ? (
             <pre className="mb-0">{this.state.previewText || <i className="text-muted">{$L('无')}</i>}</pre>
           ) : (
-            <div className="must-center">
+            <div className="must-center d-inline-block">
               <RbSpinner fully={true} />
             </div>
           )}

diff --git a/src/main/resources/web/assets/js/rb-forms.js b/src/main/resources/web/assets/js/rb-forms.js
@@ -2438,7 +2438,7 @@ class RbFormAvatar extends RbFormElement {
   renderViewElement() {
     return (
       <div className="img-field avatar">
-        <a className="img-thumbnail img-upload">
+        <a className="img-thumbnail img-upload" style={{ cursor: 'default' }}>
           <img src={this._formatUrl(this.state.value)} alt="Avatar" />
         </a>
       </div>