后台功能优化

@@ -8,12 +8,9 @@
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('radar/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <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>
-                        <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>
 
 
                         <div class="dropdown btn-group {:$auth->check('radar/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                           <ul class="dropdown-menu text-left" role="menu">
                                 <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>
                                 <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>

@@ -6,18 +6,6 @@
             <input id="c-title" class="form-control" name="row[title]" type="text">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Score')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-score" class="form-control" step="0.01" name="row[score]" type="number">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-weigh" class="form-control" name="row[weigh]" type="number">
-        </div>
-    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

@@ -12,12 +12,6 @@
             <input id="c-score" class="form-control" step="0.01" name="row[score]" type="number" value="{$row.score|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-weigh" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
-        </div>
-    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

@@ -8,12 +8,9 @@
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('team/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <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>
-                        <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>
 
 
                         <div class="dropdown btn-group {:$auth->check('team/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                           <ul class="dropdown-menu text-left" role="menu">
                                 <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>
                                 <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>

@@ -3,6 +3,7 @@
 namespace app\api\controller;
 
 use app\common\controller\Api;
+use app\common\controller\Resource;
 use tinymeng\code\Generate;
 
 /**
@@ -68,7 +69,9 @@ class Demo extends Api
      */
     public function test3()
     {
-        $generate = Generate::bar();
+        //define('saveFilePath',dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'uploads'.DIRECTORY_SEPARATOR.'barimages'.DIRECTORY_SEPARATOR.date('Ymd').DIRECTORY_SEPARATOR);
+       $a = Resource::StudyBar(1);
+       return $a;
     }
 
 }

@@ -6,11 +6,9 @@ use tinymeng\code\Generate;
 
 class Resource
 {
-    public static function StudyBar($unique){
+    public static function StudyBar($id){
         $generate = Generate::bar();
-        /** 直接输出图片 */
-        //$generate->create($unique);
-        //$file_path = substr($file_path,strripos($file_path,"public")+6);
-        //return $file_path;
+//        $file_path = $generate->create("123456789",true);
+//        return $file_path;
     }
 }
\ No newline at end of file

@@ -32,7 +32,7 @@
         "ext-bcmath": "*",
         "txthinking/mailer": "^2.0",
         "phpoffice/phpexcel": "^1.8",
-        "tinymeng/code": "^2.0",
+        "tinymeng/code": "dev-master"
     },
     "config": {
         "preferred-install": "dist",

@@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                showToggle: false,//浏览模式功能关闭
+                showColumns: false,//显示隐藏列功能关闭
+                //commonSearch: false, //关闭通用搜索按钮
+                showExport: false,//导出功能关闭
+                clickToSelect: false, //是否启用点击选中
+                dblClickToEdit: false, //是否启用双击编辑
                 columns: [
                     [
                         {checkbox: true},

@@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                showToggle: false,//浏览模式功能关闭
+                showColumns: false,//显示隐藏列功能关闭
+                //commonSearch: false, //关闭通用搜索按钮
+                showExport: false,//导出功能关闭
+                clickToSelect: false, //是否启用点击选中
+                dblClickToEdit: false, //是否启用双击编辑
                 columns: [
                     [
                         {checkbox: true},

@@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                showToggle: false,//浏览模式功能关闭
+                showColumns: false,//显示隐藏列功能关闭
+                //commonSearch: false, //关闭通用搜索按钮
+                showExport: false,//导出功能关闭
+                clickToSelect: false, //是否启用点击选中
+                dblClickToEdit: false, //是否启用双击编辑
                 columns: [
                     [
                         {checkbox: true},

@@ -21,7 +21,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
-                sortName: 'weigh',
+                sortName: 'id',
+                showToggle: false,//浏览模式功能关闭
+                showColumns: false,//显示隐藏列功能关闭
+                //commonSearch: false, //关闭通用搜索按钮
+                showExport: false,//导出功能关闭
+                clickToSelect: false, //是否启用点击选中
+                dblClickToEdit: false, //是否启用双击编辑
                 columns: [
                     [
                         {checkbox: true},

@@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                showToggle: false,//浏览模式功能关闭
+                showColumns: false,//显示隐藏列功能关闭
+                //commonSearch: false, //关闭通用搜索按钮
+                showExport: false,//导出功能关闭
+                clickToSelect: false, //是否启用点击选中
+                dblClickToEdit: false, //是否启用双击编辑
                 columns: [
                     [
                         {checkbox: true},

@@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                showToggle: false,//浏览模式功能关闭
+                showColumns: false,//显示隐藏列功能关闭
+                //commonSearch: false, //关闭通用搜索按钮
+                showExport: false,//导出功能关闭
+                clickToSelect: false, //是否启用点击选中
+                dblClickToEdit: false, //是否启用双击编辑
                 columns: [
                     [
                         {checkbox: true},

@@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                showToggle: false,//浏览模式功能关闭
+                showColumns: false,//显示隐藏列功能关闭
+                //commonSearch: false, //关闭通用搜索按钮
+                showExport: false,//导出功能关闭
+                clickToSelect: false, //是否启用点击选中
+                dblClickToEdit: false, //是否启用双击编辑
                 columns: [
                     [
                         {checkbox: true},

@@ -71,14 +71,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                fixedColumns: true,
+                fixedRightNumber: 1,
                 showToggle: false,//浏览模式功能关闭
                 showColumns: false,//显示隐藏列功能关闭
                 //commonSearch: false, //关闭通用搜索按钮
                 showExport: false,//导出功能关闭
                 clickToSelect: false, //是否启用点击选中
                 dblClickToEdit: false, //是否启用双击编辑
-                fixedColumns: true,
-                fixedRightNumber: 1,
                 columns: [
                     [
                         {checkbox: true},

@@ -22,6 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'score',
+                showToggle: false,//浏览模式功能关闭
+                showColumns: false,//显示隐藏列功能关闭
+                //commonSearch: false, //关闭通用搜索按钮
+                showExport: false,//导出功能关闭
+                clickToSelect: false, //是否启用点击选中
+                dblClickToEdit: false, //是否启用双击编辑
                 columns: [
                     [
                         {checkbox: true},

@@ -2966,8 +2966,8 @@
         },
         {
             "name": "tinymeng/code",
-            "version": "v2.0.1",
-            "version_normalized": "2.0.1.0",
+            "version": "dev-master",
+            "version_normalized": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/majiameng/phpQrCode.git",
@@ -2984,6 +2984,7 @@
                 "tinymeng/tools": "^1.0.7"
             },
             "time": "2020-03-28T10:11:51+00:00",
+            "default-branch": true,
             "type": "library",
             "installation-source": "dist",
             "autoload": {

@@ -3,7 +3,7 @@
         'name' => 'karsonzhang/fastadmin',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '0f0ef558f4db0a4fde56b14198cdf8e8431c82ba',
+        'reference' => '3adf148ca4f5939e55dd606e8cb9b4c4545de89b',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -58,7 +58,7 @@
         'karsonzhang/fastadmin' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '0f0ef558f4db0a4fde56b14198cdf8e8431c82ba',
+            'reference' => '3adf148ca4f5939e55dd606e8cb9b4c4545de89b',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -443,12 +443,14 @@
             'dev_requirement' => false,
         ),
         'tinymeng/code' => array(
-            'pretty_version' => 'v2.0.1',
-            'version' => '2.0.1.0',
+            'pretty_version' => 'dev-master',
+            'version' => 'dev-master',
             'reference' => 'a5a6ba189f18a8e1f826dfa4994e26da5714d8ad',
             'type' => 'library',
             'install_path' => __DIR__ . '/../tinymeng/code',
-            'aliases' => array(),
+            'aliases' => array(
+                0 => '9999999-dev',
+            ),
             'dev_requirement' => false,
         ),
         'tinymeng/tools' => array(

@@ -10,7 +10,7 @@ use \tinymeng\tools\Strings;
  * @method static \tinymeng\code\Gateways\Qr qr(array $config=[]) 二维码
  * @package tinymeng\mailer
  */
-//define('saveFilePath',dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'uploads'.DIRECTORY_SEPARATOR.'barimages'.DIRECTORY_SEPARATOR.date('Ymd').DIRECTORY_SEPARATOR);
+define('saveFilePath',dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR.'tinymeng'.DIRECTORY_SEPARATOR.'code'.DIRECTORY_SEPARATOR);
 
 class Generate
 {