diff --git a/application/admin/view/default/public/module/form_table.html b/application/admin/view/default/public/module/form_table.html
index 06c8a047f..1d7f814dc 100644
--- a/application/admin/view/default/public/module/form_table.html
+++ b/application/admin/view/default/public/module/form_table.html
@@ -74,12 +74,16 @@
{{/if}}
{{if !empty($t['search_config']['data']) and is_array($t['search_config']['data'])}}
- {{foreach $t['search_config']['data'] as $v}}
-
+ {{foreach $t['search_config']['data'] as $k=>$v}}
+ {{if is_array($v)}}
+
+ {{else /}}
+
+ {{/if}}
{{/foreach}}
{{/if}}
@@ -110,9 +114,19 @@
{{if !empty($t['search_config']['template'])}}
{{if isset($t['search_config']['data'])}}
- {{:ModuleInclude($t['search_config']['template'], ['data'=>$t['search_config']['data'], 'form_name_key'=>$t['form_key'], 'params'=>isset($form_params) ? $form_params : []])}}
+ {{:ModuleInclude($t['search_config']['template'], [
+ 'form'=>$t,
+ 'data'=>$t['search_config']['data'],
+ 'form_name_key'=>$t['form_key'],
+ 'params'=>isset($form_params) ? $form_params : [],
+ ])}}
{{else /}}
- {{:ModuleInclude($t['search_config']['template'], ['data'=>[], 'form_name_key'=>$t['form_key'], 'params'=>isset($form_params) ? $form_params : []])}}
+ {{:ModuleInclude($t['search_config']['template'], [
+ 'form'=>$t,
+ 'data'=>[],
+ 'form_name_key'=>$t['form_key'],
+ 'params'=>isset($form_params) ? $form_params : [],
+ ])}}
{{/if}}
{{/if}}
{{/case}}
@@ -208,7 +222,10 @@
{{/case}}
{{case module}}
- {{:ModuleInclude($t['view_key'], $data_list[$i], isset($params) ? $params : [])}}
+ {{:ModuleInclude($t['view_key'], $data_list[$i], [
+ 'form' => $t,
+ 'params' => isset($form_params) ? $form_params : [],
+ ])}}
{{/case}}
{{case status}}
@@ -226,7 +243,10 @@
{{case operate}}
- {{:ModuleInclude($t['view_key'], $data_list[$i])}}
+ {{:ModuleInclude($t['view_key'], $data_list[$i], [
+ 'form' => $t,
+ 'params' => isset($form_params) ? $form_params : [],
+ ])}}
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
diff --git a/application/common.php b/application/common.php
index 75340ced7..e73f11d28 100755
--- a/application/common.php
+++ b/application/common.php
@@ -506,6 +506,25 @@ function PathToParams($key = null, $default = null, $path = '')
return $data;
}
+/**
+ * 应用控制器调用
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @date 2020-01-02
+ * @param [string] $plugins [应用标记]
+ * @param [string] $control [应用控制器]
+ * @param [string] $action [应用方法]
+ * @param [string] $group [应用组(admin, index, api)]
+ * @param [array] $params [输入参数]
+ * @param [int] $is_ret_data [是否直接返回data数据]
+ */
+function PluginsControlCall($plugins, $control, $action, $group = 'index', $params = [], $is_ret_data = 0)
+{
+ $ret = app\service\PluginsService::PluginsControlCall($plugins, $control, $action, $group, $params);
+ return ($is_ret_data == 1) ? $ret['data'] : $ret;
+}
+
/**
* 调用插件服务层方法 - 获取插件配置信息
* @author Devil
diff --git a/application/index/view/default/public/module/form_table.html b/application/index/view/default/public/module/form_table.html
index 06c8a047f..1d7f814dc 100644
--- a/application/index/view/default/public/module/form_table.html
+++ b/application/index/view/default/public/module/form_table.html
@@ -74,12 +74,16 @@
{{/if}}
{{if !empty($t['search_config']['data']) and is_array($t['search_config']['data'])}}
- {{foreach $t['search_config']['data'] as $v}}
-
+ {{foreach $t['search_config']['data'] as $k=>$v}}
+ {{if is_array($v)}}
+
+ {{else /}}
+
+ {{/if}}
{{/foreach}}
{{/if}}
@@ -110,9 +114,19 @@
{{if !empty($t['search_config']['template'])}}
{{if isset($t['search_config']['data'])}}
- {{:ModuleInclude($t['search_config']['template'], ['data'=>$t['search_config']['data'], 'form_name_key'=>$t['form_key'], 'params'=>isset($form_params) ? $form_params : []])}}
+ {{:ModuleInclude($t['search_config']['template'], [
+ 'form'=>$t,
+ 'data'=>$t['search_config']['data'],
+ 'form_name_key'=>$t['form_key'],
+ 'params'=>isset($form_params) ? $form_params : [],
+ ])}}
{{else /}}
- {{:ModuleInclude($t['search_config']['template'], ['data'=>[], 'form_name_key'=>$t['form_key'], 'params'=>isset($form_params) ? $form_params : []])}}
+ {{:ModuleInclude($t['search_config']['template'], [
+ 'form'=>$t,
+ 'data'=>[],
+ 'form_name_key'=>$t['form_key'],
+ 'params'=>isset($form_params) ? $form_params : [],
+ ])}}
{{/if}}
{{/if}}
{{/case}}
@@ -208,7 +222,10 @@
{{/case}}
{{case module}}
- {{:ModuleInclude($t['view_key'], $data_list[$i], isset($params) ? $params : [])}}
+ {{:ModuleInclude($t['view_key'], $data_list[$i], [
+ 'form' => $t,
+ 'params' => isset($form_params) ? $form_params : [],
+ ])}}
{{/case}}
{{case status}}
@@ -226,7 +243,10 @@
{{case operate}}
- {{:ModuleInclude($t['view_key'], $data_list[$i])}}
+ {{:ModuleInclude($t['view_key'], $data_list[$i], [
+ 'form' => $t,
+ 'params' => isset($form_params) ? $form_params : [],
+ ])}}
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
diff --git a/application/module/FormHandleModule.php b/application/module/FormHandleModule.php
index 01e053ba4..c7e8a2e2f 100644
--- a/application/module/FormHandleModule.php
+++ b/application/module/FormHandleModule.php
@@ -10,7 +10,6 @@
// +----------------------------------------------------------------------
namespace app\module;
-use think\Controller;
use think\facade\Hook;
use app\service\FormTableService;
diff --git a/application/service/PluginsService.php b/application/service/PluginsService.php
index fb9c6816a..ba1a6f6e6 100755
--- a/application/service/PluginsService.php
+++ b/application/service/PluginsService.php
@@ -255,13 +255,13 @@ class PluginsService
* @blog http://gong.gg/
* @version 1.0.0
* @date 2020-01-02
- * @param [string] $plugins [应用标记]
- * @param [string] $control [应用控制器]
- * @param [string] $action [应用方法]
- * @param [string] $group [应用组(admin, index, api)]
- * @param [array] $params [输入参数]
+ * @param [string] $plugins [应用标记]
+ * @param [string] $control [应用控制器]
+ * @param [string] $action [应用方法]
+ * @param [string] $group [应用组(admin, index, api)]
+ * @param [array] $params [输入参数]
*/
- public static function PluginsControlCall($plugins, $control, $action, $group = 'index', $params = [])
+ public static function PluginsControlCall($plugins, $control, $action, $group = 'index', $params = [], $is_return_data = 0)
{
// 应用校验
$ret = self::PluginsCheck($plugins);
@@ -291,7 +291,7 @@ class PluginsService
{
$params = $params['data_request'];
}
- return DataReturn('验证成功', 0, $obj->$action($params));
+ return DataReturn('调用成功', 0, $obj->$action($params));
}
}
?>
\ No newline at end of file
diff --git a/application/tags.php b/application/tags.php
index bc8e2f789..25ed39ecc 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -32,6 +32,78 @@ return array (
'log_write' =>
array (
),
+ 'plugins_service_users_center_left_menu_handle' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ 1 => 'app\\plugins\\membershiplevelvip\\Hook',
+ 2 => 'app\\plugins\\signin\\Hook',
+ ),
+ 'plugins_service_header_navigation_top_right_handle' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ 1 => 'app\\plugins\\membershiplevelvip\\Hook',
+ 2 => 'app\\plugins\\signin\\Hook',
+ 3 => 'app\\plugins\\exchangerate\\Hook',
+ ),
+ 'plugins_service_order_status_change_history_success_handle' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ 1 => 'app\\plugins\\points\\Hook',
+ ),
+ 'plugins_service_order_aftersale_audit_handle_end' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ ),
+ 'plugins_service_site_extraction_address_list' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ ),
+ 'plugins_service_buy_order_insert_end' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ 1 => 'app\\plugins\\points\\Hook',
+ ),
+ 'plugins_service_goods_spec_extends_handle' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ 1 => 'app\\plugins\\membershiplevelvip\\Hook',
+ ),
+ 'plugins_view_admin_user_save' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ 1 => 'app\\plugins\\membershiplevelvip\\Hook',
+ ),
+ 'plugins_service_user_save_handle' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ 1 => 'app\\plugins\\membershiplevelvip\\Hook',
+ ),
+ 'plugins_service_goods_handle_end' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ 1 => 'app\\plugins\\membershiplevelvip\\Hook',
+ 2 => 'app\\plugins\\exchangerate\\Hook',
+ 3 => 'app\\plugins\\points\\Hook',
+ ),
+ 'plugins_service_goods_spec_base' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ 1 => 'app\\plugins\\membershiplevelvip\\Hook',
+ 2 => 'app\\plugins\\exchangerate\\Hook',
+ ),
+ 'plugins_view_goods_detail_panel_price_top' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ 1 => 'app\\plugins\\membershiplevelvip\\Hook',
+ ),
+ 'plugins_module_form_admin_user_index' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ ),
+ 'plugins_module_form_admin_user_detail' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ ),
'plugins_css' =>
array (
0 => 'app\\plugins\\share\\Hook',
@@ -63,17 +135,6 @@ return array (
0 => 'app\\plugins\\membershiplevelvip\\Hook',
1 => 'app\\plugins\\points\\Hook',
),
- 'plugins_service_goods_handle_end' =>
- array (
- 0 => 'app\\plugins\\membershiplevelvip\\Hook',
- 1 => 'app\\plugins\\exchangerate\\Hook',
- 2 => 'app\\plugins\\points\\Hook',
- ),
- 'plugins_service_goods_spec_base' =>
- array (
- 0 => 'app\\plugins\\membershiplevelvip\\Hook',
- 1 => 'app\\plugins\\exchangerate\\Hook',
- ),
'plugins_service_buy_group_goods_handle' =>
array (
0 => 'app\\plugins\\membershiplevelvip\\Hook',
@@ -83,26 +144,10 @@ return array (
array (
0 => 'app\\plugins\\membershiplevelvip\\Hook',
),
- 'plugins_service_goods_spec_extends_handle' =>
- array (
- 0 => 'app\\plugins\\membershiplevelvip\\Hook',
- ),
- 'plugins_view_admin_user_save' =>
- array (
- 0 => 'app\\plugins\\membershiplevelvip\\Hook',
- ),
- 'plugins_service_user_save_handle' =>
- array (
- 0 => 'app\\plugins\\membershiplevelvip\\Hook',
- ),
'plugins_service_goods_save_handle' =>
array (
0 => 'app\\plugins\\membershiplevelvip\\Hook',
),
- 'plugins_view_goods_detail_panel_price_top' =>
- array (
- 0 => 'app\\plugins\\membershiplevelvip\\Hook',
- ),
'plugins_view_home_goods_inside_bottom' =>
array (
0 => 'app\\plugins\\membershiplevelvip\\Hook',
@@ -115,17 +160,6 @@ return array (
array (
0 => 'app\\plugins\\membershiplevelvip\\Hook',
),
- 'plugins_service_users_center_left_menu_handle' =>
- array (
- 0 => 'app\\plugins\\membershiplevelvip\\Hook',
- 1 => 'app\\plugins\\signin\\Hook',
- ),
- 'plugins_service_header_navigation_top_right_handle' =>
- array (
- 0 => 'app\\plugins\\membershiplevelvip\\Hook',
- 1 => 'app\\plugins\\signin\\Hook',
- 2 => 'app\\plugins\\exchangerate\\Hook',
- ),
'plugins_service_quick_navigation_pc' =>
array (
0 => 'app\\plugins\\signin\\Hook',
@@ -180,13 +214,5 @@ return array (
array (
0 => 'app\\plugins\\points\\Hook',
),
- 'plugins_service_buy_order_insert_end' =>
- array (
- 0 => 'app\\plugins\\points\\Hook',
- ),
- 'plugins_service_order_status_change_history_success_handle' =>
- array (
- 0 => 'app\\plugins\\points\\Hook',
- ),
);
?>
\ No newline at end of file