update multipleUI frame

use interface to discribe all the builders
taoyu65 · Aug 16, 2017 · 7b5f909 · 7b5f909
1 parent 6e1053e
commit 7b5f909
Show file tree

Hide file tree

Showing 21 changed files with 121 additions and 31 deletions.
diff --git a/src/Umi/Contracts/PageBuilder/dataTableInterface.php b/src/Umi/Contracts/PageBuilder/dataTableInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace YM\Umi\Contracts\PageBuilder;
+
+interface dataTableInterface
+{
+    public function tableHeadAlert();
+
+    public function tableHead();
+
+    public function tableBody();
+
+    public function tableFoot();
+}
diff --git a/src/Umi/Contracts/PageBuilder/fieldDisplayInterface.php b/src/Umi/Contracts/PageBuilder/fieldDisplayInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace YM\Umi\Contracts\PageBuilder;
+
+interface fieldDisplayInterface
+{
+    public function showExistRecords($tableName, $tableId);
+}
diff --git a/src/Umi/Contracts/PageBuilder/masterPageInterface.php b/src/Umi/Contracts/PageBuilder/masterPageInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace YM\Umi\Contracts\PageBuilder;
+
+interface masterPageInterface
+{
+    public function masterPageHead();
+
+    public function masterPageBody();
+
+    public function masterPageFoot();
+}
diff --git a/src/Umi/Contracts/PageBuilder/menusInterface.php b/src/Umi/Contracts/PageBuilder/menusInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace YM\Umi\Contracts\PageBuilder;
+
+interface menusInterface
+{
+    public function AllMenus();
+
+    /**
+     * 根据不同的json加载不同菜单
+     * load different menus according to the json
+     * @param string $json
+     *              - 为空    : 根据当前用户从数据库加载json  get json by search from database according to current user
+     *              - 不为空   : 根据参数加载json    get json by the parameter has given
+     * @return string
+     * @throws Exception
+     */
+    public function Menus($json = '');
+}
diff --git a/src/Umi/Contracts/PageBuilder/nestableInterface.php b/src/Umi/Contracts/PageBuilder/nestableInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace YM\Umi\Contracts\PageBuilder;
+
+interface nestableInterface
+{
+    public function showDragDropTree($tableName, $showButton = false, $buttonException = []);
+
+    public function showDragDropTreeByJson($jsonArr);
+}
diff --git a/src/Umi/Contracts/PageBuilder/searchInterface.php b/src/Umi/Contracts/PageBuilder/searchInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace YM\Umi\Contracts\PageBuilder;
+
+interface searchInterface
+{
+    public function searchHtml();
+}
diff --git a/src/Umi/Contracts/PageBuilder/tableBreadInterface.php b/src/Umi/Contracts/PageBuilder/tableBreadInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace YM\Umi\Contracts\PageBuilder;
+
+interface tableBreadInterface
+{
+    public function display($records, $defaultValue, $buttonType);
+}
diff --git a/src/Umi/PageBuilder/umiDataTableBuilder_ACE.php b/src/Umi/PageBuilder/umiDataTableBuilder_ACE.php
@@ -8,10 +8,11 @@
 use YM\Models\UmiModel;
 use YM\Facades\Umi as Ym;
 use YM\Umi\Admin\AdminStrategy;
+use YM\Umi\Contracts\PageBuilder\dataTableInterface;
 use YM\umiAuth\Facades\umiAuth;
 use YM\Umi\DataTable\DataType\DataTypeOperation;
 
-class umiDataTableBuilder_ACE
+class umiDataTableBuilder_ACE implements dataTableInterface
 {
     private $browser;
     private $read;
@@ -116,9 +117,6 @@ public function tableHeadSuperAdmin()
         return $html;
     }
 
