Fix: Table's eval bug when column formatValue is a Math formula string

Author: dongnl

CHANGELOG.md

@@ -10,6 +10,7 @@
 7. Add RowNumColumn process, similar to CalculatedColumn's rownum but simpler 
 8. Add "betweenInclusive" and "notBetweenInclusive" for Filter process 
 9. Add using existed connection option for PDO, MySQL, PostgreSQL, SQL Server, and Oracle datasources
+10. Fix Table's eval bug when column formatValue is a Math formula string
 
 ## Version 6.2.0
 1. Fix Utility's arrayToDatastore function when there's only one column.

src/widgets/koolphp/Table.php

@@ -187,10 +187,10 @@ protected function onInit()
     public static function formatValue($value, $format, $row = null, $cKey = null)
     {
         $formatValue = Utility::get($format, "formatValue");
-
         if (is_string($formatValue)) {
-            eval('$fv="' . str_replace('@value', '$value', $formatValue) . '";');
-            return $fv;
+            $fv = $formatValue;
+            eval('$fv=' . str_replace('@value', $value, $formatValue) . ';');
+            return Utility::format($fv, $format);
         } else if (is_callable($formatValue)) {
             return $formatValue($value, $row, $cKey);
         } else {
@@ -203,7 +203,7 @@ public static function formatValue($value, $format, $row = null, $cKey = null)
      * 
      * @param array $meta           The metadata
      * @param array $groupModel     The group model
-     * @param array $store          The store
+     * @param object $store          The store
      * @param array $result         The previous result
      * @param array $level          The level
      * @param array $start          The starting position