Skip to content

Commit

Permalink
v5.0部分细节优化和bug修复
Browse files Browse the repository at this point in the history
  • Loading branch information
@gongfuxiang
gongfuxiang committed Jan 20, 2024
1 parent ceddb30 commit 9230571
Show file tree
Hide file tree
Showing 42 changed files with 956 additions and 183 deletions.
7 changes: 6 additions & 1 deletion app/admin/controller/Common.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ class Common extends BaseController

// 左边权限菜单
protected $left_menu;
// 当前管理员可使用的插件
protected $admin_plugins;

// 输入参数 post|get|request
protected $data_post;
Expand Down Expand Up @@ -111,9 +113,10 @@ public function __construct()
// 管理员信息
$this->admin = AdminService::LoginInfo();

// 权限菜单
// 权限菜单、当前管理员可使用的插件
$menu = AdminPowerService::PowerMenuInit($this->admin);
$this->left_menu = $menu['admin_left_menu'];
$this->admin_plugins = $menu['admin_plugins'];

// 视图初始化
$this->ViewInit();
Expand Down Expand Up @@ -265,6 +268,8 @@ public function ViewInit()

// 权限菜单
$assign['left_menu'] = $this->left_menu;
// 当前管理员可使用的插件
$assign['admin_plugins'] = $this->admin_plugins;

