合并冲突
xiyunfei 编写于 2021-08-15 10:21:33
NewLife.Cube
@using NewLife.Web;
@using XCode;
@using NewLife.Cube.Charts;
@{
    Layout = NewLife.Cube.Setting.Current.Layout;

    var fact = ViewBag.Factory as IEntityFactory;
    var page = ViewBag.Page as Pager;

    var charts = ViewBag.Charts as ECharts[];
    var charts2 = ViewBag.Charts2 as ECharts[];
}

<div class="clearfix">
    @Html.Partial("_List_Toolbar")
</div>
@if (charts != null && charts.Length > 0)
{
    <div class="clearfix">
        @foreach (var item in charts)
        {
            @Html.Partial("_ECharts", item)
        }
    </div>
}
<div class="table-responsive">
    @Html.Partial("_List_Data")
</div>
<div class="panel-footer">
    @Html.Partial("_List_Pager")
</div>
@if (charts2 != null && charts2.Length > 0)
{
    <div class="clearfix">
        @foreach (var item in charts2)
        {
            @Html.Partial("_ECharts", item)
        }
    </div>
}