excel导入模型

o2web/source/x_component_query_ImporterDesigner/$Importer/calculateField.html

+<div style="background-color: #FFF; overflow: hidden">
+	<div title="基本" class="MWFTab">
+        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+            <tr>
+                <td class="editTableTitle">字段标题:</td>
+                <td class="editTableValue"><input type="text" name="displayName" value="text{$.displayName}" class="editTableInput"/></td>
+            </tr>
+        </table>
+
+        <div style="border-top: 1px solid #999; margin-top:10px">
+            <div style="background-color: #EEE; height:24px; line-height: 24px; text-align: center; font-weight: bold">数据</div>
+            <div class="MWFDataData" id="text{$.pid}dataDataEditor">
+                <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+                    <tr>
+                        <td class="editTableTitle">字段路径:</td>
+                        <td class="editTableValue"><input id="text{$.pid}viewColumnPathInput" type="text" name="path" value="text{$.path}" class="editTableInput"/></td>
+                    </tr>
+                </table>
+            </div>
+        </div>
+
+        <div style="margin-top:10px">
+            <div style="display:text{($.vtype!=='querytable')?'block':'none'}" id="text{$.pid}dataTypeSelectedCMSProcessArea" class="text{$.vid}dataTypeSelectedCMSProcessArea">
+                <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+                    <tr>
+                        <td class="editTableTitle">字段类型:</td>
+                        <td class="editTableValue"><select id="text{$.pid}dataTypeSelectedCMSProcess">
+<!--                                                           onchange=" var v=this.options[this.selectedIndex].value; if (v){var n = $('text{$.pid}viewColumnPathInput'); n.set('value', v); n.focus();} ">-->
+                            <option value="string" selected>string</option>
+                            <option value="date">date</option>
+                            <option value="number">number</option>
+                            <option value="boolean">boolean</option>
+                            <option value="stringList">stringList</option>
+                            <option value="dateList">dateList</option>
+                            <option value="numberList">numberList</option>
+                            <option value="booleanList">booleanList</option>
+                        </select></td>
+                    </tr>
+                </table>
+            </div>
+            <div style="display:text{($.vtype=='querytable')?'block':'none'}" id="text{$.pid}dataTypeSelectedQuerytableArea" class="text{$.vid}dataTypeSelectedQuerytableArea">
+                <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+                    <tr>
+                        <td class="editTableTitle">字段类型:</td>
+                        <td class="editTableValue"><select  id="text{$.pid}dataTypeSelectedQuerytable">
+<!--                                                            onchange="var v=this.options[this.selectedIndex].value; if (v){var n = $('text{$.pid}viewColumnPathInput'); n.set('value', v); n.focus();} ">-->
+                            <option value="string">string</option>
+                            <option value="integer">integer</option>
+                            <option value="long">long</option>
+                            <option value="double">double</option>
+                            <option value="boolean">boolean</option>
+                            <option value="date">date</option>
+                            <option value="time">time</option>
+                            <option value="dateTime">dateTime</option>
+                            <option value="stringList">stringList</option>
+                            <option value="integerList">integerList</option>
+                            <option value="longList">longList</option>
+                            <option value="doubleList">doubleList</option>
+                            <option value="booleanList">booleanList</option>
+                            <option value="stringLob">stringLob</option>
+                            <option value="stringMap">stringMap</option>
+                        </select></td>
+                    </tr>
+                </table>
+            </div>
+            <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+                <tr class="MWFColumnExportGroup">
+                    <td class="editTableTitle">组织对象:</td>
+                    <td class="editTableValue">
+                        <input class="MWFWorkDataCheck" name="isName" type="radio" value="true" text{($.isName)===true?'checked':''}/>是
+                        <input class="MWFWorkDataCheck" name="isName" type="radio" value="false" text{($.isName)!==true?'checked':''}/>否
+                    </td>
+                </tr>
+            </table>
+        </div>
+	</div>
+
+    <div title="事件"  class="MWFTab">
+        <div class="MWFEventsArea" name="events"></div>
+    </div>
+	<div title="JSON"  class="MWFTab">
+		<div class="MWFJSONArea" style="font-family: Verdana, Geneva, sans-serif; font-size:14px"></div>
+	</div>
+</div>
\ No newline at end of file

o2web/source/x_component_query_ImporterDesigner/$Importer/calculateField.json

