Skip to content

Commit 97a5830

Browse files
committed
修改内置资源的 Grid Label名称
1 parent ddea7f8 commit 97a5830

File tree

9 files changed

+120686
-41
lines changed

9 files changed

+120686
-41
lines changed

public/app.js

Lines changed: 41396 additions & 1 deletion
Large diffs are not rendered by default.

public/manifest.js

Lines changed: 154 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,154 @@
1-
!function(e){function r(r){for(var n,l,f=r[0],i=r[1],a=r[2],c=0,s=[];c<f.length;c++)l=f[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,f=1;f<t.length;f++){var i=t[f];0!==o[i]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var f=window.webpackJsonp=window.webpackJsonp||[],i=f.push.bind(f);f.push=r,f=f.slice();for(var a=0;a<f.length;a++)r(f[a]);var p=i;t()}([]);
1+
/******/ (function(modules) { // webpackBootstrap
2+
/******/ // install a JSONP callback for chunk loading
3+
/******/ function webpackJsonpCallback(data) {
4+
/******/ var chunkIds = data[0];
5+
/******/ var moreModules = data[1];
6+
/******/ var executeModules = data[2];
7+
/******/
8+
/******/ // add "moreModules" to the modules object,
9+
/******/ // then flag all "chunkIds" as loaded and fire callback
10+
/******/ var moduleId, chunkId, i = 0, resolves = [];
11+
/******/ for(;i < chunkIds.length; i++) {
12+
/******/ chunkId = chunkIds[i];
13+
/******/ if(Object.prototype.hasOwnProperty.call(installedChunks, chunkId) && installedChunks[chunkId]) {
14+
/******/ resolves.push(installedChunks[chunkId][0]);
15+
/******/ }
16+
/******/ installedChunks[chunkId] = 0;
17+
/******/ }
18+
/******/ for(moduleId in moreModules) {
19+
/******/ if(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {
20+
/******/ modules[moduleId] = moreModules[moduleId];
21+
/******/ }
22+
/******/ }
23+
/******/ if(parentJsonpFunction) parentJsonpFunction(data);
24+
/******/
25+
/******/ while(resolves.length) {
26+
/******/ resolves.shift()();
27+
/******/ }
28+
/******/
29+
/******/ // add entry modules from loaded chunk to deferred list
30+
/******/ deferredModules.push.apply(deferredModules, executeModules || []);
31+
/******/
32+
/******/ // run deferred modules when all chunks ready
33+
/******/ return checkDeferredModules();
34+
/******/ };
35+
/******/ function checkDeferredModules() {
36+
/******/ var result;
37+
/******/ for(var i = 0; i < deferredModules.length; i++) {
38+
/******/ var deferredModule = deferredModules[i];
39+
/******/ var fulfilled = true;
40+
/******/ for(var j = 1; j < deferredModule.length; j++) {
41+
/******/ var depId = deferredModule[j];
42+
/******/ if(installedChunks[depId] !== 0) fulfilled = false;
43+
/******/ }
44+
/******/ if(fulfilled) {
45+
/******/ deferredModules.splice(i--, 1);
46+
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
47+
/******/ }
48+
/******/ }
49+
/******/
50+
/******/ return result;
51+
/******/ }
52+
/******/
53+
/******/ // The module cache
54+
/******/ var installedModules = {};
55+
/******/
56+
/******/ // object to store loaded and loading chunks
57+
/******/ // undefined = chunk not loaded, null = chunk preloaded/prefetched
58+
/******/ // Promise = chunk loading, 0 = chunk loaded
59+
/******/ var installedChunks = {
60+
/******/ "/manifest": 0
61+
/******/ };
62+
/******/
63+
/******/ var deferredModules = [];
64+
/******/
65+
/******/ // The require function
66+
/******/ function __webpack_require__(moduleId) {
67+
/******/
68+
/******/ // Check if module is in cache
69+
/******/ if(installedModules[moduleId]) {
70+
/******/ return installedModules[moduleId].exports;
71+
/******/ }
72+
/******/ // Create a new module (and put it into the cache)
73+
/******/ var module = installedModules[moduleId] = {
74+
/******/ i: moduleId,
75+
/******/ l: false,
76+
/******/ exports: {}
77+
/******/ };
78+
/******/
79+
/******/ // Execute the module function
80+
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
81+
/******/
82+
/******/ // Flag the module as loaded
83+
/******/ module.l = true;
84+
/******/
85+
/******/ // Return the exports of the module
86+
/******/ return module.exports;
87+
/******/ }
88+
/******/
89+
/******/
90+
/******/ // expose the modules object (__webpack_modules__)
91+
/******/ __webpack_require__.m = modules;
92+
/******/
93+
/******/ // expose the module cache
94+
/******/ __webpack_require__.c = installedModules;
95+
/******/
96+
/******/ // define getter function for harmony exports
97+
/******/ __webpack_require__.d = function(exports, name, getter) {
98+
/******/ if(!__webpack_require__.o(exports, name)) {
99+
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
100+
/******/ }
101+
/******/ };
102+
/******/
103+
/******/ // define __esModule on exports
104+
/******/ __webpack_require__.r = function(exports) {
105+
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
106+
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
107+
/******/ }
108+
/******/ Object.defineProperty(exports, '__esModule', { value: true });
109+
/******/ };
110+
/******/
111+
/******/ // create a fake namespace object
112+
/******/ // mode & 1: value is a module id, require it
113+
/******/ // mode & 2: merge all properties of value into the ns
114+
/******/ // mode & 4: return value when already ns object
115+
/******/ // mode & 8|1: behave like require
116+
/******/ __webpack_require__.t = function(value, mode) {
117+
/******/ if(mode & 1) value = __webpack_require__(value);
118+
/******/ if(mode & 8) return value;
119+
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
120+
/******/ var ns = Object.create(null);
121+
/******/ __webpack_require__.r(ns);
122+
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
123+
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
124+
/******/ return ns;
125+
/******/ };
126+
/******/
127+
/******/ // getDefaultExport function for compatibility with non-harmony modules
128+
/******/ __webpack_require__.n = function(module) {
129+
/******/ var getter = module && module.__esModule ?
130+
/******/ function getDefault() { return module['default']; } :
131+
/******/ function getModuleExports() { return module; };
132+
/******/ __webpack_require__.d(getter, 'a', getter);
133+
/******/ return getter;
134+
/******/ };
135+
/******/
136+
/******/ // Object.prototype.hasOwnProperty.call
137+
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
138+
/******/
139+
/******/ // __webpack_public_path__
140+
/******/ __webpack_require__.p = "/";
141+
/******/
142+
/******/ var jsonpArray = window["webpackJsonp"] = window["webpackJsonp"] || [];
143+
/******/ var oldJsonpFunction = jsonpArray.push.bind(jsonpArray);
144+
/******/ jsonpArray.push = webpackJsonpCallback;
145+
/******/ jsonpArray = jsonpArray.slice();
146+
/******/ for(var i = 0; i < jsonpArray.length; i++) webpackJsonpCallback(jsonpArray[i]);
147+
/******/ var parentJsonpFunction = oldJsonpFunction;
148+
/******/
149+
/******/
150+
/******/ // run deferred modules from other chunks
151+
/******/ checkDeferredModules();
152+
/******/ })
153+
/************************************************************************/
154+
/******/ ([]);

public/mix-manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"/app.js": "/app.js?id=456314d1a53bdb77cc86",
3-
"/manifest.js": "/manifest.js?id=3c768977c2574a34506e",
4-
"/vendor.js": "/vendor.js?id=38a9d2f43b98aaf4f7dd"
2+
"/app.js": "/app.js?id=b5ffc7a59066e8579b9c",
3+
"/manifest.js": "/manifest.js?id=d9708e48a6c10ccee4bb",
4+
"/vendor.js": "/vendor.js?id=736997e66e11f6db997a"
55
}

public/vendor.js

Lines changed: 79107 additions & 1 deletion
Large diffs are not rendered by default.

resources/js/components/Root.vue

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,6 @@
7979
}}</span>
8080
</div>
8181
<el-dropdown-menu slot="dropdown">
82-
<a>
83-
<el-dropdown-item>
84-
<i class="el-icon-setting" size="18" />
85-
<span>个人设置</span>
86-
</el-dropdown-item>
87-
</a>
8882
<a @click="onLogout">
8983
<el-dropdown-item>
9084
<i class="el-icon-right" size="18" />

