centaline-data-driven 1.2.26 → 1.2.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.26",
+  "version": "1.2.27",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/SearchList.vue

@@ -2,8 +2,8 @@
   <div id="app-search" style="height:100%;position: fixed;">
     <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist>
-    <!-- <ct-searchlist :searchConditionApi="'/WorklistList/getLayoutOfSearch'" :searchDataApi="'/WorklistList/getListOfSearchModel'" :searchCategoryApi="'/WorklistList/getLayoutOfSearchCategory'"></ct-searchlist> -->
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
+    <ct-searchlist :searchConditionApi="'/exampleList/getLayoutOfSearch'" :searchDataApi="'/exampleList/getListOfSearchModel'"></ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
                    :searchDataApi="'/PropertyRETList/getListOfSearchModel'"

package/src/centaline/dynamicD/src/dynamicD.vue

@@ -51,6 +51,9 @@
         }
       },
       dateBlur(event) {
+        if(this.model.attrs && this.model.attrs.type && this.model.attrs.type=='month'){
+          return;
+        }
         var text = event.$el.querySelector("input").value;
         text = text.replace('-', '').replace('/', '').replace('\\', '');
         var nowDate = new Date();

package/src/centaline/loader/src/ctl/D.js

@@ -16,6 +16,9 @@ const D = function (source, dateType) {
           if (dateType === "datetime") {
             return 'yyyy-MM-dd HH:mm:ss'
           }
+          else if (dateType === "month") {
+            return 'yyyy-MM'
+          }
           return 'yyyy-MM-dd'
         }
       },

package/src/centaline/loader/src/ctl/lib/Enum.js

@@ -221,6 +221,10 @@ const Enum = {
     /// 图片选择
     /// </summary>
     PhotoSelect: 45,
+    /// <summary>
+    /// 年份-月份控件
+    /// </summary>
+    DateYearMonth:46,
   },
 
   //返回状态码

package/src/centaline/loader/src/ctl/lib/LibFunction.js

@@ -167,6 +167,10 @@ const LibFunction = {
         item = D(field, 'date');
         item.is = 'ct-date';
         break;
+      case Enum.ControlType.DateYearMonth://年份-月份
+      item = D(field, 'month');
+      item.is = 'ct-date';
+      break;
       case Enum.ControlType.DateTime://日期时间
         item = D(field, 'datetime');
         item.is = 'ct-date';