Explorar el Código

设计搜索功能

huqi hace 5 años
padre
commit
0868780046

+ 3 - 0
o2web/package.json

@@ -48,5 +48,8 @@
     "merge-stream": "^1.0.1",
     "minimist": "^1.2.0",
     "readline-sync": "^1.4.10"
+  },
+  "dependencies": {
+    "gulp-cli": "^2.3.0"
   }
 }

+ 75 - 2
o2web/source/o2_core/o2/widget/JavascriptEditor.js

@@ -1,5 +1,5 @@
 o2.widget = o2.widget || {};
-o2.require("o2.widget.codemirror", null, false);
+//o2.require("o2.widget.codemirror", null, false);
 o2.require("o2.xDesktop.UserData", null, false);
 o2.widget.JavascriptEditor = new Class({
 	Implements: [Options, Events],
@@ -270,7 +270,7 @@ o2.widget.JavascriptEditor = new Class({
         if (textPrefix.lastIndexOf("=")!=-1) textPrefix = textPrefix.substr(textPrefix.lastIndexOf("=")+1);
         if (textPrefix.lastIndexOf(" new ")!=-1) textPrefix = textPrefix.substr(textPrefix.lastIndexOf(" new ")+5);
         //if (preCode.lastIndexOf("{")!=-1) preCode = preCode.substr(preCode.lastIndexOf("{")+1);
-debugger;
+
         var codeObj = {
             "code": textPrefix,
             "preCode": preCode,
@@ -439,6 +439,67 @@ debugger;
             }
         }
     },
+
+    getRange: function(startLine, startCol, endLine, endCol){
+        if (this.editor){
+            switch (this.options.type.toLowerCase()) {
+                case "ace":
+                    var range = this.editor.getSelection().getWordRange( startLine-1, startCol-1 );
+                    range.setStart(startLine-1, startCol-1);
+                    if (endLine && endCol){
+                        range.setEnd(endLine-1, endCol-1);
+                    }
+                    return range;
+                case "monaco":
+                    return {
+                        "endColumn": endCol,
+                        "endLineNumber": endLine,
+                        "startColumn": startCol,
+                        "startLineNumber": startLine
+                    }
+                    ;
+            }
+        }
+        return null;
+    },
+    selectRange: function(range){
+        if (this.editor){
+            switch (this.options.type.toLowerCase()) {
+                case "ace":
+                    if (o2.typeOf(range)==="array"){
+                        this.editor.getSelection().setSelectionRange( range[0] );
+                        for (var i=1; i<range.length; i++) this.editor.getSelection().addRange( range[i] );
+                    }else{
+                        this.editor.getSelection().setSelectionRange( range );
+                    }
+                    break;
+                case "monaco":
+                    if (o2.typeOf(range)==="array"){
+                        var selections = [];
+                        range.each(function(r){
+                            selections.push({
+                                "positionColumn": r.endColumn,
+                                "positionLineNumber": r.endLineNumber,
+                                "selectionStartColumn": r.startColumn,
+                                "selectionStartLineNumber": r.startLineNumber
+                            });
+                        });
+                        this.editor.setSelections(selections);
+                    }else{
+                        var selection = {
+                            "positionColumn": range.endColumn,
+                            "positionLineNumber": range.endLineNumber,
+                            "selectionStartColumn": range.startColumn,
+                            "selectionStartLineNumber": range.startLineNumber
+                        }
+                        this.editor.setSelection(selection);
+                    }
+                    this.editor.focus();
+                    break;
+            }
+        }
+    },
+
     setValue: function(v){
         if (this.editor) this.editor.setValue(v);
     },
@@ -555,6 +616,18 @@ debugger;
             }
         }
     },
