From fbaed9b851bfbd4f9c6d4051e2e4b61291a06beb Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Tue, 1 Dec 2020 16:13:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=A1=A8=E6=A0=BC=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=88=97=E8=A1=A8=E8=87=AA=E5=AE=9A=E4=B9=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/controller/User.php   | 4 ++--
 application/module/FormHandleModule.php | 7 +++++++
 changelog.txt                           | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/application/index/controller/User.php b/application/index/controller/User.php
index fd3836f84..61465d90b 100755
--- a/application/index/controller/User.php
+++ b/application/index/controller/User.php
@@ -139,8 +139,8 @@ class User extends Common
         $this->assign('goods_browse_list', $data['data']);
 
         // 订单页面订单状态form key
-        $this->assign('form_search_order_status_form_key', 'f2p');
-        $this->assign('form_search_order_user_is_comments_form_key', 'f21p');
+        $this->assign('form_search_order_status_form_key', 'status');
+        $this->assign('form_search_order_user_is_comments_form_key', 'user_is_comments');
 
         // 钩子
         $this->PluginsHook();
diff --git a/application/module/FormHandleModule.php b/application/module/FormHandleModule.php
index 63e919868..24312eb04 100644
--- a/application/module/FormHandleModule.php
+++ b/application/module/FormHandleModule.php
@@ -373,6 +373,13 @@ class FormHandleModule
                     $form_key = $fk.'p';
                     $v['form_key'] = $form_key;
 
+                    // 是否指定了数据/表单唯一key作为条件、则复制当前key数据
+                    // 用于根据key指定条件（指定不宜使用这里拼接的key）
+                    if(array_key_exists($form_name, $this->out_params) && $this->out_params[$form_name] !== null && $this->out_params[$form_name] !== '')
+                    {
+                        $this->out_params[$form_key] = $this->out_params[$form_name];
+                    }
+
                     // 根据组件类型处理
                     switch($v['search_config']['form_type'])
                     {
diff --git a/changelog.txt b/changelog.txt
index cadf1f722..025cbe244 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -15,6 +15,7 @@ web端
 	5. 分页组件新增自定义页码跳转
 	6. 后端动态表格数据列表组件优化高度固定
 	7. 首页轮播左侧商品分类和右侧聚合内容新增开关控制
+	8. 动态表格数据列表自定义条件bug修复
 
 小程序
 	1. 支付订单0金额错误修复
-- 
GitLab