表单样式兼容

update

resources/assets/dcat/extra/upload.js

@@ -181,22 +181,22 @@
                     '<p class="file-type">' + (file.ext.toUpperCase() || 'FILE') + '</p>' +
                     '<p class="imgWrap "></p>' +
                     '<p class="title" style="">' + file.name + '</p>' +
-                    '<p class="title" style=\'margin-bottom:12px;\'>(<b>' + size + '</b>)</p>' +
+                    '<p class="title" style=\'margin-bottom:20px;\'>(<b>' + size + '</b>)</p>' +
                     '</li>');
 
                 $btns = $('<div class="file-panel">' +
-                    '<a class=\'btn btn-xs btn-default\' data-file-act="cancel"><i class="fa fa-close red-dark" style=\'font-size:13px\'></i></a>' +
-                    '<a class=\'btn btn-xs btn-default\' data-file-act="delete" style="display: none"><i class="ti-trash red-dark" style=\'font-size:13px\'></i></a>' +
-                    '<a class=\'btn btn-xs btn-default\' data-file-act="preview" ><i class="glyphicon glyphicon-zoom-in"></i></a>' +
+                    '<a class=\'btn btn-sm btn-white\' data-file-act="cancel"><i class="fa fa-close red-dark" style=\'font-size:13px\'></i></a>' +
+                    '<a class=\'btn btn-sm btn-white\' data-file-act="delete" style="display: none"><i class="feather icon-trash red-dark" style=\'font-size:13px\'></i></a>' +
+                    '<a class=\'btn btn-sm btn-white\' data-file-act="preview" ><i class="feather icon-zoom-in"></i></a>' +
                     '</div>').appendTo($li);
             } else {
                 $li = $('<li id="' + getFileViewSelector(file.id) + '" title="' + file.name + '">' +
-                    '<p class="title" style="display:block"><i class=\'ti-check green _success\' style=\'font-weight:bold;font-size:17px;display:none\'></i>' +
+                    '<p class="title" style="display:block"><i class=\'feather icon-check green _success\' style=\'font-weight:bold;font-size:17px;display:none\'></i>' +
                     file.name + ' (' + size + ')</p>' +
                     '</li>');
 
-                $btns = $('<span data-file-act="cancel" class="_act" style="font-size:13px"><i class=\'ti-close red-dark\'></i></span>' +
-                    '<span data-file-act="delete" class="_act" style="display:none"><i class=\'ti-trash red-dark\'></i></span>'
+                $btns = $('<span data-file-act="cancel" class="_act" style="font-size:13px"><i class=\'feather icon-x red-dark\'></i></span>' +
+                    '<span data-file-act="delete" class="_act" style="display:none"><i class=\'feather icon-trash red-dark\'></i></span>'
                 ).appendTo($li);
             }
 
@@ -296,7 +296,7 @@
                     // $prgress.css('display', 'block');
                 } else if (cur === 'complete') {
                     if (showImg) {
-                        $li.append('<span class="success"><em></em><i class="ti-check"></i></span>');
+                        $li.append('<span class="success"><em></em><i class="feather icon-check"></i></span>');
                     } else {
                         $li.find('._success').show();
                     }
@@ -665,18 +665,18 @@
                 html += '<p class="_act" data-file-act=\'delete\' data-id="' + file.serverId + '"><i class=\'ti-trash red-dark\'></i></p>';
             }
 
-            html += "<p class='title' style=''><i class='ti-check green _success' style='font-weight:bold;font-size:17px;display:none'></i>";
+            html += "<p class='title' style=''><i class='feather icon-check' style='color:white;font-weight:bold;font-size:17px;display:none'></i>";
             html += file.serverPath;
             html += "</p>";
 
             if (showImg) {
-                html += "<p class='title' style='margin-bottom:12px;'>&nbsp;</p>";
+                html += "<p class='title' style='margin-bottom:20px;'>&nbsp;</p>";
                 html += "<div class='file-panel' >";
 
                 if (!opts.disabled) {
-                    html += "<a class='btn btn-xs btn-default' data-file-act='deleteurl' data-id='" + file.serverId + "'><i class='ti-trash red-dark' style='font-size:13px'></i></a>";
+                    html += "<a class='btn btn-sm btn-white' data-file-act='deleteurl' data-id='" + file.serverId + "'><i class='feather icon-trash red-dark' style='font-size:13px'></i></a>";
                 }
-                html += "<a class='btn btn-xs btn-default' data-file-act='preview' data-url='" + file.serverUrl + "' ><i class='glyphicon glyphicon-zoom-in'></i></a>";
+                html += "<a class='btn btn-sm btn-white' data-file-act='preview' data-url='" + file.serverUrl + "' ><i class='feather icon-zoom-in'></i></a>";
 
                 html += "</div>";
             }

resources/assets/dcat/js/extensions/Form.js

@@ -33,10 +33,13 @@ class Form {
 
         _this.originalValues = {};
         _this.$form = $(_this.options.form).first();
+
+        _this.submit();
     }
 
