From 9b2ec96a03015936f6fc97db0d8cae44d95fc63b Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Sat, 12 Oct 2019 10:50:05 +0800
Subject: [PATCH] 增加插件配置日期和时间组件 修复系统配置中日期和时间的BUG

---
 application/admin/view/addon/config.html         |  8 +++++++-
 application/admin/view/general/config/index.html | 17 ++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/application/admin/view/addon/config.html b/application/admin/view/addon/config.html
index fd4db30..2f1812d 100644
--- a/application/admin/view/addon/config.html
+++ b/application/admin/view/addon/config.html
@@ -36,8 +36,14 @@
                             <textarea name="row[{$item.name}]" cols="30" rows="5" class="hide">{$item.value|json_encode|htmlentities}</textarea>
                         </dl>
                         {/case}
+                        {case date}
+                        <input {$item.extend} type="text" name="row[{$item.name}]" value="{$item.value|htmlentities}" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-tip="{$item.tip}" data-rule="{$item.rule}"/>
+                        {/case}
+                        {case time}
+                        <input {$item.extend} type="text" name="row[{$item.name}]" value="{$item.value|htmlentities}" class="form-control datetimepicker" data-date-format="HH:mm:ss" data-tip="{$item.tip}" data-rule="{$item.rule}"/>
+                        {/case}
                         {case datetime}
-                        <input {$item.extend} type="text" name="row[{$item.name}]" value="{$item.value|htmlentities}" class="form-control datetimepicker" data-tip="{$item.tip}" data-rule="{$item.rule}"/>
+                        <input {$item.extend} type="text" name="row[{$item.name}]" value="{$item.value|htmlentities}" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-tip="{$item.tip}" data-rule="{$item.rule}"/>
                         {/case}
                         {case number}
                         <input {$item.extend} type="number" name="row[{$item.name}]" value="{$item.value|htmlentities}" class="form-control" data-tip="{$item.tip}" data-rule="{$item.rule}"/>
diff --git a/application/admin/view/general/config/index.html b/application/admin/view/general/config/index.html
index c47e99d..2d430fa 100644
--- a/application/admin/view/general/config/index.html
+++ b/application/admin/view/general/config/index.html
@@ -77,8 +77,14 @@
                                                 <textarea name="row[{$item.name}]" class="form-control hide" cols="30" rows="5">{$item.value|htmlentities}</textarea>
                                             </dl>
                                             {/case}
+                                            {case date}
+                                            <input {$item.extend} type="text" name="row[{$item.name}]" value="{$item.value}" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-tip="{$item.tip}" data-rule="{$item.rule}"/>
+                                            {/case}
+                                            {case time}
+                                            <input {$item.extend} type="text" name="row[{$item.name}]" value="{$item.value}" class="form-control datetimepicker" data-date-format="HH:mm:ss" data-tip="{$item.tip}" data-rule="{$item.rule}"/>
+                                            {/case}
                                             {case datetime}
-                                            <input {$item.extend} type="text" name="row[{$item.name}]" value="{$item.value}" class="form-control datetimepicker" data-tip="{$item.tip}" data-rule="{$item.rule}"/>
+                                            <input {$item.extend} type="text" name="row[{$item.name}]" value="{$item.value}" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-tip="{$item.tip}" data-rule="{$item.rule}"/>
                                             {/case}
                                             {case number}
                                             <input {$item.extend} type="number" name="row[{$item.name}]" value="{$item.value}" class="form-control" data-tip="{$item.tip}" data-rule="{$item.rule}"/>
@@ -97,8 +103,7 @@
                                             {case value="selects"}
                                             <select {$item.extend} name="row[{$item.name}]{$item.type=='selects'?'[]':''}" class="form-control selectpicker" data-tip="{$item.tip}" {$item.type=='selects'?'multiple':''}>
                                                 {foreach name="item.content" item="vo"}
-                                                <option value="{$key}" {in name="key" value="$item.value" }selected{
-                                                /in}>{$vo}</option>
+                                                <option value="{$key}" {in name="key" value="$item.value" }selected{/in}>{$vo}</option>
                                                 {/foreach}
                                             </select>
                                             {/case}
@@ -169,8 +174,7 @@
                         <div class="col-xs-12 col-sm-4">
                             <select name="row[type]" class="form-control selectpicker">
                                 {foreach name="typeList" item="vo"}
-                                <option value="{$key}" {in name="key" value="string" }selected{
-                                /in}>{$vo}</option>
+                                <option value="{$key}" {in name="key" value="string" }selected{/in}>{$vo}</option>
                                 {/foreach}
                             </select>
                         </div>
@@ -180,8 +184,7 @@
                         <div class="col-xs-12 col-sm-4">
                             <select name="row[group]" class="form-control selectpicker">
                                 {foreach name="groupList" item="vo"}
-                                <option value="{$key}" {in name="key" value="basic" }selected{
-                                /in}>{$vo}</option>
+                                <option value="{$key}" {in name="key" value="basic" }selected{/in}>{$vo}</option>
                                 {/foreach}
                             </select>
                         </div>
--
libgit2 0.24.0