+
Skip to content

Fix cannot save mix data #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 18, 2021
Merged

Fix cannot save mix data #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 75 additions & 78 deletions src/Mix.Cms.Lib/Extensions/MixAttributeValueModelExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,98 +203,95 @@ public static void ToModelValue(this ViewModels.MixDatabaseDataValues.UpdateView
}
else
{
if (property.HasValues)
switch (item.Column.DataType)
{
switch (item.Column.DataType)
{
case MixDataType.DateTime:
item.DateTimeValue = property.Value<DateTime?>();
item.StringValue = property.Value<string>();
break;
case MixDataType.DateTime:
item.DateTimeValue = property.Value<DateTime?>();
item.StringValue = property.Value<string>();
break;

case MixDataType.Date:
item.DateTimeValue = property.Value<DateTime?>();
item.StringValue = property.Value<string>();
break;
case MixDataType.Date:
item.DateTimeValue = property.Value<DateTime?>();
item.StringValue = property.Value<string>();
break;

case MixDataType.Time:
item.DateTimeValue = property.Value<DateTime?>();
item.StringValue = property.Value<string>();
break;
case MixDataType.Time:
item.DateTimeValue = property.Value<DateTime?>();
item.StringValue = property.Value<string>();
break;

case MixDataType.Double:
item.DoubleValue = property.Value<double?>();
item.StringValue = property.Value<string>();
break;
case MixDataType.Double:
item.DoubleValue = property.Value<double?>();
item.StringValue = property.Value<string>();
break;

case MixDataType.Boolean:
item.BooleanValue = property.Value<bool?>();
item.StringValue = property.Value<string>()?.ToLower();
break;
case MixDataType.Boolean:
item.BooleanValue = property.HasValues ? property.Value<bool?>() : null;
item.StringValue = property.HasValues ? property.Value<string>()?.ToLower() : null;
break;

case MixDataType.Integer:
item.IntegerValue = property.Value<int?>();
item.StringValue = property.Value<string>();
break;
case MixDataType.Integer:
item.IntegerValue = property.Value<int?>();
item.StringValue = property.Value<string>();
break;

case MixDataType.Reference:
item.StringValue = property.Value<string>();
break;
case MixDataType.Reference:
item.StringValue = property.Value<string>();
break;

case MixDataType.Upload:
string mediaData = property.Value<string>();
if (mediaData.IsBase64())
case MixDataType.Upload:
string mediaData = property.Value<string>();
if (mediaData.IsBase64())
{
ViewModels.MixMedias.UpdateViewModel media = new ViewModels.MixMedias.UpdateViewModel()
{
ViewModels.MixMedias.UpdateViewModel media = new ViewModels.MixMedias.UpdateViewModel()
Specificulture = item.Specificulture,
Status = MixContentStatus.Published,
MediaFile = new FileViewModel()
{
Specificulture = item.Specificulture,
Status = MixContentStatus.Published,
MediaFile = new FileViewModel()
{
FileStream = mediaData,
Extension = ".png",
Filename = Guid.NewGuid().ToString(),
FileFolder = "Attributes"
}
};
var saveMedia = media.SaveModel(true, _context, _transaction);
if (saveMedia.IsSucceed)
{
item.StringValue = saveMedia.Data.FullPath;
FileStream = mediaData,
Extension = ".png",
Filename = Guid.NewGuid().ToString(),
FileFolder = "Attributes"
}
}
else
};
var saveMedia = media.SaveModel(true, _context, _transaction);
if (saveMedia.IsSucceed)
{
item.StringValue = mediaData;
item.StringValue = saveMedia.Data.FullPath;
}
break;
case MixDataType.Json:
item.StringValue = property.Value<JObject>().ToString();
break;
case MixDataType.Tag:
item.StringValue = property.Value<JArray>().ToString();
break;
}
else
{
item.StringValue = mediaData;
}
break;
case MixDataType.Json:
item.StringValue = property.HasValues ? property.Value<JObject>().ToString() : null;
break;
case MixDataType.Tag:
item.StringValue = property.HasValues ? property.Value<JArray>().ToString() : null;
break;

case MixDataType.Custom:
case MixDataType.Duration:
case MixDataType.PhoneNumber:
case MixDataType.Text:
case MixDataType.Html:
case MixDataType.MultilineText:
case MixDataType.EmailAddress:
case MixDataType.Password:
case MixDataType.Url:
case MixDataType.ImageUrl:
case MixDataType.CreditCard:
case MixDataType.PostalCode:
case MixDataType.Color:
case MixDataType.Icon:
case MixDataType.VideoYoutube:
case MixDataType.TuiEditor:
default:
item.StringValue = property.Value<string>();
break;
}
case MixDataType.Custom:
case MixDataType.Duration:
case MixDataType.PhoneNumber:
case MixDataType.Text:
case MixDataType.Html:
case MixDataType.MultilineText:
case MixDataType.EmailAddress:
case MixDataType.Password:
case MixDataType.Url:
case MixDataType.ImageUrl:
case MixDataType.CreditCard:
case MixDataType.PostalCode:
case MixDataType.Color:
case MixDataType.Icon:
case MixDataType.VideoYoutube:
case MixDataType.TuiEditor:
default:
item.StringValue = property.Value<string>();
break;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Mix.Cms.Lib/ViewModels/MixDatabaseDataValues/UpdateViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public override void ExpandView(MixCmsContext _context = null, IDbContextTransac
if (MixDatabaseColumnId > 0)
{
Column = MixDatabaseColumns.UpdateViewModel.Repository.GetSingleModel(
f => f.Id == MixDatabaseColumnId
f => f.Name == MixDatabaseColumnName && f.MixDatabaseName == MixDatabaseName
, _context, _transaction).Data;
if (Column != null && DataType == MixDataType.Reference)
{
Expand Down
25 changes: 13 additions & 12 deletions src/Mix.Cms.Lib/ViewModels/MixDatabaseDatas/FormViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,32 +164,33 @@ public override MixDatabaseData ParseModel(
MixDatabaseId = _context.MixDatabase.First(m => m.Name == MixDatabaseName)?.Id ?? 0;
}
Values ??= MixDatabaseDataValues.UpdateViewModel
.Repository.GetModelListBy(a => a.DataId == Id && a.Specificulture == Specificulture
.Repository.GetModelListBy(a => a.DataId == Id && a.MixDatabaseName == MixDatabaseName && a.Specificulture == Specificulture
, _context, _transaction)
.Data.OrderBy(a => a.Priority).ToList();
Columns ??= MixDatabaseColumns.UpdateViewModel.Repository.GetModelListBy(f => f.MixDatabaseId == MixDatabaseId
, _context, _transaction).Data;
Columns.AddRange(
Values
.Where(v => v.Column != null && !Columns.Any(f => f.Id == v.Column?.Id))
.Where(v => v.Column != null && !Columns.Any(f => f.Name == v.Column?.Name))
.Select(v => v.Column)
.ToList());
Obj ??= new JObject();
foreach (var field in Columns.OrderBy(f => f.Priority))
foreach (var col in Columns.OrderBy(f => f.Priority))
{
var val = Values.FirstOrDefault(v => v.MixDatabaseColumnName == field.Name);
var val = Values.FirstOrDefault(v => v.MixDatabaseColumnName == col.Name);
if (val == null)
{
val = new MixDatabaseDataValues.UpdateViewModel()
{
MixDatabaseColumnId = field.Id,
MixDatabaseColumnName = field.Name,
StringValue = field.DefaultValue,
Priority = field.Priority,
Column = field,
MixDatabaseColumnId = col.Id,
MixDatabaseColumnName = col.Name,
StringValue = col.DefaultValue,
Priority = col.Priority,
Column = col,
DataId = Id
};
val.ExpandView(_context, _transaction);
val.Column = col;
Values.Add(val);
}
else
Expand All @@ -198,11 +199,11 @@ public override MixDatabaseData ParseModel(
}
val.Status = Status;
val.Specificulture = Specificulture;
val.Priority = field.Priority;
val.Priority = col.Priority;
val.MixDatabaseName = MixDatabaseName;
if (Obj[val.MixDatabaseColumnName] != null)
{
if (val.Column.DataType == MixDataType.Reference)
if (val.Column?.DataType == MixDataType.Reference)
{
var arr = Obj[val.MixDatabaseColumnName].Value<JArray>();
val.IntegerValue = val.Column.ReferenceId;
Expand All @@ -227,7 +228,7 @@ public override MixDatabaseData ParseModel(
RefData.Add(new FormViewModel()
{
Specificulture = Specificulture,
MixDatabaseId = field.ReferenceId.Value,
MixDatabaseId = col.ReferenceId.Value,
Status = MixContentStatus.Published,
Obj = objData
});
Expand Down
10 changes: 9 additions & 1 deletion src/Mix.Cms.Lib/ViewModels/MixDatabaseDatas/Helper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,15 @@ public static async Task<FormViewModel> GetBlankFormDataAsync(string mixDatabase
};
foreach (var item in result.Columns)
{
result.Obj.Add(new JProperty(item.Name, item.DefaultValue ?? string.Empty));
if (item.DataType!= MixDataType.Reference)
{
result.Obj.Add(new JProperty(item.Name, item.DefaultValue ?? string.Empty));
}
else
{
result.Obj.Add(new JProperty(item.Name, new JArray()));
}

}
return result;
}
Expand Down
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载