bugs on new user register and all fields sort problem.

1. user instance has to be under app\user 's interface
2. because of the cache cause the sort problem
3. working on the multiple UI function.

src/Config/umi.php

@@ -10,7 +10,7 @@
     |
     */
 
-    'assets_path' => 'umi/lte',
+    'assets_path' => 'umi/ace',
 
     /*
     |--------------------------------------------------------------------------

src/Http/Controllers/dashboardController.php

@@ -2,14 +2,14 @@
 
 namespace YM\Http\Controllers;
 
+use App\User;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
-use YM\Models\User;
 
 class DashBoardController extends Controller
 {
@@ -33,6 +33,11 @@ protected function create(array $data)
         ]);
     }
 
+    public function redirectPath()
+    {
+        return route('dashboard');
+    }
+
     public function index()
     {
         ######################get IP Information##############################

src/Models/UmiModel.php

@@ -79,8 +79,14 @@ public function getRecordsByFields($fields)
     public function getRecordsByWhere($where, $value, $useCache = true)
     {
         if ($this->openCache && $useCache) {
+
+            if ($this->order === 'asc')
+                return $this->cachedTable
+                    ->where($where, $value)
+                    ->sortBy($this->orderBy);
             return $this->cachedTable
-                ->where($where, $value);
+                ->where($where, $value)
+                ->sortByDesc($this->orderBy);
         }
 
         $ds = DB::table($this->tableName)

src/Umi/PageBuilder/umiDataTableBuilder_ACE.php

@@ -181,46 +181,47 @@ public function tableBody()
         //$rules = $TRO->getRulesByNames(Ym::currentTableId(), false);
         $rules = $TRO->getTableRelationOperationByTableId(Ym::currentTableId());
         $activeFieldValueList = [];
-        if ($rules) {
-            foreach ($dataSet as $ds) {
-                $activeFieldValue = '';
-                foreach ($rules as $rule) {
-                    $activeTableField = $rule->active_table_field;
-                    $dsActField = $ds->$activeTableField;
-                    $activeFieldValue .= "\"$activeTableField\":\"$dsActField\",";
-                }
-                #转换成对象类型
-                #turn into object
-                $activeFieldValue = $activeFieldValue == '' ? '' : "{" . trim($activeFieldValue,',') . "}";
-                array_push($activeFieldValueList, $activeFieldValue);
-            }
-        }
+        if ($rules)
+            $activeFieldValueList = $this->getActiveFieldValue($dataSet, $rules);
 
         #是否开启 数据映射功能
         #if available for data reformat
+        $regulatedDataSet = '';
         if (Config::get('umi.data_field_reformat'))
             $regulatedDataSet = $dataTypeOp->regulatedDataSet($dataSet);
 
         #数据表内容
         #table body
         $trBodyHtml = '';
+        $regulatedDataSet = $regulatedDataSet ?: $dataSet;
         if ($regulatedDataSet) {
             $pointer = 0;
             foreach ($regulatedDataSet as $ds) {
                 $trBodyHtml .= '<tr>';
-                $trBodyHtml .= $this->checkboxHtml();
-                foreach ($ds as $item => $value) {
+                //$trBodyHtml .= $this->checkboxHtml();
+                /*foreach ($ds as $item => $value) {
                     $trBodyHtml .= '<td>';
                     $trBodyHtml .= $value;
                     $trBodyHtml .= '</td>';
+                }*/
+                if (is_array($ds)) {
+                    foreach ($tHeads as $tHead) {
+                        $showField = $tHead->field;
+                        $trBodyHtml .= "<td>{$ds[$showField]}</td>";
+                    }
+                } else if (is_object($ds)) {
+                    foreach ($tHeads as $tHead) {
+                        $showField = $tHead->field;
+                        $trBodyHtml .= "<td>{$ds->$showField}</td>";
+                    }
                 }
 
                 #获取数据行的主键值
                 #get value of primary key of record
                 $primaryKey = Config::get('umi.primary_key');
                 $recordId = array_has($ds, $primaryKey) ? $dataSet->all()[$pointer]->$primaryKey : 0;
 
-                $activeFieldValue = $activeFieldValueList[$pointer];
+                $activeFieldValue = isset($activeFieldValueList[$pointer]) ? $activeFieldValueList[$pointer] : '';
                 $trBodyHtml .= $this->breadButtonHtml($recordId, $activeFieldValue);     //获取按钮 get button
                 $trBodyHtml .= '</tr>';
 