+    gotoLine: function(line, col){
+        if (this.editor){
+            switch (this.options.type.toLowerCase()) {
+                case "ace": this.editor.gotoLine(line-1, col-1, true); break;
+                case "monaco": this.editor.revealPositionInCenterIfOutsideViewport({
+                    "column": col,
+                    "lineNumber": line
+                }, 0);
+            }
+        }
+    },
+
     goto: function(){
         var p = this.editor.getCursorPosition();
         if (p.row==0){

+ 1 - 1
o2web/source/x_component_FindDesigner/$Main/default/view.html

@@ -76,7 +76,7 @@
                 <div class="previewNode_title_content"></div>
             </div>
             <div class="previewNode_content_lr" data-o2-element="previewContentNode">
-                <div class="inforNode"><div>{{$.lp.nothingPreview}}</div></div>
+                <div class="inforNode" data-o2-element="previewInforNode"><div>{{$.lp.nothingPreview}}</div></div>
             </div>
         </div>
     </div>

+ 121 - 65
o2web/source/x_component_FindDesigner/FindWorker.js

@@ -390,7 +390,7 @@ _worker.findScriptLineValue = function(result, code, preLine, preIndex, len){
     return {"value": value, "preLine": preLine, "preIndex": preIndex};
 };
 
-_worker.findInDesigner_script = function(formData, key, module, designer, propertyDefinition, option){
+_worker.findInDesigner_script = function(formData, key, module, designer, propertyDefinition, option, mode){
     var code = formData[key].code || formData[key];
     if (code){
         this.keywordRegexp.lastIndex = 0;
@@ -411,12 +411,13 @@ _worker.findInDesigner_script = function(formData, key, module, designer, proper
                 "name": formData.name || formData.id,
                 "key": key,
                 "value": obj.value,
-                "line": preLine+1
+                "line": preLine+1,
+                "mode": mode
             }), option);
         }
     }
 };
-_worker.findInDesigner_events = function(formData, key, module, designer, propertyDefinition, option){
+_worker.findInDesigner_events = function(formData, key, module, designer, propertyDefinition, option, mode){
     var eventObj = formData[key];
     Object.keys(eventObj).forEach(function(evkey){
         var code = eventObj[evkey].code;
@@ -439,12 +440,13 @@ _worker.findInDesigner_events = function(formData, key, module, designer, proper
                 "key": key,
                 "evkey": evkey,
                 "value": obj.value,
-                "line": preLine+1
+                "line": preLine+1,
+                "mode": mode
             }), option);
         }
     });
 };
-_worker.findInDesigner_map = function(formData, key, module, designer, propertyDefinition, option){
+_worker.findInDesigner_map = function(formData, key, module, designer, propertyDefinition, option, mode){
     var map = formData[key];
     Object.keys(map).forEach(function(evkey) {
         this.keywordRegexp.lastIndex = 0;
@@ -456,12 +458,13 @@ _worker.findInDesigner_map = function(formData, key, module, designer, propertyD
                 "propertyName": propertyDefinition.name,
                 "name": formData.name || formData.id,
                 "key": key,
-                "value": evkey+": "+text
+                "value": evkey+": "+text,
+                "mode": mode
             }), option);
         }
     });
 };
-_worker.findInDesigner_array = function(formData, key, module, designer, propertyDefinition, option){
+_worker.findInDesigner_array = function(formData, key, module, designer, propertyDefinition, option, mode){
     var arr = formData[key];
     arr.forEach(function(v, i) {
         this.keywordRegexp.lastIndex = 0;
@@ -474,12 +477,13 @@ _worker.findInDesigner_array = function(formData, key, module, designer, propert
                 "name": formData.name || formData.id,
                 "line": i+1,
                 "key": key,
-                "value": text
+                "value": text,
+                "mode": mode
             }), option);
         }
     });
 };
-_worker.findInDesigner_objectArray = function(formData, key, module, designer, propertyDefinition, option){
+_worker.findInDesigner_objectArray = function(formData, key, module, designer, propertyDefinition, option, mode){
     var arr = formData[key];
     arr.forEach(function(map, i) {
         Object.keys(map).forEach(function(evkey) {
@@ -493,14 +497,15 @@ _worker.findInDesigner_objectArray = function(formData, key, module, designer, p
                     "name": formData.name || formData.id,
                     "line": i+1,
                     "key": key,
-                    "value": evkey+": "+text
+                    "value": evkey+": "+text,
+                    "mode": mode
                 }), option);
             }
         });
     });
 };
 
