From 5d656b0a087db2d04989b937f95f3a39db6f4d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Fri, 15 Dec 2017 13:37:24 +0800
Subject: [PATCH] * Task#3387

---
 module/search/view/buildform.html.php | 37 ++++++++++++++-------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index d0973b9a34..0934964a27 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -56,11 +56,11 @@ include '../../common/view/chosen.html.php';
 .outer > #querybox {margin: -20px -20px 20px; border-top: none; border-bottom: 1px solid #ddd}
 
 #searchform input.date::-webkit-input-placeholder{color: #000000; opacity: 1;}
-#searchform input.date::-moz-placeholder{color: #000000; opacity: 1;} 
+#searchform input.date::-moz-placeholder{color: #000000; opacity: 1;}
 #searchform input.date:-ms-input-placeholder{color: #000000; opacity: 1;}
 </style>
 <script language='Javascript'>
-var dtOptions = 
+var dtOptions =
 {
     language: '<?php echo $this->app->getClientLang();?>',
     weekStart: 1,
@@ -97,8 +97,8 @@ var actionURL     = '<?php echo $actionURL;?>';
 
 /**
  * Set date field
- * 
- * @param  string $query 
+ *
+ * @param  string $query
  * @return void
  */
 function setDateField(query, fieldNO)
@@ -160,9 +160,9 @@ function setDateField(query, fieldNO)
 
 /**
  * When the value of the fields select changed, set the operator and value of the new field.
- * 
- * @param  string $obj 
- * @param  int    $fieldNO 
+ *
+ * @param  string $obj
+ * @param  int    $fieldNO
  * @access public
  * @return void
  */
@@ -177,7 +177,7 @@ function setField(obj, fieldNO, moduleparams)
     if(typeof(params[fieldName]['class']) != undefined && params[fieldName]['class'] == 'date')
     {
         setDateField($(obj).closest('form').find("#value" + fieldNO), fieldNO);
-        $(obj).closest('form').find("#value" + fieldNO).addClass('date');   // Shortcut the width of the datepicker to make sure align with others. 
+        $(obj).closest('form').find("#value" + fieldNO).addClass('date');   // Shortcut the width of the datepicker to make sure align with others.
         var groupItems = <?php echo $config->search->groupItems?>;
         var maxNO      = 2 * groupItems;
         var nextNO     = fieldNO > groupItems ? fieldNO - groupItems + 1 : fieldNO + groupItems;
@@ -207,7 +207,7 @@ function setField(obj, fieldNO, moduleparams)
 
 /**
  * Reset forms.
- * 
+ *
  * @access public
  * @return void
  */
@@ -216,12 +216,13 @@ function resetForm(obj)
     for(i = 1; i <= groupItems * 2; i ++)
     {
         $(obj).closest('form').find('#value' + i).val('').trigger('chosen:updated');
+        $(obj).closest('form').find('#dateValue' + i).val('').attr('placeholder','');
     }
 }
 
 /**
  * Show more fields.
- * 
+ *
  * @access public
  * @return void
  */
@@ -241,7 +242,7 @@ function showmore(obj)
 
 /**
  * Show lite search form.
- * 
+ *
  * @access public
  * @return void
  */
@@ -261,8 +262,8 @@ function showlite(obj)
 
 /**
  * loadQueries.
- * 
- * @param  queryID $queryID 
+ *
+ * @param  queryID $queryID
  * @access public
  * @return void
  */
@@ -273,8 +274,8 @@ function loadQueries(queryID)
 
 /**
  * Execute a query.
- * 
- * @param  int    $queryID 
+ *
+ * @param  int    $queryID
  * @access public
  * @return void
  */
@@ -286,7 +287,7 @@ function executeQuery(queryID)
 
 /**
  * Delete a query.
- * 
+ *
  * @access public
  * @return void
  */
@@ -383,7 +384,7 @@ foreach($fieldParams as $fieldName => $param)
           /* Print value. */
           echo "<td id='valueBox$fieldNO' style='overflow:visible'>";
           if($param['control'] == 'select') echo html::select("value$fieldNO", $param['values'], $formSession["value$fieldNO"], "class='form-control searchSelect chosen'");
-          if($param['control'] == 'input') 
+          if($param['control'] == 'input')
           {
               $fieldName  = $formSession["field$fieldNO"];
               $fieldValue = $formSession["value$fieldNO"];
@@ -467,7 +468,7 @@ foreach($fieldParams as $fieldName => $param)
       ?>
       </table>
     </td>
-    <td class='<?php echo $style == 'simple' ? 'w-80px' : 'w-160px';?>'> 
+    <td class='<?php echo $style == 'simple' ? 'w-80px' : 'w-160px';?>'>
       <?php
       echo html::hidden('module',     $module);
       echo html::hidden('actionURL',  $actionURL);