@@ -311,6 +312,31 @@ private function getArgs($args)
         return $arr;
     }
 
+    private function getActiveFieldValue($dataSet, $rules)
+    {
+        $activeFieldValueList = [];
+        foreach ($dataSet as $ds) {
+            $activeFieldValue = '';
+            foreach ($rules as $rule) {
+                $activeTableField = $rule->active_table_field;
+                if (!isset($ds->$activeTableField)) {
+                    Ym::showMessage('Warning', 'Detect the rule of relation operation somewhere is wrong for operating this table, Please correct or will not work', [
+                        'class_name' => 'gritter-error',
+                        'sticky'     => true
+                    ], false);
+                    return [];
+                }
+                $dsActField = $ds->$activeTableField;
+                $activeFieldValue .= "\"$activeTableField\":\"$dsActField\",";
+            }
+            #转换成对象类型
+            #turn into object
+            $activeFieldValue = $activeFieldValue == '' ? '' : "{" . trim($activeFieldValue,',') . "}";
+            array_push($activeFieldValueList, $activeFieldValue);
+        }
+        return $activeFieldValueList;
+    }
+
     #region component
     private function checkboxHtml()
     {

src/Umi/PageBuilder/umiDataTableBuilder_LTE.php

@@ -117,9 +117,6 @@ public function tableHeadSuperAdmin()
         return $html;
     }
 
