Merge branch 'feature/CMS.writingboard' into 'wrdp'

Merge of feature/CMS.writingboard 内容管理增加手写板组件 to wrdp

See merge request o2oa/o2oa!5510

o2web/gulpfile.js

@@ -253,6 +253,7 @@ function createCMSXFormConcatTask(path, isMin, thisOptions) {
             'source/' + processPath + '/Common.js',
             'source/' + processPath + '/Image.js',
             'source/' + processPath + '/ImageClipper.js',
+            'source/' + processPath + '/WritingBoard.js',
             'source/' + processPath + '/Html.js',
             'source/' + processPath + '/Radio.js',
             'source/' + processPath + '/Select.js',
@@ -290,6 +291,7 @@ function createCMSXFormConcatTask(path, isMin, thisOptions) {
             'source/' + path + '/Datatemplate.js',
             'source/' + path + '/Htmleditor.js',
             'source/' + path + '/ImageClipper.js',
+            'source/' + path + '/WritingBoard.js',
             'source/' + path + '/Label.js',
             'source/' + path + '/Number.js',
             'source/' + path + '/Radio.js',

o2web/source/x_component_cms_FormDesigner/$Main/bottom/tools.json

@@ -224,5 +224,10 @@
     "icon": "importer.png",
     "text": MWF.xApplication.cms.FormDesigner.LP.modules.importer,
     "className": "Importer"
+  },
+  "writingBoard": {
+    "icon": "writingBoard.png",
+    "text": MWF.xApplication.cms.FormDesigner.LP.modules.writingBoard,
+    "className": "WritingBoard"
   }
 }
\ No newline at end of file

o2web/source/x_component_cms_FormDesigner/$Main/default/tools.json

@@ -225,5 +225,10 @@
     "icon": "importer.png",
     "text": MWF.xApplication.cms.FormDesigner.LP.modules.importer,
     "className": "Importer"
+  },
+  "writingBoard": {
+    "icon": "writingBoard.png",
+    "text": MWF.xApplication.cms.FormDesigner.LP.modules.writingBoard,
+    "className": "WritingBoard"
   }
 }
\ No newline at end of file

o2web/source/x_component_cms_FormDesigner/Module/Form/skin/styles_blue-simple.json

@@ -481,5 +481,25 @@
     "style": "xform_blue_simple",
     "customIconStyle" : "blue",
     "customIconOverStyle" : "white"
+  },
+  "writingBoard": {
+    "styles": {
+      "overflow": "hidden"
+    },
+    "actionStyles": {
+      "float": "right",
+      "border": "1px solid #6681a5",
+      "border-radius": "3px",
+      "cursor": "pointer",
+      "height": "25px",
+      "line-height": "25px",
+      "min-width": "30px",
+      "padding-left": "24px",
+      "padding-right": "5px",
+      "margin-left": "5px",
+      "background": "url(../x_component_process_Work/$Processor/default/write.png) no-repeat 5px center"
+    },
+    "imageStyles": {
+    }
   }
 }
\ No newline at end of file

o2web/source/x_component_cms_FormDesigner/Module/Form/skin/styles_default.json

@@ -454,5 +454,25 @@
     "style": "xform_blue_simple",
     "customIconStyle" : "blue",
     "customIconOverStyle" : "white"
+  },
+  "writingBoard": {
+    "styles": {
+      "overflow": "hidden"
+    },
+    "actionStyles": {
+      "float": "right",
+      "border": "1px solid #6681a5",
+      "border-radius": "3px",
+      "cursor": "pointer",
+      "height": "25px",
+      "line-height": "25px",
+      "min-width": "30px",
+      "padding-left": "24px",
+      "padding-right": "5px",
+      "margin-left": "5px",
+      "background": "url(../x_component_process_Work/$Processor/default/write.png) no-repeat 5px center"
+    },
+    "imageStyles": {
+    }
   }
 }
\ No newline at end of file

o2web/source/x_component_cms_FormDesigner/Module/Form/skin/styles_defaultMobile.json

@@ -457,5 +457,25 @@
     "style": "xform_blue_simple",
     "customIconStyle" : "blue",
     "customIconOverStyle" : "white"