+{
+  "events": {
+    "loadTitle" : {
+      "code": "",
+      "html": ""
+    },
+    "loadContent" : {
+      "code": "",
+      "html": ""
+    },
+    "click": {
+      "code": "",
+      "html": ""
+    },
+    "mousedown": {
+      "code": "",
+      "html": ""
+    },
+    "mouseup": {
+      "code": "",
+      "html": ""
+    },
+    "mouseout": {
+      "code": "",
+      "html": ""
+    },
+    "mouseover": {
+      "code": "",
+      "html": ""
+    }
+  }
+}
\ No newline at end of file

o2web/source/x_component_query_ImporterDesigner/$Importer/default/css.wcss

@@ -9,13 +9,14 @@
     "areaNode_over": {
         "border": "1px dotted blue"
     },
+    "viewScrollNode": {
+        "overflow": "hidden"
+    },
     "viewAreaNode": {
         "overflow": "hidden"
     },
 	"viewTitleNode": {
-        "height": "91px",
-        "margin-left" : "29px",
-        "border-left" : "1px solid #999",
+        "height": "81px",
         "background-color": "#EEE",
         "border-bottom": "1px solid #999",
         "cursor": "pointer"
@@ -42,65 +43,95 @@
     },
     "viewContentBodyNode": {
         "overflow": "hidden",
-        "background-color": "#FFF"
-    },
-    "viewContentTableNode": {
-        "width": "100%"
-    },
-    "viewContentTrNode": {
-    },
-    "viewContentTdNode": {
-        "padding": "3px 5px",
-        "border-bottom": "1px solid #CCC"
-    },
-    "viewContentGroupTdNode": {
-        "padding": "3px 5px",
-        "border-bottom": "1px solid #CCC",
-        "background-color": "#F9F9F9"
-    },
-    "viewContentTdGroupNode": {
-        "overflow": "hidden",
-        "cursor": "pointer"
-    },
-    "viewContentTdGroupIconNode": {
-        "float": "left",
-        "width": "20px",
-        "height": "20px",
-        "background": "url("+"../x_component_process_ViewDesigner/$View/default/icon/right.png) center center no-repeat",
-    },
-    "viewContentTdGroupTextNode": {
-        "height": "20px",
-        "font-weight": "bold",
-        "line-height": "20px",
-        "margin-left": "20px"
-    },
-    "noDataTextNode" : {
-        "height" : "50px",
-        "font-size" : "16px",
-        "margin" : "20px auto",
-        "text-align" : "center"
-    },
+        "background-color": "#FFF",
+        "padding" : "5px",
+        "min-height" : "40px",
+        "border-bottom" : "1px solid rgb(187, 187, 187)"
+    },
+//    "viewContentTableNode": {
+//        "width": "100%"
+//    },
+//    "viewContentTrNode": {
+//    },
+//    "viewContentTdNode": {
+//        "padding": "3px 5px",
+//        "border-bottom": "1px solid #CCC"
+//    },
+//    "viewContentGroupTdNode": {
+//        "padding": "3px 5px",
+//        "border-bottom": "1px solid #CCC",
+//        "background-color": "#F9F9F9"
+//    },
+//    "viewContentTdGroupNode": {
+//        "overflow": "hidden",
+//        "cursor": "pointer"
+//    },
+//    "viewContentTdGroupIconNode": {
+//        "float": "left",
+//        "width": "20px",
+//        "height": "20px",
+//        "background": "url("+"../x_component_process_ViewDesigner/$View/default/icon/right.png) center center no-repeat",
+//    },
+//    "viewContentTdGroupTextNode": {
+//        "height": "20px",
+//        "font-weight": "bold",
+//        "line-height": "20px",
+//        "margin-left": "20px"
+//    },
+//    "noDataTextNode" : {
+//        "height" : "50px",
+//        "font-size" : "16px",
+//        "margin" : "20px auto",
+//        "text-align" : "center"
+//    },
 
     "excelTitleNode" : {
-        "padding-top" : "20px",
-        "height" : "30px",
+        "padding-left" : "30px",
+        "height" : "40px",
+        "line-height" : "40px",
         "font-size" : "14px",
         "font-weight" : "bold",
-        "background-color" : "#f3f3f3",
+        "background-color" : "#ddd",
         "border-bottom" : "1px solid rgb(153, 153, 153)"
     },
