diff --git a/src/Config/umiEnum.php b/src/Config/umiEnum.php index 5cabef9..060a0e3 100644 --- a/src/Config/umiEnum.php +++ b/src/Config/umiEnum.php @@ -170,7 +170,7 @@ 'table_id', 'tab_title', 'order', 'created_at', 'updated_at' ], 'umi_table_relation_operation'=> [ - 'rule_name', 'customer_rule_name', 'operation_type', 'active_table_id', 'active_table_field', 'response_table_id', 'response_table_field', 'check_value', 'check_operation', 'is_extra_operation', 'details', 'created_at', 'updated_at' + 'rule_name', 'custom_rule_name', 'operation_type', 'active_table_id', 'active_table_field', 'response_table_id', 'response_table_field', 'check_value', 'check_operation', 'is_extra_operation', 'details', 'created_at', 'updated_at' ], 'umi_tables' => [ 'table_name', 'type', 'created_at', 'updated_at' diff --git a/src/Umi/PageBuilder/umiDataTableBuilder_LTE.php b/src/Umi/PageBuilder/umiDataTableBuilder_LTE.php index 1ea83c2..52a0ef3 100644 --- a/src/Umi/PageBuilder/umiDataTableBuilder_LTE.php +++ b/src/Umi/PageBuilder/umiDataTableBuilder_LTE.php @@ -23,11 +23,11 @@ class umiDataTableBuilder_LTE implements dataTableInterface private $tableName; #按钮样式 style of button - protected $BtnCssDelete = 'btn btn-sm btn-danger'; - protected $BtnCssNew = 'btn btn-sm btn-success'; - protected $BtnCssSmallEdit = 'btn btn-xs btn-info'; - protected $BtnCssSmallRead = 'btn btn-xs btn-warning'; - protected $BtnCssSmallDelete = 'btn btn-xs btn-danger'; + protected $BtnCssDelete = 'btn btn-danger btn-flat'; + protected $BtnCssNew = 'btn bg-olive btn-flat'; + protected $BtnCssSmallEdit = 'btn btn-sm btn-primary btn-flat'; + protected $BtnCssSmallRead = 'btn btn-sm btn-warning btn-flat'; + protected $BtnCssSmallDelete = 'btn btn-sm btn-danger btn-flat'; #默认数据表主键为id 可以通过继承修改 #default data table's primary key is id, can be changed by inheriting this class @@ -71,14 +71,14 @@ public function __construct() public function tableHeadAlert() { $html = << - - This is Table's head! - This alert needs your attention, but it's not super important. -
- +
+ + This is Table's head! + This alert needs your attention, but it's not super important. +
+
UMI; return $html; } @@ -229,26 +229,17 @@ public function tableBody() } } $html = << -
- - +
+
+
+
- $tHeadHtml - - - $trBodyHtml - -
+ +
UMI; @@ -259,14 +250,14 @@ public function tableBody() public function tableFoot() { $html = <<< UMI -
+

- - + + This is Table's Foot You can customize this footer.
@@ -274,8 +265,8 @@ public function tableFoot()

- - + +

UMI; @@ -360,37 +351,37 @@ private function breadButtonHtml($recordId, $activeFieldValue) $buttonSmallEdit = $this->ButtonSmallEdit($recordId, $activeFieldValue); $buttonSmallRead = $this->ButtonSmallRead($recordId, $activeFieldValue); $buttonSmallDelete = $this->ButtonSmallDelete($recordId, $activeFieldValue); - $linkHideEdit = $this->LinkHideEdit($recordId, $activeFieldValue); + /*$linkHideEdit = $this->LinkHideEdit($recordId, $activeFieldValue); $linkHideDelete = $this->LinkHideDelete($recordId, $activeFieldValue); - $linkHideRead = $this->LinkHideRead($recordId, $activeFieldValue); + $linkHideRead = $this->LinkHideRead($recordId, $activeFieldValue);*/ $html = << - + */ + return $html; } @@ -409,7 +400,7 @@ private function ButtonAddHtml($disable = '') $addUrl = url('adding'). "/$this->tableName"; $html = << - + New UMI; @@ -430,9 +421,9 @@ private function ButtonDeleteHtml($disable = '') { $html = << - + Delete - +   UMI; return $html; } @@ -456,8 +447,8 @@ private function ButtonSmallEditHtml($recordId, $activeFieldValue, $disable = '' $html = << - - + +   UMI; return $html; } @@ -479,8 +470,8 @@ private function ButtonSmallReadHtml($recordId, $activeFieldValue, $disable = '' $html = << - - + +   UMI; return $html; } @@ -505,8 +496,8 @@ private function ButtonSmallDeleteHtml($recordId, $activeFieldValue, $disable = $html = << - - + +   UMI; return $html; } @@ -643,15 +634,15 @@ private function LinkHideDeleteHtml($recordId, $activeFieldValue, $disable = '') */ private function wrongMessage($message, $url = '') { - $showingButton = $url === '' ? '' : '

'; + $showingButton = $url === '' ? '' : '

'; $html = << - + Oh whoops! $message diff --git a/src/Umi/PageBuilder/umiFieldDisplayBuilder_LTE.php b/src/Umi/PageBuilder/umiFieldDisplayBuilder_LTE.php index 2da38ea..0fb0ad8 100644 --- a/src/Umi/PageBuilder/umiFieldDisplayBuilder_LTE.php +++ b/src/Umi/PageBuilder/umiFieldDisplayBuilder_LTE.php @@ -36,7 +36,7 @@ public function showExistRecords($tableName, $tableId) } $url = url('editing') . "/$tableName/$record->id"; $TR .= " "; - $TR .= ""; + $TR .= ""; $TR .= ""; array_push($existFields, $record->field); @@ -57,15 +57,11 @@ public function showExistRecords($tableName, $tableId) $html = << - - - - $TH - - - - $TR - +
+ + $TH + + $TR
+ UMI; return $html; } diff --git a/src/Umi/PageBuilder/umiTableBreadBuilder_LTE.php b/src/Umi/PageBuilder/umiTableBreadBuilder_LTE.php index 98b7926..5cfeeeb 100644 --- a/src/Umi/PageBuilder/umiTableBreadBuilder_LTE.php +++ b/src/Umi/PageBuilder/umiTableBreadBuilder_LTE.php @@ -90,11 +90,9 @@ private function rowForEditAdd($record, $defaultValue) $html =<< - -
-
- $input -
+ +
+ $input
$popover
@@ -121,11 +119,9 @@ private function rowForRead($record, $defaultValue) $html =<< - -
-
- $input -
+ +
+ $input
@@ -140,7 +136,7 @@ private function popoverInfo($title, $content) return ''; $html =<<
@@ -69,10 +72,10 @@ data-trigger="hover" style="transform: translate(0,4px);" data-placement="auto right" title="Operation Type" data-content="{{trans('umiTrans::relation.actionInfo')}}"> +
-
{{--active table--}}
@@ -89,6 +92,7 @@ data-trigger="hover" style="transform: translate(0,4px);" data-placement="auto right" title="Active Table" data-content="{{trans('umiTrans::relation.activeTableInfo')}}"> +
@@ -102,6 +106,7 @@ data-trigger="hover" style="transform: translate(0,4px);" data-placement="auto right" title="Active Field" data-content="{{trans('umiTrans::relation.activeFieldInfo')}}"> +
@@ -121,6 +126,7 @@ data-trigger="hover" style="transform: translate(0,4px);" data-placement="auto right" title="Response Table" data-content="{{trans('umiTrans::relation.responseTableInfo')}}"> +
@@ -134,6 +140,7 @@ data-trigger="hover" style="transform: translate(0,4px);" data-placement="auto right" title="Response Field" data-content="{{trans('umiTrans::relation.responseFieldInfo')}}"> +
@@ -143,9 +150,7 @@
+
@@ -204,87 +210,22 @@ + - - + + - - + + - - + + - - + @endsection diff --git a/src/resources/views/lte/table/umiTableAll.blade.php b/src/resources/views/lte/table/umiTableAll.blade.php index 762d562..42a75b9 100644 --- a/src/resources/views/lte/table/umiTableAll.blade.php +++ b/src/resources/views/lte/table/umiTableAll.blade.php @@ -1,57 +1,46 @@ @extends('umi::layouts.master') @section('content') -
-

