473：MActionUI 增加对HtmlTextArea标签支持（2017-03-24）

474：MAction SetSelectColumns 处理对Sqlite视图字段带双引号问题（2017-03-27）
gongct · Mar 30, 2017 · 20f8b7e · 20f8b7e
1 parent fab033c
commit 20f8b7e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyTitle("CYQ.Data 数据层(ORM)框架 V5 版本")]
 [assembly: AssemblyDescription("论坛：http://www.cyqdata.com/cyqdata")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("路过秋天 （2017-02-20）")]
+[assembly: AssemblyCompany("路过秋天 （2017-03-27）")]
 [assembly: AssemblyProduct("CYQ.Data 数据层(ORM)框架 V5 版本")]
 [assembly: AssemblyCopyright("版权所有 (C) 路过秋天 2010-2020")]
 [assembly: AssemblyTrademark("CYQ.Data")]
@@ -31,5 +31,5 @@
 //
 // 可以指定所有这些值，也可以使用“修订号”和“内部版本号”的默认值，
 // 方法是按如下所示使用“*”:
-[assembly: AssemblyVersion("5.7.6.5")]
-[assembly: AssemblyFileVersion("5.7.6.5")]
+[assembly: AssemblyVersion("5.7.6.6")]
+[assembly: AssemblyFileVersion("5.7.6.6")]
diff --git a/SQL/TableSchema.cs b/SQL/TableSchema.cs
@@ -460,7 +460,7 @@ internal static MDataColumn GetColumns(DataTable tableSchema)
                     {
                         continue;//后面那个会多出关联字段。
                     }
-                    columnName = row["ColumnName"].ToString();
+                    columnName = row["ColumnName"].ToString().Trim('"');//sqlite视图时会带引号
                     if (string.IsNullOrEmpty(columnName))
                     {
                         columnName = "Empty_" + i;

diff --git a/UI/MActionUI.cs b/UI/MActionUI.cs
@@ -315,6 +315,7 @@ internal void Set(object ct, string ctPropName, int enabledState, object forceVa
                                 t.GetProperty("Text").SetValue(ct, strValue, null);
                                 break;
                             case "HiddenField"://web
+                            case "HtmlTextArea"://web
                             case "HtmlInputText"://web html runat=server
                             case "HtmlInputHidden":
                                 t.GetProperty("Value").SetValue(ct, strValue, null);
@@ -453,6 +454,7 @@ internal string Get(object ct, string ctPropName, object defaultValue)
                                 value = t.GetProperty("Text").GetValue(ct, null);
                                 break;
                             case "HiddenField"://web
+                            case "HtmlTextArea"://web
                             case "DateTimePicker"://win
                             case "NumericUpDown"://win
                                 value = t.GetProperty("Value").GetValue(ct, null);

diff --git a/更新记录.txt b/更新记录.txt
@@ -684,4 +684,6 @@
 469��MutilLanguageС����֧��Winform�Ķ����ԡ�XHtmlActionС������2017-01-23��
 470��SqlCreate.FormatWhere ֧�ֶ�������������Aries�����ӣ��Ľ������磺action.Fill("a;b"))��2017-01-30��
 471��MDataColumn ������������JointPrimary��FirstPrimary��FirstUnique��2017-01-08��
-472��CacheManage��Redis������Contains�ķ����жϣ�2017-02-20��
+472��CacheManage��Redis������Contains�ķ����жϣ�2017-02-20��
+473��MActionUI ���Ӷ�HtmlTextArea��ǩ֧�֣�2017-03-24��
+474��MAction SetSelectColumns ������Sqlite��ͼ�ֶδ�˫�������⣨2017-03-27��