-    /**
-     * @return string
-     */
     public function tableBody()
     {
         #是否有权限浏览表格数据
@@ -257,18 +255,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
@@ -295,6 +281,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

diff --git a/src/Umi/PageBuilder/umiDataTableBuilder_LTE.php b/src/Umi/PageBuilder/umiDataTableBuilder_LTE.php
@@ -8,10 +8,11 @@
 use YM\Models\UmiModel;
 use YM\Facades\Umi as Ym;
 use YM\Umi\Admin\AdminStrategy;
+use YM\Umi\Contracts\PageBuilder\dataTableInterface;
 use YM\umiAuth\Facades\umiAuth;
 use YM\Umi\DataTable\DataType\DataTypeOperation;
 
-class umiDataTableBuilder_LTE
+class umiDataTableBuilder_LTE implements dataTableInterface
 {
     private $browser;
     private $read;

diff --git a/src/Umi/PageBuilder/umiFieldDisplayBuilder_ACE.php b/src/Umi/PageBuilder/umiFieldDisplayBuilder_ACE.php
@@ -4,8 +4,9 @@
 
 use YM\Models\UmiModel;
 use YM\Facades\Umi as Ym;
+use YM\Umi\Contracts\PageBuilder\fieldDisplayInterface;
 
-class umiFieldDisplayBuilder_ACE
+class umiFieldDisplayBuilder_ACE implements fieldDisplayInterface
 {
     public function showExistRecords($tableName, $tableId)
     {

diff --git a/src/Umi/PageBuilder/umiFieldDisplayBuilder_LTE.php b/src/Umi/PageBuilder/umiFieldDisplayBuilder_LTE.php
@@ -4,8 +4,9 @@
 
 use YM\Models\UmiModel;
 use YM\Facades\Umi as Ym;
+use YM\Umi\Contracts\PageBuilder\fieldDisplayInterface;
 
-class umiFieldDisplayBuilder_LTE
+class umiFieldDisplayBuilder_LTE implements fieldDisplayInterface
 {
     public function showExistRecords($tableName, $tableId)
     {

diff --git a/src/Umi/PageBuilder/umiMasterPageBuilder_ACE.php b/src/Umi/PageBuilder/umiMasterPageBuilder_ACE.php
@@ -4,8 +4,9 @@
 
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\URL;
+use YM\Umi\Contracts\PageBuilder\masterPageInterface;
 
-class umiMasterPageBuilder_ACE
+class umiMasterPageBuilder_ACE implements masterPageInterface
 {
     public function masterPageHead()
     {

diff --git a/src/Umi/PageBuilder/umiMasterPageBuilder_LTE.php b/src/Umi/PageBuilder/umiMasterPageBuilder_LTE.php
@@ -4,8 +4,9 @@
 
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\URL;
+use YM\Umi\Contracts\PageBuilder\masterPageInterface;
 
-class umiMasterPageBuilder_LTE
+class umiMasterPageBuilder_LTE implements masterPageInterface
 {
     public function masterPageHead()
     {

diff --git a/src/Umi/PageBuilder/umiMenusBuilder_ACE.php b/src/Umi/PageBuilder/umiMenusBuilder_ACE.php
@@ -7,8 +7,9 @@
 use Exception;
 use YM\Models\User;
 use YM\Facades\Umi as YM;
+use YM\Umi\Contracts\PageBuilder\menusInterface;
 
-class umiMenusBuilder_ACE
+class umiMenusBuilder_ACE implements menusInterface
 {
     private $menus;
 
@@ -280,7 +281,7 @@ private function getStyle($menuLevel)
 
     #获取此用户的menu的json值
     #get this user's json of menu
-    public function menusJson()
+    private function menusJson()
     {
         $user = new User();
         return $user->menusJson();

diff --git a/src/Umi/PageBuilder/umiMenusBuilder_LTE.php b/src/Umi/PageBuilder/umiMenusBuilder_LTE.php
@@ -7,8 +7,9 @@
 use Exception;
 use YM\Models\User;
 use YM\Facades\Umi as YM;
+use YM\Umi\Contracts\PageBuilder\menusInterface;
 
-class umiMenusBuilder_LTE
+class umiMenusBuilder_LTE implements menusInterface
 {
     private $menus;
 
@@ -280,7 +281,7 @@ private function getStyle($menuLevel)
 
     #获取此用户的menu的json值
     #get this user's json of menu
-    public function menusJson()
+    private function menusJson()
     {
         $user = new User();
         return $user->menusJson();

diff --git a/src/Umi/PageBuilder/umiNestableBuilder_ACE.php b/src/Umi/PageBuilder/umiNestableBuilder_ACE.php
@@ -5,8 +5,9 @@
 use YM\Models\Menu;
 use YM\Models\TableRelationOperation;
 use YM\Facades\Umi as YM;
+use YM\Umi\Contracts\PageBuilder\nestableInterface;
 
-class umiNestableBuilder_ACE
+class umiNestableBuilder_ACE implements nestableInterface
 {
     private $tableName;
     private $relationOperationRuleList;

diff --git a/src/Umi/PageBuilder/umiNestableBuilder_LTE.php b/src/Umi/PageBuilder/umiNestableBuilder_LTE.php
@@ -5,8 +5,9 @@
 use YM\Models\Menu;
 use YM\Models\TableRelationOperation;
 use YM\Facades\Umi as YM;
+use YM\Umi\Contracts\PageBuilder\nestableInterface;
 
-class umiNestableBuilder_LTE
+class umiNestableBuilder_LTE implements nestableInterface
 {
     private $tableName;
     private $relationOperationRuleList;

diff --git a/src/Umi/PageBuilder/umiSearchBuilder_ACE.php b/src/Umi/PageBuilder/umiSearchBuilder_ACE.php
@@ -4,8 +4,9 @@
 use YM\Models\Search;
 use YM\Models\SearchTab;
 use YM\Facades\Umi as Ym;
+use YM\Umi\Contracts\PageBuilder\searchInterface;
 
-class umiSearchBuilder_ACE
+class umiSearchBuilder_ACE implements searchInterface
 {
     private $contentList = [];
     private $firstIcon;

diff --git a/src/Umi/PageBuilder/umiSearchBuilder_LTE.php b/src/Umi/PageBuilder/umiSearchBuilder_LTE.php
@@ -4,8 +4,9 @@
 use YM\Models\Search;
 use YM\Models\SearchTab;
 use YM\Facades\Umi as Ym;
+use YM\Umi\Contracts\PageBuilder\searchInterface;
 
-class umiSearchBuilder_LTE
+class umiSearchBuilder_LTE implements searchInterface
 {
     private $contentList = [];
     private $firstIcon;

diff --git a/src/Umi/PageBuilder/umiTableBreadBuilder_ACE.php b/src/Umi/PageBuilder/umiTableBreadBuilder_ACE.php
@@ -3,9 +3,10 @@
 namespace YM\Umi\PageBuilder;
 
 use YM\Facades\Umi as YM;
+use YM\Umi\Contracts\PageBuilder\tableBreadInterface;
 use YM\Umi\FactoryDataType;
 
-class umiTableBreadBuilder_ACE
+class umiTableBreadBuilder_ACE implements tableBreadInterface
 {
     private $dataTypeFactory;
 

diff --git a/src/Umi/PageBuilder/umiTableBreadBuilder_LTE.php b/src/Umi/PageBuilder/umiTableBreadBuilder_LTE.php
@@ -3,9 +3,10 @@
 namespace YM\Umi\PageBuilder;
 
 use YM\Facades\Umi as YM;
+use YM\Umi\Contracts\PageBuilder\tableBreadInterface;
 use YM\Umi\FactoryDataType;
 
-class umiTableBreadBuilder_LTE
+class umiTableBreadBuilder_LTE implements tableBreadInterface
 {
     private $dataTypeFactory;