fix #240

jqhph · Jun 21, 2020 · 1adbfe8 · 1adbfe8
1 parent f8ca80a
commit 1adbfe8
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 9 deletions.
diff --git a/resources/assets/dcat/extra/upload.js b/resources/assets/dcat/extra/upload.js
@@ -553,6 +553,8 @@
                         $wrap.find('.queueList').css({'border': '1px solid #d3dde5', 'padding':'5px'});
                         // $wrap.find('.queueList').removeAttr('style');
                     }
+
+                    setTimeout(removeValidatorErrors, 1);
                     break;
 
                 case 'uploading':
@@ -796,6 +798,10 @@
             uploader.refresh();
         }
 
+        function removeValidatorErrors() {
+            $input.parents('.form-group,.form-label-group,.form-field').find('.with-errors').html('')
+        }
+
         // 文件排序
         function orderFiles() {
             var $this = $(this),

diff --git a/resources/assets/dcat/sass/components/_form.scss b/resources/assets/dcat/sass/components/_form.scss
@@ -81,7 +81,7 @@ select.form-control:not([multiple=multiple]) {
 }
 
 .control-label.asterisk:before {
-  content: "*";
+  content: "* ";
   font-weight: bold;
   color: $red-darker;
 }

diff --git a/resources/assets/dcat/sass/components/_grid-selector.scss b/resources/assets/dcat/sass/components/_grid-selector.scss
@@ -54,7 +54,8 @@
 
 .custom-data-table {
   .grid-selector {
-    padding: 2px;
+    padding: 2px 0;
+    margin: .35rem 0 -.5rem;
 
     .wrap {
       border-bottom: 0;

diff --git a/resources/dist/dcat/css/dcat-app-blue-dark.css b/resources/dist/dcat/css/dcat-app-blue-dark.css
diff --git a/resources/dist/dcat/css/dcat-app-blue-light.css b/resources/dist/dcat/css/dcat-app-blue-light.css
diff --git a/resources/dist/dcat/css/dcat-app-blue.css b/resources/dist/dcat/css/dcat-app-blue.css
diff --git a/resources/dist/dcat/css/dcat-app-green.css b/resources/dist/dcat/css/dcat-app-green.css
diff --git a/resources/dist/dcat/css/dcat-app.css b/resources/dist/dcat/css/dcat-app.css
diff --git a/resources/dist/dcat/extra/upload.js b/resources/dist/dcat/extra/upload.js
diff --git a/resources/dist/dcat/extra/upload.js.map b/resources/dist/dcat/extra/upload.js.map