// 分页信息
$this->page = max(1, isset($this->data_request['page']) ? intval($this->data_request['page']) : 1);
Expand Down
24 changes: 14 additions & 10 deletions app/admin/form/Appcenternav.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public function Run($params = [])
'view_type' => 'field',
'view_key' => 'name',
'is_sort' => 1,
'width' => 150,
'search_config' => [
'form_type' => 'input',
'where_type' => 'like',
Expand All @@ -72,6 +73,7 @@ public function Run($params = [])
'view_data_key' => 'name',
'view_data' => MyConst('common_platform_type'),
'is_sort' => 1,
'width' => 165,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand Down Expand Up @@ -117,16 +119,6 @@ public function Run($params = [])
'where_type' => 'like',
],
],
[
'label' => $lang['desc'],
'view_type' => 'field',
'view_key' => 'desc',
'is_sort' => 1,
'search_config' => [
'form_type' => 'input',
'where_type' => 'like',
],
],
[
'label' => $lang['is_enable'],
'view_type' => 'status',
Expand All @@ -135,6 +127,7 @@ public function Run($params = [])
'is_form_su' => 1,
'align' => 'center',
'is_sort' => 1,
'width' => 130,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand All @@ -151,6 +144,7 @@ public function Run($params = [])
'post_url' => MyUrl('admin/appcenternav/statusupdate'),
'align' => 'center',
'is_sort' => 1,
'width' => 130,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand All @@ -160,6 +154,16 @@ public function Run($params = [])
'is_multiple' => 1,
],
],
[
'label' => $lang['desc'],
'view_type' => 'field',
'view_key' => 'desc',
'is_sort' => 1,
'search_config' => [
'form_type' => 'input',
'where_type' => 'like',
],
],
[
'label' => $lang['sort'],
'view_type' => 'field',
Expand Down
5 changes: 5 additions & 0 deletions app/admin/form/Apphomenav.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public function Run($params = [])
'view_type' => 'field',
'view_key' => 'name',
'is_sort' => 1,
'width' => 150,
'search_config' => [
'form_type' => 'input',
'where_type' => 'like',
Expand All @@ -72,6 +73,7 @@ public function Run($params = [])
'view_data_key' => 'name',
'view_data' => MyConst('common_platform_type'),
'is_sort' => 1,
'width' => 165,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand All @@ -86,6 +88,7 @@ public function Run($params = [])
'view_type' => 'module',
'view_key' => 'apphomenav/module/images',
'align' => 'center',
'width' => 70,
],
[
'label' => $lang['event_type'],
Expand Down Expand Up @@ -123,6 +126,7 @@ public function Run($params = [])
'is_form_su' => 1,
'align' => 'center',
'is_sort' => 1,
'width' => 130,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand All @@ -139,6 +143,7 @@ public function Run($params = [])
'post_url' => MyUrl('admin/apphomenav/statusupdate'),
'align' => 'center',
'is_sort' => 1,
'width' => 130,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand Down
5 changes: 5 additions & 0 deletions app/admin/form/Article.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ public function Run($params = [])
'view_type' => 'field',
'view_key' => 'article_category_name',
'is_sort' => 1,
'width' => 140,
'search_config' => [
'form_type' => 'select',
'form_name' => 'article_category_id',
Expand All @@ -102,6 +103,7 @@ public function Run($params = [])
'is_form_su' => 1,
'align' => 'center',
'is_sort' => 1,
'width' => 130,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand All @@ -118,6 +120,7 @@ public function Run($params = [])
'post_url' => MyUrl('admin/article/statusupdate'),
'align' => 'center',
'is_sort' => 1,
'width' => 130,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand All @@ -132,6 +135,7 @@ public function Run($params = [])
'view_type' => 'field',
'view_key' => 'images_count',
'is_sort' => 1,
'width' => 160,
'search_config' => [
'form_type' => 'section',
],
Expand All @@ -141,6 +145,7 @@ public function Run($params = [])
'view_type' => 'field',
'view_key' => 'access_count',
'is_sort' => 1,
'width' => 160,
'search_config' => [
'form_type' => 'section',
],
Expand Down
7 changes: 6 additions & 1 deletion app/admin/form/Brand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ public function Run($params = [])
'view_type' => 'field',
'view_key' => 'name',
'is_sort' => 1,
'width' => 150,
'search_config' => [
'form_type' => 'input',
'where_type' => 'like',
Expand All @@ -86,12 +87,13 @@ public function Run($params = [])
'view_type' => 'images',
'view_key' => 'logo',
'images_height' => 25,
'width' => 100,
],
[
'label' => $lang['url'],
'view_type' => 'module',
'view_key' => 'brand/module/url',
'grid_size' => 'lg',
'grid_size' => 'sm',
'search_config' => [
'form_type' => 'input',
'form_name' => 'website_url',
Expand All @@ -102,6 +104,7 @@ public function Run($params = [])
'label' => $lang['brand_category_text'],
'view_type' => 'field',
'view_key' => 'brand_category_text',
'width' => 140,
'search_config' => [
'form_type' => 'select',
'form_name' => 'id',
Expand All @@ -121,6 +124,7 @@ public function Run($params = [])
'is_form_su' => 1,
'align' => 'center',
'is_sort' => 1,
'width' => 130,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand All @@ -135,6 +139,7 @@ public function Run($params = [])
'view_type' => 'field',
'view_key' => 'sort',
'is_sort' => 1,
'width' => 160,
'search_config' => [
'form_type' => 'section',
],
Expand Down
7 changes: 6 additions & 1 deletion app/admin/form/Customview.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function Run($params = [])
'label' => $lang['info'],
'view_type' => 'module',
'view_key' => 'customview/module/info',
'grid_size' => 'lg',
'grid_size' => 'sm',
'is_sort' => 1,
'search_config' => [
'form_type' => 'input',
Expand All @@ -75,6 +75,7 @@ public function Run($params = [])
'is_form_su' => 1,
'align' => 'center',
'is_sort' => 1,
'width' => 130,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand All @@ -91,6 +92,7 @@ public function Run($params = [])
'post_url' => MyUrl('admin/customview/statusupdate'),
'align' => 'center',
'is_sort' => 1,
'width' => 130,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand All @@ -107,6 +109,7 @@ public function Run($params = [])
'post_url' => MyUrl('admin/customview/statusupdate'),
'align' => 'center',
'is_sort' => 1,
'width' => 130,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand All @@ -123,6 +126,7 @@ public function Run($params = [])
'post_url' => MyUrl('admin/customview/statusupdate'),
'align' => 'center',
'is_sort' => 1,
'width' => 130,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand All @@ -137,6 +141,7 @@ public function Run($params = [])
'view_type' => 'field',
'view_key' => 'access_count',
'is_sort' => 1,
'width' => 160,
'search_config' => [
'form_type' => 'section',
],
Expand Down
4 changes: 4 additions & 0 deletions app/admin/form/Design.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ public function Run($params = [])
'view_type' => 'field',
'view_key' => 'access_count',
'is_sort' => 1,
'width' => 160,
'search_config' => [
'form_type' => 'section',
],
Expand All @@ -95,6 +96,7 @@ public function Run($params = [])
'is_form_su' => 1,
'align' => 'center',
'is_sort' => 1,
'width' => 130,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand All @@ -111,6 +113,7 @@ public function Run($params = [])
'post_url' => MyUrl('admin/design/statusupdate'),
'align' => 'center',
'is_sort' => 1,
'width' => 130,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand All @@ -127,6 +130,7 @@ public function Run($params = [])
'post_url' => MyUrl('admin/design/statusupdate'),
'align' => 'center',
'is_sort' => 1,
'width' => 130,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand Down
4 changes: 4 additions & 0 deletions app/admin/form/Goodsparamstemplate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public function Run($params = [])
'view_type' => 'field',
'view_key' => 'category_id',
'view_data' => $this->goods_category_list,
'width' => 150,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand All @@ -92,6 +93,7 @@ public function Run($params = [])
'view_type' => 'field',
'view_key' => 'name',
'is_sort' => 1,
'width' => 150,
'search_config' => [
'form_type' => 'input',
'where_type' => 'like',
Expand All @@ -105,6 +107,7 @@ public function Run($params = [])
'is_form_su' => 1,
'align' => 'center',
'is_sort' => 1,
'width' => 130,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand All @@ -119,6 +122,7 @@ public function Run($params = [])
'view_type' => 'field',
'view_key' => 'config_count',
'is_sort' => 1,
'width' => 160,
'search_config' => [
'form_type' => 'section',
],
Expand Down
3 changes: 3 additions & 0 deletions app/admin/form/Goodsspectemplate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public function Run($params = [])
'view_type' => 'field',
'view_key' => 'category_id',
'view_data' => $this->goods_category_list,
'width' => 150,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand All @@ -91,6 +92,7 @@ public function Run($params = [])
'view_type' => 'field',
'view_key' => 'name',
'is_sort' => 1,
'width' => 150,
'search_config' => [
'form_type' => 'input',
'where_type' => 'like',
Expand All @@ -104,6 +106,7 @@ public function Run($params = [])
'is_form_su' => 1,
'align' => 'center',
'is_sort' => 1,
'width' => 130,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand Down
3 changes: 3 additions & 0 deletions app/admin/form/Link.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public function Run($params = [])
'is_form_su' => 1,
'align' => 'center',
'is_sort' => 1,
'width' => 130,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand All @@ -112,6 +113,7 @@ public function Run($params = [])
'post_url' => MyUrl('admin/link/statusupdate'),
'align' => 'center',
'is_sort' => 1,
'width' => 130,
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
Expand All @@ -126,6 +128,7 @@ public function Run($params = [])
'view_type' => 'field',
'view_key' => 'sort',
'is_sort' => 1,
'width' => 160,
'search_config' => [
'form_type' => 'section',
],
Expand Down
Loading

0 comments on commit 9230571

Please sign in to comment.