+  },
+  "writingBoard": {
+    "styles": {
+      "overflow": "hidden"
+    },
+    "actionStyles": {
+      "float": "right",
+      "border": "1px solid #6681a5",
+      "border-radius": "3px",
+      "cursor": "pointer",
+      "height": "25px",
+      "line-height": "25px",
+      "min-width": "30px",
+      "padding-left": "24px",
+      "padding-right": "5px",
+      "margin-left": "5px",
+      "background": "url(../x_component_process_Work/$Processor/default/write.png) no-repeat 5px center"
+    },
+    "imageStyles": {
+    }
   }
 }
\ No newline at end of file

o2web/source/x_component_cms_FormDesigner/Module/Form/skin/styles_none.json

@@ -194,5 +194,25 @@
     "style": "xform_blue_simple",
     "customIconStyle" : "blue",
     "customIconOverStyle" : "white"
+  },
+  "writingBoard": {
+    "styles": {
+      "overflow": "hidden"
+    },
+    "actionStyles": {
+      "float": "right",
+      "border": "1px solid #6681a5",
+      "border-radius": "3px",
+      "cursor": "pointer",
+      "height": "25px",
+      "line-height": "25px",
+      "min-width": "30px",
+      "padding-left": "24px",
+      "padding-right": "5px",
+      "margin-left": "5px",
+      "background": "url(../x_component_process_Work/$Processor/default/write.png) no-repeat 5px center"
+    },
+    "imageStyles": {
+    }
   }
 }
\ No newline at end of file

o2web/source/x_component_cms_FormDesigner/Module/Form/skin/styles_red-simple.json

@@ -482,5 +482,25 @@
     "style": "xform_red_simple",
     "customIconStyle" : "red",
     "customIconOverStyle" : "white"
+  },
+  "writingBoard": {
+    "styles": {
+      "overflow": "hidden"
+    },
+    "actionStyles": {
+      "float": "right",
+      "border": "1px solid #6681a5",
+      "border-radius": "3px",
+      "cursor": "pointer",
+      "height": "25px",
+      "line-height": "25px",
+      "min-width": "30px",
+      "padding-left": "24px",
+      "padding-right": "5px",
+      "margin-left": "5px",
+      "background": "url(../x_component_process_Work/$Processor/default/write.png) no-repeat 5px center"
+    },
+    "imageStyles": {
+    }
   }
 }
\ No newline at end of file

o2web/source/x_component_cms_FormDesigner/Module/Package.js

@@ -47,4 +47,5 @@ MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Office", null, false);
 MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Comment", null, false);
 MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Statement", null, false);
 MWF.xDesktop.requireApp("cms.FormDesigner", "Module.StatementSelector", null, false);
-MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Importer", null, false);
\ No newline at end of file
+MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Importer", null, false);
+MWF.xDesktop.requireApp("cms.FormDesigner", "Module.WritingBoard", null, false);
\ No newline at end of file

o2web/source/x_component_cms_FormDesigner/Module/WritingBoard.js

+MWF.xApplication.cms.FormDesigner.Module = MWF.xApplication.cms.FormDesigner.Module || {};
+MWF.xDesktop.requireApp("process.FormDesigner", "Module.WritingBoard", null, false);
+MWF.xApplication.cms.FormDesigner.Module.WritingBoard = MWF.CMSFCWritingBoard = new Class({
+	Extends: MWF.FCWritingBoard,
+	Implements : [MWF.CMSFCMI]
+});

o2web/source/x_component_cms_FormDesigner/Script.js

@@ -82,6 +82,8 @@ MWF.xApplication.cms.FormDesigner.Script = new Class({
                 this.loadHtmleditorScript(v); break;
             case "ImageClipper":
                 this.loadImageClipperScript(v); break;
+            case "WritingBoard":
+                this.loadWritingBoardScript(v); break;
             case "Log":
                 this.loadLogScript(v); break;
             case "Monitor":

o2web/source/x_component_cms_Xform/$Form/default/css.wcss

@@ -571,4 +571,35 @@
         "background": "#ffffff"
     },
 
+  "inputOpinionHandwritingAction": {
+    "float": "right",
+    "border": "1px solid #6681a5",
+    "border-radius": "3px",
+    "cursor": "pointer",
+    "padding-left": "24px",
+    "padding-right": "5px",
+    "margin-left": "5px",
+    "cursor": "pointer",
+    "background": "url("+"../x_component_process_Work/$Processor/default/write.png) no-repeat 5px center"
+  },
+  "handwritingNode": {
+    "position": "absolute",
+    "background": "#ffffff",
+    "border": "2px solid #999",
+    "border-radius": "8px",
+    "box-shadow": "0px 0px 10px #666",
+  },
+  "handwritingActionNode": {
+    "height": "30px",
+    "line-height": "30px",
+    "margin": "5px auto",
+    "width": "70%",
+    "min-width": "100px",
+    "border-radius": "5px",
+    "text-align": "center",
+    "background-color": "#6681a5",
+    "color": "#ffffff",
+    "font-size": "16px",
+    "cursor": "pointer"
+  }
 }
