Merge branch 'fix/cms.property' into 'develop'

Merge of fix/cms.property 内容管理数据映射增加double类型 to develop

See merge request o2oa/o2oa!30

o2web/source/x_component_cms_ColumnManager/widget/ProjectionEditor.js

@@ -8,6 +8,7 @@ MWF.xApplication.cms.ColumnManager.widget.ProjectionEditor = new Class({
         "maxTypeCount": {
             "string": 4,
             "long": 2,
+            "double": 2,
             "dateTime": 2
         }
 	},
@@ -92,6 +93,7 @@ MWF.xApplication.cms.ColumnManager.widget.ProjectionEditor = new Class({
             '           <td class="editTableValue"><select>'+
             '               <option value="string">string</option>'+
             '               <option value="long">long</option>'+
+            '               <option value="double">double</option>'+
             '               <option value="dateTime">dateTime</option>'+
             '           </select></td>'+
             '       </tr>'+