-    /**
-     * @return string
-     */
     public function tableBody()
     {
         #是否有权限浏览表格数据
@@ -184,46 +181,47 @@ public function tableBody()
         //$rules = $TRO->getRulesByNames(Ym::currentTableId(), false);
         $rules = $TRO->getTableRelationOperationByTableId(Ym::currentTableId());
         $activeFieldValueList = [];
-        if ($rules) {
-            foreach ($dataSet as $ds) {
-                $activeFieldValue = '';
-                foreach ($rules as $rule) {
-                    $activeTableField = $rule->active_table_field;
-                    $dsActField = $ds->$activeTableField;
-                    $activeFieldValue .= "\"$activeTableField\":\"$dsActField\",";
-                }
-                #转换成对象类型
-                #turn into object
-                $activeFieldValue = $activeFieldValue == '' ? '' : "{" . trim($activeFieldValue,',') . "}";
-                array_push($activeFieldValueList, $activeFieldValue);
-            }
-        }
+        if ($rules)
+            $activeFieldValueList = $this->getActiveFieldValue($dataSet, $rules);
 
         #是否开启 数据映射功能
         #if available for data reformat
+        $regulatedDataSet = '';
         if (Config::get('umi.data_field_reformat'))
             $regulatedDataSet = $dataTypeOp->regulatedDataSet($dataSet);
 
         #数据表内容
         #table body
         $trBodyHtml = '';
+        $regulatedDataSet = $regulatedDataSet ?: $dataSet;
         if ($regulatedDataSet) {
             $pointer = 0;
             foreach ($regulatedDataSet as $ds) {
                 $trBodyHtml .= '<tr>';
-                $trBodyHtml .= $this->checkboxHtml();
-                foreach ($ds as $item => $value) {
+                //$trBodyHtml .= $this->checkboxHtml();
+                /*foreach ($ds as $item => $value) {
                     $trBodyHtml .= '<td>';
                     $trBodyHtml .= $value;
                     $trBodyHtml .= '</td>';
+                }*/
+                if (is_array($ds)) {
+                    foreach ($tHeads as $tHead) {
+                        $showField = $tHead->field;
+                        $trBodyHtml .= "<td>{$ds[$showField]}</td>";
+                    }
+                } else if (is_object($ds)) {
+                    foreach ($tHeads as $tHead) {
+                        $showField = $tHead->field;
+                        $trBodyHtml .= "<td>{$ds->$showField}</td>";
+                    }
                 }
 
                 #获取数据行的主键值
                 #get value of primary key of record
                 $primaryKey = Config::get('umi.primary_key');
                 $recordId = array_has($ds, $primaryKey) ? $dataSet->all()[$pointer]->$primaryKey : 0;
 
-                $activeFieldValue = $activeFieldValueList[$pointer];
+                $activeFieldValue = isset($activeFieldValueList[$pointer]) ? $activeFieldValueList[$pointer] : '';
                 $trBodyHtml .= $this->breadButtonHtml($recordId, $activeFieldValue);     //获取按钮 get button
                 $trBodyHtml .= '</tr>';
 
@@ -258,18 +256,6 @@ public function tableBody()
         return $html;
     }
 
-    public function getWhere()
-    {
-        if (\Request::isMethod('post')) {
-            #获取search_tab_id        #get search_tab_id
-            if (isset($_REQUEST['std'])) {
-                $search = new Search();
-                $searchList = $search->getSearchByTabId($_REQUEST['std'])->all();
-                return $searchList;
-            }
-        }
-    }
-
     public function tableFoot()
     {
         $html = <<< UMI
@@ -296,6 +282,18 @@ public function tableFoot()
         return $html;
     }
 
+    private function getWhere()
+    {
+        if (\Request::isMethod('post')) {
+            #获取search_tab_id        #get search_tab_id
+            if (isset($_REQUEST['std'])) {
+                $search = new Search();
+                $searchList = $search->getSearchByTabId($_REQUEST['std'])->all();
+                return $searchList;
+            }
+        }
+    }
+
     /**
      * @param $args - 获取url参数, 可以指定键值数组 get url args, can be array of key like ['id','key','search']
      * @return array - 参数的键值 the key
@@ -314,6 +312,31 @@ private function getArgs($args)
         return $arr;
     }
 
+    private function getActiveFieldValue($dataSet, $rules)
+    {
+        $activeFieldValueList = [];
+        foreach ($dataSet as $ds) {
+            $activeFieldValue = '';
+            foreach ($rules as $rule) {
+                $activeTableField = $rule->active_table_field;
+                if (!isset($ds->$activeTableField)) {
+                    Ym::showMessage('Warning', 'Detect the rule of relation operation somewhere is wrong for operating this table, Please correct or will not work', [
+                        'class_name' => 'gritter-error',
+                        'sticky'     => true
+                    ]);
+                    return [];
+                }
+                $dsActField = $ds->$activeTableField;
+                $activeFieldValue .= "\"$activeTableField\":\"$dsActField\",";
+            }
+            #转换成对象类型
+            #turn into object
+            $activeFieldValue = $activeFieldValue == '' ? '' : "{" . trim($activeFieldValue,',') . "}";
+            array_push($activeFieldValueList, $activeFieldValue);
+        }
+        return $activeFieldValueList;
+    }
+
     #region component
     private function checkboxHtml()
     {

src/Umi/Umi.php

@@ -51,7 +51,7 @@ public function getTableIdByTableName($tableName)
         return $this->table->getTableId($tableName);
     }
 
-    public function showMessage($title, $content = '', $options = [])
+    public function showMessage($title, $content = '', $options = [], $multiple = true)
     {
         #设置默认的样式为深绿色的界面 gritter-success
         #set default style as a gritter-success
@@ -72,7 +72,7 @@ public function showMessage($title, $content = '', $options = [])
             });
         </script>
 UMI;
-        if (Session::has('showMessage'))
+        if (Session::has('showMessage') && $multiple)
             $html .= Session::get('showMessage');
 
         Session::flash('showMessage', $html);

src/resources/assets/lte/lte/bower_components/Flot/.bower.json

@@ -0,0 +1,19 @@
+{
+  "name": "Flot",
+  "version": "0.8.3",
+  "main": "jquery.flot.js",
+  "dependencies": {
+    "jquery": ">= 1.2.6"
+  },
+  "homepage": "https://github.com/flot/flot",
+  "_release": "0.8.3",
+  "_resolution": {
+    "type": "version",
+    "tag": "v0.8.3",
+    "commit": "453b017cc5acfd75e252b93e8635f57f4196d45d"
+  },
+  "_source": "https://github.com/flot/flot.git",
+  "_target": "^0.8.3",
+  "_originalSource": "flot",
+  "_direct": true
+}

src/resources/assets/lte/lte/bower_components/Flot/.gitignore

@@ -0,0 +1,3 @@
+*.min.js
+!excanvas.min.js
+node_modules/

src/resources/assets/lte/lte/bower_components/Flot/.travis.yml

@@ -0,0 +1,3 @@
+language: node_js
+node_js:
+  - 0.8