dever 2 years ago
parent
commit
22914a8968
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/Database.php
  2. 1 1
      src/Lib/Input.php

+ 1 - 1
src/Database.php

@@ -3021,7 +3021,7 @@ class Database
                         $result .= '<a href="#dever_modal" data-toggle="modal"  class="btn btn-info btn-rounded waves-effect waves-light m-b-5 '.$class.'" onclick=' . $t[1] . ' msg-send="' . $this->value($t[2], $data) . '">' . $vj[0] . '</a>&nbsp;&nbsp;';
                     } elseif (isset($vj[1])) {
                         $result .= '<a href="' . $this->url($kj, $data['id'], $pj) . '" class="oper_' . $kj . '"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 '.$class.'">' . $h . $vjn . '</button></a>&nbsp;&nbsp;';
-                    } else {
+                    } elseif ($vj) {
                         $result .= '<span style="margin-left:5px;margin-right:10px;">' . $vj[0] . '</span>';
                     }
                 }

+ 1 - 1
src/Lib/Input.php

@@ -1010,7 +1010,7 @@ class Input
                 }
             }
 
-            $xm_value = isset($param['value']) ? $param['value'] : $param['default'];
+            $xm_value = isset($param['value']) ? $param['value'] : (isset($param['default']) ? $param['default'] : '');
             $xm_tips = '请选择';
             $xm_data = Dever::json_encode($xm_data);
             $xm_id = $param['name'];