Merge branch 'fix/Process.org_defaultvalue_add_unit' into 'develop'

Merge of fix/[流程管理]人员选组组件默认值中增加职务 to develop

See merge request o2oa/o2oa!334

o2web/source/x_component_cms_FormDesigner/Module/Org/org.html

@@ -71,6 +71,12 @@
                     <div class="MWFPersonUnit" name="unitValue" type="unit"></div>
                 </td>
             </tr>
+            <tr>
+                <td class="editTableTitle">职　　位:</td>
+                <td class="editTableValue">
+                    <div class="MWFDutySelector" name="dutyValue"></div>
+                </td>
+            </tr>
             <!--<tr>-->
                 <!--<td class="editTableTitle">群　　组:</td>-->
                 <!--<td class="editTableValue">-->

o2web/source/x_component_process_FormDesigner/Module/Org/org.html

@@ -71,6 +71,12 @@
                     <div class="MWFPersonUnit" name="unitValue" type="unit"></div>
                 </td>
             </tr>
+            <tr>
+                <td class="editTableTitle">职　　位:</td>
+                <td class="editTableValue">
+                    <div class="MWFDutySelector" name="dutyValue"></div>
+                </td>
+            </tr>
             <!--<tr>-->
                 <!--<td class="editTableTitle">群　　组:</td>-->
                 <!--<td class="editTableValue">-->

o2web/source/x_component_process_Xform/Org.js

@@ -103,16 +103,9 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
                 dutys.each(function(duty){
                     if (duty.code) par = this.form.Macro.exec(duty.code, this);
                     var code = "return this.org.getDuty(\""+duty.name+"\", \""+par+"\")";
-
-                    //var code = "return this.org.getDepartmentDuty({\"name\": \""+duty.name+"\", \"departmentName\": \""+par+"\"})";
                     var d = this.form.Macro.exec(code, this);
                     if (typeOf(d)!=="array") d = (d) ? [d.toString()] : [];
                     d.each(function(dd){if (dd) values.push(dd);});
-
-                    // code = "return this.org.getCompanyDuty({\"name\": \""+duty.name+"\", \"compName\": \""+par+"\"})";
-                    // d = this.form.Macro.exec(code, this);
-                    // if (typeOf(d)!=="array") d = (d) ? [d.toString()] : [];
-                    // d.each(function(dd){values.push(dd);});
                 }.bind(this));
             }
         }

package.json

@@ -26,14 +26,14 @@
                 "deploy:rpi": "gulp deploy --e raspberrypi",
                 "typeInfor": "type welcome && echo Your server is build success: target/o2server/",
                 "clear": "gulp clear_build",
-                "build": "npm run clear && npm run preperation && npm run build_parallel && npm run deploy && npm run typeInfor",
-                "build:win": "npm run clear && npm run preperation:win && npm run build_parallel && npm run deploy:win && npm run typeInfor",
-                "build:linux": "npm run clear && npm run preperation:linux && npm run build_parallel && npm run deploy:linux && npm run typeInfor",
-                "build:aix": "npm run clear && npm run preperation:aix && npm run build_parallel && npm run deploy:aix && npm run typeInfor",
-                "build:arm": "npm run clear && npm run preperation:arm && npm run build_parallel && npm run deploy:arm && npm run typeInfor",
-                "build:macos": "npm run clear && npm run preperation:macos && npm run build_parallel && npm run deploy:macos && npm run typeInfor",
-                "build:risc": "npm run clear && npm run preperation:risc && npm run build_parallel && npm run deploy:risc && npm run typeInfor",
-                "build:rpi": "npm run clear && npm run preperation:rpi && npm run build_parallel && npm run deploy:rpi && npm run typeInfor",
+                "build": "npm run clear  && npm run build_parallel && npm run deploy && npm run typeInfor",
+                "build:win": "npm run clear  && npm run build_parallel && npm run deploy:win && npm run typeInfor",
+                "build:linux": "npm run clear  && npm run build_parallel && npm run deploy:linux && npm run typeInfor",
+                "build:aix": "npm run clear && npm run build_parallel && npm run deploy:aix && npm run typeInfor",
+                "build:arm": "npm run clear && npm run build_parallel && npm run deploy:arm && npm run typeInfor",
+                "build:macos": "npm run clear &&  npm run build_parallel && npm run deploy:macos && npm run typeInfor",
+                "build:risc": "npm run clear && npm run build_parallel && npm run deploy:risc && npm run typeInfor",
+                "build:rpi": "npm run clear &&  npm run build_parallel && npm run deploy:rpi && npm run typeInfor",
                 "build_ci": "npm run clear && npm run preperation && npm run build_parallel && npm run deploy && npm run typeInfor",
                 "build_ci:win": "npm run clear && npm run preperation:win && npm run build_parallel && npm run deploy:win && npm run typeInfor",
                 "build_ci:linux": "npm run clear && npm run preperation:linux && npm run build_parallel && npm run deploy:linux && npm run typeInfor",