+    "calculateTitleNode" : {
+        "margin-top" : "30px",
+        "padding-left" : "30px",
+        "height" : "40px",
+        "line-height" : "40px",
+        "font-size" : "14px",
+        "font-weight" : "bold",
+        "background-color" : "#ddd",
+        "border-bottom" : "1px solid rgb(153, 153, 153)",
+        "border-top" : "1px solid rgb(153, 153, 153)"
+    },
+    "addCalculateFieldNode": {
+        "width": "34px",
+        "height": "40px",
+        "cursor" : "pointer",
+        "background": "url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_jia.png) center center no-repeat",
+        "float": "right"
+    },
     "refreshNode": {
         "width": "29px",
         "height": "40px",
+        "cursor" : "pointer",
         "background": "url("+"../x_component_process_ViewDesigner/$View/default/icon/refresh.png) center center no-repeat",
         "float": "left"
     },
     "addColumnNode": {
         "width": "29px",
         "height": "40px",
+        "cursor" : "pointer",
         "background": "url("+"../x_component_process_ViewDesigner/$View/default/icon/addColumn.png) center center no-repeat",
         "float": "right"
     },
+    "addColumnLeftNode": {
+        "width": "29px",
+        "height": "40px",
+        "background": "url("+"../x_component_query_ImporterDesigner/$Importer/default/icon/addColumnLeft.png) center center no-repeat",
+        "float": "left"
+    },
 
     "viewTitleContentNode": {
         "margin": "0px 31px 0px 31px",
@@ -232,6 +263,43 @@
         "border-right": "1px solid #EEE"
     },
 
+    "viewCalculateFieldAreaNode": {
+        "float" : "left",
+        "width" : "200px",
+        "margin": "5px",
+        "background-color": "#EEE",
+        "border-top": "1px solid #FFF",
+        "border-right": "1px solid #BBB",
+        "border-bottom": "1px solid #BBB",
+        "border-left": "1px solid #FFF",
+        "white-space": "nowrap"
+    },
+
+    "viewCalculateFieldNode": {
+        "background-color": "#EEE",
+        "height": "38px",
+        "overflow": "hidden",
+        "border": "1px solid #EEE"
+    },
+    "viewCalculateFieldTextNode":{
+        "padding": "0px 10px",
+        "height": "38px",
+        "line-height": "38px",
+        "white-space": "nowrap"
+    },
+    "viewCalculateFieldNode_selected": {
+        "background-color": "#FFF",
+        "height": "38px",
+        "border": "1px solid red",
+        "white-space": "nowrap"
+    },
+    "viewCalculateFieldNode_over": {
+        "background-color": "#F9F9F9",
+        "height": "38px",
+        "border": "1px dotted blue",
+        "white-space": "nowrap"
+    },
+
     "actionNodeStyles": {
         "width": "16px",
         "height": "16px",
@@ -300,56 +368,5 @@
         "position": "relative",
         "margin-right": "8px",
         "top": "-38px"
-    },
-
-    "toolbarWarpNode": {
-        "border": "1px dashed #999",
-        "height": "auto",
-        "overflow": "hidden",
-        "margin": "auto",
-        "display": "block",
-        "-webkit-user-select": "none",
-        "-moz-user-select": "none",
-        "position": "static",
-        "opacity": 1,
-        "width": "auto",
-        "margin": "3px 3px",
-        "background-color": "#999",
-        "cursor": "pointer"
-    },
-    "toolbarWarpNode_selected": {
-        "background-color": "#FFF",
-        "border": "1px solid red",
-        "white-space": "nowrap"
-    },
-    "toolbarWarpNode_over": {
-        "background-color": "#F9F9F9",
-        "border": "1px dotted blue",
-        "white-space": "nowrap"
-    },
-
-    "pagingWarpNode": {
-        "border": "1px dashed #999",
-        "height": "auto",
-        "overflow": "hidden",
-        "display": "block",
-        "-webkit-user-select": "none",
-        "-moz-user-select": "none",
-        "position": "static",
-        "opacity": 1,
-        "width": "auto",
-        "margin": "3px 3px",
-        "background-color": "#FFF",
-        "cursor": "pointer"
-    },
-    "pagingWarpNode_selected": {
-        "background-color": "#FFF",
-        "border": "1px solid red",
-        "white-space": "nowrap"
-    },
-    "pagingWarpNode_over": {
-        "background-color": "#F9F9F9",
-        "border": "1px dotted blue",
-        "white-space": "nowrap"
     }
 }
\ No newline at end of file

o2web/source/x_component_query_ImporterDesigner/lp/zh-cn.js

@@ -6,7 +6,7 @@ MWF.xApplication.query.ImporterDesigner.LP = {
     "type": "类型",
     "value": "值",
     "importer": "导入模型",
-    "unnamed": "无标题列",
+    "unnamed": "无标题",
     "unCategory": "未分类",
 
     "id": "标识",