Skip to content

D
DataCenter_Core2.1_20190520
Commit 49767d88 by jianshuqin
Options

优化:组件功能

parent fb7d0c77
Showing with 35 additions and 12 deletions
Bailun.DC.Common/GlobalConfig.cs
......@@ -12,13 +12,13 @@ namespace Bailun.DC.Common
/// <summary>
/// 数据中心 读写库
/// </summary>
public static string ConnectionString = "server=gz-cdb-kp7s5i79.sql.tencentcdb.com;port=61691;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;SslMode=none;";
public static string ConnectionString = "server=gz-cdb-kp7s5i79.sql.tencentcdb.com;port=61691;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;SslMode=none;Allow User Variables=True;";
//public static string ConnectionString_read = "server=gz-cdbrg-qdyec2j3.sql.tencentcdb.com;port=59667;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;";
/// <summary>
/// 数据中心 只读库
/// </summary>
public static string ConnectionString_read = "server=gz-cdbrg-qdyec2j3.sql.tencentcdb.com;port=59667;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;SslMode=none;";
public static string ConnectionString_read = "server=gz-cdbrg-qdyec2j3.sql.tencentcdb.com;port=59667;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;SslMode=none;Allow User Variables=True;";
/// <summary>
/// sku分类url
/// </summary>
......@@ -29,9 +29,9 @@ namespace Bailun.DC.Common
/// </summary>
public static string DcJavaUrl = "http://api.dcjava.bailuntec.com";
#else
public static string ConnectionString = "server=10.0.8.113;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;SslMode=none;";
public static string ConnectionString = "server=10.0.8.113;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;SslMode=none;Allow User Variables=True;";
//public static string ConnectionString_read = "server=10.0.8.21;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;";
public static string ConnectionString_read = "server=10.0.8.113;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;SslMode=none;";
public static string ConnectionString_read = "server=10.0.8.113;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;SslMode=none;Allow User Variables=True;";
/// <summary>
/// sku分类url
/// </summary>
......@@ -47,7 +47,7 @@ namespace Bailun.DC.Common
/// <summary>
/// 数据仓库
/// </summary>
public static string ConnectionString_DW = "server=gz-cdb-ncg4yhjb.sql.tencentcdb.com;port=58537;database=datawarehouse;uid=root;password=#7kfnymAM$Y9-Ntf;SslMode=none;";
public static string ConnectionString_DW = "server=gz-cdb-ncg4yhjb.sql.tencentcdb.com;port=58537;database=datawarehouse;uid=root;password=#7kfnymAM$Y9-Ntf;SslMode=none;Allow User Variables=True;";
/// <summary>
/// 产品库
......@@ -57,7 +57,7 @@ namespace Bailun.DC.Common
/// <summary>
/// 财务资金
/// </summary>
public static string ConnectionString_Fund = "Server=gz-cdb-lnrmt5zh.sql.tencentcdb.com;port=61369;database=bailun_caiwu;uid=root;password=#7kfnymAM$Y9-Ntf;Convert Zero Datetime=True;SslMode=none;";
public static string ConnectionString_Fund = "Server=gz-cdb-lnrmt5zh.sql.tencentcdb.com;port=61369;database=bailun_caiwu;uid=root;password=#7kfnymAM$Y9-Ntf;Convert Zero Datetime=True;SslMode=none;Allow User Variables=True;";
}
}
Bailun.DC.Services/Component/TableService.cs
......@@ -9,6 +9,7 @@ using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
namespace Bailun.DC.Services.Component
{
......@@ -312,7 +313,10 @@ namespace Bailun.DC.Services.Component
using (reader.Item2)
{
pageList.TotalCount = reader.Item1;
pageList.List.Load(reader.Item2);
if (pageList.TotalCount > 0)
{
pageList.List.Load(reader.Item2);
}
}
break;
......@@ -486,7 +490,10 @@ namespace Bailun.DC.Services.Component
dataCount = reader.Item1;
using (reader.Item2)
{
b = DataReaderToExcel(listColumn, reader.Item2, reader.Item1);
if (dataCount > 0)
{
b = DataReaderToExcel(listColumn, reader.Item2, reader.Item1);
}
}
}
else
......@@ -542,6 +549,7 @@ namespace Bailun.DC.Services.Component
select_row_method = dto.SelectRowMethod,
operate_column_name = dto.OperateColumnName,
operate_column_width = dto.OperateColumnWidth,
operate_controls_position = dto.OperateControlsPosition,
gmt_modified = DateTime.Now,
crumbs = dto.ListCrumb.Count(l => !string.IsNullOrWhiteSpace(l) && !l.Equals("null", StringComparison.OrdinalIgnoreCase)) > 0 ? JsonConvert.SerializeObject(dto.ListCrumb) : null,
javascript_src = dto.ListJavascriptSrc?.Count(l => !string.IsNullOrWhiteSpace(l) && !l.Equals("null", StringComparison.OrdinalIgnoreCase)) > 0 ? JsonConvert.SerializeObject(dto.ListJavascriptSrc) : null,
......@@ -790,12 +798,27 @@ namespace Bailun.DC.Services.Component
dataSql = $"SELECT * FROM `{entity.DataValue}` {whereSql} {(!string.IsNullOrWhiteSpace(orderbySql) ? $"ORDER BY {orderbySql}" : string.Empty) } LIMIT {offset} , {fetch}";
break;
default:
totalSql = $"SELECT COUNT(*) FROM ( {entity.DataValue} ) AS A {whereSql}";
dataSql = $"SELECT * FROM ( {entity.DataValue} ) AS A {whereSql} {(!string.IsNullOrWhiteSpace(orderbySql) ? $"ORDER BY {orderbySql}" : string.Empty) } LIMIT {offset} , {fetch}";
//默认参数
var setSql = string.Empty;
var paramIndex = entity.DataValue.IndexOf("@");
if (paramIndex >= 0)
{
foreach (Match item in Regex.Matches(entity.DataValue.Substring(paramIndex), @"^@\w+[^\w]*"))
{
string paramName = item.Value.Substring(1, Regex.Match(item.Value.Substring(1), @"[^\w]*$").Index);
if (!sqlparam.ParameterNames.Contains(paramName))
{
setSql += $"SET @{paramName} = null;";
}
}
}
totalSql = $"{setSql} SELECT COUNT(*) FROM ( {entity.DataValue} ) AS A {whereSql}";
dataSql = $"{setSql} SELECT * FROM ( {entity.DataValue} ) AS A {whereSql} {(!string.IsNullOrWhiteSpace(orderbySql) ? $"ORDER BY {orderbySql}" : string.Empty) } LIMIT {offset} , {fetch}";
break;
}
MySqlConnection db = this.GetDbConnection(entity);
reader = (db.QueryFirstOrDefault<int>(totalSql, sqlparam), db.ExecuteReader(dataSql, sqlparam));
int dataCount = db.QueryFirstOrDefault<int>(totalSql, sqlparam);
reader = (dataCount, dataCount > 0 ? db.ExecuteReader(dataSql, sqlparam) : null);
return reader;
}
......
Bailun.DC.Web/Areas/Component/Views/Form/Filter.cshtml
......@@ -14,7 +14,7 @@
<el-form-control v-if="filter.isShowExportButton" v-bind:item="{type: 'button',name:'导出',buttonType:'success',icon:'el-icon-download'}" v-on:click="onExport"></el-form-control>
<el-form-control v-if="filter.isShowImportButton" v-bind:item="{type: 'button',name:'导入',icon:'el-icon-upload2'}" v-on:click="onImport"></el-form-control>
<template v-if="filter.operateControlsPosition == 2">
<el-form-control v-for="(item,index) in filter.listOperateControl" v-bind:item="item" v-bind:key="index"></el-form-control>
<el-form-control v-for="(item,index) in filter.listOperateControl" v-bind:item="item" v-bind:key="index" v-on:click="onClick(item.click)"></el-form-control>
</template>
</el-col>
</el-row>
......
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