优化:组件功能

Bailun.DC.Services/Component/TableService.cs

@@ -95,7 +95,7 @@ namespace Bailun.DC.Services.Component
                 {
                     entity = this.Get(queryFilter.Code);
                 }
-                if (entity != null && (!string.IsNullOrWhiteSpace(entity.ColumnValue)))
+                if (entity != null && (!string.IsNullOrWhiteSpace(entity.ColumnValue) || entity.ListColumn?.Count() > 0))
                 {
                     switch (entity.ColumnType)
                     {
@@ -115,7 +115,7 @@ namespace Bailun.DC.Services.Component
 
                         #region 本地配置
                         case ColumnTypeEnum.Config:
-                            list = DeserializeCollection<dynamic>(entity.ColumnValue).ToList();
+                            list = !string.IsNullOrWhiteSpace(entity.ColumnValue) ? DeserializeCollection<dynamic>(entity.ColumnValue).ToList() : entity.ListColumn.ToList();
                             break;
                         #endregion 
 

Bailun.DC.Web/wwwroot/js/component/el-form-control.js

@@ -135,8 +135,21 @@
                             }
                         }
                         break;
-                    //日期
+                    //年月
                     case 'month':
+                        var date = new Date();
+                        switch (that.item.defaultValue) {
+                            case "new Date()":
+                            case "curr month()":
+                                date = new Date(date.setDate(1));
+                                break;
+                            case "prev month()":
+                                date = new Date(new Date(date.setMonth(date.getMonth() - 1)).setDate(1));
+                                break;
+                        }
+                        that.$set(that, "item_value", date);
+                        break;
+                    //日期
                     case 'date':
                         that.$set(that, "item_value", that.item.defaultValue == 'new Date()' ? new Date() : that.item.defaultValue);
                         break;