|
|
@@ -350,9 +350,19 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
string[] fieldData = m.Value.Replace("${", "").Replace("}$", "").Split('|');
|
|
|
string fieldName = fieldData[0];
|
|
|
string Title = fieldData[1];
|
|
|
+ string Control = "text";
|
|
|
+ string Option = "";
|
|
|
+ if(fieldData.Length > 2)
|
|
|
+ {
|
|
|
+ Control = fieldData[2];
|
|
|
+ if(Control == "select")
|
|
|
+ {
|
|
|
+ Option = fieldData[3];
|
|
|
+ }
|
|
|
+ }
|
|
|
if(!query.ContainsKey(fieldName))
|
|
|
{
|
|
|
- query.Add(fieldName, Title);
|
|
|
+ query.Add(fieldName, Title + "#cut#" + Control + "#cut#" + Option);
|
|
|
}
|
|
|
}
|
|
|
List<CustomQuerySub> subItems = db.CustomQuerySub.Where(m => m.ParentId == Id).ToList();
|
|
|
@@ -365,9 +375,19 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
string[] fieldData = m.Value.Replace("${", "").Replace("}$", "").Split('|');
|
|
|
string fieldName = fieldData[0];
|
|
|
string Title = fieldData[1];
|
|
|
+ string Control = "text";
|
|
|
+ string Option = "";
|
|
|
+ if(fieldData.Length > 2)
|
|
|
+ {
|
|
|
+ Control = fieldData[2];
|
|
|
+ if(Control == "select")
|
|
|
+ {
|
|
|
+ Option = fieldData[3];
|
|
|
+ }
|
|
|
+ }
|
|
|
if(!query.ContainsKey(fieldName))
|
|
|
{
|
|
|
- query.Add(fieldName, Title);
|
|
|
+ query.Add(fieldName, Title + "#cut#" + Control + "#cut#" + Option);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -501,7 +521,18 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
string val = redisCommandList[2];
|
|
|
if(kind == "lpush")
|
|
|
{
|
|
|
- new CustomRedisDbconn(ConnectStr).AddList(key, val);
|
|
|
+ if(val.Contains("\n"))
|
|
|
+ {
|
|
|
+ string[] vals = val.TrimEnd('\n').Split('\n');
|
|
|
+ foreach(string sub in vals)
|
|
|
+ {
|
|
|
+ new CustomRedisDbconn(ConnectStr).AddList(key, sub);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ new CustomRedisDbconn(ConnectStr).AddList(key, val);
|
|
|
+ }
|
|
|
}
|
|
|
else if(kind == "set")
|
|
|
{
|