Commit 82c6f779 by liyijie

feat: 支持enum_dics

parent 55d9501f
......@@ -185,8 +185,14 @@ class SimpleController::BaseController < ::InheritedResources::Base
# 执行sub_q
def ransack_paginate(association)
if params[:group_keys].present?
statistics_association = association.unscope(:order).distinct
if defined?(Com::CounterStorage) && params[:group_keys].count > 1
hash = statistics_association.group(params[:group_keys]).count.merge(count: statistics_association.count)
@statistics = Com::CounterStorage.load(params[:group_keys], hash, params[:enum_dics] || {}).group_count(*params[:group_keys])
else
@statistics = statistics_association.group(params[:group_keys]).count.merge(count: statistics_association.count)
end
end
association = association.ransack(params[:q]).result unless self.class.instance_variable_get(:@ransack_off) || params[:q].blank?
association = association.ransack(params[:sub_q]).result unless self.class.instance_variable_get(:@ransack_off) || params[:sub_q].blank?
......@@ -237,7 +243,7 @@ class SimpleController::BaseController < ::InheritedResources::Base
statistics_association = association.unscope(:order).distinct
if defined?(Com::CounterStorage) && params[:group_keys].count > 1
hash = statistics_association.group(params[:group_keys]).count.merge(count: statistics_association.count)
@statistics = Com::CounterStorage.load(params[:group_keys], hash).group_count(*params[:group_keys])
@statistics = Com::CounterStorage.load(params[:group_keys], hash, params[:enum_dics] || {}).group_count(*params[:group_keys])
else
@statistics = statistics_association.group(params[:group_keys]).count.merge(count: statistics_association.count)
end
......
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