diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index f4a7199288..5214eafede 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -162,6 +162,7 @@ $lang->action->objectTypes['repo']             = 'Repo';
 $lang->action->objectTypes['dataview']         = 'Data View';
 $lang->action->objectTypes['privlang']         = 'Priv';
 $lang->action->objectTypes['scene']            = 'Scene';
+$lang->action->objectTypes['privpackage']      = 'Priv Package';
 
 /* Used to describe operation history. */
 $lang->action->desc = new stdclass();
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 573afc3ba2..4aada15413 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -162,6 +162,7 @@ $lang->action->objectTypes['repo']             = 'Repo';
 $lang->action->objectTypes['dataview']         = 'Data View';
 $lang->action->objectTypes['privlang']         = 'Priv';
 $lang->action->objectTypes['scene']            = 'Scene';
+$lang->action->objectTypes['privpackage']      = 'Priv Package';
 
 /* Used to describe operation history. */
 $lang->action->desc = new stdclass();
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index fcec4f79be..458690ad55 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -162,6 +162,7 @@ $lang->action->objectTypes['repo']             = 'Repo';
 $lang->action->objectTypes['dataview']         = 'Data View';
 $lang->action->objectTypes['privlang']         = 'Priv';
 $lang->action->objectTypes['scene']            = 'Scene';
+$lang->action->objectTypes['privpackage']      = 'Priv Package';
 
 /* Used to describe operation history. */
 $lang->action->desc = new stdclass();
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 6996d80c6d..0335e8a451 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -162,6 +162,7 @@ $lang->action->objectTypes['repo']             = '代码库';
 $lang->action->objectTypes['dataview']         = '中间表';
 $lang->action->objectTypes['privlang']         = '权限';
 $lang->action->objectTypes['scene']            = '场景';
+$lang->action->objectTypes['privpackage']      = '权限包';
 
 /* 用来描述操作历史记录。*/
 $lang->action->desc = new stdclass();
diff --git a/module/execution/model.php b/module/execution/model.php
index fb92c42f96..6895d02cb3 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -5784,11 +5784,6 @@ class executionModel extends model
         $post    = $_POST;
 
         $_POST = array();
-        $extendFields = $this->getExtendFields();
-        foreach(array_keys($extendFields) as $field)
-        {
-            if(isset($post[$field])) $_POST[$field] = $post[$field];
-        }
 
         $_POST['project']     = $projectID;
         $_POST['name']        = $project->name;
@@ -5843,11 +5838,6 @@ class executionModel extends model
         $post    = $_POST;
 
         $_POST = array();
-        $extendFields = $this->getExtendFields();
-        foreach(array_keys($extendFields) as $field)
-        {
-            if(isset($post[$field])) $_POST[$field] = $post[$field];
-        }
 
         $_POST['project']   = $projectID;
         $_POST['name']      = $project->name;
@@ -6037,23 +6027,4 @@ class executionModel extends model
         }
         return $sortedExecutions;
     }
-
-    /**
-     * Get Extend Fields in workflow.
-     *
-     * @param  string $module
-     * @access public
-     * @return array
-     */
-    public function getExtendFields($module = 'project')
-    {
-        $extendFields = $this->dao->select('field')
-            ->from(TABLE_WORKFLOWFIELD)
-            ->where('module')->eq('project')
-            ->andWhere('buildin')->eq(0)
-            ->andWhere('role')->eq('custom')
-            ->fetchPairs('field');
-
-        return $extendFields;
-    }
 }
diff --git a/module/group/control.php b/module/group/control.php
index 6539e1abd1..4fbc88f405 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -509,25 +509,24 @@ class group extends control
         if($browseType == 'bycard')
         {
             $privs        = $this->group->getPrivsListByView($view);
-            $privPackages = $this->group->getPrivPackagePairs();
-            $privLang     = $this->group->getPrivLangPairs();
+            $privs        = $this->group->transformPrivLang($privs);
+            $privPackages = $this->group->getPrivManagerPairs('package');
 
             $privList = array();
             foreach($privs as $privID => $priv)
             {
-                if(!isset($privList[$priv->module])) $privList[$priv->module] = array();
-                if(!isset($privList[$priv->module][$priv->package])) $privList[$priv->module][$priv->package] = array();
-                $privList[$priv->module][$priv->package][$priv->id] = $priv;
+                if(!isset($privList[$priv->parentCode])) $privList[$priv->parentCode] = array();
+                if(!is_array($privList[$priv->parentCode])) $privList[$priv->parentCode] = array();
+                if(!isset($privList[$priv->parentCode][$priv->parent])) $privList[$priv->parentCode][$priv->parent] = array();
+                $privList[$priv->parentCode][$priv->parent][$priv->key] = $priv;
             }
 
-            $this->view->privLang     = $privLang;
             $this->view->privPackages = $privPackages;
         }
         else
         {
             $privList = $browseType != 'bysearch' ? $this->group->getPrivsListByView($view) : $this->group->getPrivsListBySearch($paramID);
-
-            foreach($privList as $privID => $priv) if(!$this->group->checkMenuModule($view, $priv->module)) unset($privList[$privID]);
+            $privs    = $this->group->transformPrivLang($privList);
 
             /* Pager. */
             $this->app->loadClass('pager', $static = true);
@@ -552,7 +551,7 @@ class group extends control
         $this->view->title          = $this->lang->group->editManagePriv;
         $this->view->browseType     = $browseType;
         $this->view->privList       = $privList;
-        $this->view->packages       = $this->group->getPrivPackagePairs($view);
+        $this->view->packages       = $this->group->getPrivManagerPairs('package');
         $this->view->moduleLang     = $moduleLang;
         $this->view->modulePackages = $this->group->getModuleAndPackageTree();
         $this->view->view           = $view;
@@ -613,7 +612,7 @@ class group extends control
         }
 
         $this->view->title   = $this->lang->group->createPrivPackage;
-        $this->view->modules = $this->group->getPrivModules();
+        $this->view->modules = $this->group->getPrivManagerPairs('module', '', 'name', true);
         $this->display();
     }
 
@@ -639,7 +638,7 @@ class group extends control
 
         $this->view->title       = $this->lang->group->editPrivPackage;
         $this->view->privPackage = $this->group->getPrivPackageByID($privPackageID);
-        $this->view->modules     = $this->group->getPrivModules();
+        $this->view->modules     = $this->group->getPrivManagerPairs('module', '', 'name', true);
         $this->view->actions     = $this->loadModel('action')->getList('privpackage', $privPackageID);
         $this->view->users       = $this->loadModel('user')->getPairs();
         $this->display();
@@ -657,25 +656,12 @@ class group extends control
     {
         $orders = $_POST['orders'];
         if(empty($orders)) return false;
-        if($type == 'view')
+
+        $orders = explode(',', $orders);
+
+        foreach($orders as $index => $id)
         {
-            $orders = str_replace('View,', ',', $orders);
-            $orders = trim($orders, ',');
-            $this->loadModel('setting')->setItem("system.priv.views", $orders);
-        }
-        if($type == 'module')
-        {
-            $orders   = trim($orders, ',');
-            $parentID = rtrim($parentID, 'View');
-            $this->loadModel('setting')->setItem("system.priv.{$parentID}Modules", $orders);
-        }
-        if($type == 'package')
-        {
-            $orders = explode(',', $orders);
-            foreach($orders as $index => $id)
-            {
-                if(!empty($id)) $this->dao->update(TABLE_PRIVPACKAGE)->set('order')->eq(($index + 1) * 5)->where('id')->eq($id)->exec();
-            }
+            if(!empty($id)) $this->dao->update(TABLE_PRIVMANAGER)->set('order')->eq(($index + 1) * 5)->where('id')->eq($id)->exec();
         }
     }
 
@@ -695,7 +681,7 @@ class group extends control
         else
         {
             $privPackage = $this->group->getPrivPackageByID($privPackageID);
-            $this->group->deletePrivPackage($privPackageID);
+            $this->group->deletePrivPackage($privPackageID, $privPackage->parent);
             if(!dao::isError()) $this->loadModel('action')->create('privpackage', $privPackageID, 'deleted', '', zget($privPackage, 'name'));
 
             return print(js::reload('parent'));
@@ -724,16 +710,20 @@ class group extends control
         }
 
         $privs   = $this->group->getPrivByIdList($privIdList);
+        $privs   = $this->group->transformPrivLang($privs);
         $modules = array();
         foreach($privs as $priv) $modules[$priv->module] = $priv->module;
 
         $modulePrivs   = $this->group->getPrivByModule($modules);
         $packageIdList = array();
-        foreach($modulePrivs as $packagePrivs) $packageIdList = array_unique(array_merge($packageIdList, array_keys($packagePrivs)));
+        foreach($modulePrivs as $packagePrivs)
+        {
+            $packageIdList = array_unique(array_merge($packageIdList, array_keys($packagePrivs)));
+        }
 
         $this->view->privs       = $privs;
         $this->view->modules     = array('' => $this->lang->group->selectModule) + $this->group->getMenuModules(null, true);
-        $this->view->packages    = $this->dao->select('*')->from(TABLE_PRIVPACKAGE)->where('id')->in($packageIdList)->orderBy('`order`')->fetchPairs('id', 'name');
+        $this->view->packages    = $this->group->getPrivManagerPairs('package', current($modules));
         $this->view->modulePrivs = $modulePrivs;
         $this->view->type        = $type;
         $this->display();
@@ -787,7 +777,7 @@ class group extends control
 
         $this->view->privs       = $privs;
         $this->view->modules     = array('' => $this->lang->group->selectModule) + $this->group->getMenuModules(null, true);
-        $this->view->packages    = $this->dao->select('*')->from(TABLE_PRIVPACKAGE)->where('id')->in($packageIdList)->orderBy('`order`')->fetchPairs('id', 'name');
+        $this->view->packages    = $this->group->getPrivManagerPairs('package', current($modules));
         $this->view->modulePrivs = $modulePrivs;
         $this->view->type        = $type;
         $this->display('group', 'addrelation');
@@ -806,12 +796,9 @@ class group extends control
     {
         if(is_string($privIdList)) $privIdList = explode(',', $privIdList);
 
-        $modulePrivs   = $this->group->getPrivByModule($module);
-        $packageIdList = array();
-        foreach($modulePrivs as $packagePrivs) $packageIdList = array_unique(array_merge($packageIdList, array_keys($packagePrivs)));
-
-        $modules  = $this->group->getMenuModules(null, true);
-        $packages = $this->dao->select('*')->from(TABLE_PRIVPACKAGE)->where('id')->in($packageIdList)->orderBy('`order`')->fetchPairs('id', 'name');
+        $modulePrivs = $this->group->getPrivByModule($module);
+        $modules     = $this->group->getMenuModules(null, true);
+        $packages    = $this->group->getPrivManagerPairs('package', $module);
 
         $tree  = "<ul class='tree' data-ride='tree'><li>";
         $tree .= html::a('#', $modules[$module]);
@@ -866,21 +853,13 @@ class group extends control
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
         }
-        $views      = $this->loadModel('setting')->getItem("owner=system&module=priv&key=views");
-        $views      = explode(',', $views);
-        $moduleLang = $this->group->getMenuModules('', true);
-        foreach($views as $index => $view)
-        {
-            $views[$view] = isset($this->lang->{$view}->common) ? $this->lang->{$view}->common : zget($moduleLang, $view);
-            unset($views[$index]);
-        }
 
         $this->view->title              = $this->lang->group->createPriv;
-        $this->view->views              = array('' => '') + $views;
-        $this->view->modules            = array('' => '') + $this->group->getPrivModules('', 'noViewName');
+        $this->view->views              = array('' => '') + $this->group->getPrivManagerPairs('view');
+        $this->view->modules            = array('' => '') + $this->group->getPrivManagerPairs('module');
         $this->view->packages           = array('' => '') + $this->group->getPrivPackagePairs();
         $this->view->moduleViewPairs    = $this->group->getPrivModuleViewPairs();
-        $this->view->packageModulePairs = $this->group->getPrivPackagePairs('', '', 'module');
+        $this->view->packageModulePairs = $this->group->getPrivPackagePairs('', '', 't3.code');
         $this->display();
     }
 
@@ -916,23 +895,18 @@ class group extends control
             $this->send(array('result' => $responseResult, 'message' => $responseMessage, 'locate' => $locate));
         }
 
-        $views      = $this->loadModel('setting')->getItem("owner=system&module=priv&key=views");
-        $views      = explode(',', $views);
-        $moduleLang = $this->group->getMenuModules('', true);
-        foreach($views as $index => $view)
-        {
-            $views[$view] = isset($this->lang->{$view}->common) ? $this->lang->{$view}->common : zget($moduleLang, $view);
-            unset($views[$index]);
-        }
-        $moduleViewPairs = $this->group->getPrivModuleViewPairs();
-        $priv->view      = zget($moduleViewPairs, $priv->module, '');
+        $moduleViewPairs    = $this->group->getPrivModuleViewPairs();
+        $packageModulePairs = $this->group->getPrivPackagePairs('', '', 't3.code');
+        $priv->privModule    = zget($packageModulePairs, $priv->parent);
+        $priv->privView      = zget($moduleViewPairs, $priv->module);
+        $priv->package       = isset($packageModulePairs[$priv->parent]) ? $priv->parent : 0;
 
         $this->view->title              = $this->lang->group->editPriv;
-        $this->view->views              = array('' => '') + $views;
-        $this->view->modules            = array('' => '') + $this->group->getPrivModules($priv->view, 'noViewName');
-        $this->view->packages           = array('' => '') + $this->group->getPrivPackagePairs($priv->view, $priv->module);
+        $this->view->views              = array('' => '') + $this->group->getPrivManagerPairs('view');
+        $this->view->modules            = array('' => '') + $this->group->getPrivManagerPairs('module');
+        $this->view->packages           = array('' => '') + $this->group->getPrivPackagePairs();
         $this->view->moduleViewPairs    = $moduleViewPairs;
-        $this->view->packageModulePairs = $this->group->getPrivPackagePairs('', '', 'module');
+        $this->view->packageModulePairs = $packageModulePairs;
         $this->view->priv               = $priv;
         $this->view->actions            = $this->loadModel('action')->getList('privlang', $privID);
         $this->view->users              = $this->loadModel('user')->getPairs();
@@ -1009,7 +983,7 @@ class group extends control
         {
             foreach($relations as $relatedPriv)
             {
-                $module = $relatedPriv->module;
+                $module = $relatedPriv->moduleCode;
                 if(!isset($privList[$type][$module])) $privList[$type][$module] = array();
                 $privList[$type][$module]['title']      = zget($moduleLang, $module, $module);
                 $privList[$type][$module]['module']     = $relatedPriv->module;
diff --git a/module/group/js/editmanagepriv.js b/module/group/js/editmanagepriv.js
index 4217c5a211..4bf453ffe2 100644
--- a/module/group/js/editmanagepriv.js
+++ b/module/group/js/editmanagepriv.js
@@ -13,7 +13,7 @@ function initRecomendTree(data)
         initialState: 'active',
         itemCreator: function($li, item)
         {
-            $li.append('<a class="priv-item" data-has-children="' + (item.children ? !!item.children.length : false) + '" href="#" title="' + item.title + '">' + item.title + (item.children ? '' : '<i class="icon icon-close hidden" data-type="depend" data-privid=' + item.privID + ' data-relationpriv=' + item.relationPriv + '></i>') +  '</a>');
+            $li.append('<a class="priv-item" data-has-children="' + (item.children ? !!item.children.length : false) + '" href="#" title="' + item.title + '">' + item.title + (item.children ? '' : '<i class="icon icon-close hidden" data-type="recommend" data-privid=' + item.privID + ' data-relationpriv=' + item.relationPriv + '></i>') +  '</a>');
             if(item.active) $li.addClass('active open in');
         }
     });
@@ -34,7 +34,7 @@ function initDependTree(data)
         initialState: 'active',
         itemCreator: function($li, item)
         {
-            $li.append('<a class="priv-item" data-has-children="' + (item.children ? !!item.children.length : false) + '" href="#" title="' + item.title + '">' + item.title + (item.children ? '' : '<i class="icon icon-close hidden" data-type="recommend" data-privid=' + item.privID + ' data-relationpriv=' + item.relationPriv + '></i>') + '</a>');
+            $li.append('<a class="priv-item" data-has-children="' + (item.children ? !!item.children.length : false) + '" href="#" title="' + item.title + '">' + item.title + (item.children ? '' : '<i class="icon icon-close hidden" data-type="depend" data-privid=' + item.privID + ' data-relationpriv=' + item.relationPriv + '></i>') + '</a>');
             if(item.active) $li.addClass('active open in');
         }
     });
diff --git a/module/group/lang/de.php b/module/group/lang/de.php
index da64e6d502..73d2b46065 100644
--- a/module/group/lang/de.php
+++ b/module/group/lang/de.php
@@ -118,6 +118,13 @@ $lang->privpackage->module = 'Module';
 $lang->privpackage->desc   = 'Priv Package Desc';
 $lang->privpackage->belong = 'Priv Package';
 
+if(!isset($lang->privlang)) $lang->privlang = new stdclass();
+$lang->privlang->value  = 'Name';
+$lang->privlang->desc   = 'Desc';
+$lang->privlang->module = 'Module';
+$lang->privlang->method = 'Method';
+$lang->privlang->parent = 'Module/Package';
+
 $lang->group->copyOptions['copyPriv'] = 'Rechte kopieren';
 $lang->group->copyOptions['copyUser'] = 'Benutzer kopieren';
 
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index c3820bfce7..9484c0d964 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -118,6 +118,13 @@ $lang->privpackage->module = 'Module';
 $lang->privpackage->desc   = 'Priv Package Desc';
 $lang->privpackage->belong = 'Priv Package';
 
+if(!isset($lang->privlang)) $lang->privlang = new stdclass();
+$lang->privlang->value  = 'Name';
+$lang->privlang->desc   = 'Desc';
+$lang->privlang->module = 'Module';
+$lang->privlang->method = 'Method';
+$lang->privlang->parent = 'Module/Package';
+
 $lang->group->copyOptions['copyPriv'] = 'Copy Privileges';
 $lang->group->copyOptions['copyUser'] = 'Copy Users';
 
diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php
index bb050d09b4..19dea5c114 100644
--- a/module/group/lang/fr.php
+++ b/module/group/lang/fr.php
@@ -118,6 +118,13 @@ $lang->privpackage->module = 'Module';
 $lang->privpackage->desc   = 'Priv Package Desc';
 $lang->privpackage->belong = 'Priv Package';
 
+if(!isset($lang->privlang)) $lang->privlang = new stdclass();
+$lang->privlang->value  = 'Name';
+$lang->privlang->desc   = 'Desc';
+$lang->privlang->module = 'Module';
+$lang->privlang->method = 'Method';
+$lang->privlang->parent = 'Module/Package';
+
 $lang->group->copyOptions['copyPriv'] = 'Copier Privilèges';
 $lang->group->copyOptions['copyUser'] = 'Copier Utilisateurs';
 
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index 3d8d6f0337..5aef2bfba4 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -118,6 +118,13 @@ $lang->privpackage->module = '所属模块';
 $lang->privpackage->desc   = '权限包说明';
 $lang->privpackage->belong = '所属权限包';
 
+if(!isset($lang->privlang)) $lang->privlang = new stdclass();
+$lang->privlang->value  = '权限名称';
+$lang->privlang->desc   = '描述';
+$lang->privlang->module = '模块名';
+$lang->privlang->method = '方法名';
+$lang->privlang->parent = '所属模块/权限包';
+
 $lang->group->copyOptions['copyPriv'] = '复制权限';
 $lang->group->copyOptions['copyUser'] = '复制用户';
 
