Commit 4836cc26 by Ivan

feat: group_index 最后一级重复问题

parent d4bf9714
......@@ -50,20 +50,18 @@ module SimpleController::GroupIndex
def tree_result_mount_data(tree_result, statistics, group_configs, depth=0)
(tree_result || []).map do |key, value|
children =
if value.is_a?(Hash)
if depth > group_configs.length
[]
elsif value.is_a?(Hash)
tree_result_mount_data(value, statistics, group_configs, depth + 1)
elsif value.is_a?(Array)
fake_tree_result = value.map { |ary_key| [ary_key.last, [ary_key]] }.to_h
if fake_tree_result == tree_result
[]
else
tree_result_mount_data(
fake_tree_result,
statistics,
group_configs,
depth + 1
depth + 1,
)
end
else
[]
end
......@@ -72,10 +70,10 @@ module SimpleController::GroupIndex
children: children,
}.merge(
key.nil? ? {
ransack_key: (group_configs[depth] || group_configs.last)[:ransack_key].gsub(/_eq$/, '_null'),
ransack_key: group_configs[depth][:ransack_key].gsub(/_eq$/, '_null'),
ransack_value: true,
} : {
ransack_key: (group_configs[depth] || group_configs.last)[:ransack_key],
ransack_key: group_configs[depth][:ransack_key],
ransack_value: key,
}
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment