Merge pull request #227325 in DEC/fineui from master to feature/x

* commit 'e8946e5c39921376aae1709a0993bba1eb4d575a':
  REPORT-90850 fix:修改属性名，防止与父组件高度冲突

src/widget/dynamicdatetime/dynamicdatetime.timeselect.js

@@ -3,7 +3,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
     props: function () {
         return {
             baseCls: "bi-date-time-select",
-            height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
+            editorHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
         };
     },
 
@@ -46,7 +46,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
                             }
                         }],
                         width: 60,
-                        height: o.height,
+                        height: o.editorHeight,
                     }
                 }, {
                     type: "bi.label",
@@ -82,7 +82,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
                         }
                     }],
                     width: 60,
-                    height: o.height,
+                    height: o.editorHeight,
                 }, {
                     type: "bi.label",
                     text: ":",
@@ -111,7 +111,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
                         }
                     }],
                     width: 60,
-                    height: o.height,
+                    height: o.editorHeight,
                 }]
             }]
         };