添加HTML组件

添加Card组件
添加Steps组件
添加Grid 头部 顶部 自定义组件
修改Grid树形展示

Author: SmallRuralDog

config/admin.php

@@ -98,7 +98,7 @@
     ],
     //操作日志
     'operation_log' => [
-        'enable' => true,
+        'enable' => false,
         /*
          * Only logging allowed methods in the list
          */

docs/components.md

@@ -8,6 +8,52 @@
 className('class-1 class-2');
 style(['width'=>'100px']);
 ```
+## 展示组件
+
+### 步骤条
+
+引导用户按照流程完成任务的分步导航条，可根据实际应用场景设定步骤，步骤不得少于 2 步。
+
+```php
+Steps::make()
+->simple(false)
+->active($order->orderStep())
+->processStatus("process")
+->alignCenter(true)
+->stepList(function (Collection $list) use ($order) {
+    //下单
+    $xd = Step::make()->title("下单");
+    $xd->description($order->created_at);
+    $list->push($xd);
+    //付款
+    $fk = Step::make()->title("付款");
+    $fk->description($order->pay_time);
+    $list->push($fk);
+    //发货
+    $fh = Step::make()->title("发货");
+    $fh->description($order->delivery_time);
+    $list->push($fh);
+    //收货
+    $sh = Step::make()->title("收货");
+    $sh->description($order->receipt_time);
+    $list->push($sh);
+    //完成
+    $wc = Step::make()->title("完成");
+    $wc->description($order->receipt_time);
+    $list->push($wc);
+}));
+```
+
+### HTML
+
+组件使用`v-html`渲染
+
+```php
+Html::make()->html("<div>......</div>");
+```
+
+
+
 ## 表格组件
 
 ### Tag 标签

docs/form.md

@@ -229,8 +229,14 @@ $form->saving(function (Form $form) {
     return \Admin::responseError("xxxx");
 });
 $form->saved(function (Form $form) {});
-$form->deleting(function (Form $form) {});
-$form->deleted(function (Form $form) {});
+
+$form->deleting(function (Form $form,$id) {
+    
+});
+
+$form->deleted(function (Form $form) {
+    
+});
 
 //表单验证时回调，用于处理复杂的表单验证
 $form->validating(function (Form $form, $validator) {

docs/grid.md

@@ -573,55 +573,25 @@ public function children() {
 ```
 以下代码开启树形展示模式
 ```php
-$grid->tree()
+$grid->tree();
+$grid->defaultExpandAll();//是否默认展开所有行
 ```
-开启拖拽排序功能
-```php
-//自定义拖拽完成接受地址
-$grid->tree()->draggable(route('admin.auth.menu.order'))
-```
-后端会接受到三个参数,可参考以下代码示例
-```php
-public function menuOrder(Request $request)
-{
-    try {
-        \Admin::validatorData($request->all(), [
-            'self' => 'required',//当前节点信息
-            'target' => 'required',//目标节点信息
-            'type' => ['required', Rule::in(["before", "after", "inner"])],//放置类型  前 后  插入
-        ]);
-    } catch (\Exception $exception) {
-        return \Admin::responseError($exception->getMessage());
-    }
 
-}
 
-```
 ### 关联模型
 >要成功显示关联模型的值，必须设置`with`的值
 
 要显示关联模型的值，使用`.`来获取关联模型的值，可以多级显示，最后一级为要显示的值
 #### 一对一
 ```php
-$grid->with(['permissions']);
 $grid->column('permissions.name'),
 ```
 #### 一对多
 一对多最终得到的是数组，前端会自动循环展示，文本建议使用`Tag`组件，图片建议使用`Avatar`或`Image`组件
 ```php
-$grid->with(['permissions']);
 $grid->column('permissions.name')->displayComponent(Tag::make()->type('info')),
 ```
-#### 多级显示
-```php
-$grid->with(['permissions','permissions.roles','permissions.roles.administrators']);
 
-$grid->column('permissions.name')->displayComponent(Tag::make()->type('info'));
-
-$grid->column('permissions.roles.name')->displayComponent(Tag::make()->type('info'));
-
-$grid->column('permissions.roles.administrators.name')->displayComponent(Tag::make()->type('info'));
-```
 
 ## 行操作
 
