添加资源控制器接口

SmallRuralDog · SmallRuralDog · commit ecc55acefcc1 · 2020-03-06T15:01:27.000+08:00
diff --git a/public/app.js b/public/app.js
@@ -388,6 +388,29 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 /* harmony default export */ __webpack_exports__["default"] = ({
   props: {
@@ -1401,7 +1424,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 //
 //
 //
-//
 
 
 /* harmony default export */ __webpack_exports__["default"] = ({
@@ -1473,11 +1495,15 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
       });
     },
     onNodeDrop: function onNodeDrop(node, before, after, inner) {
+      var _this3 = this;
+
       this.$http.post(this.attrs.attributes.draggableUrl, {
         self: node.data,
         target: before.data,
         type: after
-      }).then(function () {});
+      }).then(function () {
+        _this3.$Message.success("排序成功");
+      });
       console.log(node);
       console.log(before);
       console.log(after);
@@ -27807,11 +27833,7 @@ var render = function() {
                           "el-button",
                           {
                             staticClass: "mr-10",
-                            attrs: {
-                              type: "primary",
-                              size: "medium",
-                              icon: "el-icon-plus"
-                            }
+                            attrs: { type: "primary", icon: "el-icon-plus" }
                           },
                           [_vm._v("新建")]
                         )
@@ -32897,8 +32919,9 @@ axios__WEBPACK_IMPORTED_MODULE_2___default.a.interceptors.response.use(function
   return data;
 }, function (_ref2) {
   var response = _ref2.response;
-  console.log(response.status); // 对响应错误做点什么
 
+  //console.log(response.status);
+  // 对响应错误做点什么
   switch (response.status) {
     case 404:
       view_design_src_components_notice__WEBPACK_IMPORTED_MODULE_0__["default"].error({
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=6c8d28b670b7528d3aef",
+    "/app.js": "/app.js?id=fe8a9b23760b6394bc45",
     "/manifest.js": "/manifest.js?id=d9708e48a6c10ccee4bb",
     "/vendor.js": "/vendor.js?id=f4679ac178c0e413cb28"
 }
diff --git a/resources/js/components/Root.vue b/resources/js/components/Root.vue
@@ -4,8 +4,8 @@
       <el-aside
         ref="contentSide"
         class="content-side"
-        :class="{'content-side-fixed':fixedSide,'side-dark':isDark}"
-        :width="isCollapsed?'64px':'200px'"
+        :class="{ 'content-side-fixed': fixedSide, 'side-dark': isDark }"
+        :width="isCollapsed ? '64px' : '200px'"
       >
         <div class="content-side-logo">
           <template v-if="!isCollapsed">
@@ -19,36 +19,56 @@
           <el-menu
             :default-active="route"
             :collapse="isCollapsed"
-            :background-color="isDark?'#1d1e23':''"
-            :text-color="isDark?'#ffffff':''"
+            :background-color="isDark ? '#1d1e23' : ''"
+            :text-color="isDark ? '#ffffff' : ''"
             :collapse-transition="false"
             :router="true"
             unique-opened
           >
             <template v-for="menu in page_data.menu">
-              <MenuItem :menu="menu" :key="menu.id" :is_collapsed="isCollapsed" />
+              <MenuItem
+                :menu="menu"
+                :key="menu.id"
+                :is_collapsed="isCollapsed"
+              />
             </template>
           </el-menu>
         </el-scrollbar>
       </el-aside>
       <el-container
-        :class="{'el-container-fixed':fixedSide,'el-container-fixed-collapsed':isCollapsed}"
+        :class="{
+          'el-container-fixed': fixedSide,
+          'el-container-fixed-collapsed': isCollapsed
+        }"
       >
         <el-header
-          :style="{padding: 0}"
+          :style="{ padding: 0 }"
           class="layout-header-bar"
-          :class="{'layout-header-bar-dark':isDarkHeader,'layout-header-bar-fixed':fixedHeader,'layout-header-bar-fixed-collapsed':isCollapsed}"
+          :class="{
+            'layout-header-bar-dark': isDarkHeader,
+            'layout-header-bar-fixed': fixedHeader,
+            'layout-header-bar-fixed-collapsed': isCollapsed
+          }"
           height="55px"
         >
           <div class="layout-header-l">
             <div class="layout-header-trigger hover" @click="collapsedSide">
-              <i class="el-icon-s-fold fs-20 menu-icon" :class="{'rotate-icon':isCollapsed}" />
+              <i
+                class="el-icon-s-fold fs-20 menu-icon"
+                :class="{ 'rotate-icon': isCollapsed }"
+              />
             </div>
             <div class="layout-header-breadcrumb">
               <el-breadcrumb separator="/">
-                <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+                <el-breadcrumb-item :to="{ path: '/' }"
+                  >首页</el-breadcrumb-item
+                >
                 <template v-for="menu in page_data.menuList">
-                  <el-breadcrumb-item v-if="menu.route==route" :key="menu.route">{{menu.title}}</el-breadcrumb-item>
+                  <el-breadcrumb-item
+                    v-if="menu.route == route"
+                    :key="menu.route"
+                    >{{ menu.title }}</el-breadcrumb-item
+                  >
                 </template>
               </el-breadcrumb>
             </div>
@@ -58,7 +78,9 @@
               <el-dropdown>
                 <div class="layout-header-user">
                   <el-avatar :src="page_data.user.avatar" :size="25" />
-                  <span class="layout-header-user-name">{{page_data.user.name}}</span>
+                  <span class="layout-header-user-name">{{
+                    page_data.user.name
+                  }}</span>
                 </div>
                 <el-dropdown-menu slot="dropdown">
                   <a>
@@ -77,14 +99,14 @@
               </el-dropdown>
             </div>
             <div
-              @click="showAdminSet=true"
+              @click="showAdminSet = true"
               class="layout-header-trigger layout-header-trigger-min hover"
             >
               <i class="el-icon-setting icon-btn"></i>
             </div>
           </div>
         </el-header>
-        <el-main :class="{'el-main-fixed':fixedHeader}">
+        <el-main :class="{ 'el-main-fixed': fixedHeader }">
           <div class="layout-content-main">
             <transition name="fade-transform" mode="out-in">
               <router-view></router-view>
@@ -94,13 +116,14 @@
         <el-footer class="admin-footer">
           <div class="footer-links">
             <el-link
-              v-for="(item,index) in page_data.footerLinks"
+              v-for="(item, index) in page_data.footerLinks"
               :key="index"
               type="text"
               :href="item.href"
               target="_blank"
               :underline="false"
-            >{{item.title}}</el-link>
+              >{{ item.title }}</el-link
+            >
           </div>
           <div v-html="page_data.copyright"></div>
         </el-footer>
@@ -115,7 +138,7 @@
           <div>
             <el-tooltip content="亮色菜单风格" placement="top">
               <el-image
-                @click="isDark=false"
+                @click="isDark = false"
                 class="hover"
                 src="https://gw.alipayobjects.com/zos/antfincdn/NQ%24zoisaD2/jpRkZQMyYRryryPNtyIC.svg"
               />
@@ -126,7 +149,7 @@
           <div class="ml-20">
             <el-tooltip content="暗色菜单风格" placement="top">
               <el-image
-                @click="isDark=true"
+                @click="isDark = true"
                 class="hover"
                 src="https://gw.alipayobjects.com/zos/antfincdn/XwFOFbLkSM/LCkqqYNmvBEbokSDscrm.svg"
               />
@@ -136,7 +159,7 @@
       </div>
       <div class="mt-30">
         <el-badge type="success" is-dot :hidden="isDarkHeader">
-          <div @click="isDarkHeader=false">
+          <div @click="isDarkHeader = false">
             <el-tooltip content="亮色顶栏风格" placement="top">
               <el-image
                 class="hover"
@@ -146,7 +169,7 @@
           </div>
         </el-badge>
         <el-badge type="success" is-dot :hidden="!isDarkHeader">
-          <div class="ml-20" @click="isDarkHeader=true">
+          <div class="ml-20" @click="isDarkHeader = true">
             <el-tooltip content="暗色顶栏风格" placement="top">
               <el-image
                 class="hover"
@@ -253,7 +276,7 @@ export default {
 };
 </script>
 
-<style lang="scss" >
+<style lang="scss">
 $header-bar-height: 55px;
 .admin-layout {
   min-height: 100vh;
diff --git a/resources/js/components/grid/Tree.vue b/resources/js/components/grid/Tree.vue
@@ -28,7 +28,6 @@
             <el-button
               type="primary"
               class="mr-10"
-              size="medium"
               icon="el-icon-plus"
               >新建</el-button
             >
@@ -159,7 +158,9 @@ export default {
           target: before.data,
           type: after
         })
-        .then(() => {});
+        .then(() => {
+          this.$Message.success("排序成功")
+        });
 
       console.log(node);
       console.log(before);
diff --git a/resources/js/util/axios.js b/resources/js/util/axios.js
@@ -49,7 +49,7 @@ axios.interceptors.response.use(
         return data;
     },
     ({ response }) => {
-        console.log(response.status);
+        //console.log(response.status);
         // 对响应错误做点什么
         switch (response.status) {
             case 404:
diff --git a/src/Admin.php b/src/Admin.php
@@ -67,9 +67,10 @@ public function menu()
         /** @var Menu $menuModel */
         $menuModel = new $menuClass();
 
+        $allNodes = $menuModel->allNodes();
 
 
-        return $this->menu = $menuModel->buildNestedArray($menuModel->allNodes());
+        return $this->menu = $menuModel->buildNestedArray($allNodes);
     }
 
     public function menuList()
@@ -83,7 +84,10 @@ public function menuList()
         /** @var Menu $menuModel */
         $menuModel = new $menuClass();
 
+
+
         return $this->menuList = $menuModel->get(['uri', 'title']);
+
     }
 
 
diff --git a/src/Controllers/AdminResource.php b/src/Controllers/AdminResource.php
@@ -0,0 +1,13 @@
+<?php
+
+
+namespace SmallRuralDog\Admin\Controllers;
+
+
+interface AdminResource
+{
+    public function grid();
+
+    public function form();
+
+}
diff --git a/src/Controllers/MenuController.php b/src/Controllers/MenuController.php
@@ -98,7 +98,7 @@ protected function form()
         $form = new Form(new $model());
         $items = [
             $form->item('parent_id', '上级目录')->displayComponent(Select::make(0)->options(function () use ($model) {
-                return $model::query()->where('parent_id', 0)->get()->map(function ($item) {
+                return $model::query()->where('parent_id', 0)->orderBy('order')->get()->map(function ($item) {
                     return SelectOption::make($item->id, $item->title);
                 })->prepend(SelectOption::make(0, '根目录'));
             })),
diff --git a/src/Controllers/PermissionController.php b/src/Controllers/PermissionController.php
@@ -32,16 +32,16 @@ protected function grid()
 
         $grid->columns([
             $grid->column('id', 'ID')->sortable()->width('80px'),
-            $grid->column('slug', trans('admin::admin.slug')),
-            $grid->column('name', trans('admin::admin.name')),
+            $grid->column('slug', trans('admin::admin.slug'))->width(120),
+            $grid->column('name', trans('admin::admin.name'))->width(120),
             $grid->column('http_method', trans('admin::admin.http_method'))->displayComponent(Tag::make()),
             $grid->column('http_path', trans('admin::admin.route'))->customValue(function ($row, $value) {
                 return explode("\n", $value);
             })->displayComponent(function () {
                 return Tag::make();
             }),
-            $grid->column('created_at', trans('admin::admin.created_at')),
-            $grid->column('updated_at', trans('admin::admin.updated_at'))
+            //$grid->column('created_at', trans('admin::admin.created_at')),
+            //$grid->column('updated_at', trans('admin::admin.updated_at'))
         ]);
         return $grid;
     }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "/app.js": "/app.js?id=6c8d28b670b7528d3aef",`
	`2`	`+ "/app.js": "/app.js?id=fe8a9b23760b6394bc45",`
`3`	`3`	`"/manifest.js": "/manifest.js?id=d9708e48a6c10ccee4bb",`
`4`	`4`	`"/vendor.js": "/vendor.js?id=f4679ac178c0e413cb28"`
`5`	`5`	`}`