更新medoo

hooray · hooray · commit 5f7822a0f04d · 2017-08-09T15:46:34.000+08:00
diff --git a/inc/medoo.php b/inc/medoo.php
@@ -2,7 +2,7 @@
 /*!
  * Medoo database framework
  * https://medoo.in
- * Version 1.4.3
+ * Version 1.4.5
  *
  * Copyright 2017, Angel Lai
  * Released under the MIT license
@@ -298,16 +298,23 @@ public function exec($query, $map = [])
 
 		$statement = $this->pdo->prepare($query);
 
-		foreach ($map as $key => $value)
+		if ($statement)
 		{
-			$statement->bindValue($key, $value[ 0 ], $value[ 1 ]);
-		}
+			foreach ($map as $key => $value)
+			{
+				$statement->bindValue($key, $value[ 0 ], $value[ 1 ]);
+			}
 
-		$statement->execute();
+			$statement->execute();
 
-		$this->statement = $statement;
+			$this->statement = $statement;
 
-		return $statement;
+			return $statement;
+		}
+		else
+		{
+			return false;
+		}
 	}
 
 	protected function generate($query, $map)
@@ -343,7 +350,7 @@ protected function tableQuote($table)
 
 	protected function mapKey()
 	{
-		return ':MeDoOmEdOo_' . $this->guid++;
+		return ':MeDoO_' . $this->guid++ . '_mEdOo';
 	}
 
 	protected function columnQuote($string)
@@ -464,6 +471,15 @@ protected function dataImplode($data, &$map, $conjunctor)
 					preg_match('/(#?)([a-zA-Z0-9_\.]+)(\[(?<operator>\>|\>\=|\<|\<\=|\!|\<\>|\>\<|\!?~)\])?/i', $key, $match);
 					$column = $this->columnQuote($match[ 2 ]);
 
+					if (!empty($match[ 1 ]))
+					{
+						$wheres[] = $column .
+							(isset($match[ 'operator' ]) ? ' ' . $match[ 'operator' ] . ' ' : ' = ') .
+							$this->fnQuote($key, $value);
+
+						continue;
+					}
+
 					if (isset($match[ 'operator' ]))
 					{
 						$operator = $match[ 'operator' ];
@@ -539,17 +555,15 @@ protected function dataImplode($data, &$map, $conjunctor)
 
 							foreach ($value as $index => $item)
 							{
-								$map_key .= 'L' . $index;
-
 								$item = strval($item);
 
 								if (!preg_match('/(\[.+\]|_|%.+|.+%)/', $item))
 								{
 									$item = '%' . $item . '%';
 								}
 
-								$like_clauses[] = $column . ($operator === '!~' ? ' NOT' : '') . ' LIKE ' . $map_key;
-								$map[ $map_key ] = [$item, PDO::PARAM_STR];
+								$like_clauses[] = $column . ($operator === '!~' ? ' NOT' : '') . ' LIKE ' . $map_key . 'L' . $index;
+								$map[ $map_key . 'L' . $index ] = [$item, PDO::PARAM_STR];
 							}
 
 							$wheres[] = '(' . implode($connector, $like_clauses) . ')';
@@ -564,10 +578,6 @@ protected function dataImplode($data, &$map, $conjunctor)
 								$condition .= $map_key;
 								$map[ $map_key ] = [$value, PDO::PARAM_INT];
 							}
-							elseif (strpos($key, '#') === 0)
-							{
-								$condition .= $this->fnQuote($key, $value);
-							}
 							else
 							{
 								$condition .= $map_key;
@@ -1458,7 +1468,7 @@ public function debug()
 
 	public function error()
 	{
-		return $this->statement->errorInfo();
+		return $this->statement ? $this->statement->errorInfo() : null;
 	}
 
 	public function last()
diff --git a/static/js/hros.popupMenu.js b/static/js/hros.popupMenu.js
@@ -38,8 +38,8 @@ HROS.popupMenu = (function(){
 		**  计算右键菜单位置
 		*/
 		calcPosition: function(e, obj){
-			var l = ($(window).width() - e.clientX) < obj.width() ? (e.clientX - obj.width()): e.clientX;
-			var t = ($(window).height() - e.clientY) < obj.height() ? (e.clientY - obj.height()): e.clientY;
+			var l = ($(window).width() - e.clientX) < obj.width() ? (e.clientX - obj.width()) : e.clientX;
+			var t = ($(window).height() - e.clientY) < obj.height() ? (e.clientY - obj.height()) : e.clientY;
 			obj.css({
 				left: l,
 				top: t
diff --git a/static/template/window.art b/static/template/window.art
@@ -38,7 +38,7 @@
         </div>
         <div class="set-bar">
             <div class="fr">
-                <a class="btn refresh" btn="refresh">
+                <a class="btn" btn="refresh">
                     <i class="fa fa-refresh"></i>
                     <span class="btn-con">刷新</span>
                 </a>
