修复管理员页面无法查看权限问题；修复表单block布局失效问题

jqhph · Nov 16, 2020 · e3a9f49 · e3a9f49
1 parent 9fda1e0
commit e3a9f49
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 18 deletions.
diff --git a/resources/views/grid/displayer/dialogtree.blade.php b/resources/views/grid/displayer/dialogtree.blade.php
@@ -6,13 +6,11 @@
     <i class='feather icon-align-right'></i> {{ trans('admin.view') }}
 </a>
 
-<template>
-    <template id="dialog-tree-tpl">
-        <div class="jstree-wrapper p-1" style="border:0"><div class="da-tree" style="margin-top:10px"></div></div>
-    </template>
+<template id="dialog-tree-tpl">
+    <div class="jstree-wrapper p-1" style="border:0"><div class="da-tree" style="margin-top:10px"></div></div>
 </template>
 
-<script require="jstree" once>
+<script require="@jstree" once>
     window.resolveDialogTree = function (options) {
         var tpl = $('#dialog-tree-tpl').html(),
             t = $(this),

diff --git a/src/Form/Field.php b/src/Form/Field.php
@@ -254,9 +254,7 @@ protected function formatLabel($arguments = [])
 
         $column = is_array($this->column) ? current($this->column) : $this->column;
 
-        $label = admin_trans_field($column);
-
-        return str_replace('_', ' ', $label);
+        return str_replace('_', ' ', admin_trans_field($column));
     }
 
     /**

diff --git a/src/Form/Layout.php b/src/Form/Layout.php
@@ -131,7 +131,7 @@ public function form(\Closure $callback = null)
 
         $form->disableResetButton();
         $form->disableSubmitButton();
-        $form->disableFormTag();
+        $form->useFormTag(false);
         $form->ajax(false);
 
         if ($callback) {

diff --git a/src/Grid/Column.php b/src/Grid/Column.php
@@ -58,8 +58,8 @@ class Column
     use Grid\Column\HasHeader;
     use Grid\Column\HasDisplayers;
     use Macroable {
-            __call as __macroCall;
-        }
+        __call as __macroCall;
+    }
 
     const SELECT_COLUMN_NAME = '__row_selector__';
     const ACTION_COLUMN_NAME = '__actions__';
@@ -410,13 +410,7 @@ public function getValue()
      */
     protected function formatLabel($label)
     {
-        if ($label) {
-            return $label;
-        }
-
-        $label = admin_trans_field($this->name);
-
-        return str_replace('_', ' ', $label);
+        return $label ?: str_replace('_', ' ', admin_trans_field($this->name));
     }
 
     /**