@@ -728,3 +698,25 @@ $toolbars->addRight(new MyRoghtTool());//添加在右侧
 
 
 
+## 头部内容
+
+可自定义Grid顶部内容，闭包返回一个content组件
+
+```php
+ $grid->top(function (Content $top){
+ 	$top->body(Card::make()->content(Html::make()->html("我是头部内容")));
+ });
+```
+
+
+
+## 底部内容
+
+可自定义Grid底部内容，闭包返回一个content组件
+
+```php
+ $grid->bottom(function (Content $bottom){
+ 	$bottom->body(Card::make()->content(Html::make()->html("我是头部内容")));
+ });
+```
+

public/app.js

@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=1543085b14bd62d505c1",
+    "/app.js": "/app.js?id=ebcf5ad45ebf6b98ef46",
     "/manifest.js": "/manifest.js?id=3c768977c2574a34506e",
     "/vendor.js": "/vendor.js?id=38a9d2f43b98aaf4f7dd"
 }

public/mix-manifest.json

@@ -105,4 +105,13 @@ Vue.component('ToolButton', ToolButton);
 
 //Widget
 import Divider from './components/widgets/Divider'
-Vue.component('Divider', Divider)
+Vue.component('Divider', Divider)
+
+import Card from './components/widgets/Card'
+Vue.component('Card', Card)
+
+import Steps from './components/widgets/Steps'
+Vue.component('Steps', Steps)
+
+import Html from './components/widgets/Html'
+Vue.component('Html', Html)

resources/js/components.js

@@ -1,5 +1,7 @@
 <template>
   <div class="grid-container">
+    <component v-if="attrs.top" :is="attrs.top.componentName" :attrs='attrs.top' />
+
     <el-card shadow="never" :body-style="{ padding: 0 }">
       <div class="grid-top-container">
         <div class="grid-top-container-left">
@@ -127,7 +129,7 @@
           :highlight-current-row="attrs.attributes.highlightCurrentRow"
           :empty-text="attrs.attributes.emptyText"
           :tooltip-effect="attrs.attributes.tooltipEffect"
-          :default-expand-all="true"
+          :default-expand-all="attrs.attributes.defaultExpandAll"
           @sort-change="onTableSortChange"
           @selection-change="onTableselectionChange"
         >
@@ -136,7 +138,8 @@
             align="center"
             type="selection"
           ></el-table-column>
-
+          <el-table-column v-if="attrs.tree" align="center" width="50">
+          </el-table-column>
           <template v-for="column in attrs.columnAttributes">
             <el-table-column
               :type="column.type"
@@ -173,9 +176,7 @@
             <template slot="header"></template>
             <template slot-scope="scope">
               <Actions
-                v-if="
-                  scope.row.grid_actions && !scope.row.grid_actions.hide
-                "
+                v-if="scope.row.grid_actions && !scope.row.grid_actions.hide"
                 :action_list="scope.row.grid_actions.data"
                 :scope="scope"
                 :key_name="attrs.keyName"
@@ -198,6 +199,7 @@
         />
       </div>
     </el-card>
+    <component v-if="attrs.bottom" :is="attrs.bottom.componentName" :attrs='attrs.bottom' />
   </div>
 </template>
 

resources/js/components/grid/Table.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-col :span="attrs.width">
+  <el-col :span="attrs.width" :style="attrs.style" :class="attrs.className">
     <component
       v-for="(content, index) in attrs.contents"
       :key="index"

resources/js/components/layout/Column.vue

@@ -1,7 +1,7 @@
 <template>
-  <el-row :gutter="attrs.gutter">
+  <el-row :gutter="attrs.gutter" :style="attrs.style" :class="attrs.className">
     <component
-      v-for="(column,index) in attrs.columns"
+      v-for="(column, index) in attrs.columns"
       :key="index"
       :is="column.componentName"
       :attrs="column"
@@ -17,5 +17,4 @@ export default {
 };
 </script>
 
-<style>
-</style>
+<style></style>