\ No newline at end of file

o2web/source/x_component_cms_Xform/WritingBoard.js

+MWF.xDesktop.requireApp("process.Xform", "WritingBoard", null, false);
+MWF.xApplication.cms.Xform.WritingBoard = MWF.CMSWritingBoard =  new Class({
+	Extends: MWF.APPWritingBoard,
+    upload: function( callback ){
+        var image = this.tablet.getImage( null, true );
+        o2.xDesktop.uploadImageByScale(
+            this.form.businessData.document.id,
+            "cmsDocument",
+            0, //maxSize
+            this.tablet.getFormData(image),
+            image,
+            function (json) {
+                if(callback)callback(json);
+            }.bind(this),
+            function () {
+
+            }.bind(this)
+        );
+    },
+    validationConfigItem: function(routeName, data){
+        var flag = (data.status=="all") ? true: (routeName == "publish");
+        if (flag){
+            var n = this.getData();
+            var v = (data.valueType=="value") ? n : n.length;
+            switch (data.operateor){
+                case "isnull":
+                    if (!v){
+                        this.notValidationMode(data.prompt);
+                        return false;
+                    }
+                    break;
+                case "notnull":
+                    if (v){
+                        this.notValidationMode(data.prompt);
+                        return false;
+                    }
+                    break;
+                case "gt":
+                    if (v>data.value){
+                        this.notValidationMode(data.prompt);
+                        return false;
+                    }
+                    break;
+                case "lt":
+                    if (v<data.value){
+                        this.notValidationMode(data.prompt);
+                        return false;
+                    }
+                    break;
+                case "equal":
+                    if (v==data.value){
+                        this.notValidationMode(data.prompt);
+                        return false;
+                    }
+                    break;
+                case "neq":
+                    if (v!=data.value){
+                        this.notValidationMode(data.prompt);
+                        return false;
+                    }
+                    break;
+                case "contain":
+                    if (v.indexOf(data.value)!=-1){
+                        this.notValidationMode(data.prompt);
+                        return false;
+                    }
+                    break;
+                case "notcontain":
+                    if (v.indexOf(data.value)==-1){
+                        this.notValidationMode(data.prompt);
+                        return false;
+                    }
+                    break;
+            }
+        }
+        return true;
+    }
+	
+}); 
\ No newline at end of file

o2web/source/x_component_portal_PageDesigner/Script.js

@@ -190,6 +190,8 @@ MWF.xApplication.portal.PageDesigner.Script = new Class({
                 this.loadHtmleditorScript(v); break;
             case "ImageClipper":
                 this.loadImageClipperScript(v); break;
+            case "WritingBoard":
+                this.loadWritingBoardScript(v); break;
             case "Log":
                 this.loadLogScript(v); break;
             case "Monitor":
@@ -224,10 +226,6 @@ MWF.xApplication.portal.PageDesigner.Script = new Class({
                 this.addScriptItem(v.readScript, "code", v, "readScript");
                 this.loadEventsScript(v);
                 break;
-            case "IWebOffice":
-                this.addScriptItem(v.readScript, "code", v, "readScript");
-                this.loadEventsScript(v);
-                break;
             case "WpsOffice":
                 this.addScriptItem(v.readScript, "code", v, "readScript");
                 this.loadEventsScript(v);
@@ -578,6 +576,7 @@ MWF.xApplication.portal.PageDesigner.Script = new Class({
         this.loadEventsScript(data);
     },
     loadImageClipperScript: function(data){  this.loadEventsScript(data); },
+    loadWritingBoardScript: function(data){  this.loadEventsScript(data); },
 
     loadLogScript: function(data){
         this.addScriptItem(data.filterScript, "code", data, "filterScript");