v3.7 bug

Author: hikki

resources/assets/component.css

@@ -292,8 +292,7 @@
     display: flex;
     justify-content:left;
     align-items: baseline;
-    margin: 10px 3em 5px 10px;
-    border: 1px solid #ebebeb;
+    margin: 15px 10px;
 }
 .dlp-form-row>input,.dlp-form-row>textarea{
     flex: auto;

src/Tool/FormPanel.php

@@ -86,16 +86,16 @@ public function select(string $column, string $label, array $select, array $sele
      *          format: [YYYY-MM-DD HH:mm:ss | YYYY-MM-DD | YYYY ]
      *          locale 语言配置
      */
-    public function datepicker(string $column, string $label, $value = '',array $settings = ['format'=>"YYYY-MM-DD HH:mm:ss",'locale'=>"zh-CN"])
+    public function datepicker(string $column, string $label, $value = '',array $settings = [])
     {
         if (!$value) {
             $value = date('Y-m-d H:i:s');
         }
-        $settings = json_encode($settings);
+        $settings = json_encode(array_merge(['format'=>'YYYY-MM-DD HH:mm:ss','locale'=>'zh-CN'], $settings));
         $content = <<<EOF
 <input style="width: 160px" type="text" id="{$column}" name="{$column}" value="{$value}" class="dlp-input {$column}" placeholder="输入 {$label}" />
 <script>
-$('#{$column}').datetimepicker(JSON.parse({$settings}));
+$('#{$column}').datetimepicker({$settings});
 </script>
 EOF;
         $this->html .= $this->rowpanel($column, $label, $content);
@@ -158,7 +158,8 @@ public function fileInput(string $column, string $label, array $settings = [], a
             }
         }
         $settings = json_encode(array_merge($file_input_settings, $settings));
-        $content = `<input class='{$column}' name='{$column}' multiple type='file' {$attribute}>
+        $content = <<<EOF
+<input class='{$column}' name='{$column}' multiple type='file' {$attribute}>
 <script>
 $('input.{$column}').fileinput(JSON.parse('{$settings}')).on('filebeforedelete', function () {
                 return new Promise(function(resolve, reject) {
@@ -184,7 +185,8 @@ public function fileInput(string $column, string $label, array $settings = [], a
             }).on('fileerror', function (event, data, msg) {
                 alert(msg);
             });
-</script>`;
+</script>
+EOF;
 
         $this->html .= $this->rowpanel($column, $label, $content);
     }