menu表增加remark字段

windhoney · Jul 2, 2019 · 3126419 · 3126419
1 parent c8f271b
commit 3126419
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/controllers/MenuController.php b/controllers/MenuController.php
@@ -44,7 +44,7 @@ public function actionUserMenu()
 
             return $return;
         };
-        $result = MenuHelper::getAssignedMenu(Yii::$app->user->id, null, $callback, Yii::$app->request->get('client'));
+        $result = MenuHelper::getAssignedMenu(Yii::$app->user->id, null, $callback, false, Yii::$app->request->get('client'));
 
         return $result;
     }

diff --git a/migrations/m140602_111327_create_menu_table.php b/migrations/m140602_111327_create_menu_table.php
@@ -27,6 +27,7 @@ public function up()
             'name' => $this->string(128)->notNull(),
             'parent' => $this->integer(),
             'route' => $this->string(),
+            'remark' => $this->string(),
             'order' => $this->integer(),
             'data' => $this->binary(),
             "FOREIGN KEY ([[parent]]) REFERENCES {$menuTable}([[id]]) ON DELETE SET NULL ON UPDATE CASCADE",

diff --git a/models/Menu.php b/models/Menu.php
@@ -63,7 +63,7 @@ public function rules()
                 'range' => static::find()->select(['name'])->column(),
                 'message' => 'Menu "{value}" not found.'
             ],
-            [['parent', 'route', 'data', 'order'], 'default'],
+            [['parent', 'route', 'data', 'order', 'remark'], 'default'],
             [
                 ['parent'],
                 'filterParent',
@@ -134,6 +134,7 @@ public function attributeLabels()
             'route' => 'route',//Yii::t('rbac-admin', 'Route'),
             'order' => 'order',//Yii::t('rbac-admin', 'Order'),
             'data' => 'data',//Yii::t('rbac-admin', 'Data'),
+            'remark' => 'remark',//Yii::t('rbac-admin', 'Data'),
         ];
     }
 
@@ -192,6 +193,7 @@ public function getMenuSource()
             'm.route',
             'parent_name' => 'p.name',
             'm.order',
+            'm.remark',
             'a.description as route_name'
         ])
             ->from(['m' => $tableName])