-_worker.findInDesigner_duty = function(formData, key, module, designer, propertyDefinition, option){
+_worker.findInDesigner_duty = function(formData, key, module, designer, propertyDefinition, option, mode){
     var text = formData[key];
     var json = JSON.parse(text);
     json.forEach(function(duty, i) {
@@ -514,7 +519,8 @@ _worker.findInDesigner_duty = function(formData, key, module, designer, property
                 "name": formData.name || formData.id,
                 "key": key,
                 "line": i+1,
-                "value": "name:"+text
+                "value": "name:"+text,
+                "mode": mode
             }), option);
         }
 
@@ -539,14 +545,15 @@ _worker.findInDesigner_duty = function(formData, key, module, designer, property
                     "name": formData.name || formData.id,
                     "key": key,
                     "value": obj.value,
-                    "line": preLine+1
+                    "line": preLine+1,
+                    "mode": mode
                 }), option);
             }
         }
     });
 };
 
-_worker.findInDesigner_actions = function(formData, key, module, designer, propertyDefinition, option){
+_worker.findInDesigner_actions = function(formData, key, module, designer, propertyDefinition, option, mode){
     var arr = formData[key];
     arr.forEach(function(action, i) {
         this.keywordRegexp.lastIndex = 0;
@@ -559,7 +566,8 @@ _worker.findInDesigner_actions = function(formData, key, module, designer, prope
                 "name": formData.name || formData.id,
                 "key": key,
                 "line": i+1,
-                "value": "text:"+text
+                "value": "text:"+text,
+                "mode": mode
             }), option);
         }
 
@@ -584,7 +592,8 @@ _worker.findInDesigner_actions = function(formData, key, module, designer, prope
                     "name": formData.name || formData.id,
                     "key": key,
                     "value": obj.value,
-                    "line": preLine+1
+                    "line": preLine+1,
+                    "mode": mode
                 }), option);
             }
         }
@@ -608,14 +617,15 @@ _worker.findInDesigner_actions = function(formData, key, module, designer, prope
                     "name": formData.name || formData.id,
                     "key": key,
                     "value": obj.value,
-                    "line": preLine+1
+                    "line": preLine+1,
+                    "mode": mode
                 }), option);
             }
         }
     });
 };
 
-_worker.findInDesigner_filter = function(formData, key, module, designer, propertyDefinition, option){
+_worker.findInDesigner_filter = function(formData, key, module, designer, propertyDefinition, option, mode){
     var arr = formData[key];
     arr.forEach(function(filter, i) {
         this.keywordRegexp.lastIndex = 0;
@@ -628,7 +638,8 @@ _worker.findInDesigner_filter = function(formData, key, module, designer, proper
                 "name": formData.name || formData.id,
                 "key": key,
                 "line": i+1,
-                "value": "path:"+text
+                "value": "path:"+text,
+                "mode": mode
             }), option);
         }
 
@@ -653,14 +664,15 @@ _worker.findInDesigner_filter = function(formData, key, module, designer, proper
                     "name": formData.name || formData.id,
                     "key": key,
                     "value": obj.value,
-                    "line": preLine+1
+                    "line": preLine+1,
+                    "mode": mode
                 }), option);
             }
         }
     });
 };
 
-_worker.findInDesigner_text = function(formData, key, module, designer, propertyDefinition, option){
+_worker.findInDesigner_text = function(formData, key, module, designer, propertyDefinition, option, mode){
     this.keywordRegexp.lastIndex = 0;
     var text = formData[key];
     if (this.keywordRegexp.test(text)){
@@ -670,49 +682,54 @@ _worker.findInDesigner_text = function(formData, key, module, designer, property
             "propertyName": propertyDefinition.name,
             "name": formData.name || formData.id,
             "key": key,
-            "value": text
+            "value": text,
+            "mode": mode
         }), option);
     }
 };
 