- UMI Tables - - - Data Table Manage & Search - -

-
-
- - -
-
-

Raw denim you probably haven't heard of them jean shorts Austin.

-
- -
-

Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid.

-
- - @endsection \ No newline at end of file diff --git a/src/resources/views/lte/table/umiTableDeleting.blade.php b/src/resources/views/lte/table/umiTableDeleting.blade.php index 034c2fc..fe7d4c3 100644 --- a/src/resources/views/lte/table/umiTableDeleting.blade.php +++ b/src/resources/views/lte/table/umiTableDeleting.blade.php @@ -2,42 +2,42 @@ @section('content') -
-

- - Delete Confirmation -

- - {!! $message !!} - @if (!$actionAvailable) -
- Currently you can not delete this record until meet the requirement ! -

- - -

-
- @else -
- Confirm to delete this record? -

-

- {!! csrf_field() !!} - - - - - - - -
+
+
+
+

Delete Confirmation

+
+
+ {!! $message !!} + @if (!$actionAvailable) +
+ Currently you can not delete this record until meet the requirement ! +

+ + +

+
+ @else +
+ Confirm to delete this record? +

+

+
+ {!! csrf_field() !!} + + + + + + + +

-
- @endif - + @endif +
- - + - + @endsection diff --git a/src/resources/views/lte/table/umiTableReading.blade.php b/src/resources/views/lte/table/umiTableReading.blade.php index 2d290db..d911390 100644 --- a/src/resources/views/lte/table/umiTableReading.blade.php +++ b/src/resources/views/lte/table/umiTableReading.blade.php @@ -2,17 +2,15 @@ @section('content') -
-

- - Read Fields -

-
-

+
+

+
+

Read Fields

+
+
{!! $display !!}
-