pc权限调整

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

@@ -34,9 +34,15 @@ return [
     'Type 1' => '目录',
     'Type 2' => '菜单',
     'Type 3' => '按钮',
-    'Visible'   => 'PC显示',
-    'Visible 1' => '显示',
-    'Visible 0' => '不显示',
+    'visible'   => 'visible',
+    'visible 1' => '是',
+    'visible 0' => '否',
+    'alwaysShow'   => 'alwaysShow',
+    'alwaysShow 1' => '是',
+    'alwaysShow 0' => '否',
+    'keepAlive'   => 'keepAlive',
+    'keepAlive 1' => '是',
+    'keepAlive 0' => '否',
     'Weigh'  => '排序',
 
 ];

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

@@ -75,18 +75,30 @@
             <input type="text" class="form-control" id="weigh" name="row[weigh]" value="0" data-rule="required" />
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
             {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])}
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Visible')}:</label>
         <div class="col-xs-12 col-sm-8">
             {:build_radios('row[visible]', ['1'=>__('Visible 1'), '0'=>__('Visible 0')])}
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('alwaysShow')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            {:build_radios('row[alwaysShow]', ['1'=>__('alwaysShow 1'), '0'=>__('alwaysShow 0')])}
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('keepAlive')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            {:build_radios('row[keepAlive]', ['1'=>__('keepAlive 1'), '0'=>__('keepAlive 0')])}
+        </div>
+    </div>
 
     <div class="form-group hidden layer-footer">
         <div class="col-xs-2"></div>

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

@@ -76,16 +76,28 @@
             <input type="text" class="form-control" id="weigh" name="row[weigh]" value="{$row.weigh}" data-rule="required" />
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
             {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
         </div>
+    </div>-->
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('visible')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            {:build_radios('row[visible]', ['1'=>__('visible 1'), '0'=>__('visible 0')], $row['visible'])}
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('alwaysShow')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            {:build_radios('row[alwaysShow]', ['1'=>__('alwaysShow 1'), '0'=>__('alwaysShow 0')], $row['alwaysShow'])}
+        </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Visible')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('keepAlive')}:</label>
         <div class="col-xs-12 col-sm-8">
-            {:build_radios('row[visible]', ['1'=>__('Visible 1'), '0'=>__('Visible 0')], $row['visible'])}
+            {:build_radios('row[keepAlive]', ['1'=>__('keepAlive 1'), '0'=>__('keepAlive 0')], $row['keepAlive'])}
         </div>
     </div>
     <div class="form-group hidden layer-footer">

application/common/library/Authcompany.php

@@ -551,15 +551,15 @@ class Authcompany extends \fast\Authpc
 
         // 必须将结果集转换为数组
         $ruleList = collection(\app\admin\model\PcAuthRule::where('status', 'normal')
-            ->field('id,pid as parentId,name as namerule,title as name,path,component,component_name as componentName,icon,visible')
+            ->field('id,pid as parentId,name as namerule,title as name,path,component,component_name as componentName,icon,visible,alwaysShow,keepAlive')
             ->where('type', 'NEQ',3)
             ->order('weigh', 'desc')
             ->select())->toArray();
 
         foreach ($ruleList as $k => &$v) {
             $v['visible']    = $v['visible'] == 1 ? true : false;
-            $v['alwaysShow'] = true;
-            $v['keepAlive']  = true;
+            $v['alwaysShow'] = $v['alwaysShow'] == 1 ? true : false;
+            $v['keepAlive']  = $v['keepAlive'] == 1 ? true : false;
 
             if (!in_array($v['namerule'], $userRule)) {
                 unset($ruleList[$k]);

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

@@ -34,8 +34,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
                         {field: 'path', title: __('path')},
                         {field: 'component', title: __('component')},
                         {field: 'component_name', title: __('component_name')},
-                        {field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
-                        {field: 'visible', title: __('Visible'), searchList: {"1": __('Visible 1'), "0": __('Visible 0')}, formatter: Table.api.formatter.normal},
+//                        {field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
+                        {field: 'visible', title: __('visible'), searchList: {"1": __('visible 1'), "0": __('visible 0')}, formatter: Table.api.formatter.normal},
+                        {field: 'alwaysShow', title: __('alwaysShow'), searchList: {"1": __('alwaysShow 1'), "0": __('alwaysShow 0')}, formatter: Table.api.formatter.normal},
+                        {field: 'keepAlive', title: __('keepAlive'), searchList: {"1": __('keepAlive 1'), "0": __('keepAlive 0')}, formatter: Table.api.formatter.normal},
                         {
                             field: 'ismenu',
                             title: __('Ismenu'),