diff --git a/module/group/model.php b/module/group/model.php
index fe69978400..63e4ae6d03 100644
--- a/module/group/model.php
+++ b/module/group/model.php
@@ -853,13 +853,31 @@ class groupModel extends model
      */
     public function createPrivPackage()
     {
-        $package = fixer::input('post')->get();
+        if(empty($_POST['value'])) dao::$errors['value'] = sprintf($this->lang->error->notempty, $this->lang->privpackage->name);
+        if(empty($_POST['parent'])) dao::$errors['parent'] = sprintf($this->lang->error->notempty, $this->lang->privpackage->module);
+        if(dao::isError()) return false;
 
-        $packages = $this->getPrivPackagesByModule($package->module);
+        $module = $this->dao->select('id')->from(TABLE_PRIVMANAGER)->where('code')->eq($_POST['parent'])->andWhere('type')->eq('module')->fetch('id');
+        $package = fixer::input('post')
+            ->add('type', 'package')
+            ->add('parent', $module)
+            ->remove('value,desc')
+            ->get();
+        $packages = $this->getPrivPackagesByModule($package->parent);
         $package->order = (count($packages) + 1) * 5;
 
-        $this->dao->insert(TABLE_PRIVPACKAGE)->data($package)->batchCheck($this->config->privPackage->create->requiredFields, 'notempty')->exec();
+        $this->dao->insert(TABLE_PRIVMANAGER)->data($package)->exec();
         $packageID = $this->dao->lastInsertId();
+
+        $packageLang = fixer::input('post')
+            ->add('objectID', $packageID)
+            ->add('objectType', 'manager')
+            ->add('lang', $this->app->getClientLang())
+            ->remove('parent')
+            ->get();
+
+        $this->dao->insert(TABLE_PRIVLANG)->data($packageLang)->exec();
+
         $this->loadModel('action')->create('privpackage', $packageID, 'Opened');
         return $packageID;
     }
@@ -875,18 +893,32 @@ class groupModel extends model
     {
         $oldPackage = $this->getPrivPackageByID($packageID);
 
-        $package = fixer::input('post')->get();
-        if($oldPackage->module != $package->module)
+        if(empty($_POST['value'])) dao::$errors['value'] = sprintf($this->lang->error->notempty, $this->lang->privpackage->name);
+        if(empty($_POST['parent'])) dao::$errors['parent'] = sprintf($this->lang->error->notempty, $this->lang->privpackage->module);
+        if(dao::isError()) return false;
+
+        $module = $this->dao->select('id')->from(TABLE_PRIVMANAGER)->where('code')->eq($_POST['parent'])->andWhere('type')->eq('module')->fetch('id');
+
+        $package = fixer::input('post')
+            ->add('parent', $module)
+            ->remove('value,desc')
+            ->get();
+
+        if($oldPackage->parent != $package->parent)
         {
-            $packages = $this->getPrivPackagesByModule($package->module);
+            $packages = $this->getPrivPackagesByModule($package->parent);
             $package->order = (count($packages) + 1) * 5;
+        }
 
-            $priv = new stdclass();
-            $priv->module = $package->module;
-        }
-        $this->dao->update(TABLE_PRIVPACKAGE)->data($package)->batchCheck($this->config->privPackage->edit->requiredFields, 'notempty')->where('id')->eq($packageID)->exec();
+        $this->dao->update(TABLE_PRIVMANAGER)->data($package)->where('id')->eq($packageID)->exec();
+
+        $packageLang = fixer::input('post')
+            ->remove('parent')
+            ->get();
+
+        $this->dao->update(TABLE_PRIVLANG)->data($packageLang)->where('objectID')->eq($packageID)->andWhere('objectType')->eq('manager')->andWhere('lang')->eq($this->app->getClientLang())->exec();
+
         if(dao::isError()) return false;
-        if(isset($priv)) $this->dao->update(TABLE_PRIV)->data($priv)->where('package')->eq($packageID)->exec();
 
         $package = $this->getPrivPackageByID($packageID);
         $changes = common::createChanges($oldPackage, $package);
@@ -901,11 +933,12 @@ class groupModel extends model
      * @access public
      * @return bool
      */