src/Controllers/LogController.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ protected function grid()
2727

2828

2929
$grid->column('id', "ID")->width("100");
30-
$grid->column('user.avatar', 'Avatar', 'user_id')->displayComponent(Avatar::make()->size('small'))->width(80);
31-
$grid->column('user.name', 'User', 'user_id')->help("操作用户")->sortable();
32-
$grid->column('method')->width(100)->align('center')->displayComponent(Tag::make()->type(['GET' => 'info', 'POST' => 'success']));
33-
$grid->column('path')->help('操作URL')->sortable();
34-
$grid->column('ip');
30+
$grid->column('user.avatar', '头像', 'user_id')->component(Avatar::make()->size('small'))->width(80);
31+
$grid->column('user.name', '用户', 'user_id')->help("操作用户")->sortable();
32+
$grid->column('method','请求方式')->width(100)->align('center')->component(Tag::make()->type(['GET' => 'info', 'POST' => 'success']));
33+
$grid->column('path','路径')->help('操作URL')->sortable();
34+
$grid->column('ip','IP');
3535
$grid->column('created_at', "创建时间")->sortable();
3636

3737
$grid->actions(function (Grid\Actions $actions) {

src/Controllers/PermissionController.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ protected function grid()
3232

3333

3434
$grid->column('id', 'ID')->sortable()->width('80px');
35-
$grid->column('slug', trans('admin::admin.slug'))->width(120);
36-
$grid->column('name', trans('admin::admin.name'))->width(120);
37-
$grid->column('http_method', trans('admin::admin.http_method'))->component(Tag::make());
38-
$grid->column('http_path', trans('admin::admin.route'))->customValue(function ($row, $value) {
35+
$grid->column('slug', "标识")->width(120);
36+
$grid->column('name', "名称")->width(120);
37+
$grid->column('http_method', "请求方式")->component(Tag::make());
38+
$grid->column('http_path', "路由")->customValue(function ($row, $value) {
3939
return explode("\n", $value);
4040
})->component(function () {
4141
return Tag::make();
@@ -56,17 +56,17 @@ protected function form()
5656
$form = new Form(new $permissionModel());
5757

5858

59-
$form->item('slug', trans('admin::admin.slug'))->required();
60-
$form->item('name', trans('admin::admin.name'))->required();
61-
$form->item('http_method', trans('admin::admin.http.method'))
62-
->help(trans('admin::admin.all_methods_if_empty'))
59+
$form->item('slug', "标识")->required();
60+
$form->item('name', "名称")->required();
61+
$form->item('http_method', "请求方式")
62+
->help("为空默认为所有方法")
6363
->component(function () {
6464
return Select::make()->multiple()
6565
->block()
6666
->clearable()
6767
->options($this->getHttpMethodsOptions());
6868
});
69-
$form->item('http_path', trans('admin::admin.http.path'))->required()->component(Input::make()->textarea(8));
69+
$form->item('http_path', "路由")->required()->component(Input::make()->textarea(8));
7070

7171

7272
return $form;

src/Controllers/RoleController.php

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ protected function grid()
2121
$grid = new Grid(new $roleModel());
2222

2323
$grid->column('id', 'ID')->width('80px')->sortable();
24-
$grid->column('slug', trans('admin::admin.slug'));
25-
$grid->column('name', trans('admin::admin.name'));
26-
$grid->column('permissions.name', trans('admin::admin.permission'))->component(Tag::make()->type('info'));
27-
$grid->column('created_at', trans('admin::admin.created_at'));
28-
$grid->column('updated_at', trans('admin::admin.updated_at'));
24+
$grid->column('slug', "标识");
25+
$grid->column('name', "名称");
26+
$grid->column('permissions.name', "权限")->component(Tag::make()->type('info'));
27+
$grid->column('created_at');
28+
$grid->column('updated_at');
2929

3030

3131
return $grid;
@@ -37,16 +37,13 @@ public function form()
3737
$roleModel = config('admin.database.roles_model');
3838
$form = new Form(new $roleModel());
3939

40-
41-
$form->item('slug', trans('admin::admin.slug'))->required();
42-
$form->item('name', trans('admin::admin.name'))->required();
43-
$form->item('permissions', trans('admin::admin.permissions'), 'permissions.id')->component(
40+
$form->item('slug', "标识")->required();
41+
$form->item('name', "名称")->required();
42+
$form->item('permissions', "权限", 'permissions.id')->component(
4443
Transfer::make()->data($permissionModel::get()->map(function ($item) {
4544
return TransferData::make($item->id, $item->name);
4645
}))->titles(['可授权', '已授权'])->filterable()
4746
);
48-
49-
5047
return $form;
5148
}
5249
}

src/Controllers/UserController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ protected function grid()
3434

3535
$grid->column('id', "ID")->width(80);
3636
$grid->column('avatar', '头像')->width(80)->align('center')->component(Avatar::make());
37-
$grid->column('username', trans('admin::admin.username'));
37+
$grid->column('username', "用户名");
3838
$grid->column('name', '用户昵称');
39-
$grid->column('roles.name', trans('admin::admin.roles'))->component(Tag::make()->effect('dark'));
40-
$grid->column('created_at', trans('admin::admin.created_at'));
41-
$grid->column('updated_at', trans('admin::admin.updated_at'));
39+
$grid->column('roles.name', "角色")->component(Tag::make()->effect('dark'));
40+
$grid->column('created_at');
41+
$grid->column('updated_at');
4242

4343
return $grid;
4444
}

0 commit comments

Comments
 (0)