开飞机的舒克 / Campus · 提交

转到一个项目

作者 开飞机的舒克
提交 4bc83ac7c09d1f91177b8652ce5a03f8a2d4ad9f 1 个父辈 3adf148c

后台功能优化

内嵌 并排对比
正在显示 19 个修改的文件 包含 74 行增加 和 46 行删除
@@ -8,13 +8,10 @@ @@ -8,13 +8,10 @@
8 <div id="toolbar" class="toolbar"> 8 <div id="toolbar" class="toolbar">
9 <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a> 9 <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
10 <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('radar/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a> 10 <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('radar/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
11 - <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('radar/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>  
12 - <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('radar/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>  
13 - 11 +
14 12
15 <div class="dropdown btn-group {:$auth->check('radar/multi')?'':'hide'}"> 13 <div class="dropdown btn-group {:$auth->check('radar/multi')?'':'hide'}">
16 - <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>  
17 - <ul class="dropdown-menu text-left" role="menu"> 14 + <ul class="dropdown-menu text-left" role="menu">
18 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li> 15 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
19 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li> 16 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
20 </ul> 17 </ul>
@@ -6,18 +6,6 @@ @@ -6,18 +6,6 @@
6 <input id="c-title" class="form-control" name="row[title]" type="text"> 6 <input id="c-title" class="form-control" name="row[title]" type="text">
7 </div> 7 </div>
8 </div> 8 </div>
9 - <div class="form-group">  
10 - <label class="control-label col-xs-12 col-sm-2">{:__('Score')}:</label>  
11 - <div class="col-xs-12 col-sm-8">  
12 - <input id="c-score" class="form-control" step="0.01" name="row[score]" type="number">  
13 - </div>  
14 - </div>  
15 - <div class="form-group">  
16 - <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>  
17 - <div class="col-xs-12 col-sm-8">  
18 - <input id="c-weigh" class="form-control" name="row[weigh]" type="number">  
19 - </div>  
20 - </div>  
21 <div class="form-group layer-footer"> 9 <div class="form-group layer-footer">
22 <label class="control-label col-xs-12 col-sm-2"></label> 10 <label class="control-label col-xs-12 col-sm-2"></label>
23 <div class="col-xs-12 col-sm-8"> 11 <div class="col-xs-12 col-sm-8">
@@ -12,12 +12,6 @@ @@ -12,12 +12,6 @@
12 <input id="c-score" class="form-control" step="0.01" name="row[score]" type="number" value="{$row.score|htmlentities}"> 12 <input id="c-score" class="form-control" step="0.01" name="row[score]" type="number" value="{$row.score|htmlentities}">
13 </div> 13 </div>
14 </div> 14 </div>
15 - <div class="form-group">  
16 - <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>  
17 - <div class="col-xs-12 col-sm-8">  
18 - <input id="c-weigh" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">  
19 - </div>  
20 - </div>  
21 <div class="form-group layer-footer"> 15 <div class="form-group layer-footer">
22 <label class="control-label col-xs-12 col-sm-2"></label> 16 <label class="control-label col-xs-12 col-sm-2"></label>
23 <div class="col-xs-12 col-sm-8"> 17 <div class="col-xs-12 col-sm-8">
@@ -8,13 +8,10 @@ @@ -8,13 +8,10 @@
8 <div id="toolbar" class="toolbar"> 8 <div id="toolbar" class="toolbar">
9 <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a> 9 <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
10 <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('team/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a> 10 <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('team/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
11 - <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('team/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>  
12 - <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('team/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>  
13 - 11 +
14 12
15 <div class="dropdown btn-group {:$auth->check('team/multi')?'':'hide'}"> 13 <div class="dropdown btn-group {:$auth->check('team/multi')?'':'hide'}">
16 - <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>  
17 - <ul class="dropdown-menu text-left" role="menu"> 14 + <ul class="dropdown-menu text-left" role="menu">
18 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li> 15 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
19 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li> 16 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
20 </ul> 17 </ul>
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 namespace app\api\controller; 3 namespace app\api\controller;
4 4
5 use app\common\controller\Api; 5 use app\common\controller\Api;
  6 +use app\common\controller\Resource;
6 use tinymeng\code\Generate; 7 use tinymeng\code\Generate;
7 8
8 /** 9 /**
@@ -68,7 +69,9 @@ class Demo extends Api @@ -68,7 +69,9 @@ class Demo extends Api
68 */ 69 */
69 public function test3() 70 public function test3()
70 { 71 {
71 - $generate = Generate::bar(); 72 + //define('saveFilePath',dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'uploads'.DIRECTORY_SEPARATOR.'barimages'.DIRECTORY_SEPARATOR.date('Ymd').DIRECTORY_SEPARATOR);
  73 + $a = Resource::StudyBar(1);
  74 + return $a;
72 } 75 }
73 76
74 } 77 }
@@ -6,11 +6,9 @@ use tinymeng\code\Generate; @@ -6,11 +6,9 @@ use tinymeng\code\Generate;
6 6
7 class Resource 7 class Resource
8 { 8 {
9 - public static function StudyBar($unique){ 9 + public static function StudyBar($id){
10 $generate = Generate::bar(); 10 $generate = Generate::bar();
11 - /** 直接输出图片 */  
12 - //$generate->create($unique);  
13 - //$file_path = substr($file_path,strripos($file_path,"public")+6);  
14 - //return $file_path; 11 +// $file_path = $generate->create("123456789",true);
  12 +// return $file_path;
15 } 13 }
16 } 14 }
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 "ext-bcmath": "*", 32 "ext-bcmath": "*",
33 "txthinking/mailer": "^2.0", 33 "txthinking/mailer": "^2.0",
34 "phpoffice/phpexcel": "^1.8", 34 "phpoffice/phpexcel": "^1.8",
35 - "tinymeng/code": "^2.0", 35 + "tinymeng/code": "dev-master"
36 }, 36 },
37 "config": { 37 "config": {
38 "preferred-install": "dist", 38 "preferred-install": "dist",
@@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
22 url: $.fn.bootstrapTable.defaults.extend.index_url, 22 url: $.fn.bootstrapTable.defaults.extend.index_url,
23 pk: 'id', 23 pk: 'id',
24 sortName: 'id', 24 sortName: 'id',
  25 + showToggle: false,//浏览模式功能关闭
  26 + showColumns: false,//显示隐藏列功能关闭
  27 + //commonSearch: false, //关闭通用搜索按钮
  28 + showExport: false,//导出功能关闭
  29 + clickToSelect: false, //是否启用点击选中
  30 + dblClickToEdit: false, //是否启用双击编辑
25 columns: [ 31 columns: [
26 [ 32 [
27 {checkbox: true}, 33 {checkbox: true},
@@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
22 url: $.fn.bootstrapTable.defaults.extend.index_url, 22 url: $.fn.bootstrapTable.defaults.extend.index_url,
23 pk: 'id', 23 pk: 'id',
24 sortName: 'id', 24 sortName: 'id',
  25 + showToggle: false,//浏览模式功能关闭
  26 + showColumns: false,//显示隐藏列功能关闭
  27 + //commonSearch: false, //关闭通用搜索按钮
  28 + showExport: false,//导出功能关闭
  29 + clickToSelect: false, //是否启用点击选中
  30 + dblClickToEdit: false, //是否启用双击编辑
25 columns: [ 31 columns: [
26 [ 32 [
27 {checkbox: true}, 33 {checkbox: true},
@@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
22 url: $.fn.bootstrapTable.defaults.extend.index_url, 22 url: $.fn.bootstrapTable.defaults.extend.index_url,
23 pk: 'id', 23 pk: 'id',
24 sortName: 'id', 24 sortName: 'id',
  25 + showToggle: false,//浏览模式功能关闭
  26 + showColumns: false,//显示隐藏列功能关闭
  27 + //commonSearch: false, //关闭通用搜索按钮
  28 + showExport: false,//导出功能关闭
  29 + clickToSelect: false, //是否启用点击选中
  30 + dblClickToEdit: false, //是否启用双击编辑
25 columns: [ 31 columns: [
26 [ 32 [
27 {checkbox: true}, 33 {checkbox: true},
@@ -21,7 +21,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -21,7 +21,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
21 table.bootstrapTable({ 21 table.bootstrapTable({
22 url: $.fn.bootstrapTable.defaults.extend.index_url, 22 url: $.fn.bootstrapTable.defaults.extend.index_url,
23 pk: 'id', 23 pk: 'id',
24 - sortName: 'weigh', 24 + sortName: 'id',
  25 + showToggle: false,//浏览模式功能关闭
  26 + showColumns: false,//显示隐藏列功能关闭
  27 + //commonSearch: false, //关闭通用搜索按钮
  28 + showExport: false,//导出功能关闭
  29 + clickToSelect: false, //是否启用点击选中
  30 + dblClickToEdit: false, //是否启用双击编辑
25 columns: [ 31 columns: [
26 [ 32 [
27 {checkbox: true}, 33 {checkbox: true},
@@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
22 url: $.fn.bootstrapTable.defaults.extend.index_url, 22 url: $.fn.bootstrapTable.defaults.extend.index_url,
23 pk: 'id', 23 pk: 'id',
24 sortName: 'id', 24 sortName: 'id',
  25 + showToggle: false,//浏览模式功能关闭
  26 + showColumns: false,//显示隐藏列功能关闭
  27 + //commonSearch: false, //关闭通用搜索按钮
  28 + showExport: false,//导出功能关闭
  29 + clickToSelect: false, //是否启用点击选中
  30 + dblClickToEdit: false, //是否启用双击编辑
25 columns: [ 31 columns: [
26 [ 32 [
27 {checkbox: true}, 33 {checkbox: true},
@@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
22 url: $.fn.bootstrapTable.defaults.extend.index_url, 22 url: $.fn.bootstrapTable.defaults.extend.index_url,
23 pk: 'id', 23 pk: 'id',
24 sortName: 'id', 24 sortName: 'id',
  25 + showToggle: false,//浏览模式功能关闭
  26 + showColumns: false,//显示隐藏列功能关闭
  27 + //commonSearch: false, //关闭通用搜索按钮
  28 + showExport: false,//导出功能关闭
  29 + clickToSelect: false, //是否启用点击选中
  30 + dblClickToEdit: false, //是否启用双击编辑
25 columns: [ 31 columns: [
26 [ 32 [
27 {checkbox: true}, 33 {checkbox: true},
@@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
22 url: $.fn.bootstrapTable.defaults.extend.index_url, 22 url: $.fn.bootstrapTable.defaults.extend.index_url,
23 pk: 'id', 23 pk: 'id',
24 sortName: 'id', 24 sortName: 'id',
  25 + showToggle: false,//浏览模式功能关闭
  26 + showColumns: false,//显示隐藏列功能关闭
  27 + //commonSearch: false, //关闭通用搜索按钮
  28 + showExport: false,//导出功能关闭
  29 + clickToSelect: false, //是否启用点击选中
  30 + dblClickToEdit: false, //是否启用双击编辑
25 columns: [ 31 columns: [
26 [ 32 [
27 {checkbox: true}, 33 {checkbox: true},
@@ -71,14 +71,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -71,14 +71,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
71 url: $.fn.bootstrapTable.defaults.extend.index_url, 71 url: $.fn.bootstrapTable.defaults.extend.index_url,
72 pk: 'id', 72 pk: 'id',
73 sortName: 'id', 73 sortName: 'id',
  74 + fixedColumns: true,
  75 + fixedRightNumber: 1,
74 showToggle: false,//浏览模式功能关闭 76 showToggle: false,//浏览模式功能关闭
75 showColumns: false,//显示隐藏列功能关闭 77 showColumns: false,//显示隐藏列功能关闭
76 //commonSearch: false, //关闭通用搜索按钮 78 //commonSearch: false, //关闭通用搜索按钮
77 showExport: false,//导出功能关闭 79 showExport: false,//导出功能关闭
78 clickToSelect: false, //是否启用点击选中 80 clickToSelect: false, //是否启用点击选中
79 dblClickToEdit: false, //是否启用双击编辑 81 dblClickToEdit: false, //是否启用双击编辑
80 - fixedColumns: true,  
81 - fixedRightNumber: 1,  
82 columns: [ 82 columns: [
83 [ 83 [
84 {checkbox: true}, 84 {checkbox: true},
@@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
22 url: $.fn.bootstrapTable.defaults.extend.index_url, 22 url: $.fn.bootstrapTable.defaults.extend.index_url,
23 pk: 'id', 23 pk: 'id',
24 sortName: 'score', 24 sortName: 'score',
  25 + showToggle: false,//浏览模式功能关闭
  26 + showColumns: false,//显示隐藏列功能关闭
  27 + //commonSearch: false, //关闭通用搜索按钮
  28 + showExport: false,//导出功能关闭
  29 + clickToSelect: false, //是否启用点击选中
  30 + dblClickToEdit: false, //是否启用双击编辑
25 columns: [ 31 columns: [
26 [ 32 [
27 {checkbox: true}, 33 {checkbox: true},
@@ -2966,8 +2966,8 @@ @@ -2966,8 +2966,8 @@
2966 }, 2966 },
2967 { 2967 {
2968 "name": "tinymeng/code", 2968 "name": "tinymeng/code",
2969 - "version": "v2.0.1",  
2970 - "version_normalized": "2.0.1.0", 2969 + "version": "dev-master",
  2970 + "version_normalized": "dev-master",
2971 "source": { 2971 "source": {
2972 "type": "git", 2972 "type": "git",
2973 "url": "https://github.com/majiameng/phpQrCode.git", 2973 "url": "https://github.com/majiameng/phpQrCode.git",
@@ -2984,6 +2984,7 @@ @@ -2984,6 +2984,7 @@
2984 "tinymeng/tools": "^1.0.7" 2984 "tinymeng/tools": "^1.0.7"
2985 }, 2985 },
2986 "time": "2020-03-28T10:11:51+00:00", 2986 "time": "2020-03-28T10:11:51+00:00",
  2987 + "default-branch": true,
2987 "type": "library", 2988 "type": "library",
2988 "installation-source": "dist", 2989 "installation-source": "dist",
2989 "autoload": { 2990 "autoload": {
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 'name' => 'karsonzhang/fastadmin', 3 'name' => 'karsonzhang/fastadmin',
4 'pretty_version' => 'dev-master', 4 'pretty_version' => 'dev-master',
5 'version' => 'dev-master', 5 'version' => 'dev-master',
6 - 'reference' => '0f0ef558f4db0a4fde56b14198cdf8e8431c82ba', 6 + 'reference' => '3adf148ca4f5939e55dd606e8cb9b4c4545de89b',
7 'type' => 'project', 7 'type' => 'project',
8 'install_path' => __DIR__ . '/../../', 8 'install_path' => __DIR__ . '/../../',
9 'aliases' => array(), 9 'aliases' => array(),
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 'karsonzhang/fastadmin' => array( 58 'karsonzhang/fastadmin' => array(
59 'pretty_version' => 'dev-master', 59 'pretty_version' => 'dev-master',
60 'version' => 'dev-master', 60 'version' => 'dev-master',
61 - 'reference' => '0f0ef558f4db0a4fde56b14198cdf8e8431c82ba', 61 + 'reference' => '3adf148ca4f5939e55dd606e8cb9b4c4545de89b',
62 'type' => 'project', 62 'type' => 'project',
63 'install_path' => __DIR__ . '/../../', 63 'install_path' => __DIR__ . '/../../',
64 'aliases' => array(), 64 'aliases' => array(),
@@ -443,12 +443,14 @@ @@ -443,12 +443,14 @@
443 'dev_requirement' => false, 443 'dev_requirement' => false,
444 ), 444 ),
445 'tinymeng/code' => array( 445 'tinymeng/code' => array(
446 - 'pretty_version' => 'v2.0.1',  
447 - 'version' => '2.0.1.0', 446 + 'pretty_version' => 'dev-master',
  447 + 'version' => 'dev-master',
448 'reference' => 'a5a6ba189f18a8e1f826dfa4994e26da5714d8ad', 448 'reference' => 'a5a6ba189f18a8e1f826dfa4994e26da5714d8ad',
449 'type' => 'library', 449 'type' => 'library',
450 'install_path' => __DIR__ . '/../tinymeng/code', 450 'install_path' => __DIR__ . '/../tinymeng/code',
451 - 'aliases' => array(), 451 + 'aliases' => array(
  452 + 0 => '9999999-dev',
  453 + ),
452 'dev_requirement' => false, 454 'dev_requirement' => false,
453 ), 455 ),
454 'tinymeng/tools' => array( 456 'tinymeng/tools' => array(
@@ -10,7 +10,7 @@ use \tinymeng\tools\Strings; @@ -10,7 +10,7 @@ use \tinymeng\tools\Strings;
10 * @method static \tinymeng\code\Gateways\Qr qr(array $config=[]) 二维码 10 * @method static \tinymeng\code\Gateways\Qr qr(array $config=[]) 二维码
11 * @package tinymeng\mailer 11 * @package tinymeng\mailer
12 */ 12 */
13 -//define('saveFilePath',dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'uploads'.DIRECTORY_SEPARATOR.'barimages'.DIRECTORY_SEPARATOR.date('Ymd').DIRECTORY_SEPARATOR); 13 +define('saveFilePath',dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR.'tinymeng'.DIRECTORY_SEPARATOR.'code'.DIRECTORY_SEPARATOR);
14 14
15 class Generate 15 class Generate
16 { 16 {