Merge branch 'master' of http://git.izouma.com/xiongzhu/O2OA

gulpfile.js

@@ -1505,17 +1505,16 @@ if (os.platform().indexOf("win") == -1) {
 }
 
 function make_def_config(cb) {
+    if (
+        !fs.existsSync(path.resolve(__dirname, "target", "o2server", "config"))
+    ) {
+        fs.mkdirSync(path.resolve(__dirname, "target", "o2server", "config"));
+    }
     fs.readdirSync(path.resolve(__dirname, "config")).forEach((child) => {
         if (/.+\.json/.test(child)) {
             fs.copyFileSync(
                 path.resolve(__dirname, "config", child),
-                path.resolve(
-                    __dirname,
-                    "target",
-                    "o2server",
-                    "config",
-                    child
-                )
+                path.resolve(__dirname, "target", "o2server", "config", child)
             );
         }
     });

o2web/source/x_component_process_Xform/Documenteditor.js

@@ -3034,11 +3034,13 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
             var fileName = docNmae || this.json.toWordFilename || "$doc";
             var n = fileName.lastIndexOf(".");
             if (n==-1) fileName = fileName+".pdf";
+            fileName = fileName.replace(/\.doc$/,'.pdf');
 
             var body = {
                 "fileName": fileName,
                 "site": this.json.toWordSite || "$doc",
-                "content": content
+                "content": content,
+                selectStamp: this.data.selectStamp
             };
             o2.Actions.get("x_processplatform_assemble_surface").docToPDF(this.form.businessData.work.id, body, function(json){
                 if (this.form.businessData.workCompleted){