dever 7 years ago
parent
commit
c9a5ece275

+ 13 - 0
assets/moltran/css/core.css

@@ -1381,4 +1381,17 @@ tds
 .data-auth-top li a
 {
   margin-top: -5px;
+}
+
+.dever-color
+{
+
+  margin:0;
+
+  padding:0;
+
+  border:0;
+
+  line-height:20px;
+
 }

+ 3 - 0
assets/moltran/html/inc/head.html

@@ -24,6 +24,9 @@
 <!-- Responsive-table -->
 <link rel="stylesheet" type="text/css" href="../script/lib/table/rwd-table.min.css?v4">
 
+<!-- color -->
+<link rel="stylesheet" type="text/css" href="../script/lib/color/colpick.css">
+
 <!--
 <link rel="stylesheet" href="../script/lib/kindeditor/themes/default/default.css" />
 -->

+ 3 - 0
assets/moltran/html/inc/script.html

@@ -25,6 +25,9 @@
 <script type="text/javascript" src="../script/lib/pjax/nprogress.js"></script>
 <!--<![endif]-->
 
+<!-- 加载颜色控件 -->
+<script type="text/javascript" src="../script/lib/color/colpick.js"></script>
+
 <!-- 加载时间控件 -->
 <script type="text/javascript" src="../script/lib/datetime/jquery.datetimepicker.min.js"></script>
 

+ 4 - 4
src/Database.php

@@ -2350,7 +2350,7 @@ class Database
         if ($index != 0) {
             $style = 'style="display:none;"';
         }
-        $result[$key] .= '<div id="' . $key . '-child-' . ($index + 1) . '" class="dever_' . $key . '_child dever_form_add_child" ' . $style . '><div class="dever_form_delete">[删除]</div>';
+        $result .= '<div id="' . $key . '-child-' . ($index + 1) . '" class="dever_' . $key . '_child dever_form_add_child" ' . $style . '><div class="dever_form_delete">[删除]</div>';
         foreach ($param as $k => $v) {
             $v['type'] = $v['update'];
 
@@ -2367,14 +2367,14 @@ class Database
             }
 
             $class = $this->update_class($v['col'], $v, $prefix);
-            $result[$key] .= '<div class="form-group ' . $class . '">';
+            $result .= '<div class="form-group ' . $class . '">';
 
             $this->update_html($v, $key, $v['col'], $data, $result);
 
-            $result[$key] .= '</div>';
+            $result .= '</div>';
         }
 
-        $result[$key] .= '</div>';
+        $result .= '</div>';
     }
 
     /**

+ 13 - 0
src/Lib/Input.php

@@ -631,6 +631,19 @@ class Input
         }
     }
 
+    /**
+     * color
+     *
+     * @return string
+     */
+    public static function color($param)
+    {
+        $param['class'] = 'dever-color form-control';
+        $param['update'] = 'text';
+        $param['default'] = '#000000';
+        return self::text($param, '');
+    }
+
     /**
      * password
      *