-    _execute() {
-        let _this = this,
+    submit() {
+        let Dcat = window.Dcat,
+            _this = this,
             $form = _this.$form,
             options = _this.options;
 
@@ -44,12 +47,12 @@ class Form {
         removeFieldError(_this);
 
         $form.ajaxSubmit({
-            beforeSubmit: function (fields, $form, options) {
-                if (options.before(fields, $form, options, _this) === false) {
+            beforeSubmit: function (fields, $form, _opt) {
+                if (options.before(fields, $form, _opt, _this) === false) {
                     return false;
                 }
 
-                if (fire(formCallbacks.before, fields, $form, options, _this) === false) {
+                if (fire(formCallbacks.before, fields, $form, _opt, _this) === false) {
                     return false;
                 }
 

resources/assets/dcat/plugins/webuploader/webuploader.css

@@ -297,7 +297,8 @@
 	-moz-transition: 200ms ease-out;
 	-o-transition: 200ms ease-out;
 	-ms-transition: 200ms ease-out;
-	transition: 200ms ease-out
+	transition: 200ms ease-out;
+	margin-bottom: 0;
 }
 
 .web-uploader .filelist li img {
@@ -433,7 +434,7 @@
 .web-uploader .statusBar .info {
 	display: inline-block;
 	font-size: 14px;
-	color: #666
+	color: #666!important;
 }
 
 .web-uploader .statusBar .btns {
@@ -453,9 +454,7 @@
 }
 
 .web-uploader .placeholder:before {
-	/*font-family: FontAwesome;*/
-	/*content: "\f0ee";*/
 	font-size: 80px;
-	font-family: themify;
-	content: "\e6b2";
-}
+	font-family: feather;
+	content: "\e8e1";
+}

resources/assets/dcat/sass/components/_box.scss

@@ -0,0 +1,59 @@
+.box {
+  position: relative;
+  border-radius: .35rem;
+  background: #ffffff;
+  border-top: 2px solid $input-border-color;
+  margin-bottom: 10px;
+  width: 100%;
+  box-shadow: $shadow;
+  display: flex;
+}
+.box-header {
+  padding: 13px;
+  display: inherit;
+  justify-content: space-between;
+
+  h3, .h3 {
+    font-size: 1.2rem;
+    margin-bottom: 0;
+  }
+}
+
+.box-header.with-border {
+  border-bottom: 1px solid #f4f4f4;
+}
+
+.box, .panel {
+  transition: .3s cubic-bezier(.25,.8,.5,1);
+}
+
+.box-shadow {
+  box-shadow: 0 2px 4px 0 rgba(0,0,0,.05);
+}
+
+.box.box-solid {
+  border-top: 0;
+}
+
+.box.box-solid.box-default {
+  border: 1px solid $input-border-color;
+}
+
+.box-body {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+  padding: 10px;
+}
+
+.box-footer {
+  display: inherit;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+  border-top: 1px solid $divider-color;
+  padding: 10px;
+  background-color: $white;
+}

resources/assets/dcat/sass/components/_button.scss

@@ -1,7 +1,7 @@
 .btn {
-  padding: .75rem 1.35rem!important;
+  padding: 0.8rem 1.35rem !important;
   font-size: .95rem;
-  height: 36px;
+  height: 37.6px;
   line-height: 1.2;
   border-radius: 0.2rem;
   box-shadow: $shadow-100;
@@ -24,7 +24,7 @@
 .btn-sm, .btn-group-sm > .btn {
   padding: 0.6rem 1rem!important;;
   font-size: 0.6rem;
-  line-height: 1.2;
+  line-height: 1.1;
   height: 30px;
 }
 

resources/assets/dcat/sass/components/_form.scss

@@ -20,6 +20,27 @@ select.form-control:not([multiple=multiple]) {
 }
 
 
+.input-group-text {
+  padding: 0.7rem 0.9rem;
+}
+
+.help-block {
+  display: block;
+  margin-top: 7px;
+  margin-bottom: 10px;
+  color: #737373;
+}
+
+.control-label {
+  padding-top: 7px;
+  margin-bottom: 0;
+  font-size: 1rem;
+}
+@media (min-width: 768px) {
+  .form-group .control-label {
+    text-align: right;
+  }
+}
 // --------------------- input-group-addon ---------------------
 .input-group-addon {
   width: 1%;

resources/assets/dcat/sass/dcat-app.scss

@@ -59,6 +59,8 @@ html body .content .content-wrapper {
 @import "./components/datetimepicker";
 // grid selector
 @import "./components/grid-selector";
+// box
+@import "./components/box";
 
 body.vertical-layout.vertical-menu-modern.menu-expanded .main-menu .navigation > li > a > i:before {
    font-size: 1.3rem;

resources/assets/dcat/sass/variables/_variables.scss

@@ -1,6 +1,10 @@
 
 // 继承
+@import "../../../sass/bootstrap/functions";
+
 @import "../../../sass/core/variables/variables";
+@import "../../../sass/bootstrap/variables";
+
 @import "./colors";
 
 

resources/dist/css/plugins/loaders/animations/ball-grid-beat.css

@@ -27,66 +27,66 @@
 }
 
 .ball-grid-beat > div:nth-child(1) {
-  -webkit-animation-delay: 0.65s;
-          animation-delay: 0.65s;
-  -webkit-animation-duration: 0.67s;
-          animation-duration: 0.67s;
+  -webkit-animation-delay: 0.72s;
+          animation-delay: 0.72s;
+  -webkit-animation-duration: 0.68s;
+          animation-duration: 0.68s;
 }
 
 .ball-grid-beat > div:nth-child(2) {
-  -webkit-animation-delay: -0.14s;
-          animation-delay: -0.14s;
-  -webkit-animation-duration: 0.7s;
-          animation-duration: 0.7s;
+  -webkit-animation-delay: 0.29s;
+          animation-delay: 0.29s;
+  -webkit-animation-duration: 1.51s;
+          animation-duration: 1.51s;
 }
 
 .ball-grid-beat > div:nth-child(3) {
-  -webkit-animation-delay: 0.74s;
-          animation-delay: 0.74s;
-  -webkit-animation-duration: 0.97s;
-          animation-duration: 0.97s;
+  -webkit-animation-delay: -0.14s;
+          animation-delay: -0.14s;
+  -webkit-animation-duration: 1s;
+          animation-duration: 1s;
 }
 
 .ball-grid-beat > div:nth-child(4) {
-  -webkit-animation-delay: 0.25s;
-          animation-delay: 0.25s;
-  -webkit-animation-duration: 1.32s;
-          animation-duration: 1.32s;
+  -webkit-animation-delay: 0.62s;
+          animation-delay: 0.62s;
+  -webkit-animation-duration: 0.63s;
+          animation-duration: 0.63s;
 }
 
 .ball-grid-beat > div:nth-child(5) {
-  -webkit-animation-delay: 0.6s;
-          animation-delay: 0.6s;
-  -webkit-animation-duration: 0.96s;
-          animation-duration: 0.96s;
+  -webkit-animation-delay: 0.5s;
+          animation-delay: 0.5s;
+  -webkit-animation-duration: 0.94s;
+          animation-duration: 0.94s;
 }
 
 .ball-grid-beat > div:nth-child(6) {
-  -webkit-animation-delay: 0.41s;
-          animation-delay: 0.41s;
-  -webkit-animation-duration: 0.85s;
-          animation-duration: 0.85s;
+  -webkit-animation-delay: 0.67s;
+          animation-delay: 0.67s;
+  -webkit-animation-duration: 0.97s;
+          animation-duration: 0.97s;
 }
 
 .ball-grid-beat > div:nth-child(7) {
-  -webkit-animation-delay: 0.12s;
-          animation-delay: 0.12s;
-  -webkit-animation-duration: 1.44s;
-          animation-duration: 1.44s;
+  -webkit-animation-delay: 0.51s;
+          animation-delay: 0.51s;
+  -webkit-animation-duration: 0.88s;
+          animation-duration: 0.88s;
 }
 
 .ball-grid-beat > div:nth-child(8) {
-  -webkit-animation-delay: -0.17s;
-          animation-delay: -0.17s;
-  -webkit-animation-duration: 1.22s;
-          animation-duration: 1.22s;
+  -webkit-animation-delay: 0.69s;
+          animation-delay: 0.69s;
+  -webkit-animation-duration: 1.35s;
+          animation-duration: 1.35s;
 }
 
 .ball-grid-beat > div:nth-child(9) {
-  -webkit-animation-delay: -0.02s;
-          animation-delay: -0.02s;
-  -webkit-animation-duration: 0.83s;
-          animation-duration: 0.83s;
+  -webkit-animation-delay: -0.03s;
+          animation-delay: -0.03s;
+  -webkit-animation-duration: 1.59s;
+          animation-duration: 1.59s;
 }
 
 .ball-grid-beat > div {

resources/dist/css/plugins/loaders/animations/ball-grid-pulse.css

@@ -39,66 +39,66 @@
 }
 
 .ball-grid-pulse > div:nth-child(1) {
-  -webkit-animation-delay: 0.73s;
-          animation-delay: 0.73s;
-  -webkit-animation-duration: 1.1s;
-          animation-duration: 1.1s;
+  -webkit-animation-delay: 0.66s;
+          animation-delay: 0.66s;
+  -webkit-animation-duration: 1.37s;
+          animation-duration: 1.37s;
 }
 
 .ball-grid-pulse > div:nth-child(2) {
-  -webkit-animation-delay: 0.49s;
-          animation-delay: 0.49s;
-  -webkit-animation-duration: 1.05s;
-          animation-duration: 1.05s;
+  -webkit-animation-delay: 0.7s;
+          animation-delay: 0.7s;
+  -webkit-animation-duration: 1.11s;
+          animation-duration: 1.11s;
 }
 
 .ball-grid-pulse > div:nth-child(3) {
-  -webkit-animation-delay: -0.15s;
-          animation-delay: -0.15s;
-  -webkit-animation-duration: 0.84s;
-          animation-duration: 0.84s;
+  -webkit-animation-delay: 0.14s;
+          animation-delay: 0.14s;
+  -webkit-animation-duration: 0.94s;
+          animation-duration: 0.94s;
 }
 
 .ball-grid-pulse > div:nth-child(4) {
-  -webkit-animation-delay: 0.69s;
-          animation-delay: 0.69s;
-  -webkit-animation-duration: 1.08s;
-          animation-duration: 1.08s;
+  -webkit-animation-delay: 0.09s;
+          animation-delay: 0.09s;
+  -webkit-animation-duration: 1.29s;
+          animation-duration: 1.29s;
 }
 
 .ball-grid-pulse > div:nth-child(5) {
-  -webkit-animation-delay: 0.21s;
-          animation-delay: 0.21s;
-  -webkit-animation-duration: 0.71s;
-          animation-duration: 0.71s;
+  -webkit-animation-delay: 0.23s;
+          animation-delay: 0.23s;
+  -webkit-animation-duration: 1.41s;
+          animation-duration: 1.41s;
 }
 
 .ball-grid-pulse > div:nth-child(6) {
-  -webkit-animation-delay: 0.53s;
-          animation-delay: 0.53s;
-  -webkit-animation-duration: 1.35s;
-          animation-duration: 1.35s;
+  -webkit-animation-delay: -0.1s;
+          animation-delay: -0.1s;
+  -webkit-animation-duration: 1.16s;
+          animation-duration: 1.16s;
 }
 
 .ball-grid-pulse > div:nth-child(7) {
-  -webkit-animation-delay: -0.09s;
-          animation-delay: -0.09s;
-  -webkit-animation-duration: 1.5s;
-          animation-duration: 1.5s;
+  -webkit-animation-delay: 0.57s;
+          animation-delay: 0.57s;
+  -webkit-animation-duration: 1.03s;
+          animation-duration: 1.03s;
 }
 
 .ball-grid-pulse > div:nth-child(8) {
-  -webkit-animation-delay: 0.7s;
-          animation-delay: 0.7s;
-  -webkit-animation-duration: 0.63s;
-          animation-duration: 0.63s;
+  -webkit-animation-delay: -0.12s;
+          animation-delay: -0.12s;
+  -webkit-animation-duration: 1.43s;
+          animation-duration: 1.43s;
 }
 
 .ball-grid-pulse > div:nth-child(9) {
-  -webkit-animation-delay: 0.41s;
-          animation-delay: 0.41s;
-  -webkit-animation-duration: 1.25s;
-          animation-duration: 1.25s;
+  -webkit-animation-delay: 0.15s;
+          animation-delay: 0.15s;
+  -webkit-animation-duration: 1.01s;
+          animation-duration: 1.01s;
 }
 
 .ball-grid-pulse > div {

resources/dist/css/plugins/loaders/animations/line-scale-random.css

@@ -31,31 +31,31 @@
 }
 
 .line-scale-party > div:nth-child(1) {
-  -webkit-animation-delay: 0.39s;
-          animation-delay: 0.39s;
-  -webkit-animation-duration: 1.17s;
-          animation-duration: 1.17s;
+  -webkit-animation-delay: 0.65s;
+          animation-delay: 0.65s;
+  -webkit-animation-duration: 0.39s;
+          animation-duration: 0.39s;
 }
 
 .line-scale-party > div:nth-child(2) {
-  -webkit-animation-delay: 0.5s;
-          animation-delay: 0.5s;
-  -webkit-animation-duration: 0.88s;
-          animation-duration: 0.88s;
+  -webkit-animation-delay: 0.26s;
+          animation-delay: 0.26s;
+  -webkit-animation-duration: 0.56s;
+          animation-duration: 0.56s;
 }
 
 .line-scale-party > div:nth-child(3) {
-  -webkit-animation-delay: 0.31s;
-          animation-delay: 0.31s;
-  -webkit-animation-duration: 1.15s;
-          animation-duration: 1.15s;
+  -webkit-animation-delay: 0.48s;
+          animation-delay: 0.48s;
+  -webkit-animation-duration: 0.34s;
+          animation-duration: 0.34s;
 }
 
 .line-scale-party > div:nth-child(4) {
-  -webkit-animation-delay: 0.2s;
-          animation-delay: 0.2s;
-  -webkit-animation-duration: 0.74s;
-          animation-duration: 0.74s;
+  -webkit-animation-delay: 0.38s;
+          animation-delay: 0.38s;
+  -webkit-animation-duration: 0.94s;
+          animation-duration: 0.94s;
 }
 
 .line-scale-party > div {

resources/dist/css/plugins/loaders/loaders.css

@@ -1456,64 +1456,64 @@
 .ball-grid-beat > div:nth-child(1) {
   -webkit-animation-delay: 0.52s;
           animation-delay: 0.52s;
-  -webkit-animation-duration: 0.95s;
-          animation-duration: 0.95s;
+  -webkit-animation-duration: 0.96s;
+          animation-duration: 0.96s;
 }
 
 .ball-grid-beat > div:nth-child(2) {
-  -webkit-animation-delay: 0.39s;
-          animation-delay: 0.39s;
-  -webkit-animation-duration: 1.41s;
-          animation-duration: 1.41s;
+  -webkit-animation-delay: 0.38s;
+          animation-delay: 0.38s;
+  -webkit-animation-duration: 1.07s;
+          animation-duration: 1.07s;
 }
 
 .ball-grid-beat > div:nth-child(3) {
-  -webkit-animation-delay: 0.04s;
-          animation-delay: 0.04s;
-  -webkit-animation-duration: 1.08s;
-          animation-duration: 1.08s;
+  -webkit-animation-delay: -0.18s;
+          animation-delay: -0.18s;
+  -webkit-animation-duration: 1.3s;
+          animation-duration: 1.3s;
 }
 
 .ball-grid-beat > div:nth-child(4) {
-  -webkit-animation-delay: 0.61s;
-          animation-delay: 0.61s;
-  -webkit-animation-duration: 1.41s;
-          animation-duration: 1.41s;
+  -webkit-animation-delay: 0.6s;
+          animation-delay: 0.6s;
+  -webkit-animation-duration: 0.89s;
+          animation-duration: 0.89s;
 }
 
 .ball-grid-beat > div:nth-child(5) {
-  -webkit-animation-delay: 0.48s;
-          animation-delay: 0.48s;
-  -webkit-animation-duration: 0.72s;
-          animation-duration: 0.72s;
+  -webkit-animation-delay: 0.79s;
+          animation-delay: 0.79s;
+  -webkit-animation-duration: 0.94s;
+          animation-duration: 0.94s;
 }
 
 .ball-grid-beat > div:nth-child(6) {
-  -webkit-animation-delay: 0.59s;
-          animation-delay: 0.59s;
-  -webkit-animation-duration: 1.24s;
-          animation-duration: 1.24s;
+  -webkit-animation-delay: 0.33s;
+          animation-delay: 0.33s;
+  -webkit-animation-duration: 0.71s;
+          animation-duration: 0.71s;
 }
 
 .ball-grid-beat > div:nth-child(7) {
-  -webkit-animation-delay: 0.27s;
-          animation-delay: 0.27s;
-  -webkit-animation-duration: 0.87s;
-          animation-duration: 0.87s;
+  -webkit-animation-delay: 0.67s;
+          animation-delay: 0.67s;
+  -webkit-animation-duration: 0.73s;
+          animation-duration: 0.73s;
 }
 
 .ball-grid-beat > div:nth-child(8) {
-  -webkit-animation-delay: 0.46s;
-          animation-delay: 0.46s;
-  -webkit-animation-duration: 0.66s;
-          animation-duration: 0.66s;
+  -webkit-animation-delay: -0.18s;
+          animation-delay: -0.18s;
+  -webkit-animation-duration: 0.82s;
+          animation-duration: 0.82s;
 }
 
 .ball-grid-beat > div:nth-child(9) {
-  -webkit-animation-delay: 0.43s;
-          animation-delay: 0.43s;
-  -webkit-animation-duration: 0.78s;
-          animation-duration: 0.78s;
+  -webkit-animation-delay: 0.58s;
+          animation-delay: 0.58s;
+  -webkit-animation-duration: 0.8s;
+          animation-duration: 0.8s;
 }
 
 .ball-grid-beat > div {
@@ -1575,66 +1575,66 @@
 }
 
 .ball-grid-pulse > div:nth-child(1) {
-  -webkit-animation-delay: 0.32s;
-          animation-delay: 0.32s;
-  -webkit-animation-duration: 0.93s;
-          animation-duration: 0.93s;
+  -webkit-animation-delay: -0.12s;
+          animation-delay: -0.12s;
+  -webkit-animation-duration: 1.04s;
+          animation-duration: 1.04s;
 }
 
 .ball-grid-pulse > div:nth-child(2) {
-  -webkit-animation-delay: 0.42s;
-          animation-delay: 0.42s;
-  -webkit-animation-duration: 0.74s;
-          animation-duration: 0.74s;
+  -webkit-animation-delay: 0.49s;
+          animation-delay: 0.49s;
+  -webkit-animation-duration: 0.7s;
+          animation-duration: 0.7s;
 }
 
 .ball-grid-pulse > div:nth-child(3) {
-  -webkit-animation-delay: 0.06s;
-          animation-delay: 0.06s;
-  -webkit-animation-duration: 1.08s;
-          animation-duration: 1.08s;
+  -webkit-animation-delay: 0.08s;
+          animation-delay: 0.08s;
+  -webkit-animation-duration: 1.3s;
+          animation-duration: 1.3s;
 }
 
 .ball-grid-pulse > div:nth-child(4) {
-  -webkit-animation-delay: 0.38s;
-          animation-delay: 0.38s;
-  -webkit-animation-duration: 1.11s;
-          animation-duration: 1.11s;
+  -webkit-animation-delay: -0.18s;
+          animation-delay: -0.18s;
+  -webkit-animation-duration: 1.29s;
+          animation-duration: 1.29s;
 }
 
 .ball-grid-pulse > div:nth-child(5) {
-  -webkit-animation-delay: 0.52s;
-          animation-delay: 0.52s;
-  -webkit-animation-duration: 1.5s;
-          animation-duration: 1.5s;
+  -webkit-animation-delay: 0.19s;
+          animation-delay: 0.19s;
+  -webkit-animation-duration: 1.33s;
+          animation-duration: 1.33s;
 }
 
 .ball-grid-pulse > div:nth-child(6) {
-  -webkit-animation-delay: 0.07s;
-          animation-delay: 0.07s;
-  -webkit-animation-duration: 1.16s;
-          animation-duration: 1.16s;
+  -webkit-animation-delay: 0.18s;
+          animation-delay: 0.18s;
+  -webkit-animation-duration: 1.33s;
+          animation-duration: 1.33s;
 }
 
 .ball-grid-pulse > div:nth-child(7) {
-  -webkit-animation-delay: 0.18s;
-          animation-delay: 0.18s;
-  -webkit-animation-duration: 1.41s;
-          animation-duration: 1.41s;
+  -webkit-animation-delay: 0.38s;
+          animation-delay: 0.38s;
+  -webkit-animation-duration: 0.81s;
+          animation-duration: 0.81s;
 }
 
 .ball-grid-pulse > div:nth-child(8) {
-  -webkit-animation-delay: 0.71s;
-          animation-delay: 0.71s;
-  -webkit-animation-duration: 0.93s;
-          animation-duration: 0.93s;
+  -webkit-animation-delay: 0.55s;
+          animation-delay: 0.55s;
+  -webkit-animation-duration: 0.78s;
+          animation-duration: 0.78s;
 }
 
 .ball-grid-pulse > div:nth-child(9) {
-  -webkit-animation-delay: -0.05s;
-          animation-delay: -0.05s;
-  -webkit-animation-duration: 1.45s;
-          animation-duration: 1.45s;
+  -webkit-animation-delay: 0.62s;
+          animation-delay: 0.62s;
+  -webkit-animation-duration: 1s;
+          animation-duration: 1s;
 }
 
 .ball-grid-pulse > div {
@@ -2181,31 +2181,31 @@
 }
 
 .line-scale-party > div:nth-child(1) {
-  -webkit-animation-delay: 0.34s;
-          animation-delay: 0.34s;
-  -webkit-animation-duration: 1.29s;
-          animation-duration: 1.29s;
+  -webkit-animation-delay: 0.32s;
+          animation-delay: 0.32s;
+  -webkit-animation-duration: 0.57s;
+          animation-duration: 0.57s;
 }
 
 .line-scale-party > div:nth-child(2) {
-  -webkit-animation-delay: 0.65s;
-          animation-delay: 0.65s;
-  -webkit-animation-duration: 0.95s;
-          animation-duration: 0.95s;
+  -webkit-animation-delay: 0.13s;
+          animation-delay: 0.13s;
+  -webkit-animation-duration: 1.24s;
+          animation-duration: 1.24s;
 }
 
 .line-scale-party > div:nth-child(3) {
-  -webkit-animation-delay: 0.71s;
-          animation-delay: 0.71s;
-  -webkit-animation-duration: 0.78s;
-          animation-duration: 0.78s;
+  -webkit-animation-delay: -0.04s;
+          animation-delay: -0.04s;
+  -webkit-animation-duration: 0.64s;
+          animation-duration: 0.64s;
 }
 
 .line-scale-party > div:nth-child(4) {
-  -webkit-animation-delay: -0.01s;
-          animation-delay: -0.01s;
-  -webkit-animation-duration: 0.36s;
-          animation-duration: 0.36s;
+  -webkit-animation-delay: 0.11s;
+          animation-delay: 0.11s;
+  -webkit-animation-duration: 1.29s;
+          animation-duration: 1.29s;
 }
 
 .line-scale-party > div {

resources/dist/dcat/css/dcat-app.css

@@ -1750,9 +1750,9 @@ html body .content .content-wrapper {
 }
 
 .btn {
-  padding: 0.75rem 1.35rem !important;
+  padding: 0.8rem 1.35rem !important;
   font-size: 0.95rem;
-  height: 36px;
+  height: 37.6px;
   line-height: 1.2;
   border-radius: 0.2rem;
   box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.05), 0 2px 2px 0 rgba(0, 0, 0, 0.05), 0 1px 5px 1px rgba(0, 0, 0, 0.05);
@@ -1778,7 +1778,7 @@ html body .content .content-wrapper {
 .btn-group-sm > .btn {
   padding: 0.6rem 1rem !important;
   font-size: 0.6rem;
-  line-height: 1.2;
+  line-height: 1.1;
   height: 30px;
 }
 
@@ -1873,6 +1873,29 @@ select.form-control:not([multiple=multiple]) {
   line-height: 13px;
 }
 
+.input-group-text {
+  padding: 0.7rem 0.9rem;
+}
+
+.help-block {
+  display: block;
+  margin-top: 7px;
+  margin-bottom: 10px;
+  color: #737373;
+}
+
+.control-label {
+  padding-top: 7px;
+  margin-bottom: 0;
+  font-size: 1rem;
+}
+
+@media (min-width: 768px) {
+  .form-group .control-label {
+    text-align: right;
+  }
+}
+
 .input-group-addon {
   width: 1%;
   white-space: nowrap;
@@ -2419,6 +2442,69 @@ table.dataTable.complex-headers tfoot td {
   margin: 7px 0;
 }
 
+.box {
+  position: relative;
+  border-radius: 0.35rem;
+  background: #ffffff;
+  border-top: 2px solid #d9d9d9;
+  margin-bottom: 10px;
+  width: 100%;
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
+  display: flex;
+}
+
+.box-header {
+  padding: 13px;
+  display: inherit;
+  justify-content: space-between;
+}
+
+.box-header h3,
+.box-header .h3 {
+  font-size: 1.2rem;
+  margin-bottom: 0;
+}
+
+.box-header.with-border {
+  border-bottom: 1px solid #f4f4f4;
+}
+
+.box,
+.panel {
+  transition: 0.3s cubic-bezier(0.25, 0.8, 0.5, 1);
+}
+
+.box-shadow {
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.05);
+}
+
+.box.box-solid {
+  border-top: 0;
+}
+
+.box.box-solid.box-default {
+  border: 1px solid #d9d9d9;
+}
+
+.box-body {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+  padding: 10px;
+}
+
+.box-footer {
+  display: inherit;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+  border-top: 1px solid #f4f4f4;
+  padding: 10px;
+  background-color: #fff;
+}
+
 body.vertical-layout.vertical-menu-modern.menu-expanded .main-menu .navigation > li > a > i:before {
   font-size: 1.3rem;
 }

resources/dist/dcat/extra/upload.js

@@ -257,11 +257,11 @@
           $btns;
 
       if (showImg) {
-        $li = $('<li id="' + getFileViewSelector(file.id) + '" title="' + file.name + '" style="margin:7px">' + '<p class="file-type">' + (file.ext.toUpperCase() || 'FILE') + '</p>' + '<p class="imgWrap "></p>' + '<p class="title" style="">' + file.name + '</p>' + '<p class="title" style=\'margin-bottom:12px;\'>(<b>' + size + '</b>)</p>' + '</li>');
-        $btns = $('<div class="file-panel">' + '<a class=\'btn btn-xs btn-default\' data-file-act="cancel"><i class="fa fa-close red-dark" style=\'font-size:13px\'></i></a>' + '<a class=\'btn btn-xs btn-default\' data-file-act="delete" style="display: none"><i class="ti-trash red-dark" style=\'font-size:13px\'></i></a>' + '<a class=\'btn btn-xs btn-default\' data-file-act="preview" ><i class="glyphicon glyphicon-zoom-in"></i></a>' + '</div>').appendTo($li);
+        $li = $('<li id="' + getFileViewSelector(file.id) + '" title="' + file.name + '" style="margin:7px">' + '<p class="file-type">' + (file.ext.toUpperCase() || 'FILE') + '</p>' + '<p class="imgWrap "></p>' + '<p class="title" style="">' + file.name + '</p>' + '<p class="title" style=\'margin-bottom:20px;\'>(<b>' + size + '</b>)</p>' + '</li>');
+        $btns = $('<div class="file-panel">' + '<a class=\'btn btn-sm btn-white\' data-file-act="cancel"><i class="fa fa-close red-dark" style=\'font-size:13px\'></i></a>' + '<a class=\'btn btn-sm btn-white\' data-file-act="delete" style="display: none"><i class="feather icon-trash red-dark" style=\'font-size:13px\'></i></a>' + '<a class=\'btn btn-sm btn-white\' data-file-act="preview" ><i class="feather icon-zoom-in"></i></a>' + '</div>').appendTo($li);
       } else {
-        $li = $('<li id="' + getFileViewSelector(file.id) + '" title="' + file.name + '">' + '<p class="title" style="display:block"><i class=\'ti-check green _success\' style=\'font-weight:bold;font-size:17px;display:none\'></i>' + file.name + ' (' + size + ')</p>' + '</li>');
-        $btns = $('<span data-file-act="cancel" class="_act" style="font-size:13px"><i class=\'ti-close red-dark\'></i></span>' + '<span data-file-act="delete" class="_act" style="display:none"><i class=\'ti-trash red-dark\'></i></span>').appendTo($li);
+        $li = $('<li id="' + getFileViewSelector(file.id) + '" title="' + file.name + '">' + '<p class="title" style="display:block"><i class=\'feather icon-check green _success\' style=\'font-weight:bold;font-size:17px;display:none\'></i>' + file.name + ' (' + size + ')</p>' + '</li>');
+        $btns = $('<span data-file-act="cancel" class="_act" style="font-size:13px"><i class=\'feather icon-x red-dark\'></i></span>' + '<span data-file-act="delete" class="_act" style="display:none"><i class=\'feather icon-trash red-dark\'></i></span>').appendTo($li);
       }
 
       var $wrap = $li.find('p.imgWrap'),
@@ -357,7 +357,7 @@
           $info.remove(); // $prgress.css('display', 'block');
         } else if (cur === 'complete') {
           if (showImg) {
-            $li.append('<span class="success"><em></em><i class="ti-check"></i></span>');
+            $li.append('<span class="success"><em></em><i class="feather icon-check"></i></span>');
           } else {
             $li.find('._success').show();
           }
@@ -743,19 +743,19 @@
         html += '<p class="_act" data-file-act=\'delete\' data-id="' + file.serverId + '"><i class=\'ti-trash red-dark\'></i></p>';
       }
 
-      html += "<p class='title' style=''><i class='ti-check green _success' style='font-weight:bold;font-size:17px;display:none'></i>";
+      html += "<p class='title' style=''><i class='feather icon-check' style='color:white;font-weight:bold;font-size:17px;display:none'></i>";
       html += file.serverPath;
       html += "</p>";
 
       if (showImg) {
-        html += "<p class='title' style='margin-bottom:12px;'>&nbsp;</p>";
+        html += "<p class='title' style='margin-bottom:20px;'>&nbsp;</p>";
         html += "<div class='file-panel' >";
 
         if (!opts.disabled) {
-          html += "<a class='btn btn-xs btn-default' data-file-act='deleteurl' data-id='" + file.serverId + "'><i class='ti-trash red-dark' style='font-size:13px'></i></a>";
+          html += "<a class='btn btn-sm btn-white' data-file-act='deleteurl' data-id='" + file.serverId + "'><i class='feather icon-trash red-dark' style='font-size:13px'></i></a>";
         }
 
-        html += "<a class='btn btn-xs btn-default' data-file-act='preview' data-url='" + file.serverUrl + "' ><i class='glyphicon glyphicon-zoom-in'></i></a>";
+        html += "<a class='btn btn-sm btn-white' data-file-act='preview' data-url='" + file.serverUrl + "' ><i class='feather icon-zoom-in'></i></a>";
         html += "</div>";
       }
 

resources/dist/dcat/js/dcat-app.js

@@ -1541,24 +1541,27 @@ var Form = /*#__PURE__*/function () {
     }, options);
     _this.originalValues = {};
     _this.$form = $(_this.options.form).first();
+
+    _this.submit();
   }
 
   _createClass(Form, [{
-    key: "_execute",
-    value: function _execute() {
-      var _this = this,
+    key: "submit",
+    value: function submit() {
+      var Dcat = window.Dcat,
+          _this = this,
           $form = _this.$form,
           options = _this.options; // 移除错误信息
 
 
       removeFieldError(_this);
       $form.ajaxSubmit({
-        beforeSubmit: function beforeSubmit(fields, $form, options) {
-          if (options.before(fields, $form, options, _this) === false) {
+        beforeSubmit: function beforeSubmit(fields, $form, _opt) {
+          if (options.before(fields, $form, _opt, _this) === false) {
             return false;
           }
 
-          if (fire(formCallbacks.before, fields, $form, options, _this) === false) {
+          if (fire(formCallbacks.before, fields, $form, _opt, _this) === false) {
             return false;
           }
 

resources/dist/dcat/plugins/webuploader/webuploader.css

@@ -297,7 +297,8 @@
 	-moz-transition: 200ms ease-out;
 	-o-transition: 200ms ease-out;
 	-ms-transition: 200ms ease-out;
-	transition: 200ms ease-out
+	transition: 200ms ease-out;
+	margin-bottom: 0;
 }
 
 .web-uploader .filelist li img {
@@ -433,7 +434,7 @@
 .web-uploader .statusBar .info {
 	display: inline-block;
 	font-size: 14px;
-	color: #666
+	color: #666!important;
 }
 
 .web-uploader .statusBar .btns {
@@ -453,9 +454,7 @@
 }
 
 .web-uploader .placeholder:before {
-	/*font-family: FontAwesome;*/
-	/*content: "\f0ee";*/
 	font-size: 80px;
-	font-family: themify;
-	content: "\e6b2";
-}
+	font-family: feather;
+	content: "\e8e1";
+}

resources/views/form/display.blade.php

@@ -2,10 +2,9 @@
     <label class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
     <div class="{{$viewClass['field']}}">
         <div class="box box-solid box-default no-margin">
-            <!-- /.box-header -->
             <div class="box-body">
                 {!! $value !!}&nbsp;
-            </div><!-- /.box-body -->
+            </div>
         </div>
 
         @include('admin::form.help-block')

resources/views/form/file.blade.php

@@ -16,8 +16,8 @@
                 </div>
             </div>
             <div class="statusBar" style="display:none;">
-                <div class="upload-progress progress pull-left">
-                    <div class="progress-bar progress-bar-primary progress-bar-striped active" style="line-height:18px">0%</div>
+                <div class="upload-progress progress progress-bar-primary pull-left">
+                    <div class="progress-bar progress-bar-striped active" style="line-height:18px">0%</div>
                 </div>
                 <div class="info"></div>
                 <div class="btns">

resources/views/form/input.blade.php

@@ -1,6 +1,8 @@
 <div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
 
-    <label for="{{$id}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
+    <div for="{{ $id }}" class="{{$viewClass['label']}} control-label">
+        <span>{!! $label !!}</span>
+    </div>
 
     <div class="{{$viewClass['field']}}">
 
@@ -9,15 +11,13 @@
         <div class="input-group">
 
             @if ($prepend)
-            <span class="input-group-addon">{!! $prepend !!}</span>
+                <span class="input-group-prepend"><span class="input-group-text bg-white">{!! $prepend !!}</span></span>
             @endif
-
             <input {!! $attributes !!} />
 
             @if ($append)
-                <span class="input-group-addon clearfix">{!! $append !!}</span>
+                <span class="input-group-append">{!! $append !!}</span>
             @endif
-
         </div>
 
         @include('admin::form.help-block')

resources/views/form/multipleselect.blade.php

@@ -1,12 +1,14 @@
 <div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
 
-    <label for="{{$id}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
+    <div for="{{ $id }}" class="{{$viewClass['label']}} control-label">
+        <span>{!! $label !!}</span>
+    </div>
 
-    <div class="{{$viewClass['field']}}">
+    <div class="{{$viewClass['field']}} d-flex">
 
         @include('admin::form.error')
 
-        <select class="form-control {{$class}}" style="width: 100%;" name="{{$name}}[]" multiple="multiple" data-placeholder="{{ $placeholder }}" {!! $attributes !!} >
+        <select class="form-control {{$class}}" style="width: 100%!important;" name="{{$name}}[]" multiple="multiple" data-placeholder="{{ $placeholder }}" {!! $attributes !!} >
             @foreach($options as $select => $option)
                 <option value="{{$select}}" {{  in_array($select, (array)old($column, $value)) ?'selected':'' }}>{{$option}}</option>
             @endforeach

resources/views/form/select.blade.php

@@ -1,8 +1,11 @@
 <div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
 
-<label for="{{$id}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
+    <div for="{{ $id }}" class="{{ $viewClass['label'] }} control-label">
+        <span>{!! $label !!}</span>
+    </div>
+
 
-    <div class="{{$viewClass['field']}}">
+    <div class="{{$viewClass['field']}} d-flex">
 
         @include('admin::form.error')
 

src/Form/Builder.php

@@ -847,12 +847,12 @@ EOF;
 
     f.find('button.submit').click(function () {
         var t = $(this);
-    
+    console.log(12312321, f);
         Dcat.Form({
             form: f,
             before: function () {
                 f.validator('validate');
-        
+        console.log(567777, f);
                 if (f.find('.has-error').length > 0) {
                     return false;
                 }

src/Form/Field.php

@@ -840,7 +840,7 @@ class Field implements Renderable
             return [
                 'label'      => "col-sm-{$this->width['label']} {$this->getLabelClass()}",
                 'field'      => "col-sm-{$this->width['field']}",
-                'form-group' => 'form-group ',
+                'form-group' => 'form-group row',
             ];
         }
 

src/Form/Field/Password.php

@@ -6,7 +6,7 @@ class Password extends Text
 {
     public function render()
     {
-        $this->prepend('<i class="ti-eye"></i>')
+        $this->prepend('<i class="feather icon-eye"></i>')
             ->defaultAttribute('type', 'password');
 
         return parent::render();

src/Form/Tools.php

@@ -182,7 +182,7 @@ class Tools implements Renderable
 
         return <<<EOT
 <div class="btn-group pull-right" style="margin-right: 5px">
-    <a href="{$this->getListPath()}" class="btn btn-sm btn-white "><i class=" ti-view-list-alt"></i><span class="d-none d-sm-inline">&nbsp;$text</span></a>
+    <a href="{$this->getListPath()}" class="btn btn-sm btn-white "><i class="feather icon-list"></i><span class="d-none d-sm-inline">&nbsp;$text</span></a>
 </div>
 EOT;
     }
@@ -199,7 +199,7 @@ EOT;
         return <<<HTML
 <div class="btn-group pull-right" style="margin-right: 5px">
     <a href="{$this->getViewPath()}" class="btn btn-sm btn-primary">
-        <i class="ti-eye"></i><span class="d-none d-sm-inline"> {$view}</span>
+        <i class="feather icon-eye"></i><span class="d-none d-sm-inline"> {$view}</span>
     </a>
 </div>
 HTML;
@@ -216,9 +216,9 @@ HTML;
 
         return <<<HTML
 <div class="btn-group pull-right" style="margin-right: 5px">
-    <a class="btn btn-sm btn-danger " data-action="delete" data-url="{$this->getDeletePath()}" data-redirect="{$this->getListPath()}">
-        <i class="ti-trash"></i><span class="d-none d-sm-inline"> {$delete}</span>
-    </a>
+    <button class="btn btn-sm btn-danger " data-action="delete" data-url="{$this->getDeletePath()}" data-redirect="{$this->getListPath()}">
+        <i class="feather icon-trash"></i><span class="d-none d-sm-inline"> {$delete}</span>
+    </button>
 </div>
 HTML;
     }

src/Show/Tools.php

@@ -257,7 +257,7 @@ class Tools implements Renderable
         return <<<HTML
 <div class="btn-group pull-right btn-mini" style="margin-right: 5px">
     <a href="{$this->getListPath()}" class="btn btn-sm btn-white ">
-        <i class=" ti-view-list-alt"></i><span class="d-none d-sm-inline"> {$list}</span>
+        <i class="feather icon-list"></i><span class="d-none d-sm-inline"> {$list}</span>
     </a>
 </div>
 HTML;
@@ -282,7 +282,7 @@ HTML;
         if ($this->showEdit) {
             $btn = <<<EOF
 <a href="{$url}" class="btn btn-sm btn-primary">
-        <i class="ti-pencil-alt "></i><span class="d-none d-sm-inline"> {$edit}</span>
+        <i class="feather icon-edit-1"></i><span class="d-none d-sm-inline"> {$edit}</span>
     </a>
 EOF;
         }
@@ -321,9 +321,9 @@ HTML;
 
         return <<<HTML
 <div class="btn-group pull-right btn-mini" style="margin-right: 5px">
-    <a class="btn btn-sm btn-danger " data-action="delete" data-url="{$this->getDeletePath()}" data-redirect="{$this->getListPath()}">
-        <i class="ti-trash"></i><span class="d-none d-sm-inline">  {$delete}</span>
-    </a>
+    <button class="btn btn-sm btn-danger " data-action="delete" data-url="{$this->getDeletePath()}" data-redirect="{$this->getListPath()}">
+        <i class="feather icon-trash"></i><span class="d-none d-sm-inline">  {$delete}</span>
+    </button>
 </div>
 HTML;
     }