-    public function deletePrivPackage($packageID)
+    public function deletePrivPackage($packageID, $moduleID)
     {
-        $this->dao->delete()->from(TABLE_PRIVPACKAGE)->where('id')->eq($packageID)->exec();
+        $this->dao->delete()->from(TABLE_PRIVMANAGER)->where('id')->eq($packageID)->exec();
+        $this->dao->delete()->from(TABLE_PRIVLANG)->where('objectID')->eq($packageID)->andWhere('objectType')->eq('manager')->exec();
         if(dao::isError()) return false;
-        $this->dao->update(TABLE_PRIV)->set('package')->eq(0)->where('package')->eq($packageID)->exec();
+        $this->dao->update(TABLE_PRIV)->set('parent')->eq($moduleID)->where('parent')->eq($packageID)->exec();
     }
 
     /**
@@ -917,7 +950,7 @@ class groupModel extends model
      */
     public function getPrivPackageByID($packageID)
     {
-        return $this->dao->select('distinct t1.*,t2.`value` as name')->from(TABLE_PRIVMANAGER)->alias('t1')
+        return $this->dao->select('distinct t1.*,t2.`value` as name, t2.desc')->from(TABLE_PRIVMANAGER)->alias('t1')
             ->leftJoin(TABLE_PRIVLANG)->alias('t2')->on('t1.id=t2.objectID')
             ->where('t1.id')->eq($packageID)
             ->andWhere('t1.edition')->like("%,{$this->config->edition},%")
@@ -937,7 +970,7 @@ class groupModel extends model
     {
         $moduleID = $this->dao->select('id')->from(TABLE_PRIVMANAGER)->where('`code`')->eq($module)->andWhere('type')->eq('module')->fetch('id');
 
-        return $this->dao->select('t1.*,t2.value as name')->from(TABLE_PRIVMANAGER)->alias('t1')
+        return $this->dao->select('t1.*,t2.value as name, t2.desc')->from(TABLE_PRIVMANAGER)->alias('t1')
             ->leftJoin(TABLE_PRIVLANG)->alias('t2')->on('t1.id=t2.objectID')
             ->where('t1.parent')->eq($moduleID)
             ->andWhere('t1.type')->eq('package')
@@ -982,21 +1015,22 @@ class groupModel extends model
         else
         {
             $modules = $this->getPrivManagerPairs('module', $view);
-            $modules = array_keys($modules);
-            $modules = implode(',', $modules);
+            $modules = $this->dao->select('id')->from(TABLE_PRIVMANAGER)->where('type')->eq('module')->andWhere('code')->in(array_keys($modules))->fetchPairs('id');
         }
-        $modules = trim($modules, ',');
 
-        return $this->dao->select("id,{$field}")
+        return $this->dao->select("t1.id, $field")
             ->from(TABLE_PRIVMANAGER)->alias('t1')
             ->leftJoin(TABLE_PRIVLANG)->alias('t2')->on('t1.id=t2.objectID')
+            ->leftJoin(TABLE_PRIVMANAGER)->alias('t3')->on('t1.parent=t3.id')
             ->where('1=1')
             ->andWhere('t2.objectType')->eq('manager')
-            ->beginIF(!empty($modules))->andWhere('parent')->in($modules)->fi()
+            ->andWhere('t1.type')->eq('package')
+            ->beginIF(!empty($modules))->andWhere('t1.parent')->in($modules)->fi()
             ->andWhere('t1.edition')->like("%,{$this->config->edition},%")
             ->andWhere('t1.vision')->like("%,{$this->config->vision},%")
             ->andWhere('t2.lang')->eq($this->app->getClientLang())
-            ->orderBy('order_asc')
+            ->andWhere('t3.type')->eq('module')
+            ->orderBy('t1.order_asc')
             ->fetchPairs();
     }
 
@@ -1069,54 +1103,51 @@ class groupModel extends model
     {
         $this->loadModel('setting');
 
-        $views = empty($viewName) ? $this->setting->getItem("owner=system&module=priv&key=views") : $viewName;
-        if(empty($views)) return array();
-        $views = explode(',', $views);
+        $views = $this->getPrivManagers('view');
 
-        $modules    = array();
-        $moduleLang = $this->getMenuModules('', true);
-        foreach($views as $viewIndex => $view)
+        $tree = array();
+        foreach($views as $viewID => $view)
         {
-            $viewID           = $view . 'View';
+            if(empty($view->name)) continue;
+
             $treeView         = new stdclass();
             $treeView->id     = $viewID;
             $treeView->type   = 'view';
-            $treeView->name   = $this->lang->{$view}->common;
+            $treeView->name   = $view->name;
             $treeView->parent = 0;
             $treeView->path   = ",{$viewID},";
             $treeView->grade  = 1;
-            $treeView->order  = $viewIndex;
+            $treeView->order  = $view->order;
             $treeView->desc   = '';
             $tree[$viewID]    = $treeView;
 
-            $viewModules = $this->setting->getItem("owner=system&module=priv&key={$view}Modules");
+            $viewModules = $this->getPrivManagers('module', $view->code);
             if(empty($viewModules)) continue;
 
-            $viewModules = explode(',', $viewModules);
-            foreach($viewModules as $moduleIndex => $module)
+            foreach($viewModules as $moduleID => $module)
             {
                 $treeModule         = new stdclass();
-                $treeModule->id     = $module;
+                $treeModule->id     = $moduleID;
                 $treeModule->type   = 'module';
-                $treeModule->name   = zget($moduleLang, $module);
+                $treeModule->name   = $module->name;
                 $treeModule->parent = $viewID;
-                $treeModule->path   = ",{$viewID},{$module},";
+                $treeModule->path   = ",{$viewID},{$moduleID},";
                 $treeModule->grade  = 2;
-                $treeModule->order  = $moduleIndex;
+                $treeModule->order  = $moduleID;
                 $treeModule->desc   = '';
-                $tree[$module]      = $treeModule;
+                $tree[$moduleID]    = $treeModule;
 
-                $packages = $this->getPrivPackagesByModule($module);
+                $packages = $this->getPrivManagers('package', $module->code);
                 foreach($packages as $packageID => $package)
                 {
                     $treePackage = new stdclass();
                     $treePackage->id     = $packageID;
                     $treePackage->type   = 'package';
                     $treePackage->name   = $package->name;
-                    $treePackage->parent = $module;
-                    $treePackage->path   = ",{$viewID},{$module},{$packageID},";
+                    $treePackage->parent = $moduleID;
+                    $treePackage->path   = ",{$viewID},{$moduleID},{$packageID},";
                     $treePackage->grade  = 3;
-                    $treePackage->desc   = $package->desc;
+                    $treePackage->desc   = !empty($package->desc) ? $package->desc : '';
                     $treePackage->order  = $package->order;
                     $tree[$packageID]    = $treePackage;
                 }
@@ -1507,12 +1538,24 @@ class groupModel extends model
     public function getPrivByID($privID, $lang = '')
     {
         if(empty($lang)) $lang = $this->app->getClientLang();
-        return $this->dao->select('t1.*,t2.key,t2.value,t2.desc')->from(TABLE_PRIV)->alias('t1')
+        $priv = $this->dao->select('t1.*,t2.`key`,t2.value,t2.desc')->from(TABLE_PRIV)->alias('t1')
             ->leftJoin(TABLE_PRIVLANG)->alias('t2')->on('t1.id=t2.objectID')
             ->where('t1.id')->eq($privID)
             ->andWhere('t2.objectType')->eq('priv')
             ->andWhere('t2.lang')->eq($lang)
             ->fetch();
+        if(!empty($priv->value)) $priv->name = $priv->value;
+        if(empty($priv->value) and !empty($priv->key))
+        {
+            list($moduleName, $methodLang) = explode('-', $priv->key);
+            if($moduleName == 'requirement') $moduleName = 'story';
+            $this->app->loadLang($moduleName);
+
+            $hasLang = (!empty($moduleName) and !empty($methodLang) and isset($this->lang->resource->{$priv->module}) and isset($this->lang->resource->{$priv->module}->{$priv->method}));
+            if($hasLang) $priv->name = (!empty($moduleName) and !empty($methodLang) and isset($this->lang->{$moduleName}->$methodLang)) ? $this->lang->{$moduleName}->$methodLang : $priv->method;
+        }
+
+        return $priv;
     }
 
     /**
@@ -1524,13 +1567,17 @@ class groupModel extends model
      */
     public function getPrivByIdList($privIdList)
     {
-        return $this->dao->select('t1.*,t2.key,t2.value,t2.desc')->from(TABLE_PRIV)->alias('t1')
+        return $this->dao->select("t1.*,t2.`key`,t2.value,t2.desc,IF(t3.type='package', t4.`code`, t3.`code`) as moduleCode")->from(TABLE_PRIV)->alias('t1')
             ->leftJoin(TABLE_PRIVLANG)->alias('t2')->on('t1.id=t2.objectID')
+            ->leftJoin(TABLE_PRIVMANAGER)->alias('t3')->on('t1.parent=t3.id')
+            ->leftJoin(TABLE_PRIVMANAGER)->alias('t4')->on('t3.parent=t4.id')
             ->where('t1.id')->in($privIdList)
             ->andWhere('t1.edition')->like("%,{$this->config->edition},%")
             ->andWhere('t1.vision')->like("%,{$this->config->vision},%")
             ->andWhere('t2.lang')->eq($this->app->getClientLang())
             ->andWhere('t2.objectType')->eq('priv')
+            ->andWhere('(t3.type')->eq('module')
+            ->orWhere('(t3.type')->eq('package')->andWhere('t4.type')->eq('module')->markRight(2)
             ->orderBy('order_asc')
             ->fetchAll('id');
     }
@@ -1547,28 +1594,32 @@ class groupModel extends model
         $moduleIdList = $this->dao->select('id')->from(TABLE_PRIVMANAGER)
             ->where('code')->in($modules)
             ->andWhere('`type`')->eq('module')
-            ->fetchAll('id');
+            ->fetchPairs('id');
 
         $packageIdList = $this->dao->select('id')->from(TABLE_PRIVMANAGER)
             ->where('`parent`')->in(array_keys($moduleIdList))
-            ->fetchAll('id');
+            ->fetchPairs('id');
 
-        $parentsIdList = array_merge(array_keys($moduleIdList), array_keys($packageIdList));
-
-        $stmt = $this->dao->select('t1.*,t3.`parent` as moduleID,t2.`key`,t2.value,t2.`desc`')->from(TABLE_PRIV)->alias('t1')
+        $privs = $this->dao->select("t1.*,IF(t3.type='package', t3.`id`, '0') as packageID,IF(t3.type='package', t4.`code`, t3.`code`) as moduleCode,t2.`key`,t2.value,t2.`desc`")->from(TABLE_PRIV)->alias('t1')
             ->leftJoin(TABLE_PRIVLANG)->alias('t2')->on('t1.id=t2.objectID')
             ->leftJoin(TABLE_PRIVMANAGER)->alias('t3')->on('t1.parent=t3.id')
-            ->where('t3.id')->in($parentsIdList)
-            ->andWhere('t1.edition')->like("%,{$this->config->edition},%")
+            ->leftJoin(TABLE_PRIVMANAGER)->alias('t4')->on('t3.parent=t4.id')
+            ->where('t1.edition')->like("%,{$this->config->edition},%")
             ->andWhere('t1.vision')->like("%,{$this->config->vision},%")
             ->andWhere('t2.lang')->eq($this->app->getClientLang())
             ->andWhere('t2.objectType')->eq('priv')
-            ->orderBy('t1.`order`')
-            ->query();
 
-        $privs = array();
-        while($priv = $stmt->fetch()) $privs[$priv->moduleID][$priv->parent][$priv->id] = $priv;
-        return $privs;
+            ->andWhere('((t3.type')->eq('module')->andWhere('t3.id')->in($moduleIdList)->markRight(1)
+            ->orWhere('(t3.type')->eq('package')->andWhere('t3.id')->in($packageIdList)->andWhere('t4.type')->eq('module')->markRight(2)
+
+            ->orderBy('t1.`order`')
+            ->fetchAll('id');
+        $privs = $this->transformPrivLang($privs);
+
+        $privList = array();
+        foreach($privs as $priv) $privList[$priv->moduleCode][$priv->packageID][$priv->id] = $priv;
+
+        return $privList;
     }
 
     /**
@@ -1602,9 +1653,8 @@ class groupModel extends model
     {
         $modules = $this->getPrivManagerPairs('module', $view);
         $modules = array_keys($modules);
-        $modules = implode(',', $modules);
 
-        $privs = $this->dao->select("t1.id, t1.module, t1.method, CONCAT(t1.module, '-', t1.method) AS action, IF(t3.type = 'module', 0, t1.parent) as parent, t1.order, t2.`key`, t2.`value`, t2.desc, IF(t3.type = 'module', t3.code, t4.code) as parentCode, IF(t3.type = 'module', 999, INSTR('$modules', t4.code)) as moduleOrder")->from(TABLE_PRIV)->alias('t1')
+        $privs = $this->dao->select("t1.id, t1.module, t1.method, CONCAT(t1.module, '-', t1.method) AS action, IF(t3.type = 'module', 0, t1.parent) as parent, t1.order, t2.`key`, t2.`value`, t2.desc, IF(t3.type = 'module', t3.code, t4.code) as parentCode")->from(TABLE_PRIV)->alias('t1')
             ->leftJoin(TABLE_PRIVLANG)->alias('t2')->on('t1.id=t2.objectID')
             ->leftJoin(TABLE_PRIVMANAGER)->alias('t3')->on('t1.parent=t3.id')
             ->leftJoin(TABLE_PRIVMANAGER)->alias('t4')->on('t3.parent=t4.id')
@@ -1623,10 +1673,15 @@ class groupModel extends model
             ->markRight(2)
             ->andWhere('t1.edition')->like("%,{$this->config->edition},%")
             ->andWhere('t1.vision')->like("%,{$this->config->vision},%")
-            ->orderBy("moduleOrder asc, t3.order asc, `order` asc")
+            ->orderBy("t3.order asc, `order` asc")
             ->page($pager)
-            ->fetchAll('action');
-        return $privs;
+            ->fetchGroup('parentCode', 'action');
+        $privList = array();
+        foreach($modules as $module)
+        {
+            $privList = array_merge($privList, zget($privs, $module, array()));
+        }
+        return $privList;
     }
 
     /**
@@ -1709,7 +1764,7 @@ class groupModel extends model
                 $privQuery = preg_replace("/`dependPrivs`([^']+)'([%]?{$priv}[%]?)'/Ui", "t1.`id`$1('{$privs}')", $privQuery);
             }
         }
-        if(strpos($privQuery, '`name`') !== false) $privQuery = str_replace('`name`', 't2.`name`', $privQuery);
+        if(strpos($privQuery, '`name`') !== false) $privQuery = str_replace('`name`', 't2.`value`', $privQuery);
         if(strpos($privQuery, '`module`') !== false) $privQuery = str_replace('`module`', 't1.`module`', $privQuery);
         if(strpos($privQuery, '`desc`') !== false) $privQuery = str_replace('`desc`', 't2.`desc`', $privQuery);
 
@@ -1719,7 +1774,7 @@ class groupModel extends model
         foreach($views as $view) $modules .= ',' . $this->setting->getItem("owner=system&module=priv&key={$view}Modules");
         $modules = trim($modules, ',');
 
-        return $this->dao->select("t1.*,t2.name,t2.desc, INSTR('$modules', t1.`module`) as moduleOrder")->from(TABLE_PRIV)->alias('t1')
+        return $this->dao->select("t1.*,t2.value,t2.desc, INSTR('$modules', t1.`module`) as moduleOrder")->from(TABLE_PRIV)->alias('t1')
             ->leftJoin(TABLE_PRIVLANG)->alias('t2')->on('t1.id=t2.priv')
             ->leftJoin(TABLE_PRIVPACKAGE)->alias('t3')->on('t1.parent=t3.id')
             ->where('1=1')
@@ -1743,18 +1798,27 @@ class groupModel extends model
      */
     public function getPrivRelation($priv, $type = '', $module = '')
     {
-        $relations = $this->dao->select('t1.type,t2.*,t3.`key`,t3.value')->from(TABLE_PRIVRELATION)->alias('t1')
+        $relations = $this->dao->select("t1.type,t2.*,t3.`key`,t3.value,IF(t4.type='package', t5.`code`, t4.`code`) as moduleCode")->from(TABLE_PRIVRELATION)->alias('t1')
             ->leftJoin(TABLE_PRIV)->alias('t2')->on('t1.relationPriv=t2.id')
             ->leftJoin(TABLE_PRIVLANG)->alias('t3')->on('t2.id=t3.objectID')
+            ->leftJoin(TABLE_PRIVMANAGER)->alias('t4')->on('t2.parent=t4.id')
+            ->leftJoin(TABLE_PRIVMANAGER)->alias('t5')->on('t4.parent=t5.id')
             ->where('t1.priv')->eq($priv)
             ->andWhere('t2.edition')->like("%,{$this->config->edition},%")
             ->andWhere('t2.vision')->like("%,{$this->config->vision},%")
             ->andWhere('t3.objectType')->eq('priv')
             ->beginIF(!empty($type))->andWhere('t1.type')->eq($type)->fi()
-            ->beginIF($module)->andWhere('t2.module')->eq($module)->fi()
+
+            ->andWhere('((t4.type')->eq('module')
+            ->beginIF($module)->andWhere('t4.code')->eq($module)->fi()
+            ->markRight(1)
+            ->orWhere('(t4.type')->eq('package')
+            ->andWhere('t5.type')->eq('module')
+            ->beginIF($module)->andWhere('t5.code')->eq($module)->fi()
+            ->markRight(2)
             ->fetchGroup('type', 'id');
 
-        foreach($relations as $type => $privList) $relations[$type] = $this->transformPrivLang($privList);
+        foreach($relations as $relationType => $privList) $relations[$relationType] = $this->transformPrivLang($privList);
 
         if(!empty($type)) return zget($relations, $type, array());
         return $relations;
@@ -1770,15 +1834,16 @@ class groupModel extends model
      */
     public function getPrivRelationsByIdList($privs, $type = '', $returnType = 'name')
     {
-        $privs = $this->dao->select('t1.priv,t3.`key`,t3.value,t1.type,t1.relationPriv')->from(TABLE_PRIVRELATION)->alias('t1')
-            ->leftJoin(TABLE_PRIV)->alias('t2')->on('t1.relationPriv=t2.id')
-            ->leftJoin(TABLE_PRIVLANG)->alias('t3')->on('t2.id=t3.objectID')
-            ->where('t1.priv')->in($privs)
-            ->andWhere('t2.edition')->like("%,{$this->config->edition},%")
-            ->andWhere('t2.vision')->like("%,{$this->config->vision},%")
-            ->andWhere('t3.objectType')->eq('priv')
+        $privs = $this->dao->select('DISTINCT t1.priv,t1.type,t1.relationPriv,t3.module,t3.method,t4.`key`,t4.value')->from(TABLE_PRIVRELATION)->alias('t1')
+            ->leftJoin(TABLE_PRIV)->alias('t2')->on('t1.priv=t2.id')
+            ->leftJoin(TABLE_PRIV)->alias('t3')->on('t1.relationPriv=t3.id')
+            ->leftJoin(TABLE_PRIVLANG)->alias('t4')->on('t3.id=t4.objectID')
+            ->where("CONCAT(t2.module, '-', t2.method)")->in($privs)
+            ->andWhere('t3.edition')->like("%,{$this->config->edition},%")
+            ->andWhere('t3.vision')->like("%,{$this->config->vision},%")
+            ->andWhere('t4.objectType')->eq('priv')
             ->beginIF(!empty($type))->andWhere('t1.type')->eq($type)->fi()
-            ->fetchGroup('type', 'relationPriv');
+            ->fetchGroup('type');
         if($returnType == 'idGroup') return $privs;
 
         $relationPrivs = array();
@@ -1860,7 +1925,7 @@ class groupModel extends model
 
         if(!empty($data->moduleName) and !empty($data->methodName))
         {
-            $method = $this->dao->select('`moduleName`,`methodName`')->from(TABLE_PRIV)->where('`moduleName`')->eq($data->moduleName)->andWhere('`methodName`')->eq($data->methodName)->fetchPairs();
+            $method = $this->dao->select('`module`,`method`')->from(TABLE_PRIV)->where('`module`')->eq($data->moduleName)->andWhere('`method`')->eq($data->methodName)->fetchPairs();
             if(count($method) > 0) dao::$errors['methodName'] = $this->lang->group->repeatPriv;
         }
 
@@ -1876,16 +1941,25 @@ class groupModel extends model
 
         if(dao::isError()) return false;
 
-        $priv = fixer::input('post')->remove('name,desc,view')->get();
-        if(!empty($priv->module)) $priv->order = $this->dao->select('(count(`id`) + 1) * 5 as `order`')->from(TABLE_PRIV)->where('`module`')->eq($priv->module)->andWhere('`package`')->eq($priv->package)->fetch('order');
+        $parent = !empty($data->package) ? $data->package : $this->dao->select('id')->from(TABLE_PRIVMANAGER)->where('code')->eq($data->module)->andWhere('type')->eq('module')->fetch('id');
+
+        $priv = new stdclass();
+        $priv->module = $data->moduleName;
+        $priv->method = $data->methodName;
+        $priv->parent = $parent;
+        $priv->order  = $this->dao->select('(count(`id`) + 1) * 5 as `order`')->from(TABLE_PRIV)->where('`parent`')->eq($parent)->fetch('order');
         $this->dao->insert(TABLE_PRIV)->data($priv)->exec();
         if(dao::isError()) return false;
 
         $privID = $this->dao->lastInsertId();
 
-        $privLang = fixer::input('post')->remove('moduleName,methodName,view,module,package')->get();
-        $privLang->priv = $privID;
+        $privLang = new stdclass();
+        $privLang->value      = $data->name;
+        $privLang->desc       = $data->desc;
+        $privLang->objectID   = $privID;
+        $privLang->objectType = 'priv';
         $privLang->lang = $this->app->clientLang;
+
         $this->dao->insert(TABLE_PRIVLANG)->data($privLang)->exec();
 
         $this->loadModel('action')->create('privlang', $privID, 'Opened');
@@ -1906,7 +1980,7 @@ class groupModel extends model
 
         if(!empty($data->moduleName) and !empty($data->methodName))
         {
-            $method = $this->dao->select('moduleName,methodName')->from(TABLE_PRIV)->where('`moduleName`')->eq($data->moduleName)->andWhere('`methodName`')->eq($data->methodName)->andWhere('id')->ne($privID)->fetchAll('methodName');
+            $method = $this->dao->select('module,method')->from(TABLE_PRIV)->where('`module`')->eq($data->moduleName)->andWhere('`method`')->eq($data->methodName)->andWhere('id')->ne($privID)->fetchAll('methodName');
             if(count($method) > 0) dao::$errors['methodName'] = $this->lang->group->repeatPriv;
         }
 
@@ -1922,12 +1996,20 @@ class groupModel extends model
 
         if(dao::isError()) return false;
 
-        $priv = fixer::input('post')->remove('name,desc,view')->get();
-        if(!empty($priv->module) and $priv->module != $oldPriv->module and $priv->package != $oldPriv->package) $priv->order = $this->dao->select('(count(`id`) + 1) * 5 as `order`')->from(TABLE_PRIV)->where('`module`')->eq($priv->module)->andWhere('`package`')->eq($priv->package)->fetch('order');
+        $parent = !empty($data->package) ? $data->package : $this->dao->select('id')->from(TABLE_PRIVMANAGER)->where('code')->eq($data->module)->andWhere('type')->eq('module')->fetch('id');
+
+        $priv = new stdclass();
+        $priv->module = $data->moduleName;
+        $priv->method = $data->methodName;
+        $priv->parent = $parent;
+
+        if($priv->parent != $oldPriv->parent) $priv->order = $this->dao->select('(count(`id`) + 1) * 5 as `order`')->from(TABLE_PRIV)->where('`parent`')->eq($priv->parent)->fetch('order');
         $this->dao->update(TABLE_PRIV)->data($priv)->where('id')->eq($privID)->exec();
 
-        $privLang = fixer::input('post')->remove('moduleName,methodName,view,module,package')->get();
-        $this->dao->update(TABLE_PRIVLANG)->data($privLang)->where('priv')->eq($privID)->andWhere('lang')->eq($lang)->exec();
+        $privLang = new stdclass();
+        $privLang->value = $data->name;
+        $privLang->desc  = $data->desc;
+        $this->dao->update(TABLE_PRIVLANG)->data($privLang)->where('objectID')->eq($privID)->andWhere('objectType')->eq('priv')->andWhere('lang')->eq($lang)->exec();
 
         $priv = $this->getPrivByID($privID, $lang);
 
@@ -1993,27 +2075,9 @@ class groupModel extends model
 
         $this->loadModel('setting');
 
-        $views = $this->setting->getItem("owner=system&module=priv&key=views");
-        $views = explode(',', $views);
-        foreach($views as $index => $view)
-        {
-            $views[$view] = isset($this->lang->{$view}->common) ? $this->lang->{$view}->common : $view;
-            unset($views[$index]);
-        }
-
-        $modules = '';
-        foreach(array_keys($views) as $view) $modules .= ',' . $this->setting->getItem("owner=system&module=priv&key={$view}Modules");
-        $modules    = trim($modules, ',');
-        $modules    = explode(',', $modules);
-        $moduleLang = $this->getMenuModules('', true);
-        foreach($modules as $index => $module)
-        {
-            $modules[$module] = zget($moduleLang, $module);
-            unset($modules[$index]);
-        }
-
-        $packages       = $this->getPrivPackagePairs();
-        $packageModules = $this->getPrivPackagePairs('', '', 'module');
+        $modules        = $this->getPrivManagerPairs('module');
+        $packages       = $this->getPrivManagerPairs('package');
+        $packageModules = $this->getPrivManagerPairs('package', '', 'parentCode');
         foreach($packages as $packageID => $package)
         {
             $packages[$packageID] = $modules[$packageModules[$packageID]] . '/' . $package;
@@ -2021,12 +2085,13 @@ class groupModel extends model
 
         $privs    = array();
         $privList = $this->getPrivsListByView();
+        $privList = $this->transformPrivLang($privList);
         foreach($privList as $privID => $priv)
         {
-            $privs[$privID] = $modules[$priv->module] . '/' . $priv->name;
+            $privs[$privID] = (isset($packages[$priv->parent]) ? $packages[$priv->parent] : $modules[$priv->parentCode]) . '/' . $priv->name;
         }
 
-        $this->config->group->priv->search['params']['view']['values']           = array('' => '') + $views;
+        $this->config->group->priv->search['params']['view']['values']           = array('' => '') + $this->getPrivManagerPairs('view');
         $this->config->group->priv->search['params']['module']['values']         = array('' => '') + $modules;
         $this->config->group->priv->search['params']['package']['values']        = array('' => '') + $packages;
         $this->config->group->priv->search['params']['recommendPrivs']['values'] = array('' => '') + $privs;
@@ -2068,37 +2133,89 @@ class groupModel extends model
      * @access public
      * @return array
      */
-    public function getPrivManagerPairs($type, $parent = '')
+    public function getPrivManagerPairs($type, $parent = '', $field = 'name', $hasParentName = false)
     {
         $parentType = $type == 'package' ? 'module' : 'view';
         $parent     = !empty($parent) ? $this->dao->select('id as parent')->from(TABLE_PRIVMANAGER)->where('type')->eq($parentType)->andWhere('code')->eq($parent)->fetch('parent') : 0;
 
         $moduleLang = $type == 'module' ? $this->getMenuModules('', true) : array();
 
-        $managers = $this->dao->select('t1.id,t1.code,t2.key,t2.value')
+        $orderBy = $type == 'module' ? 'parentOrder_asc, t1.order_asc' : 't1.order asc';
+        $managers = $this->dao->select('DISTINCT t1.id,t1.code,t2.`key`,t1.`order`,t2.value,t3.code AS parentCode,IFNULL(t3.order, 999) as parentOrder,t4.key AS parentKey,t4.value AS parentValue')
             ->from(TABLE_PRIVMANAGER)->alias('t1')
             ->leftJoin(TABLE_PRIVLANG)->alias('t2')->on('t1.id=t2.objectID')
+            ->leftJoin(TABLE_PRIVMANAGER)->alias('t3')->on('t1.parent=t3.id')
+            ->leftJoin(TABLE_PRIVLANG)->alias('t4')->on('t3.id=t4.objectID')
             ->where('t1.type')->eq($type)
             ->andWhere('t2.objectType')->eq('manager')
-            ->beginIF($type == 'module')->andWhere('code')->in(array_keys($moduleLang))->fi()
+            ->beginIF($type == 'package')->andWhere('t4.objectType')->eq('manager')->fi()
+            ->beginIF($type == 'module')->andWhere('t1.code')->in(array_keys($moduleLang))->fi()
+            ->beginIF($type == 'package')->andWhere('t3.type')->eq('module')->fi()
             ->beginIF(!empty($parent))->andWhere('t1.parent')->eq($parent)->fi()
             ->andWhere('t1.edition')->like("%,{$this->config->edition},%")
             ->andWhere('t1.vision')->like("%,{$this->config->vision},%")
             ->andWhere('t2.lang')->eq($this->app->getClientLang())
-            ->orderBy('order asc')
+            ->beginIF($type == 'package')->andWhere('t4.lang')->eq($this->app->getClientLang())->fi()
+            ->orderBy($orderBy)
             ->fetchAll('id');
 
         $pairs = array();
         foreach($managers as $managerID => $manager)
         {
             $key = $type == 'package' ? $managerID : $manager->code;
-            if(!empty($manager->value)) $pairs[$key] = $manager->value;
-            if(empty($manager->value) and $type == 'view')   $pairs[$key] = $this->lang->{$manager->key}->common;
-            if(empty($manager->value) and $type == 'module') $pairs[$key] = isset($moduleLang[$manager->key]) ? $moduleLang[$manager->key] : $this->lang->{$manager->key}->common;
+            if($field == 'name' and !empty($manager->value)) $pairs[$key] = $manager->value;
+            if($field == 'name' and empty($manager->value) and $type == 'view' and isset($this->lang->{$manager->key}->common)) $pairs[$key] = $this->lang->{$manager->key}->common;
+            if($field == 'name' and empty($manager->value) and $type == 'module') $pairs[$key] = isset($moduleLang[$manager->key]) ? $moduleLang[$manager->key] : $this->lang->{$manager->key}->common;
+            if($field == 'parentCode') $pairs[$key] = $manager->parentCode;
+            if($hasParentName)
+            {
+                $parentName = '';
+                if(!empty($manager->parentValue)) $parentName = $manager->parentValue;
+                if(empty($manager->parentValue) and $type == 'module')  $parentName = $this->lang->{$manager->parentKey}->common;
+                if(empty($manager->parentValue) and $type == 'package') $parentName = isset($moduleLang[$manager->parentKey]) ? $moduleLang[$manager->parentKey] : $this->lang->{$manager->parentKey}->common;
+                $pairs[$key] =  $parentName . '/' . $pairs[$key];
+            }
         }
         return $pairs;
     }
 
+    /**
+     * Get priv managers.
+     *
+     * @param  string $type
+     * @param  string $parent
+     * @access public
+     * @return array
+     */
+    public function getPrivManagers($type, $parent = '')
+    {
+        $parentType = $type == 'package' ? 'module' : 'view';
+        $parent     = !empty($parent) ? $this->dao->select('id as parent')->from(TABLE_PRIVMANAGER)->where('type')->eq($parentType)->andWhere('code')->eq($parent)->fetch('parent') : 0;
+
+        $moduleLang = $type == 'module' ? $this->getMenuModules('', true) : array();
+
+        $managers = $this->dao->select('t1.id,t1.code,t2.`key`,t2.value, t1.`order`')
+            ->from(TABLE_PRIVMANAGER)->alias('t1')
+            ->leftJoin(TABLE_PRIVLANG)->alias('t2')->on('t1.id=t2.objectID')
+            ->where('t1.type')->eq($type)
+            ->andWhere('t2.objectType')->eq('manager')
+            ->beginIF($type == 'module')->andWhere('t1.code')->in(array_keys($moduleLang))->fi()
+            ->beginIF($parent !== '')->andWhere('t1.parent')->eq($parent)->fi()
+            ->andWhere('t1.edition')->like("%,{$this->config->edition},%")
+            ->andWhere('t1.vision')->like("%,{$this->config->vision},%")
+            ->andWhere('t2.lang')->eq($this->app->getClientLang())
+            ->orderBy('t1.order asc')
+            ->fetchAll('id');
+
+        foreach($managers as $managerID => $manager)
+        {
+            if(!empty($manager->value)) $managers[$managerID]->name = $manager->value;
+            if(empty($manager->value) and $type == 'view')   $managers[$managerID]->name = $this->lang->{$manager->key}->common;
+            if(empty($manager->value) and $type == 'module') $managers[$managerID]->name = isset($moduleLang[$manager->key]) ? $moduleLang[$manager->key] : $this->lang->{$manager->key}->common;
+        }
+        return $managers;
+    }
+
     /**
      * Transform priv lang.
      *
@@ -2209,8 +2326,7 @@ class groupModel extends model
     {
         $modulePairs = $this->getPrivManagerPairs('module');
         $modules     = array_keys($modulePairs);
-        $modules     = implode(',', $modules);
-        $relatedPrivs = $this->dao->select("t1.relationPriv,t1.type,t2.parent,t2.module,t2.method,t2.`order`,t3.`key`,t3.value, IF(t4.type = 'module', 999, INSTR('$modules', t5.code)) as moduleOrder")->from(TABLE_PRIVRELATION)->alias('t1')
+        $privs = $this->dao->select("t1.relationPriv,t1.type,t2.parent,t2.module,t2.method,t2.`order`,t3.`key`,t3.value, IF(t4.type = 'module', t4.code, t5.code) as parentCode")->from(TABLE_PRIVRELATION)->alias('t1')
             ->leftJoin(TABLE_PRIV)->alias('t2')->on('t1.relationPriv=t2.id')
             ->leftJoin(TABLE_PRIVLANG)->alias('t3')->on('t1.relationPriv=t3.objectID')
             ->leftJoin(TABLE_PRIVMANAGER)->alias('t4')->on('t2.parent=t4.id')
@@ -2238,8 +2354,13 @@ class groupModel extends model
             ->andWhere('t5.type')->eq('view')
             ->beginIF(!empty($view) and $view != 'general')->andWhere('t1.module')->in($modules)->fi()
             ->markRight(2)
-            ->orderBy('moduleOrder asc, t2.`order`_asc, t1.`type` desc')
-            ->fetchAll('relationPriv');
+            ->orderBy('t2.`order`_asc, t1.`type` desc')
+            ->fetchGroup('parentCode', 'relationPriv');
+        $relatedPrivs = array();
+        foreach($modules as $module)
+        {
+            $relatedPrivs = array_merge($relatedPrivs, zget($privs, $module, array()));
+        }
 
         $privList = empty($type) ? array('depend' => array(), 'recommend' => array()) : array($type => array());
         if(empty($relatedPrivs)) return $privList;
diff --git a/module/group/view/addrelation.html.php b/module/group/view/addrelation.html.php
index 70053ccfd5..d5e139add5 100644
--- a/module/group/view/addrelation.html.php
+++ b/module/group/view/addrelation.html.php
@@ -28,7 +28,7 @@
         foreach($privs as $priv)
         {
             $privName[] = $priv->name;
-            $privModules[$priv->module][] = $priv->id;
+            $privModules[$priv->moduleCode][] = $priv->id;
         }
         $privName = implode('、', $privName);
         printf($lang->group->selectedPrivs, $privName);
diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php
index 157896ad68..ceda6e1e24 100644
--- a/module/group/view/browse.html.php
+++ b/module/group/view/browse.html.php
@@ -18,7 +18,7 @@
     <span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->group->browse;?></span></span>
   </div>
   <div class='btn-toolbar pull-right'>
-    <?php //if(common::hasPriv('group', 'editManagePriv')) echo html::a($this->createLink('group', 'editManagePriv', '', '', false), '<i class="icon icon-backend muted" style="padding-right: 5px"></i>' . $lang->group->editManagePriv, '', 'class="btn btn-link"');?>
+    <?php if(common::hasPriv('group', 'editManagePriv')) echo html::a($this->createLink('group', 'editManagePriv', '', '', false), '<i class="icon icon-backend muted" style="padding-right: 5px"></i>' . $lang->group->editManagePriv, '', 'class="btn btn-link"');?>
     <?php if(common::hasPriv('group', 'managePriv')) echo html::a($this->createLink('group', 'managePriv', 'type=byModule', '', true), $lang->group->managePrivByModule, '', 'class="btn btn-link iframe"');?>
     <?php if(common::hasPriv('group', 'create')) echo html::a($this->createLink('group', 'create', '', '', true), '<i class="icon-plus"></i> ' . $lang->group->create, '', 'class="btn btn-primary iframe" data-width="550"');?>
   </div>
diff --git a/module/group/view/createprivpackage.html.php b/module/group/view/createprivpackage.html.php
index e3311dda63..0d266d50f7 100644
--- a/module/group/view/createprivpackage.html.php
+++ b/module/group/view/createprivpackage.html.php
@@ -20,11 +20,11 @@
       <tbody>
         <tr>
           <th class='c-name'><?php echo $lang->privpackage->name;?></th>
-          <td class='required'><?php echo html::input('name', '', "class='form-control'");?></td>
+          <td class='required'><?php echo html::input('value', '', "class='form-control'");?></td>
         </tr>
         <tr>
           <th><?php echo $lang->privpackage->module;?></th>
-          <td class='required'><?php echo html::select('module', $modules, '', "class='form-control picker-select'");?></td>
+          <td class='required'><?php echo html::select('parent', $modules, '', "class='form-control picker-select'");?></td>
         </tr>
         <tr>
           <th><?php echo $lang->privpackage->desc;?></th>
diff --git a/module/group/view/editmanageprivbycard.html.php b/module/group/view/editmanageprivbycard.html.php
index 58eb26459f..42b60041f4 100644
--- a/module/group/view/editmanageprivbycard.html.php
+++ b/module/group/view/editmanageprivbycard.html.php
@@ -36,8 +36,7 @@
           <div class="group-item">
             <div class="checkbox-primary">
               <?php $action = $priv->method;?>
-              <?php $label  = zget($privLang, $privID, $lang->$module->$action);?>
-              <?php echo html::checkbox("actions[$module][]", array($action => $label), '', "title='{$label}' id='actions[$module]$action' data-id='$privID'");?>
+              <?php echo html::checkbox("actions[$module][]", array($action => $priv->name), '', "title='{$priv->name}' id='actions[$module]$action' data-id='$priv->id'");?>
             </div>
           </div>
           <?php endforeach;?>
diff --git a/module/group/view/editmanageprivbylist.html.php b/module/group/view/editmanageprivbylist.html.php
index bda96eab16..5bef67064c 100644
--- a/module/group/view/editmanageprivbylist.html.php
+++ b/module/group/view/editmanageprivbylist.html.php
@@ -39,7 +39,7 @@
         <?php $view = isset($this->lang->navGroup->{$priv->module}) ? $this->lang->navGroup->{$priv->module} : $priv->module;?>
         <td title='<?php echo isset($lang->{$view}->common) ? $lang->{$view}->common : $view;?>'><?php echo isset($lang->{$view}->common) ? $lang->{$view}->common : $view;?></td>
         <td title='<?php echo isset($moduleLang[$priv->module]) ? $moduleLang[$priv->module] : $priv->module;?>'><?php echo isset($moduleLang[$priv->module]) ? $moduleLang[$priv->module] : $priv->module;?></td>
-        <td title='<?php echo zget($packages, $priv->package, '');?>'><?php echo zget($packages, $priv->package, '');?></td>
+        <td title='<?php echo zget($packages, $priv->parent, '');?>'><?php echo zget($packages, $priv->parent, '');?></td>
         <td title='<?php echo zget($privRelations['depend'], $priv->id, '');?>'><?php echo zget($privRelations['depend'], $priv->id, '');?></td>
         <td title='<?php echo zget($privRelations['recommend'], $priv->id, '');?>'><?php echo zget($privRelations['recommend'], $priv->id, '');?></td>
         <td title='<?php echo $priv->desc;?>'><?php echo $priv->desc;?></td>
diff --git a/module/group/view/editpriv.html.php b/module/group/view/editpriv.html.php
index decb2f814f..6f1b42d5d3 100644
--- a/module/group/view/editpriv.html.php
+++ b/module/group/view/editpriv.html.php
@@ -27,23 +27,23 @@
         <?php $isSystem = !empty($priv->system);?>
         <tr>
           <th><?php echo $lang->group->privModuleName;?></th>
-          <td class='<?php echo !$isSystem ? 'required' : '';?>'><?php echo !$isSystem ? html::input('moduleName', $priv->moduleName, "class='form-control'") : $priv->moduleName;?></td>
+          <td class='<?php echo !$isSystem ? 'required' : '';?>'><?php echo !$isSystem ? html::input('moduleName', $priv->module, "class='form-control'") : $priv->module;?></td>
         </tr>
         <tr>
           <th><?php echo $lang->group->privMethodName;?></th>
-          <td class='<?php echo !$isSystem ? 'required' : '';?>'><?php echo !$isSystem ? html::input('methodName', $priv->methodName, "class='form-control'") : $priv->methodName;?></td>
+          <td class='<?php echo !$isSystem ? 'required' : '';?>'><?php echo !$isSystem ? html::input('methodName', $priv->method, "class='form-control'") : $priv->method;?></td>
         </tr>
         <tr>
           <th><?php echo $lang->group->privView;?></th>
-          <td class='required'><?php echo html::select('view', $views, $priv->view, "class='form-control chosen' onchange='loadModuleAndPackage(this.value)' data-drop_direction='down'");?></td>
+          <td class='required'><?php echo html::select('view', $views, $priv->privView, "class='form-control chosen' onchange='loadModuleAndPackage(this.value)' data-drop_direction='down'");?></td>
         </tr>
         <tr>
           <th><?php echo $lang->group->privModule;?></th>
-          <td class='required'><?php echo html::select('module', $modules, $priv->module, "class='form-control picker-select' onchange='loadPackages(this.value, \"module\")'");?></td>
+          <td class='required'><?php echo html::select('module', $modules, $priv->privModule, "class='form-control picker-select' onchange='loadPackages(this.value, \"module\")'");?></td>
         </tr>
         <tr>
           <th><?php echo $lang->privpackage->belong;?></th>
-          <td class='required'><?php echo html::select('package', $packages, $priv->package, "class='form-control picker-select'");?></td>
+          <td><?php echo html::select('package', $packages, $priv->package, "class='form-control picker-select'");?></td>
         </tr>
         <tr>
           <th><?php echo $lang->group->privDesc;?></th>
diff --git a/module/group/view/editprivpackage.html.php b/module/group/view/editprivpackage.html.php
index 42a9921711..93410f3e9d 100644
--- a/module/group/view/editprivpackage.html.php
+++ b/module/group/view/editprivpackage.html.php
@@ -20,11 +20,11 @@
       <tbody>
         <tr>
           <th class='c-name'><?php echo $lang->privpackage->name;?></th>
-          <td class='required'><?php echo html::input('name', $privPackage->name, "class='form-control'");?></td>
+          <td class='required'><?php echo html::input('value', $privPackage->name, "class='form-control'");?></td>
         </tr>
         <tr>
           <th><?php echo $lang->privpackage->module;?></th>
-          <td class='required'><?php echo html::select('module', $modules, $privPackage->module, "class='form-control picker-select'");?></td>
+          <td class='required'><?php echo html::select('parent', $modules, $privPackage->parent, "class='form-control picker-select'");?></td>
         </tr>
         <tr>
           <th><?php echo $lang->privpackage->desc;?></th>
diff --git a/test/class/execution.class.php b/test/class/execution.class.php
index a773c81725..5c79afdd64 100644
--- a/test/class/execution.class.php
+++ b/test/class/execution.class.php
@@ -2979,17 +2979,4 @@ class executionTest
         }
         return $executionIDList;
     }
-
-    /**
-     * Get user custom workflow field.
-     *
-     * @param  string  $moduleName
-     * @access public
-     * @return array
-     */
-    public function getExtendFieldsTest($moduleName = 'project')
-    {
-        $extendFields = $this->executionModel->getExtendFields($moduleName);
-        return $extendFields;
-    }
 }
diff --git a/test/lib/init.php b/test/lib/init.php
index a1d5ddb85f..a87a0c6f73 100644
--- a/test/lib/init.php
+++ b/test/lib/init.php
@@ -39,7 +39,7 @@ function c($code)
         return true;
     }
 
-    echo ">> \n\n";
+    echo "\n\n";
     return false;
 }
 
@@ -73,11 +73,10 @@ if(!empty($config->test->account) and !empty($config->test->password) and !empty
     $token = $rest->post('/tokens', array('account' => $config->test->account, 'password' => $config->test->password));
     $token = $token->body;
 }
-if($argv[1] == '-extract')
-{
-    parseScript();
-    exit;
-}
+
+global $isExtractAction;
+$isExtractAction = $argv[1] == '-extract';
+
 /**
  * Save variable to $_result.
  *
@@ -103,99 +102,172 @@ function r($result)
 function p($keys = '', $delimiter = ',')
 {
     global $_result;
+    global $_keys;
+    global $_delimiter;
+    global $isExtractAction;
 
-    if(empty($_result)) return print(">> 0\n");
+    $_keys      = $keys;
+    $_delimiter = $delimiter;
 
-    if(is_array($_result) and isset($_result['code']) and $_result['code'] == 'fail') return print(">> " . (string) $_result['message'] . "\n");
+    if($isExtractAction) return true;
+
+    if(empty($_result)) return print("0\n");
+
+    if(is_array($_result) and isset($_result['code']) and $_result['code'] == 'fail') return print((string) $_result['message'] . "\n");
 
     /* Print $_result. */
-    if(!$keys and is_array($_result)) return print(">> " . (string)$_result[''] . "\n");
-    if(!$keys or !is_array($_result) and !is_object($_result)) return print(">> " . (string) $_result . "\n");
+    if(!$keys and is_array($_result)) return print((string)$_result[''] . "\n");
+    if(!$keys or !is_array($_result) and !is_object($_result)) return print((string) $_result . "\n");
 
     $parts  = explode(';', $keys);
-    $values = array();
     foreach($parts as $part)
     {
-        $values[] = implode($delimiter, getValues($_result, $part, $delimiter));
+        $values = getValues($_result, $part, $delimiter);
+        foreach($values as $value) echo $value . "\n";
     }
 
-    echo ">> " . implode(';', $values) . "\n";
-
     return true;
 }
 
 /**
  * extract ZTF note.
  *
+ * @param  string $key
  * @access public
  * @return void
  */
-function parseScript()
+function parseScript($expect)
 {
     $debugInfo = debug_backtrace();
     if(!empty($debugInfo))
     {
-        $file     = $debugInfo[count($debugInfo)-1]['file'];
-        $contents = file_get_contents($file);
-        $translatedList = array();
-        preg_match_all("/r\((.*?)\)\s*&&\s*p\((.*?)\)\s*&&\s*e\((.*?)\);/", $contents, $matches);
-        $rParams = !empty($matches[1]) ? $matches[1] : array();
-        $pParams = !empty($matches[2]) ? $matches[2] : array();
-        $eParams = !empty($matches[3]) ? $matches[3] : array();
-        $rParams = is_array($rParams) ? $rParams : array($rParams);
-        $pParams = is_array($pParams) ? $pParams : array($pParams);
-        $eParams = is_array($eParams) ? $eParams : array($eParams);
-        foreach($rParams as $param)
-        {
-            $param                = trim($param, "'");
-            $objArrowCount        = substr_count($param, '->');
-            $rParamsStructureList = explode('->', $param);
+        global $_keys;
+        global $_delimiter;
+        global $_current;
 
-            if($objArrowCount == 1)
+        $keys      = $_keys;
+        $delimiter = $_delimiter;
+        $file      = $debugInfo[count($debugInfo)-1]['file'];
+        $contents  = file_get_contents($file);
+        
+        list($moduleName, $methodName, $methodParam) = genParamsByRPE($contents);
+        
+        $isGrup   = false;
+        $stepDesc = '';
+        $expects  = empty($expect) ? array() : explode($delimiter, $expect);
+
+        $object    = '';
+        $rowIndex  = -1;
+        $pos       = strpos($keys, ':');
+        if($pos)
+        {
+            $arrKey = substr($keys, 0, $pos);
+            $keys   = substr($keys, $pos + 1);
+            $pos    = strpos($arrKey, '[');
+            if($pos)
             {
-                $moduleName  = substr($rParamsStructureList[0], 1);
-                $method      = $rParamsStructureList[1];
-                $methodName  = substr(explode('(', $method)[0], 0, -4);
-                $methodParam = substr(explode('(', $method)[1], 0, -1);
-            }
-            elseif($objArrowCount == 2)
-            {
-                $moduleName  = $rParamsStructureList[1];
-                $method      = $rParamsStructureList[2];
-                $methodName  = explode('(', $method)[0];
-                $methodParam = trim(substr(explode('(', $method)[1], 0, -1), ")");
-                $methodParam = trim($methodParam, "'");
+                $object   = substr($arrKey, 0, $pos);
+                $rowIndex = trim(substr($arrKey, $pos + 1), ']');
             }
             else
             {
-                $moduleName  = $param;
-                $methodName  = 0;
-                $methodParam = 0;
+                $rowIndex = $arrKey;
             }
+        }
+        $keys = explode($delimiter, $keys);
 
+        if(count($keys) > 1) $isGrup = true;
 
-            if ($methodName === 0 && $methodParam === 0)
+        if ($methodName === 0 && $methodParam === 0)
+        {
+            $stepDesc = "- 执行{$moduleName}" . ($isGrup ? "\n" : '');
+        }
+        else
+        {
+            $stepDesc = "- 执行{$moduleName}模块的{$methodName}方法，参数是{$methodParam}" . ($isGrup ? "\n" : '');
+        }
+
+        if(empty($keys)) $stepDesc .= " @{$expects[0]}\n";
+
+        foreach($keys as $index => $row)
+        {
+            if(count($keys) < 2)
             {
-                $translatedList['r'][] = "测试参数{$moduleName}";
+                if($rowIndex == -1)
+                {
+                    $stepDesc .= $row ? ",属性{$row}" : '';
+                }
+                else
+                {
+                    $stepDesc .= ($rowIndex == -1 ? '' : ($isGrup ? ' - ' : '- ') . ",属性{$rowIndex} @{$expects[0]}\n");
+                }
+                $stepDesc .= " @$expect";
             }
             else
             {
-                $translatedList['r'][] = "测试模块{$moduleName}方法{$methodName}参数为{$methodParam}";
+                if($rowIndex == -1)
+                {
+                    $stepDesc .= ($isGrup ? ' - ' : '- ') . "属性{$row} @{$expects[$index]}\n";
+                }
+                else {
+                    $stepDesc .= ($isGrup ? ' - ' : '- ') . "第{$rowIndex}条的{$row}属性 @{$expects[$index]}\n";
+                }
             }
         }
-
-        foreach($pParams as $pParam)
-        {
-            $translatedList['p'][] = "的输出" . trim($pParam, "'");
-        }
-
-        foreach($translatedList['r'] as $index => $translated)
-        {
-            echo $translated . $translatedList['p'][$index] . PHP_EOL;
-        }
+        echo $stepDesc . ($isGrup ? "\n" : "\n");
     }
 }
 
+/**
+ * Generate method,module,params from rpe.
+ * 从RPE中获取模块，方法以及参数
+ *
+ * @param  string $rpe
+ * @return array
+ */
+function genParamsByRPE($rpe)
+{
+    global $_current;
+    preg_match_all("/r\((.*?)\)\s*&&\s*p\((.*?)\)\s*&&\s*e\((.*?)\);/", $rpe, $matches);
+    $rParams = !empty($matches[1]) ? $matches[1] : array();
+    $pParams = !empty($matches[2]) ? $matches[2] : array();
+    $eParams = !empty($matches[3]) ? $matches[3] : array();
+    $rParams = is_array($rParams) ? $rParams : array($rParams);
+    $pParams = is_array($pParams) ? $pParams : array($pParams);
+    $eParams = is_array($eParams) ? $eParams : array($eParams);
+
+    $_current = intval($_current);
+    $param    = $rParams[$_current];
+    $_current++;
+    $param                = trim($param, "'");
+    $objArrowCount        = substr_count($param, '->');
+    $rParamsStructureList = explode('->', $param);
+
+    if($objArrowCount == 1)
+    {
+        $moduleName  = substr($rParamsStructureList[0], 1);
+        $method      = $rParamsStructureList[1];
+        $methodName  = substr(explode('(', $method)[0], 0, -4);
+        $methodParam = substr(explode('(', $method)[1], 0, -1);
+    }
+    elseif($objArrowCount == 2)
+    {
+        $moduleName  = $rParamsStructureList[1];
+        $method      = $rParamsStructureList[2];
+        $methodName  = explode('(', $method)[0];
+        $methodParam = trim(substr(explode('(', $method)[1], 0, -1), ")");
+        $methodParam = trim($methodParam, "'");
+    }
+    else
+    {
+        $moduleName  = $param;
+        $methodName  = 0;
+        $methodParam = 0;
+    }
+
+    return array($moduleName, $methodName, $methodParam);
+}
+
 /**
  * Get values
  *
@@ -240,7 +312,7 @@ function getValues($value, $keys, $delimiter)
         }
         else
         {
-            return print(">> Error: No object name '$object'.\n");
+            return print("Error: No object name '$object'.\n");
         }
     }
 
@@ -248,17 +320,17 @@ function getValues($value, $keys, $delimiter)
     {
         if(is_array($value))
         {
-            if(!isset($value[$index])) return print(">> Error: Cannot get index $index.\n");
+            if(!isset($value[$index])) return print("Error: Cannot get index $index.\n");
             $value = $value[$index];
         }
         else if(is_object($value))
         {
-            if(!isset($value->$index)) return print(">> Error: Cannot get index $index.\n");
+            if(!isset($value->$index)) return print("Error: Cannot get index $index.\n");
             $value = $value->$index;
         }
         else
         {
-            return print(">> Error: Not array, cannot get index $index.\n");
+            return print("Error: Not array, cannot get index $index.\n");
         }
     }
 
@@ -277,6 +349,13 @@ function getValues($value, $keys, $delimiter)
  */
 function e($expect)
 {
+    global $isExtractAction;
+    if($isExtractAction)
+    {
+        parseScript($expect);
+        return;
+    }
+
 }
 
 /**