-_worker.findInDesigner = function(formData, option, module, designer){
+_worker.findInDesignerProperty = function(key, propertyDefinition, formData, option, module, designer, mode){
+    if (propertyDefinition){
+        switch (propertyDefinition.type){
+            case "html":
+                _worker.findInDesigner_script(formData, key, module, designer, propertyDefinition, option, mode);
+                break;
+            case "script":
+            case "css":
+            case "sql":
+                _worker.findInDesigner_script(formData, key, module, designer, propertyDefinition, option, mode);
+                break;
+            case "events":
+                _worker.findInDesigner_events(formData, key, module, designer, propertyDefinition, option, mode);
+                break;
+            case "map":
+                _worker.findInDesigner_map(formData, key, module, designer, propertyDefinition, option, mode);
+                break;
+            case "array":
+                _worker.findInDesigner_array(formData, key, module, designer, propertyDefinition, option, mode);
+                break;
+            case "object-array":
+                _worker.findInDesigner_objectArray(formData, key, module, designer, propertyDefinition, option, mode);
+                break;
+            case "duty":
+                _worker.findInDesigner_duty(formData, key, module, designer, propertyDefinition, option, mode);
+                break;
+            case "actions":
+                _worker.findInDesigner_actions(formData, key, module, designer, propertyDefinition, option, mode);
+                break;
+            case "filter":
+                _worker.findInDesigner_filter(formData, key, module, designer, propertyDefinition, option, mode);
+                break;
+            default:
+                _worker.findInDesigner_text(formData, key, module, designer, propertyDefinition, option, mode);
+        }
+    }
+}
+
+_worker.findInDesigner = function(formData, option, module, designer, mode){
     Object.keys(formData).forEach(function(key){
         var propertyDefinition = this.designerPropertysData.form[key];
-        if (propertyDefinition){
-            switch (propertyDefinition.type){
-                case "html":
-                    _worker.findInDesigner_script(formData, key, module, designer, propertyDefinition, option);
-                    break;
-                case "script":
-                case "css":
-                case "sql":
-                    _worker.findInDesigner_script(formData, key, module, designer, propertyDefinition, option);
-                    break;
-                case "events":
-                    _worker.findInDesigner_events(formData, key, module, designer, propertyDefinition, option);
-                    break;
-                case "map":
-                    _worker.findInDesigner_map(formData, key, module, designer, propertyDefinition, option);
-                    break;
-                case "array":
-                    _worker.findInDesigner_array(formData, key, module, designer, propertyDefinition, option);
-                    break;
-                case "object-array":
-                    _worker.findInDesigner_objectArray(formData, key, module, designer, propertyDefinition, option);
-                    break;
-                case "duty":
-                    _worker.findInDesigner_duty(formData, key, module, designer, propertyDefinition, option);
-                    break;
-                case "actions":
-                    _worker.findInDesigner_actions(formData, key, module, designer, propertyDefinition, option);
-                    break;
-                case "filter":
-                    _worker.findInDesigner_filter(formData, key, module, designer, propertyDefinition, option);
-                    break;
-                default:
-                    _worker.findInDesigner_text(formData, key, module, designer, propertyDefinition, option);
-            }
-        }
+        _worker.findInDesignerProperty(key, propertyDefinition, formData, option, module, designer, mode);
     });
 };
 
@@ -724,8 +741,16 @@ _worker.decodeJsonString = function(str){
 
 _worker._getDesignerData = function(designer, module){
     var action = "";
-    if (module=="processPlatform") action = this.findData.actions.getProcessForm
-    else if (module=="cms") action = this.findData.actions.getCmsForm;
+
+    switch (designer.designerType){
+        case "form":
+            if (module=="processPlatform") action = this.findData.actions.getProcessForm
+            else if (module=="cms") action = this.findData.actions.getCmsForm;
+            break;
+        case "process":
+            action = this.findData.actions.getProcessProcess;
+            break;
+    }
 
     if (action){
         var formPromise = _worker.action.sendRequest(_worker._getRequestOption({"url": action}, {"id": designer.designerId}));
@@ -735,9 +760,10 @@ _worker._getDesignerData = function(designer, module){
 };
 
 _worker._findInDesigner_form = function(formData, designer, option, module){
-    _worker.findInDesigner(formData.json, option, module, designer);
+    var mode = formData.json.mode;
+    _worker.findInDesigner(formData.json, option, module, designer, mode);
     for (key in formData.json.moduleList){
-        _worker.findInDesigner(formData.json.moduleList[key], option, module, designer);
+        _worker.findInDesigner(formData.json.moduleList[key], option, module, designer, mode);
     }
 };
 
@@ -762,14 +788,44 @@ _worker._findProcessPlatformParse_form = function(designer, option, module){
     }
 };
 
-_worker._findProcessPlatformParse_process = function(designer){
+_worker._findProcessPlatformParse_process = function(designer, option, module){
     if (designer.patternList && designer.patternList.length){
         var p = _worker._getDesignerData(designer, module);
         if (p){
-            var patternPropertys = designer.patternList.map(function(a){return a.property;});
             p.then(function(arr){
-                var formJson = arr[0];
+                var processData = arr[0].data;
                 this.designerPropertysData = arr[1];
+
+                designer.patternList.forEach(function(pattern){
+                    switch (pattern.elementType){
+                        case "process":
+
+                            break;
+                        case "activity":
+
+                            break;
+                        case "route":
+
+                            break;
+                    }
+
+                    var propertyDefinition = this.designerPropertysData.process[pattern.property];
+
+                   // _worker.findInDesignerProperty(pattern.property, propertyDefinition, option, module, designer);
+                });
+
+                var propertyDefinition = this.designerPropertysData.form[key];
+
+
+
+                elementId: "7ce87b0e-7fa8-4bea-bc4b-bbf816f584e7"
+                elementName: "开始"
+                elementType: "activity"
+                property: "validationScriptText"
+                propertyValue: "路由校验"
+
+
+
                 if (patternPropertys.indexOf("data")!=-1){
                     var formData = JSON.parse(_worker.decodeJsonString(formJson.data.data));
                     _worker._findInDesigner_form(formData, designer, option, module);

+ 98 - 7
o2web/source/x_component_FindDesigner/Main.js

@@ -125,6 +125,8 @@ MWF.xApplication.FindDesigner.Main = new Class({
 					if (this.options.layout.percent<0.1) this.options.layout.percent = 0.1;
 					if (this.options.layout.percent>0.85) this.options.layout.percent = 0.85;
 					this.sizeNode_topBottom();
+
+					if (this.editor) this.editor.resize();
 				}.bind(this),
 				"onComplete": function(){
 					o2.UD.putData("findDesignerLayout", {"layout": this.options.layout});
@@ -152,6 +154,8 @@ MWF.xApplication.FindDesigner.Main = new Class({
 					if (this.options.layout.percent>0.85) this.options.layout.percent = 0.85;
 
 					this.sizeNode_leftRight();
+
+					if (this.editor) this.editor.resize();
 				}.bind(this),
 				"onComplete": function(){
 					o2.UD.putData("findDesignerLayout", {"layout": this.options.layout});
@@ -413,11 +417,12 @@ MWF.xApplication.FindDesigner.Main = new Class({
 		}
 		return tree.appendChild(obj);
 	},
-	createResultPatternItem: function(text, title, tree, icon){
+	createResultPatternItem: function(text, title, tree, icon, action){
 		var obj = {
 			"title": title,
 			"text": "<span style='color: #000000'>"+text+"</span>",
-			"icon": icon||""
+			"icon": icon||"",
+			"action": action || null
 		}
 		return tree.appendChild(obj);
 	},
@@ -493,7 +498,6 @@ MWF.xApplication.FindDesigner.Main = new Class({
 	},
 
 	createFormPatternNode: function(data, node, regexp){
-		debugger;
 		var text = this.lp.elementPattern.replace("{element}", "&lt;"+data.pattern.type+"&gt;"+data.pattern.name).
 			replace("{property}", "{"+data.pattern.key+"}"+data.pattern.propertyName);
 		text = "<span style='color: #666666'>"+text+"</span>&nbsp;&nbsp;"
@@ -507,15 +511,22 @@ MWF.xApplication.FindDesigner.Main = new Class({
 		}else{
 			text += this.getPatternValue(data.pattern.value, regexp);
 		}
+		if (data.pattern.mode){
+			text = "<b>["+data.pattern.mode+"]</b>&nbsp;"+text;
+		}
 
 		patternNode = this.createResultPatternItem(text, "", node, "icon_"+data.pattern.propertyType+".png");
 	},
 
-	getPatternValue: function(value, regexp){
+	getPatternValue: function(value, regexp, pattern){
 		regexp.lastIndex = 0;
 		var valueHtml = "";
 		var idx = 0;
 		while ((arr = regexp.exec(value)) !== null) {
+			if (pattern){
+				if (!pattern.cols) pattern.cols = [];
+				pattern.cols.push({"start": arr.index+1, "end": regexp.lastIndex+1});
+			}
 			valueHtml += o2.common.encodeHtml(value.substring(idx, arr.index));
 			valueHtml += "<span style='background-color: #ffef8f'>"+o2.common.encodeHtml(value.substring(arr.index, regexp.lastIndex))+"</span>";
 			idx = regexp.lastIndex;
@@ -526,14 +537,90 @@ MWF.xApplication.FindDesigner.Main = new Class({
 	createScriptPatternNode: function(data, node, regexp){
 		var patternNode;
 		var text;
+
+		var openScript = function(node){
+			this.openPatternScript(node.pattern);
+		}.bind(this);
+
 		if (data.pattern.property=="text"){
-			text = "<span style='color: #666666'>"+data.pattern.line+"</span>&nbsp;&nbsp;"+this.getPatternValue(data.pattern.value, regexp);
-			patternNode = this.createResultPatternItem(text, "", node, "icon_script.png");
+			text = "<span style='color: #666666'>"+data.pattern.line+"</span>&nbsp;&nbsp;"+this.getPatternValue(data.pattern.value, regexp, data.pattern);
+			patternNode = this.createResultPatternItem(text, "", node, "icon_script.png", openScript);
 		}else{
 			text = this.lp.property+":&nbsp;<b>"+data.pattern.property+"</b> "+this.lp.value+":&nbsp;"+this.getPatternValue(data.pattern.value, regexp);
-			patternNode = this.createResultPatternItem(text, "", node, "icon_text.png");
+			patternNode = this.createResultPatternItem(text, "", node, "icon_text.png", openScript);
+		}
+		patternNode.pattern = data;
+	},
+	openPatternScript: function(pattern){
+		// appId: "267d4445-b75c-4627-af26-251e623a5fe8"
+		// appName: "合同"
+		// designerAliase: ""
+		// designerId: "ff1d382f-54af-4bb1-80f9-1e3bc3e4f03c"
+		// designerName: "file"
+		// designerType: "script"
+		// module: "processPlatform"
+		//
+		// appId: "invoke"
+		// appName: "接口"
+		// designerAliase: ""
+		// designerId: "80c08112-afa1-48b1-b693-87ba8504f47c"
+		// designerName: "getService"
+		// designerType: "script"
+		// module: "service"
+debugger;
+		if (this.editor && this.editor.pattern.designerId === pattern.designerId && this.editor.pattern.module === pattern.module){
+			this.reLocationEditor(pattern);
+		}else{
+			if (this.editor) this.editor.destroyEditor();
+			this.editor = null;
+			this.previewInforNode.hide().dispose();
+
+			switch (pattern.module){
+				case "processPlatform":
+					o2.Actions.load("x_processplatform_assemble_designer").ScriptAction.get(pattern.designerId).then(function(json){
+						if (json.data) this.openProcessPlatformPatternScript(json.data, pattern);
+					}.bind(this), function(){});
+
+					break;
+				case "cms":
+
+					break;
+				case "portal":
+
+					break;
+				case "service":
+
+					break;
+			}
+		}
+	},
+	openProcessPlatformPatternScript: function(data, pattern){
+		o2.require("o2.widget.JavascriptEditor", function(){
+
+			this.editor = new o2.widget.JavascriptEditor(this.previewContentNode, {
+				"option": {"value": data.text}
+			});
+			this.editor.pattern = pattern;
+			this.editor.load(function(){
+				this.reLocationEditor(pattern);
+			}.bind(this));
+		}.bind(this));
+	},
+
+	reLocationEditor: function(pattern){
+		this.editor.gotoLine(pattern.pattern.line, 1);
+		if (pattern.pattern.cols && pattern.pattern.cols.length){
+			var rs = [];
+			pattern.pattern.cols.forEach(function(col){
+				rs.push(this.editor.getRange(pattern.pattern.line,col.start, pattern.pattern.line, col.end));
+			}.bind(this));
+			this.editor.selectRange(rs);
+		}else{
+			this.editor.selectRange(this.editor.getRange(pattern.pattern.line,0));
 		}
 	},
+
+
 	getFilterOptionRegex: function(option){
 		var keyword = option.keyword;
 		if (option.matchRegExp){
@@ -616,6 +703,10 @@ MWF.xApplication.FindDesigner.Main = new Class({
 		this.listInfoNode.addClass("loadding");
 		this.patternCount = 0;
 
+		if (this.editor) this.editor.destroyEditor();
+		this.editor = null;
+		this.previewInforNode.show().inject(this.previewContentNode);
+
 		this.getFindWorker();
 		var actions = this.getActionsUrl();
 

+ 81 - 0
o2web/source/x_component_FindDesigner/propertys.json

@@ -193,5 +193,86 @@
     "template": {"name": "文件模板"},
     "readScript": {"name": "只读脚本", "type":"script"},
     "fileSite": {"name": "读取文件的site脚本", "type":"script"}
+  },
+  "process": {
+    "id": {"name": "标识"},
+    "name": {"name": "名称"},
+    "alias": {"name": "别名"},
+    "description": {"name": "描述"},
+    "controllerList": {"name": "管理者", "type":"array"},
+    "editionDes": {"name": "版本描述"},
+    "startableIdentityList": {"name": "启动者", "type":"array"},
+    "startableUnitList": {"name": "启动组织", "type":"array"},
+    "serialTexture": {"name": "编号规则", "type":"serial"},
+    "expireScriptText": {"name": "超时脚本", "type":"scriptText"},
+    "projection": {"name": "数据映射", "type":"projection"},
+
+    "beforeBeginScriptText": {"name": "流程启动前事件", "type":"scriptText"},
+    "afterBeginScriptText ": {"name": "流程启动后事件", "type":"scriptText"},
+    "beforeEndScriptText ": {"name": "流程结束前事件", "type":"scriptText"},
+    "afterEndScriptText ": {"name": "流程结束后事件", "type":"scriptText"},
+    "beforeArriveScriptText ": {"name": "活动到达前事件", "type":"scriptText"},
+    "afterArriveScriptText ": {"name": "活动到达后事件", "type":"scriptText"},
+    "beforeExecuteScriptText ": {"name": "活动执行前事件", "type":"scriptText"},
+    "afterExecuteScriptText ": {"name": "活动执行后事件", "type":"scriptText"},
+    "beforeInquireScriptText": {"name": "路由查询前事件", "type":"scriptText"},
+    "afterInquireScriptText ": {"name": "路由查询后事件", "type":"scriptText"},
+
+    "readIdentityList": {"name": "待阅人", "type":"array"},
+    "readUnitList": {"name": "待阅组织", "type":"array"},
+    "readGroupList": {"name": "待阅群组", "type":"array"},
+    "readDataPathList": {"name": "待阅人表单数据", "type":"array"},
+    "readScriptText": {"name": "待阅人脚本", "type":"scriptText"},
+    "readDuty": {"name": "待阅人职务", "type":"duty"},
+    "reviewIdentityList": {"name": "可阅读人", "type":"array"},
+    "reviewUnitList": {"name": "可阅读组织", "type":"array"},
+    "reviewGroupList": {"name": "可阅读群组", "type":"array"},
+    "reviewDataPathList": {"name": "可阅读人表单数据", "type":"array"},
+    "reviewScriptText": {"name": "可阅读人脚本", "type":"scriptText"},
+    "reviewDuty": {"name": "可阅读人职务", "type":"duty"},
+
+    "scriptText": {"name": "脚本", "type":"scriptText"},
+
+    "targetTitleScriptText": {"name": "流程调用标题脚本", "type":"scriptText"},
+    "targetAssginDataScriptText": {"name": "流程调用数据脚本", "type":"scriptText"},
+    "targetIdentity": {"name": "流程调用启动者"},
+    "targetIdentityScriptText": {"name": "流程调用启动者脚本", "type":"scriptText"},
+
+    "delayScriptText": {"name": "定时脚本", "type":"scriptText"},
+    "delayDataPath": {"name": "定时数据路径"},
+
+    "jaxwsAddress": {"name": "WSDL地址"},
+    "jaxwsMethod": {"name": "调用方法"},
+    "jaxwsParameterScriptText": {"name": "参数脚本", "type":"scriptText"},
+    "jaxwsResponseScriptText": {"name": "响应脚本", "type":"scriptText"},
+    "jaxrsAddress": {"name": "REST服务地址"},
+    "jaxrsContentType": {"name": "ContentType"},
+    "jaxrsParameterScriptText ": {"name": "参数脚本", "type":"scriptText"},
+    "jaxrsBodyScriptText ": {"name": "消息体脚本", "type":"scriptText"},
+    "jaxrsHeadScriptText ": {"name": "消息头脚本", "type":"scriptText"},
+    "jaxrsResponseScriptText": {"name": "响应脚本", "type":"scriptText"},
+
+    "group": {"name": "活动组"},
+    "opinionGroup": {"name": "意见组"},
+
+    "taskIdentityList": {"name": "待阅人", "type":"array"},
+    "taskUnitList": {"name": "待阅组织", "type":"array"},
+    "taskGroupList": {"name": "待阅群组", "type":"array"},
+    "taskDataPathList": {"name": "待阅人表单数据", "type":"array"},
+    "taskScriptText": {"name": "待阅人脚本", "type":"scriptText"},
+    "taskDuty": {"name": "待阅人职务", "type":"duty"},
+    "taskExpireScriptText": {"name": "超时脚本", "type":"scriptText"},
+
+    "manualStayScriptText": {"name": "等待人工处理事件", "type":"scriptText"},
+    "manualBeforeTaskScriptText ": {"name": "待办处理前事件", "type":"scriptText"},
+    "manualAfterTaskScriptText ": {"name": "待办处理后事件", "type":"scriptText"},
+
+    "opinion": {"name": "默认意见"},
+    "appendTaskIdentityScriptText": {"name": "转交脚本", "type":"scriptText"},
+    "decisionOpinion": {"name": "决策组"},
+    "validationScriptText": {"name": "路由校验脚本", "type":"scriptText"},
+    "displayNameScriptText": {"name": "路由显示名称脚本", "type":"scriptText"},
+    "hiddenScriptText ": {"name": "隐藏条件脚本", "type":"scriptText"},
+    "selectConfig": {"name": "组织选择配置", "type":"selectConfig"}
   }
 }

+ 1 - 1
o2web/source/x_component_process_ProcessDesigner/$Process/invoke.html

@@ -177,7 +177,7 @@
                 </tr>
             </table>
             <div class="MWFScriptText" name="jaxrsResponseScriptText"></div>
-            <div style="margin-left: 10px; line-height:26px">使用 <font style="color: #e40000">this</font><font style="color: #666666">.response</font> 获取响应的JSON对象</div>
+            <div style="margin-left: 10px; line-height:26px">使用 <font style="color: #e40000">this</font><font style="color: #666666">.response.get()</font> 获取响应的JSON对象</div>
         </div>
     </div>