修复导入模型的BUG，并添加计算字段脚本说明

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

@@ -20,6 +20,15 @@
         </div>
 
         <div style="margin-top:10px">
+            <div style="padding: 5px;">
+                {{$.lp.valueScriptNote}}
+                <br/>{ <br/>
+                &nbsp;&nbsp;"importedData" : {}, //{{$.lp.valueScriptImportedDataNote}}<br/>
+                &nbsp;&nbsp;"data" : {}, //{{$.lp.valueScriptDataNote}} <br/>
+                &nbsp;&nbsp;"document" : {}, //{{$.lp.valueScriptDocumentNote}}<br/>
+                &nbsp;&nbsp;"work" : {}, //{{$.lp.valueScriptWorkNote}}<br/>
+                };
+            </div>
             <div class="MWFFormulaArea" name="valueScript" title="{{$.lp.valueScript}}"></div>
             <div style="display:text{($.vtype=='cms')?'block':'none'}" id="text{$.pid}cmsFieldProperty" class="text{$.vid}cmsFieldProperty">
                 <div style="background-color: #EEE; height:24px; line-height: 24px; text-align: center; font-weight: bold">{{$.lp.cmsProperty}}</div>

o2web/source/x_component_query_ImporterDesigner/lp/en.js

@@ -21,7 +21,7 @@ MWF.xApplication.query.ImporterDesigner.LP = {
     "copy": "Copy",
     "ok": "OK",
     "cancel": "Cancel",
-    "columnField": "Column Field",
+    "columnField": "Excel column corresponding field",
     "calculateField": "Calculate Field",
 
     "action": {
@@ -137,6 +137,11 @@ MWF.xApplication.query.ImporterDesigner.LP = {
         "startTimeField": "Start Date",
         "completeTimeField": "End Date",
         "selectProcess1": "Please select the process first",
-        "lineBreak": "Line Break"
+        "lineBreak": "Line Break",
+        "valueScriptNote": "The field value needs to be returned by return. You can get the data of the current imported row through this.target;, as follows:",
+        "valueScriptImportedDataNote": "Imported Original Data",
+        "valueScriptDataNote": "Business data generated by the system according to configuration",
+        "valueScriptDocumentNote": "If you import a CMS document, the document data generated by the system",
+        "valueScriptWorkNote": "If importing process Work, the system generated work data"
     }
 };
\ No newline at end of file

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

@@ -21,7 +21,7 @@ MWF.xApplication.query.ImporterDesigner.LP = {
     "copy" : "副本",
     "ok" : "确定",
     "cancel" : "取消",
-    "columnField": "列字段",
+    "columnField": "Excel列对应字段",
     "calculateField": "计算字段",
 
     "action": {
@@ -138,6 +138,11 @@ MWF.xApplication.query.ImporterDesigner.LP = {
         "startTimeField": "开始日期",
         "completeTimeField": "结束日期",
         "selectProcess1": "请先选择流程",
-        "lineBreak": "换行符"
+        "lineBreak": "换行符",
+        "valueScriptNote": "在“值脚本中”需要通过return返回字段值。可以通过this.target;获取当前导入行的数据，如下：",
+        "valueScriptImportedDataNote": "导入的原始数据",
+        "valueScriptDataNote": "系统根据配置生成的业务数据",
+        "valueScriptDocumentNote": "如果导入CMS文档，系统生成的文档数据",
+        "valueScriptWorkNote": "如果导入流程work，系统生成的工作数据"
     }
 };
\ No newline at end of file

o2web/source/x_component_query_Query/Importer.js

@@ -393,7 +393,7 @@ MWF.xApplication.query.Query.Importer = MWF.QImporter = new Class({
             if( identityList.length ){
                 identityList = identityList.unique();
                 o2.Actions.load("x_organization_assemble_express").IdentityAction.listObject({ identityList : identityList }, function (json) {
-                    json.data.each( function (d) { this.identityMapImported[ d.matchKey ] = d; }.bind(this));
+                    json.data.each( function (d) { if(d)this.identityMapImported[ d.matchKey ] = d; }.bind(this));
                     identityLoaded = true;
                     check();
                 }.bind(this))
@@ -406,7 +406,7 @@ MWF.xApplication.query.Query.Importer = MWF.QImporter = new Class({
             if( personList.length ){
                 personList = personList.unique();
                 o2.Actions.load("x_organization_assemble_express").PersonAction.listObject({ personList : personList }, function (json) {
-                    json.data.each( function (d) { this.personMapImported[ d.matchKey ] = d; }.bind(this));
+                    json.data.each( function (d) { if(d)this.personMapImported[ d.matchKey ] = d; }.bind(this));
                     personLoaded = true;
                     check();
                 }.bind(this))
@@ -419,7 +419,7 @@ MWF.xApplication.query.Query.Importer = MWF.QImporter = new Class({
             if( unitList.length ){
                 unitList = unitList.unique();
                 o2.Actions.load("x_organization_assemble_express").UnitAction.listObject({ unitList : unitList }, function (json) {
-                    json.data.each( function (d) { this.unitMapImported[ d.matchKey ] = d; }.bind(this));
+                    json.data.each( function (d) { if(d)this.unitMapImported[ d.matchKey ] = d; }.bind(this));
                     unitLoaded = true;
                     check();
                 }.bind(this))
@@ -432,7 +432,7 @@ MWF.xApplication.query.Query.Importer = MWF.QImporter = new Class({
             if( groupList.length ){
                 groupList = groupList.unique();
                 o2.Actions.load("x_organization_assemble_express").GroupAction.listObject({ groupList : groupList }, function (json) {
-                    json.data.each( function (d) { this.groupMapImported[ d.matchKey ] = d; }.bind(this));
+                    json.data.each( function (d) { if(d)this.groupMapImported[ d.matchKey ] = d; }.bind(this));
                     groupLoaded = true;
                     check();
                 }.bind(this))