给pc端的权限

application/admin/controller/pcauth/Rule.php

@@ -49,6 +49,7 @@ class Rule extends Backend
         unset($v);
         $this->view->assign('ruledata', $ruledata);
         $this->view->assign("menutypeList", $this->model->getMenutypeList());
+        $this->view->assign("typeList", $this->model->gettypeList());
     }
 
     /**
@@ -117,9 +118,9 @@ class Rule extends Backend
                 }
                 //这里需要针对name做唯一验证
                 $ruleValidate = \think\Loader::validate('PcAuthRule');
-                $ruleValidate->rule([
+                /*$ruleValidate->rule([
                     'name' => 'require|unique:PcAuthRule,name,' . $row->id,
-                ]);
+                ]);*/
                 $result = $row->validate()->save($params);
                 if ($result === false) {
                     $this->error($row->getError());

application/admin/lang/zh-cn/pcauth/rule.php

@@ -7,6 +7,7 @@ return [
     'Icon'                                                      => '图标',
     'Alert'                                                     => '警告',
     'Name'                                                      => '规则',
+    'Title'                                                      => '菜单名称',
     'Controller/Action'                                         => '控制器名/方法名',
     'Ismenu'                                                    => '菜单',
     'Menutype'                                                  => '菜单类型',
@@ -27,6 +28,12 @@ return [
     'Name only supports letters, numbers, underscore and slash' => 'URL规则只能是小写字母、数字、下划线和/组成',
     'permission'     => '权限标识',
     'path'           => '路由地址',
-    'component'      => '组件路径',
-    'component_name' => '组件名',
+    'component'      => '组件地址',
+    'component_name' => '组件名字',
+    'Type'   => '菜单类型',
+    'Type 1' => '目录',
+    'Type 2' => '菜单',
+    'Type 3' => '按钮',
+    'Weigh'  => '排序',
+
 ];

application/admin/model/PcAuthRule.php

@@ -14,8 +14,8 @@ class PcAuthRule extends Model
     protected $createTime = 'createtime';
     protected $updateTime = 'updatetime';
     // 数据自动完成字段
-    protected $insert = ['py', 'pinyin'];
-    protected $update = ['py', 'pinyin'];
+//    protected $insert = ['py', 'pinyin'];
+//    protected $update = ['py', 'pinyin'];
     // 拼音对象
     protected static $pinyin = null;
 
@@ -44,6 +44,11 @@ class PcAuthRule extends Model
         return ['addtabs' => __('Addtabs'), 'dialog' => __('Dialog'), 'ajax' => __('Ajax'), 'blank' => __('Blank')];
     }
 
+    public function gettypeList()
+    {
+        return ['1' => __('Type 1'), '2' => __('Type 2'), '3' => __('Type 3')];
+    }
+
     public function setPyAttr($value, $data)
     {
         if (isset($data['title']) && $data['title']) {

application/admin/validate/PcAuthRule.php

@@ -16,7 +16,7 @@ class PcAuthRule extends Validate
      * 验证规则
      */
     protected $rule = [
-        'name'  => 'require|unique:PcAuthRule',
+//        'name'  => 'require|unique:PcAuthRule',
         'title' => 'require',
     ];
 

application/admin/view/pcauth/rule/add.html

@@ -12,24 +12,20 @@
             {:build_select('row[pid]', $ruledata, null, ['class'=>'form-control', 'required'=>''])}
         </div>
     </div>
-    <div class="form-group">
-        <label for="name" class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input type="text" class="form-control" id="name" name="row[name]" data-placeholder-node="{:__('Node tips')}" data-placeholder-menu="{:__('Menu tips')}" value="" data-rule="required" />
-        </div>
-    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input type="text" class="form-control" id="title" name="row[title]" value="" data-rule="required" />
         </div>
     </div>
-    <div class="form-group" data-type="menu">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Url')}:</label>
+    <div class="form-group">
+        <label for="type" class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input type="text" class="form-control" id="url" name="row[url]" value="" data-rule="" placeholder="{:__('Url tips')}" />
+            {:build_radios('row[type]', $typeList)}
         </div>
     </div>
+
     <div class="form-group">
         <label for="icon" class="control-label col-xs-12 col-sm-2">{:__('Icon')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -40,66 +36,47 @@
             </div>
         </div>
     </div>
+
     <div class="form-group">
-        <label for="remark" class="control-label col-xs-12 col-sm-2">{:__('Condition')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <textarea class="form-control" id="condition" name="row[condition]"></textarea>
-        </div>
-    </div>
-    <div class="form-group" data-type="menu">
-        <label for="remark" class="control-label col-xs-12 col-sm-2">{:__('Menutype')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            {:build_radios('row[menutype]', $menutypeList)}
-        </div>
-    </div>
-    <div class="form-group" data-type="menu">
-        <label for="remark" class="control-label col-xs-12 col-sm-2">{:__('Extend')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <textarea class="form-control" id="extend" name="row[extend]"></textarea>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="remark" class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('path')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea class="form-control" id="remark" name="row[remark]"></textarea>
+            <input type="text" class="form-control" id="path" name="row[path]" value="" />
         </div>
     </div>
+
     <div class="form-group">
-        <label for="weigh" class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('component')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input type="text" class="form-control" id="weigh" name="row[weigh]" value="0" data-rule="required" />
+            <input type="text" class="form-control" id="component" name="row[component]" value="" />
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('component_name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])}
+            <input type="text" class="form-control" id="component_name" name="row[component_name]" value="" />
         </div>
     </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('permission')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input type="text" class="form-control" id="permission" name="row[permission]" value="" />
         </div>
     </div>
+
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('path')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input type="text" class="form-control" id="path" name="row[path]" value="" />
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('component')}:</label>
+        <label for="weigh" class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input type="text" class="form-control" id="component" name="row[component]" value="" />
+            <input type="text" class="form-control" id="weigh" name="row[weigh]" value="0" data-rule="required" />
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('component_name')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input type="text" class="form-control" id="component_name" name="row[component_name]" value="" />
+            {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])}
         </div>
     </div>
+
     <div class="form-group hidden layer-footer">
         <div class="col-xs-2"></div>
         <div class="col-xs-12 col-sm-8">

application/admin/view/pcauth/rule/edit.html

@@ -12,24 +12,20 @@
             {:build_select('row[pid]', $ruledata, $row['pid'], ['class'=>'form-control', 'required'=>''])}
         </div>
     </div>
-    <div class="form-group">
-        <label for="name" class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input type="text" class="form-control" id="name" name="row[name]" data-placeholder-node="{:__('Node tips')}" data-placeholder-menu="{:__('Menu tips')}" value="{$row.name|htmlentities}" data-rule="required" />
-        </div>
-    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input type="text" class="form-control" id="title" name="row[title]" value="{$row.title|htmlentities}" data-rule="required" />
         </div>
     </div>
-    <div class="form-group" data-type="menu">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Url')}:</label>
+    <div class="form-group">
+        <label for="type" class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input type="text" class="form-control" id="url" name="row[url]" value="{$row.url|htmlentities}" data-rule="" placeholder="{:__('Url tips')}" />
+            {:build_radios('row[type]', $typeList)}
         </div>
     </div>
+
     <div class="form-group">
         <label for="icon" class="control-label col-xs-12 col-sm-2">{:__('Icon')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -40,64 +36,45 @@
             </div>
         </div>
     </div>
+
     <div class="form-group">
-        <label for="remark" class="control-label col-xs-12 col-sm-2">{:__('Condition')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <textarea class="form-control" id="condition" name="row[condition]">{$row.condition|htmlentities}</textarea>
-        </div>
-    </div>
-    <div class="form-group" data-type="menu">
-        <label for="remark" class="control-label col-xs-12 col-sm-2">{:__('Menutype')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            {:build_radios('row[menutype]', $menutypeList, $row['menutype'])}
-        </div>
-    </div>
-    <div class="form-group" data-type="menu">
-        <label for="remark" class="control-label col-xs-12 col-sm-2">{:__('Extend')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <textarea class="form-control" id="extend" name="row[extend]">{$row.extend|htmlentities}</textarea>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="remark" class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('path')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea class="form-control" id="remark" name="row[remark]">{$row.remark|__|htmlentities}</textarea>
+            <input type="text" class="form-control" id="path" name="row[path]" value="{$row.path|htmlentities}" />
         </div>
     </div>
+
     <div class="form-group">
-        <label for="weigh" class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('component')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input type="text" class="form-control" id="weigh" name="row[weigh]" value="{$row.weigh}" data-rule="required" />
+            <input type="text" class="form-control" id="component" name="row[component]" value="{$row.component|htmlentities}" />
         </div>
     </div>
+
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('component_name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
+            <input type="text" class="form-control" id="component_name" name="row[component_name]" value="{$row.component_name|htmlentities}" />
         </div>
     </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('permission')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input type="text" class="form-control" id="permission" name="row[permission]" value="{$row.permission|htmlentities}" />
         </div>
     </div>
+
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('path')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input type="text" class="form-control" id="path" name="row[path]" value="{$row.path|htmlentities}" />
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('component')}:</label>
+        <label for="weigh" class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input type="text" class="form-control" id="component" name="row[component]" value="{$row.component|htmlentities}" />
+            <input type="text" class="form-control" id="weigh" name="row[weigh]" value="{$row.weigh}" data-rule="required" />
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('component_name')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input type="text" class="form-control" id="component_name" name="row[component_name]" value="{$row.component_name|htmlentities}" />
+            {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
         </div>
     </div>
     <div class="form-group hidden layer-footer">

public/assets/js/backend/pcauth/rule.js

@@ -27,7 +27,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
                         {field: 'id', title: 'ID'},
                         {field: 'title', title: __('Title'), align: 'left', formatter: Controller.api.formatter.title, clickToSelect: !false},
                         {field: 'icon', title: __('Icon'), formatter: Controller.api.formatter.icon},
-                        {field: 'name', title: __('Name'), align: 'left', formatter: Controller.api.formatter.name},
+//                        {field: 'name', title: __('Name'), align: 'left', formatter: Controller.api.formatter.name},
                         {field: 'weigh', title: __('Weigh')},
                         {field: 'permission', title: __('permission')},
                         {field: 'path', title: __('path')},