修复由于编辑器自动完成脚本造成的代码冲突

o2web/source/o2_core/o2/widget/JavascriptEditor.js

@@ -254,15 +254,15 @@ o2.widget.JavascriptEditor = new Class({
                     if (o) {
                         var arr = [];
                         Object.keys(o).each(function (key) {
-                            var type = typeOf(o[key]);
-                            if (type === "function") {
+                            var keyType = typeOf(o[key]);
+                            if (keyType === "function") {
                                 var count = o[key].length;
                                 var v = key + "(";
                                 for (var i = 1; i <= count; i++) v += (i == count) ? "par" + i : "par" + i + ", ";
                                 v += ")";
-                                arr.push({ label: key, kind: monaco.languages.CompletionItemKind.Function, insertText: v, range: range, detail: type });
+                                arr.push({ label: key, kind: monaco.languages.CompletionItemKind.Function, insertText: v, range: range, detail: keyType });
                             } else {
-                                arr.push({ label: key, kind: monaco.languages.CompletionItemKind.Interface, insertText: key, range: range, detail: type });
+                                arr.push({ label: key, kind: monaco.languages.CompletionItemKind.Interface, insertText: key, range: range, detail: keyType });
                             }
                         });
                     }
@@ -287,15 +287,15 @@ o2.widget.JavascriptEditor = new Class({
                     if (o){
                         var arr = [];
                         Object.keys(o).each(function(key){
-                            var type = typeOf(o[key]);
-                            if (type==="function") {
+                            var keyType = typeOf(o[key]);
+                            if (keyType==="function") {
                                 var count = o[key].length;
                                 var v = x+"."+key+"(";
                                 for (var i=1; i<=count; i++) v+= (i==count) ? "par"+i :  "par"+i+", ";
                                 v+=");";
-                                arr.push({ caption: key, value: v, score: 3, meta: type });
+                                arr.push({ caption: key, value: v, score: 3, meta: keyType });
                             }else{
-                                arr.push({ caption: key, value: x+"."+key, score: 3, meta: type });
+                                arr.push({ caption: key, value: x+"."+key, score: 3, meta: keyType });
                             }
                         });
                         callback(null, arr);
@@ -559,13 +559,15 @@ o2.widget.JavascriptEditor.getCompletionEnvironment = function(runtime, callback
 };
 
 o2.widget.JavascriptEditor.getServiceCompletionEnvironment = function(runtime, callback) {
-    var serviceScriptText = null;
+    //var serviceScriptText = null;
     var serviceScriptSubstitute = null;
     var check = function () {
-        if (o2.typeOf(serviceScriptText) !== "null" && o2.typeOf(serviceScriptSubstitute) !== "null") {
-            var code = "o2.Macro.swapSpace.tmpMacroCompletionFunction = function (){\n" + serviceScriptSubstitute + "\n" + serviceScriptText + "\nreturn bind;" + "\n};";
+        //if (o2.typeOf(serviceScriptText) !== "null" && o2.typeOf(serviceScriptSubstitute) !== "null") {
+        if (o2.typeOf(serviceScriptSubstitute) !== "null") {
+            //var code = "o2.Macro.swapSpace.tmpMacroCompletionFunction = function (){\n" + serviceScriptSubstitute + "\n" + serviceScriptText + "\nreturn bind;" + "\n};";
+            var code = "o2.Macro.swapSpace.tmpMacroCompletionFunction = function (){\n" + serviceScriptSubstitute + "\nreturn bind;" + "\n};";
             Browser.exec(code);
-            var ev = o2.Macro.swapSpace.tmpMacroCompletionFunction();
+            var ev = o2.Macro.swapSpace.tmpMacroCompletionFunction() ;
             o2.widget.JavascriptEditor.runtimeEnvironment[runtime] = {
                 "environment": ev,
                 exec: function(code){
@@ -576,13 +578,13 @@ o2.widget.JavascriptEditor.getServiceCompletionEnvironment = function(runtime, c
         }
     }
 
-    o2.xhr_get("../x_desktop/js/initialServiceScriptText.js", function (xhr) {
-        serviceScriptText = xhr.responseText;
-        check();
-    }, function () {
-        serviceScriptText = "";
-        check();
-    });
+    // o2.xhr_get("../x_desktop/js/initialServiceScriptText.js", function (xhr) {
+    //     serviceScriptText = xhr.responseText;
+    //     check();
+    // }, function () {
+    //     serviceScriptText = "";
+    //     check();
+    // });
     o2.xhr_get("../x_desktop/js/initalServiceScriptSubstitute.js", function (xhr) {
         serviceScriptSubstitute = xhr.responseText;
         check();
@@ -593,11 +595,13 @@ o2.widget.JavascriptEditor.getServiceCompletionEnvironment = function(runtime, c
 };
 
 o2.widget.JavascriptEditor.getServerCompletionEnvironment = function(runtime, callback) {
-    var serverScriptText = null;
+   //var serverScriptText = null;
     var serverScriptSubstitute = null;
     var check = function () {
-        if (o2.typeOf(serverScriptText) !== "null" && o2.typeOf(serverScriptSubstitute) !== "null") {
-            var code = "o2.Macro.swapSpace.tmpMacroCompletionFunction = function (){\n" + serverScriptSubstitute + "\n" + serverScriptText + "\nreturn bind;" + "\n};";
+        // if (o2.typeOf(serverScriptText) !== "null" && o2.typeOf(serverScriptSubstitute) !== "null") {
+        //     var code = "o2.Macro.swapSpace.tmpMacroCompletionFunction = function (){\n" + serverScriptSubstitute + "\n" + serverScriptText + "\nreturn bind;" + "\n};";
+        if (o2.typeOf(serverScriptSubstitute) !== "null") {
+            var code = "o2.Macro.swapSpace.tmpMacroCompletionFunction = function (){\n" + serverScriptSubstitute + "\nreturn bind;" + "\n};";
             Browser.exec(code);
             var ev = o2.Macro.swapSpace.tmpMacroCompletionFunction();
             o2.widget.JavascriptEditor.runtimeEnvironment[runtime] = {
@@ -610,13 +614,13 @@ o2.widget.JavascriptEditor.getServerCompletionEnvironment = function(runtime, ca
         }
     }
 
-    o2.xhr_get("../x_desktop/js/initialScriptText.js", function (xhr) {
-        serverScriptText = xhr.responseText;
-        check();
-    }, function () {
-        serverScriptText = "";
-        check();
-    });
+    // o2.xhr_get("../x_desktop/js/initialScriptText.js", function (xhr) {
+    //     serverScriptText = xhr.responseText;
+    //     check();
+    // }, function () {
+    //     serverScriptText = "";
+    //     check();
+    // });
     o2.xhr_get("../x_desktop/js/initalScriptSubstitute.js", function (xhr) {
         serverScriptSubstitute = xhr.responseText;
         check();
@@ -638,9 +642,13 @@ o2.widget.JavascriptEditor.getDefaultCompletionEnvironment = function(runtime, c
 o2.widget.JavascriptEditor.getAllCompletionEnvironment = function(runtime, callback){
     var check = function(){
         if (o2.widget.JavascriptEditor.runtimeEnvironment["service"] && o2.widget.JavascriptEditor.runtimeEnvironment["server"] && o2.widget.JavascriptEditor.runtimeEnvironment["web"] ){
+        //if (o2.widget.JavascriptEditor.runtimeEnvironment["web"] ){
             var ev = Object.merge(o2.widget.JavascriptEditor.runtimeEnvironment["service"].environment,
                 o2.widget.JavascriptEditor.runtimeEnvironment["server"].environment,
                 o2.widget.JavascriptEditor.runtimeEnvironment["web"].environment)
+
+            //var ev = o2.widget.JavascriptEditor.runtimeEnvironment["web"].environment;
+
             o2.widget.JavascriptEditor.runtimeEnvironment[runtime] = {
                 "environment": ev,
                 exec: function(code){
@@ -654,4 +662,4 @@ o2.widget.JavascriptEditor.getAllCompletionEnvironment = function(runtime, callb
     o2.widget.JavascriptEditor.getServerCompletionEnvironment("server", check);
     o2.widget.JavascriptEditor.getDefaultCompletionEnvironment("web", check);
 
-}
+}

o2web/source/x_desktop/js/initalScriptSubstitute.js

@@ -7,4 +7,918 @@ var organization = this.organization = {
         unit: function(){ return {}; },
         unitAttribute: function(){ return {}; },
         unitDuty: function(){ return {}; }
-};
+};
+bind = {};
+var library = {
+        'version': '4.0',
+        "defineProperties": Object.defineProperties || function (obj, properties) {
+                function convertToDescriptor(desc) {
+                        function hasProperty(obj, prop) {
+                                return Object.prototype.hasOwnProperty.call(obj, prop);
+                        }
+
+                        function isCallable(v) {
+                                // NB: modify as necessary if other values than functions are callable.
+                                return typeof v === "function";
+                        }
+
+                        if (typeof desc !== "object" || desc === null)
+                                throw new TypeError("bad desc");
+
+                        var d = {};
+
+                        if (hasProperty(desc, "enumerable"))
+                                d.enumerable = !!obj.enumerable;
+                        if (hasProperty(desc, "configurable"))
+                                d.configurable = !!obj.configurable;
+                        if (hasProperty(desc, "value"))
+                                d.value = obj.value;
+                        if (hasProperty(desc, "writable"))
+                                d.writable = !!desc.writable;
+                        if (hasProperty(desc, "get")) {
+                                var g = desc.get;
+
+                                if (!isCallable(g) && typeof g !== "undefined")
+                                        throw new TypeError("bad get");
+                                d.get = g;
+                        }
+                        if (hasProperty(desc, "set")) {
+                                var s = desc.set;
+                                if (!isCallable(s) && typeof s !== "undefined")
+                                        throw new TypeError("bad set");
+                                d.set = s;
+                        }
+
+                        if (("get" in d || "set" in d) && ("value" in d || "writable" in d))
+                                throw new TypeError("identity-confused descriptor");
+
+                        return d;
+                }
+
+                if (typeof obj !== "object" || obj === null)
+                        throw new TypeError("bad obj");
+
+                properties = Object(properties);
+
+                var keys = Object.keys(properties);
+                var descs = [];
+
+                for (var i = 0; i < keys.length; i++)
+                        descs.push([keys[i], convertToDescriptor(properties[keys[i]])]);
+
+                for (var i = 0; i < descs.length; i++)
+                        Object.defineProperty(obj, descs[i][0], descs[i][1]);
+
+                return obj;
+        },
+        'typeOf': function(item){
+                if (item == null) return 'null';
+                if (item.$family != null) return item.$family();
+                if (item.constructor == Array) return 'array';
+
+                if (item.nodeName){
+                        if (item.nodeType == 1) return 'element';
+                        if (item.nodeType == 3) return (/\S/).test(item.nodeValue) ? 'textnode' : 'whitespace';
+                } else if (typeof item.length == 'number'){
+                        if (item.callee) return 'arguments';
+                        //if ('item' in item) return 'collection';
+                }
+
+                return typeof item;
+        },
+
+        'JSONDecode': function(string, secure){
+                if (!string || library.typeOf(string) != 'string') return null;
+                return eval('(' + string + ')');
+        },
+
+        'JSONEncode': function(obj){
+                if (obj && obj.toJSON) obj = obj.toJSON();
+                switch (library.typeOf(obj)){
+                        case 'string':
+                                return '"' + obj.replace(/[\x00-\x1f\\"]/g, escape) + '"';
+                        case 'array':
+                                var string = [];
+                                for (var i=0; i<obj.length; i++){
+                                        var json = library.JSONEncode(obj[i]);
+                                        if (json) string.push(json);
+                                }
+                                return '[' + string + ']';
+                        case 'object': case 'hash':
+                                var string = [];
+                                for (key in obj){
+                                        var json = library.JSONEncode(obj[key]);
+                                        if (json) string.push(library.JSONEncode(key) + ':' + json);
+                                }
+                                return '{' + string + '}';
+                        case 'number': case 'boolean': return '' + obj;
+                        case 'null': return 'null';
+                }
+                return null;
+        }
+};
+(function(){
+        var o={"indexOf": {
+                        "value": function(item, from){
+                                var length = this.length >>> 0;
+                                for (var i = (from < 0) ? Math.max(0, length + from) : from || 0; i < length; i++){
+                                        if (this[i] === item) return i;
+                                }
+                                return -1;
+                        }
+                }};
+        library.defineProperties(Array.prototype, o);
+})();
+
+var wrapWorkContext = {
+
+        "getTask": function(){return JSON.parse(workContext.getTaskOrTaskCompleted());},
+        "getWork": function(){return JSON.parse(workContext.getWork());},
+        "getActivity": function(){return JSON.parse(workContext.getActivity());},
+        "getTaskList": function(){return JSON.parse(workContext.getTaskList());},
+        "getTaskCompletedList": function(){return JSON.parse(workContext.getTaskCompletedList());},
+        "getReadList": function(){return JSON.parse(workContext.getReadList());},
+        "getReadCompletedList": function(){return JSON.parse(workContext.getReadCompletedList());},
+
+        "getJobTaskList": function(){return JSON.parse(workContext.getJobTaskList());},
+        "getJobTaskCompletedList": function(){return JSON.parse(workContext.getJobTaskCompletedList());},
+        "getJobReadList": function(){return JSON.parse(workContext.getJobReadList());},
+        "getJobReadCompletedList": function(){return JSON.parse(workContext.getJobReadCompletedList());},
+        "getTaskListByJob": function(){return JSON.parse(workContext.getJobTaskList());},
+        "getTaskCompletedListByJob": function(){return JSON.parse(workContext.getJobTaskCompletedList());},
+        "getReadListByJob": function(){return JSON.parse(workContext.getJobReadList());},
+        "getReadCompletedListByJob": function(){return JSON.parse(workContext.getJobReadCompletedList());},
+
+        "getReviewList": function(){return JSON.parse(workContext.getReviewList());},
+        "getWorkLogList": function(){return JSON.parse(workContext.getWorkLogList());},
+        "getAttachmentList": function(){return JSON.parse(workContext.getAttachmentList());},
+        "getRouteList": function(){return JSON.parse(workContext.getRouteList());},
+        "setTitle": function(title){workContext.setTitle(title);},
+
+        "getControl": function(){return null;},
+        "getInquiredRouteList": function(){return null;}
+};
+//applications
+
+
+var includedScripts = [];
+var _self = this;
+var include = function(name, callback){
+        if (includedScripts.indexOf(name)==-1){
+                var json = JSON.parse(_self.workContext.getScript(name, includedScripts));
+                includedScripts = includedScripts.concat(json.importedList);
+                if (json.text){
+                        //MWF.Macro.exec(json.data.text, bind);
+                        var f = eval("(function(){return function(){\n"+json.text+"\n}})();");
+                        returnValue = f.apply(bind);
+
+                        if (callback) callback.apply(bind);
+                }
+        }
+};
+
+var define = function(name, fun, overwrite){
+        var over = true;
+        if (overwrite===false) over = false;
+        var o = {};
+        o[name] = {"value": fun, "configurable": over};
+        library.defineProperties(bind, o);
+};
+
+var Dict =  function(name){
+        var dictionary = _self.dictionary;
+        this.name = name;
+        this.get = function(path){
+                return JSON.parse(dictionary.select(this.name, path));
+        };
+        this.set = function(path, value){
+                try {
+                        dictionary.update(this.name, library.JSONEncode(value), path);
+                        return true;
+                }catch(e){
+                        return false;
+                }
+        };
+        this.add = function(path, value){
+                try {
+                        dictionary.insert(this.name, library.JSONEncode(value), path);
+                        return true;
+                }catch(e){
+                        return false;
+                }
+        };
+};
+if ((typeof JSON) == 'undefined'){
+        JSON = {};
+}
+JSON.validate = function(string){
+        string = string.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').replace(/(?:^|:|,)(?:\s*\[)+/g, '');
+        return (/^[\],:{}\s]*$/).test(string);
+};
+JSON.encode = JSON.stringify ? function(obj){
+        return JSON.stringify(obj);
+} : function(obj){
+        if (obj && obj.toJSON) obj = obj.toJSON();
+        switch (typeof obj){
+                case 'string':
+                        return '"' + obj.replace(/[\x00-\x1f\\"]/g, escape) + '"';
+                case 'array':
+                        var string = [];
+                        for (var i=0; i<obj.length; i++){
+                                var json = JSON.encode(obj[i]);
+                                if (json) string.push(json);
+                        }
+                        return '[' + string + ']';
+                case 'object': case 'hash':
+                        var string = [];
+                        for (key in obj){
+                                var json = JSON.encode(obj[key]);
+                                if (json) string.push(JSON.encode(key) + ':' + json);
+                        }
+                        return '{' + string + '}';
+                case 'number': case 'boolean': return '' + obj;
+                case 'null': return 'null';
+        }
+        return null;
+};
+JSON.decode = function(string, secure){
+        if (!string || (typeof string) !== 'string') return null;
+
+        if (secure || JSON.secure){
+                if (JSON.parse) return JSON.parse(string);
+                if (!JSON.validate(string)) throw new Error('JSON could not decode the input; security is enabled and the value is not secure.');
+        }
+        return eval('(' + string + ')');
+};
+var body = {
+        set: function(data){
+                if ((typeof data)=="string"){
+                        if (jaxrsBody) jaxrsBody.set(data);
+                }else{
+                        if (jaxrsBody) jaxrsBody.set(JSON.encode(data));
+                }
+        }
+};
+
+var getNameFlag = function(name){
+        var t = library.typeOf(name);
+        if (t==="array"){
+                var v = [];
+                name.forEach(function(id){
+                        v.push((library.typeOf(id)==="object") ? (id.distinguishedName || id.id || id.unique || id.name) : id);
+                });
+                return v;
+        }else{
+                return [(t==="object") ? (name.distinguishedName || name.id || name.unique || name.name) : name];
+        }
+};
+var _org = {
+        "oGroup": this.organization.group(),
+        "oIdentity": this.organization.identity(),
+        "oPerson": this.organization.person(),
+        "oPersonAttribute": this.organization.personAttribute(),
+        "oRole": this.organization.role(),
+        "oUnit": this.organization.unit(),
+        "oUnitAttribute": this.organization.unitAttribute(),
+        "oUnitDuty": this.organization.unitDuty(),
+
+        "group": function() { return this.oGroup},
+        "identity": function() { return this.oIdentity},
+        "person": function() { return this.oPerson},
+        "personAttribute": function() { return this.oPersonAttribute},
+        "role": function() { return this.oRole},
+        "unit": function() { return this.oUnit},
+        "unitAttribute": function() { return this.oUnitAttribute},
+        "unitDuty": function() { return this.oUnitDuty},
+
+        "getObject": function(o, v){
+                var arr = [];
+                if (!v || !v.length){
+                        return null;
+                }else{
+                        for (var i=0; i<v.length; i++){
+                                var g = o.getObject(v[i]);
+                                if (g) arr.push(JSON.parse(g.toString()));
+                        }
+                }
+                return arr;
+        },
+        //群组***************
+        //获取群组--返回群组的对象数组
+        getGroup: function(name){
+                var v = this.oGroup.listObject(getNameFlag(name));
+                var v_json = (!v || !v.length) ? null: JSON.parse(v.toString());
+                return (v_json && v_json.length===1) ? v_json[0] : v_json;
+        },
+
+        //查询下级群组--返回群组的对象数组
+        //nested  布尔  true嵌套下级；false直接下级；默认false；
+        listSubGroup: function(name, nested){
+                var v = null;
+                if (nested){
+                        v = this.oGroup.listWithGroupSubNested(getNameFlag(name));
+                }else{
+                        v = this.oGroup.listWithGroupSubDirect(getNameFlag(name));
+                }
+                return this.getObject(this.oGroup, v);
+        },
+        //查询上级群组--返回群组的对象数组
+        //nested  布尔  true嵌套上级；false直接上级；默认false；
+        listSupGroup:function(name, nested){
+                var v = null;
+                if (nested){
+                        v = this.oGroup.listWithGroupSupNested(getNameFlag(name));
+                }else{
+                        v = this.oGroup.listWithGroupSupDirect(getNameFlag(name));
+                }
+                return this.getObject(this.oGroup, v);
+        },
+        //人员所在群组（嵌套）--返回群组的对象数组
+        listGroupWithPerson:function(name){
+                var v = this.oGroup.listWithPerson(getNameFlag(name));
+                return this.getObject(this.oGroup, v);
+        },
+        //群组是否拥有角色--返回true, false
+        groupHasRole: function(name, role){
+                nameFlag = (library.typeOf(name)==="object") ? (name.distinguishedName || name.id || name.unique || name.name) : name;
+                return this.oGroup.hasRole(nameFlag, getNameFlag(role));
+        },
+
+        //角色***************
+        //获取角色--返回角色的对象数组
+        getRole: function(name){
+                var v = this.oRole.listObject(getNameFlag(name));
+                var v_json = (!v || !v.length) ? null: JSON.parse(v.toString());
+                return (v_json && v_json.length===1) ? v_json[0] : v_json;
+        },
+        //人员所有角色（嵌套）--返回角色的对象数组
+        listRoleWithPerson:function(name){
+                var v = this.oRole.listWithPerson(getNameFlag(name));
+                return this.getObject(this.oRole, v);
+        },
+
+        //人员***************
+        //人员是否拥有角色--返回true, false
+        personHasRole: function(name, role){
+                nameFlag = (library.typeOf(name)==="object") ? (name.distinguishedName || name.id || name.unique || name.name) : name;
+                return this.oPerson.hasRole(nameFlag, getNameFlag(role));
+        },
+        //获取人员--返回人员的对象数组
+        getPerson: function(name){
+                var v = this.oPerson.listObject(getNameFlag(name));
+                var v_json = (!v || !v.length) ? null: JSON.parse(v.toString());
+                // if (!v || !v.length) v = null;
+                // return (v && v.length===1) ? v[0] : v;
+                return (v_json && v_json.length===1) ? v_json[0] : v_json;
+        },
+        //查询下级人员--返回人员的对象数组
+        //nested  布尔  true嵌套下级；false直接下级；默认false；
+        listSubPerson: function(name, nested){
+                var v = null;
+                if (nested){
+                        v = this.oPerson.listWithPersonSubNested(getNameFlag(name));
+                }else{
+                        v = this.oPerson.listWithPersonSubDirect(getNameFlag(name));
+                }
+                return this.getObject(this.oPerson, v);
+        },
+        //查询上级人员--返回人员的对象数组
+        //nested  布尔  true嵌套上级；false直接上级；默认false；
+        listSupPerson: function(name, nested){
+                var v = null;
+                if (nested){
+                        v = this.oPerson.listWithPersonSupNested(getNameFlag(name));
+                }else{
+                        v = this.oPerson.listWithPersonSupDirect(getNameFlag(name));
+                }
+                return this.getObject(this.oPerson, v);
+        },
+        //获取群组的所有人员--返回人员的对象数组
+        listPersonWithGroup: function(name){
+                var v = this.oPerson.listWithGroup(getNameFlag(name));
+                return this.getObject(this.oPerson, v);
+                // if (!v || !v.length) v = null;
+                // return v;
+                // var v_json = (!v || !v.length) ? null: JSON.parse(v.toString());
+                // return v_json;
+        },
+        //获取角色的所有人员--返回人员的对象数组
+        listPersonWithRole: function(name){
+                var v = this.oPerson.listWithRole(getNameFlag(name));
+                return this.getObject(this.oPerson, v);
+        },
+        //获取身份的所有人员--返回人员的对象数组
+        listPersonWithIdentity: function(name){
+                var v = this.oPerson.listWithIdentity(getNameFlag(name));
+                return this.getObject(this.oPerson, v);
+        },
+        //获取身份的所有人员--返回人员的对象数组
+        getPersonWithIdentity: function(name){
+                var v = this.oPerson.listWithIdentity(getNameFlag(name));
+                var arr = this.getObject(this.oPerson, v);
+                return (arr && arr.length) ? arr[0] : null;
+        },
+        //查询组织成员的人员--返回人员的对象数组
+        //nested  布尔  true嵌套的所有成员；false直接成员；默认false；
+        listPersonWithUnit: function(name, nested){
+                var v = null;
+                if (nested){
+                        v = this.oPerson.listWithUnitSubNested(getNameFlag(name));
+                }else{
+                        v = this.oPerson.listWithUnitSubDirect(getNameFlag(name));
+                }
+                return this.getObject(this.oPerson, v);
+        },
+
+        //人员属性************
+        //添加人员属性值(在属性中添加values值，如果没有此属性，则创建一个)
+        appendPersonAttribute: function(person, attr, values){
+                var personFlag = (library.typeOf(person)==="object") ? (person.distinguishedName || person.id || person.unique || person.name) : person;
+                return this.oPersonAttribute.appendWithPersonWithName(personFlag, attr, values);
+        },
+        //设置人员属性值(将属性值修改为values，如果没有此属性，则创建一个)
+        setPersonAttribute: function(person, attr, values){
+                var personFlag = (library.typeOf(person)==="object") ? (person.distinguishedName || person.id || person.unique || person.name) : person;
+                return this.oPersonAttribute.setWithPersonWithName(personFlag, attr, values);
+        },
+        //获取人员属性值
+        getPersonAttribute: function(person, attr){
+                var personFlag = (library.typeOf(person)==="object") ? (person.distinguishedName || person.id || person.unique || person.name) : person;
+                var v = this.oPersonAttribute.listAttributeWithPersonWithName(personFlag, attr);
+                var v_json = [];
+                if (v && v.length){
+                        for (var i=0; i<v.length; i++){
+                                v_json.push(v[i].toString());
+                        }
+                }
+                return v_json;
+        },
+        //列出人员所有属性的名称
+        listPersonAttributeName: function(name){
+                var p = getNameFlag(name);
+                var nameList = [];
+                for (var i=0; i<p.length; i++){
+                        var v = this.oPersonAttribute.listNameWithPerson(p[i]);
+                        if (v && v.length){
+                                for (var j=0; j<v.length; j++){
+                                        if (nameList.indexOf(v[j])==-1) nameList.push(v[j].toString());
+                                }
+                        }
+                }
+                return nameList;
+        },
+        //列出人员的所有属性
+        //listPersonAllAttribute: function(name){
+        // getOrgActions();
+        // var data = {"personList":getNameFlag(name)};
+        // var v = null;
+        // orgActions.listPersonAllAttribute(data, function(json){v = json.data;}, null, false);
+        // return v;
+        //},
+
+        //身份**********
+        //获取身份
+        getIdentity: function(name){
+                var v = this.oIdentity.listObject(getNameFlag(name));
+                var v_json = (!v || !v.length) ? null: JSON.parse(v.toString());
+                return (v_json && v_json.length===1) ? v_json[0] : v_json;
+                // if (!v || !v.length) v = null;
+                // return (v && v.length===1) ? v[0] : v;
+        },
+        //列出人员的身份
+        listIdentityWithPerson: function(name){
+                var v = this.oIdentity.listWithPerson(getNameFlag(name));
+                return this.getObject(this.oIdentity, v);
+        },
+        //查询组织成员身份--返回身份的对象数组
+        //nested  布尔  true嵌套的所有成员；false直接成员；默认false；
+        listIdentityWithUnit: function(name, nested){
+                var v = null;
+                if (nested){
+                        v = this.oIdentity.listWithUnitSubNested(getNameFlag(name));
+                }else{
+                        v = this.oIdentity.listWithUnitSubDirect(getNameFlag(name));
+                }
+                return this.getObject(this.oIdentity, v);
+        },
+
+        //组织**********
+        //获取组织
+        getUnit: function(name){
+                var v = this.oUnit.listObject(getNameFlag(name));
+                var v_json = (!v || !v.length) ? null: JSON.parse(v.toString());
+                return (v_json && v_json.length===1) ? v_json[0] : v_json;
+                // if (!v || !v.length) v = null;
+                // return (v && v.length===1) ? v[0] : v;
+        },
+        //查询组织的下级--返回组织的对象数组
+        //nested  布尔  true嵌套下级；false直接下级；默认false；
+        listSubUnit: function(name, nested){
+                var v = null;
+                if (nested){
+                        v = this.oUnit.listWithUnitSubNested(getNameFlag(name));
+                }else{
+                        v = this.oUnit.listWithUnitSubDirect(getNameFlag(name));
+                }
+                return this.getObject(this.oUnit, v);
+        },
+        //查询组织的上级--返回组织的对象数组
+        //nested  布尔  true嵌套上级；false直接上级；默认false；
+        listSupUnit: function(name, nested){
+                var v = null;
+                if (nested){
+                        v = this.oUnit.listWithUnitSupNested(getNameFlag(name));
+                }else{
+                        v = this.oUnit.listWithUnitSupDirect(getNameFlag(name));
+                }
+                return this.getObject(this.oUnit, v);
+        },
+        //根据个人身份获取组织
+        //flag 数字    表示获取第几层的组织
+        //     字符串  表示获取指定类型的组织
+        //     空     表示获取直接所在的组织
+        getUnitByIdentity: function(name, flag){
+                //getOrgActions();
+                var getUnitMethod = "current";
+                var v;
+                if (flag){
+                        if (library.typeOf(flag)==="string") getUnitMethod = "type";
+                        if (library.typeOf(flag)==="number") getUnitMethod = "level";
+                }
+                var n = getNameFlag(name)[0];
+                switch (getUnitMethod){
+                        case "current":
+                                v = this.oUnit.getWithIdentity(n);
+                                break;
+                        case "type":
+                                v = this.oUnit.getWithIdentityWithType(n, flag);
+                                break;
+                        case "level":
+                                v = this.oUnit.getWithIdentityWithLevel(n, flag);
+                                break;
+                }
+                var o = this.getObject(this.oUnit, [v]);
+                return (o && o.length===1) ? o[0] : o;
+        },
+        //列出身份所在组织的所有上级组织
+        listAllSupUnitWithIdentity: function(name){
+                var v = this.oUnit.listWithIdentitySupNested(getNameFlag(name));
+                return this.getObject(this.oUnit, v);
+        },
+        //获取人员所在的所有组织（直接所在组织）
+        listUnitWithPerson: function(name){
+                var v = this.oUnit.listWithPerson(getNameFlag(name));
+                return this.getObject(this.oUnit, v);
+        },
+        //列出人员所在组织的所有上级组织
+        listAllSupUnitWithPerson: function(name){
+                var v = this.oUnit.listWithPersonSupNested(getNameFlag(name));
+                return this.getObject(this.oUnit, v);
+        },
+        //根据组织属性，获取所有符合的组织
+        listUnitWithAttribute: function(name, attribute){
+                var v = this.oUnit.listWithUnitAttribute(name, attribute);
+                return this.getObject(this.oUnit, v);
+        },
+        //根据组织职务，获取所有符合的组织
+        listUnitWithDuty: function(name, id){
+                var idflag = (library.typeOf(id)==="object") ? (id.distinguishedName || id.id || id.unique || id.name) : id;
+                var v = this.oUnit.listWithUnitDuty(name, idflag);
+                return this.getObject(this.oUnit, v);
+        },
+
+        //组织职务***********
+        //获取指定的组织职务的身份
+        getDuty: function(duty, id){
+                var unit = (library.typeOf(id)==="object") ? (id.distinguishedName || id.id || id.unique || id.name) : id;
+                var v = this.oUnitDuty.listIdentityWithUnitWithName(unit, duty);
+                return this.getObject(this.oIdentity, v);
+        },
+
+        //获取身份的所有职务名称
+        listDutyNameWithIdentity: function(name){
+                var ids = getNameFlag(name);
+                var nameList = [];
+                for (var i=0; i<ids.length; i++){
+                        var v = this.oUnitDuty.listNameWithIdentity(ids[i]);
+                        if (v && v.length){
+                                for (var j=0; j<v.length; j++){
+                                        if (nameList.indexOf(v[j])==-1) nameList.push(v[j].toString());
+                                }
+                        }
+                }
+                return nameList;
+        },
+        //获取组织的所有职务名称
+        listDutyNameWithUnit: function(name){
+                var ids = getNameFlag(name);
+                var nameList = [];
+                for (var i=0; i<ids.length; i++){
+                        var v = this.oUnitDuty.listNameWithUnit(ids[i]);
+                        if (v && v.length){
+                                for (var j=0; j<v.length; j++){
+                                        if (nameList.indexOf(v[j])==-1) nameList.push(v[j].toString());
+                                }
+                        }
+                }
+                return nameList;
+        },
+        //获取组织的所有职务
+        listUnitAllDuty: function(name){
+                var u = getNameFlag(name)[0];
+                var ds = this.oUnitDuty.listNameWithUnit(u);
+                var o = []
+                for (var i=0; i<ds.length; i++){
+                        v = this.oUnitDuty.listIdentityWithUnitWithName(u, ds[i]);
+                        o.push({"name": ds[i], "identityList": this.getObject(this.oIdentity, v)});
+                }
+                return o;
+        },
+
+        //组织属性**************
+        //添加组织属性值(在属性中添加values值，如果没有此属性，则创建一个)
+        appendUnitAttribute: function(unit, attr, values){
+                var unitFlag = (library.typeOf(unit)==="object") ? (unit.distinguishedName || unit.id || unit.unique || unit.name) : unit;
+                return this.oUnitAttribute.appendWithUnitWithName(unitFlag, attr, values);
+        },
+        //设置组织属性值(将属性值修改为values，如果没有此属性，则创建一个)
+        setUnitAttribute: function(unit, attr, values){
+                var unitFlag = (library.typeOf(unit)==="object") ? (unit.distinguishedName || unit.id || unit.unique || unit.name) : unit;
+                return this.oUnitAttribute.setWithUnitWithName(unitFlag, attr, values);
+        },
+        //获取组织属性值
+        getUnitAttribute: function(unit, attr){
+                var unitFlag = (library.typeOf(unit)==="object") ? (unit.distinguishedName || unit.id || unit.unique || unit.name) : unit;
+                var v = this.oUnitAttribute.listAttributeWithUnitWithName(unitFlag, attr);
+                var v_json = [];
+                if (v && v.length){
+                        for (var i=0; i<v.length; i++){
+                                v_json.push(v[i].toString());
+                        }
+                }
+                return v_json;
+        },
+        //列出组织所有属性的名称
+        listUnitAttributeName: function(name){
+                var p = getNameFlag(name);
+                var nameList = [];
+                for (var i=0; i<p.length; i++){
+                        var v = this.oUnitAttribute.listNameWithUnit(p[i]);
+                        if (v && v.length){
+                                for (var j=0; j<v.length; j++){
+                                        if (nameList.indexOf(v[j])==-1) nameList.push(v[j]);
+                                }
+                        }
+                }
+                return nameList;
+        },
+        //列出组织的所有属性
+        listUnitAllAttribute: function(name){
+                var u = getNameFlag(name)[0];
+                var ds = this.oUnitAttribute.listNameWithUnit(u);
+                var o = []
+                for (var i=0; i<ds.length; i++){
+                        v = this.getUnitAttribute(u, ds[i]);
+                        o.push({"name": ds[i], "valueList":v});
+                }
+                return o;
+        }
+};
+
+bind.applications = this.applications;
+var restfulAcpplication = this.applications;
+var _Action = (function(){
+        //var actions = [];
+        return function(root, json){
+                this.actions = json;
+                // if (!actions[root]) actions[root] = {};
+                // Object.keys(json).forEach(function(key){
+                //     actions[root][key] = json[key];
+                // });
+                //Object.merge(actions[root], json);
+                this.root = root;
+                //this.actions = actions[root];
+
+                var invokeFunction = function(service, parameters, key){
+                        var _self = this;
+                        return function(){
+                                var i = parameters.length-1;
+                                var n = arguments.length;
+                                var functionArguments = arguments;
+                                var parameter = {};
+                                var success, failure, async, data, file;
+                                if (typeOf(functionArguments[0])==="function"){
+                                        i=-1;
+                                        success = (n>++i) ? functionArguments[i] : null;
+                                        failure = (n>++i) ? functionArguments[i] : null;
+                                        parameters.each(function(p, x){
+                                                parameter[p] = (n>++i) ? functionArguments[i] : null;
+                                        });
+                                        if (service.method && (service.method.toLowerCase()==="post" || service.method.toLowerCase()==="put")){
+                                                data = (n>++i) ? functionArguments[i] : null;
+                                        }
+                                }else{
+                                        parameters.each(function(p, x){
+                                                parameter[p] = (n>x) ? functionArguments[x] : null;
+                                        });
+                                        if (service.method && (service.method.toLowerCase()==="post" || service.method.toLowerCase()==="put")){
+                                                data = (n>++i) ? functionArguments[i] : null;
+                                        }
+                                        success = (n>++i) ? functionArguments[i] : null;
+                                        failure = (n>++i) ? functionArguments[i] : null;
+                                }
+                                return _self.invoke({"name": key, "data": data, "parameter": parameter, "success": success, "failure": failure});
+                        };
+                };
+                var createMethod = function(service, key){
+                        var jaxrsUri = service.uri;
+                        var re = new RegExp("\{.+?\}", "g");
+                        var replaceWords = jaxrsUri.match(re);
+                        var parameters = [];
+                        if (replaceWords) parameters = replaceWords.map(function(s){
+                                return s.substring(1,s.length-1);
+                        });
+
+                        this[key] = invokeFunction.call(this, service, parameters, key);
+                };
+                Object.keys(this.actions).forEach(function(key){
+                        var service = this.actions[key];
+                        if (service.uri) if (!this[key]) createMethod.call(this, service, key);
+                }, this);
+
+                this.invoke = function(option){
+                        // {
+                        //     "name": "",
+                        //     "data": "",
+                        //     "parameter": "",,
+                        //     "success": function(){}
+                        //     "failure": function(){}
+                        // }
+                        if (this.actions[option.name]){
+                                var uri = this.actions[option.name].uri;
+                                var method = this.actions[option.name].method || "get";
+                                if (option.parameter){
+                                        Object.keys(option.parameter).forEach(function(key){
+                                                var v = option.parameter[key];
+                                                uri = uri.replace("{"+key+"}", v);
+                                        });
+                                }
+                                var res = null;
+                                try{
+                                        switch (method.toLowerCase()){
+                                                case "get":
+                                                        res = bind.applications.getQuery(this.root, uri);
+                                                        break;
+                                                case "post":
+                                                        res = bind.applications.postQuery(this.root, uri, JSON.stringify(option.data));
+                                                        break;
+                                                case "put":
+                                                        res = bind.applications.putQuery(this.root, uri, JSON.stringify(option.data));
+                                                        break;
+                                                case "delete":
+                                                        res = bind.applications.deleteQuery(this.root, uri);
+                                                        break;
+                                                default:
+                                                        res = bind.applications.getQuery(this.root, uri);
+                                        }
+                                        if (res && res.getType().toString()==="success"){
+                                                var json = JSON.parse(res.toString());
+                                                if (option.success) option.success(json);
+                                        }else{
+                                                if (option.failure) option.failure(((res) ? JSON.parse(res.toString()) : null));
+                                        }
+                                }catch(e){
+                                        if (option.failure) option.failure(e);
+                                }
+                        }
+                };
+        }
+})();
+_Action.applications = this.applications;
+
+var _Actions = {
+        "loadedActions": {},
+        "load": function(root){
+                if (this.loadedActions[root]) return this.loadedActions[root];
+                var jaxrsString = bind.applications.describeApi(root);
+                var json = JSON.parse(jaxrsString.toString());
+                if (json && json.jaxrs){
+                        var actionObj = {};
+                        json.jaxrs.each(function(o){
+                                if (o.methods && o.methods.length){
+                                        var actions = {};
+                                        o.methods.each(function(m){
+                                                var o = {"uri": "/"+m.uri};
+                                                if (m.method) o.method = m.method;
+                                                if (m.enctype) o.enctype = m.enctype;
+                                                actions[m.name] = o;
+                                        }.bind(this));
+                                        actionObj[o.name] = new bind.Action(root, actions);
+                                }
+                        }.bind(this));
+                        this.loadedActions[root] = actionObj;
+                        return actionObj;
+                }
+                return null;
+        }
+};
+bind.Actions = _Actions;
+
+
+bind.library = library;
+bind.data = this.data;
+bind.workContext = wrapWorkContext;
+bind.service = this.webservicesClient;
+bind.org = _org;
+bind.Action = _Action;
+//bind.organization = this.organization;
+bind.include = include;
+bind.define = define;
+bind.Dict = Dict;
+bind.form = null;
+bind.body = {
+        "set": function(data){
+                if ((typeof data)==="string"){
+                        body.set(data);
+                }
+                if ((typeof data)==="object"){
+                        body.set(JSON.encode(data));
+                }
+        }
+};
+
+
+bind.headers = {
+        "put": function(name, value){
+                try{
+                        if ((typeof name)==="object"){
+                                var _keys = Object.keys(name);
+                                for (var i=0; i<_keys.length; i++){
+                                        if (jaxrsHead) jaxrsHead.put(_keys[i], name[_keys[i]]);
+                                }
+                        }else{
+                                if (jaxrsHead) jaxrsHead.put(name, value);
+                        }
+                }catch(e){}
+        },
+        "remove": function(name){
+                try{
+                        if (jaxrsHead)jaxrsHead.remove(name);
+                }catch(e){}
+        }
+};
+
+
+bind.parameters = this.parameters || null;
+bind.response = (function(){
+        if (this.jaxrsResponse){
+                if (this.jaxrsResponse.get()){
+                        if (JSON.validate(this.jaxrsResponse.get())){
+                                return {
+                                        "status": this.jaxrsResponse.status,
+                                        "value": JSON.decode(this.jaxrsResponse.get())
+                                };
+                        }else{
+                                return {
+                                        "status": this.jaxrsResponse.status,
+                                        "value": this.jaxrsResponse.value
+                                };
+                        }
+                }else{
+                        return {"status": this.jaxrsResponse.status};
+                }
+        }
+        return null;
+}).apply(this);
+
+bind.assginData = {
+        "data": null,
+        "get": function(){
+                this.data = JSON.decode(assignData.get());
+                return this.data;
+        },
+        "set": function(data){
+                assignData.set(JSON.encode(data || this.data));
+        }
+};
+bind.assignData = bind.assginData;
+bind.expire = {
+        "setHour": function(hour){
+                try{expire.setHour(hour);}catch(e){}
+        },
+        "setWorkHour": function(hour){
+                try{expire.setWorkHour(hour);}catch(e){}
+        },
+        "setDate": function(date){
+                try{expire.setDate(date);}catch(e){}
+        }
+};
+bind.request = {
+        "getBody": function(){
+                try{
+                        return JSON.parse(serviceValue);
+                }catch(e){
+                        return null
+                }
+        }
+};

o2web/source/x_desktop/js/initalServiceScriptSubstitute.js

@@ -16,4 +16,901 @@ var resources = {
         },
         "getWebservicesClient": function(){ return {}; }
 };
-var effectivePerson = this.effectivePerson = {};
+var effectivePerson = this.effectivePerson = {};
+
+bind = this;
+var library = {
+        'version': '4.0',
+        "defineProperties": Object.defineProperties || function (obj, properties) {
+                return obj;
+        },
+        'typeOf': function(item){
+                if (item == null) return 'null';
+                if (item.$family != null) return item.$family();
+                if (item.constructor == Array) return 'array';
+
+                if (item.nodeName){
+                        if (item.nodeType == 1) return 'element';
+                        if (item.nodeType == 3) return (/\S/).test(item.nodeValue) ? 'textnode' : 'whitespace';
+                } else if (typeof item.length == 'number'){
+                        if (item.callee) return 'arguments';
+                        //if ('item' in item) return 'collection';
+                }
+
+                return typeof item;
+        },
+
+        'JSONDecode': function(string, secure){
+                if (!string || library.typeOf(string) != 'string') return null;
+                return eval('(' + string + ')');
+        },
+
+        'JSONEncode': function(obj){
+                if (obj && obj.toJSON) obj = obj.toJSON();
+                switch (library.typeOf(obj)){
+                        case 'string':
+                                return '"' + obj.replace(/[\x00-\x1f\\"]/g, escape) + '"';
+                        case 'array':
+                                var string = [];
+                                for (var i=0; i<obj.length; i++){
+                                        var json = library.JSONEncode(obj[i]);
+                                        if (json) string.push(json);
+                                }
+                                return '[' + string + ']';
+                        case 'object': case 'hash':
+                                var string = [];
+                                for (key in obj){
+                                        var json = library.JSONEncode(obj[key]);
+                                        if (json) string.push(library.JSONEncode(key) + ':' + json);
+                                }
+                                return '{' + string + '}';
+                        case 'number': case 'boolean': return '' + obj;
+                        case 'null': return 'null';
+                }
+                return null;
+        }
+};
+(function(){
+        var o={"indexOf": {
+                        "value": function(item, from){
+                                var length = this.length >>> 0;
+                                for (var i = (from < 0) ? Math.max(0, length + from) : from || 0; i < length; i++){
+                                        if (this[i] === item) return i;
+                                }
+                                return -1;
+                        }
+                }};
+        library.defineProperties(Array.prototype, o);
+})();
+
+/********************
+ this.entityManager; //实体管理器
+ this.context; //上下文根
+ this.applications;
+ this.org; //组织访问
+ this.service;//webSerivces客户端
+
+ this.response;
+ this.response.seeOther(url); //303跳转
+ this.response.temporaryRedirect(url); //304跳转
+ this.response.setBody(body); //设置返回
+
+ this.requestText//请求正文
+ this.request//请求
+ this.currentPerson//当前用户
+
+ this.Actions;
+ this.Actions.load(root);    //获取接口服务
+ ********************/
+
+bind.entityManager = resources.getEntityManagerContainer();
+bind.context = resources.getContext();
+bind.applications = resources.getApplications();
+bind.organization = resources.getOrganization();
+bind.service = resources.getWebservicesClient();
+
+//bind.response = customResponse;
+//bind.customResponse = customResponse;
+bind.requestText = this.requestText || null;
+bind.request = this.request || null;
+if (this.effectivePerson) bind.currentPerson = bind.effectivePerson = effectivePerson;
+
+if (this.parameters) bind.parameters = JSON.parse(this.parameters); //JPQL语句传入参数
+if (this.customResponse){
+        var _response = {
+                "customResponse": this.customResponse || "",
+                seeOther: function(url){
+                        customResponse.seeOther(url);
+                },
+                temporaryRedirect: function(url){
+                        customResponse.temporaryRedirect(url);
+                },
+                setBody: function(o, contentType){
+                        var body = o;
+                        if (typeOf(o)=="object"){
+                                body = JSON.stringify(o);
+                        }
+                        customResponse.setBody(body, contentType || "");
+                }
+        };
+        bind.response = _response;
+}
+
+//定义方法
+var _define = function(name, fun, overwrite){
+        var over = true;
+        if (overwrite===false) over = false;
+        var o = {};
+        o[name] = {"value": fun, "configurable": over};
+        library.defineProperties(bind, o);
+};
+
+//Action对象
+var restfulAcpplication = resources.getApplications();
+var _Action = (function(){
+        //var actions = [];
+        return function(root, json){
+                this.actions = json;
+                // Object.keys(json).forEach(function(key){
+                //     this.actions[key] = json[key];
+                // });
+                //Object.merge(actions[root], json);
+                this.root = root;
+                //this.actions = actions[root];
+
+                var invokeFunction = function(service, parameters, key){
+                        var _self = this;
+                        return function(){
+                                var i = parameters.length-1;
+                                var n = arguments.length;
+                                var functionArguments = arguments;
+                                var parameter = {};
+                                var success, failure, async, data, file;
+                                if (typeOf(functionArguments[0])==="function"){
+                                        i=-1;
+                                        success = (n>++i) ? functionArguments[i] : null;
+                                        failure = (n>++i) ? functionArguments[i] : null;
+                                        parameters.each(function(p, x){
+                                                parameter[p] = (n>++i) ? functionArguments[i] : null;
+                                        });
+                                        if (service.method && (service.method.toLowerCase()==="post" || service.method.toLowerCase()==="put")){
+                                                data = (n>++i) ? functionArguments[i] : null;
+                                        }
+                                }else{
+                                        parameters.each(function(p, x){
+                                                parameter[p] = (n>x) ? functionArguments[x] : null;
+                                        });
+                                        if (service.method && (service.method.toLowerCase()==="post" || service.method.toLowerCase()==="put")){
+                                                data = (n>++i) ? functionArguments[i] : null;
+                                        }
+                                        success = (n>++i) ? functionArguments[i] : null;
+                                        failure = (n>++i) ? functionArguments[i] : null;
+                                }
+                                return _self.invoke({"name": key, "data": data, "parameter": parameter, "success": success, "failure": failure});
+                        };
+                };
+                var createMethod = function(service, key){
+                        var jaxrsUri = service.uri;
+                        var re = new RegExp("\{.+?\}", "g");
+                        var replaceWords = jaxrsUri.match(re);
+                        var parameters = [];
+                        if (replaceWords) parameters = replaceWords.map(function(s){
+                                return s.substring(1,s.length-1);
+                        });
+
+                        this[key] = invokeFunction.call(this, service, parameters, key);
+                };
+                Object.keys(this.actions).forEach(function(key){
+                        var service = this.actions[key];
+                        if (service.uri) if (!this[key]) createMethod.call(this, service, key);
+                }, this);
+
+                this.invoke = function(option){
+                        // {
+                        //     "name": "",
+                        //     "data": "",
+                        //     "parameter": "",,
+                        //     "success": function(){}
+                        //     "failure": function(){}
+                        // }
+                        if (this.actions[option.name]){
+                                var uri = this.actions[option.name].uri;
+                                var method = this.actions[option.name].method || "get";
+                                if (option.parameter){
+                                        Object.keys(option.parameter).forEach(function(key){
+                                                var v = option.parameter[key];
+                                                uri = uri.replace("{"+key+"}", v);
+                                        });
+                                }
+                                var res = null;
+                                try{
+                                        print(uri);
+                                        switch (method.toLowerCase()){
+                                                case "get":
+                                                        res = bind.applications.getQuery(this.root, uri);
+                                                        break;
+                                                case "post":
+                                                        res = bind.applications.postQuery(this.root, uri, JSON.stringify(option.data));
+                                                        break;
+                                                case "put":
+                                                        res = bind.applications.putQuery(this.root, uri, JSON.stringify(option.data));
+                                                        break;
+                                                case "delete":
+                                                        res = bind.applications.deleteQuery(this.root, uri);
+                                                        break;
+                                                default:
+                                                        res = bind.applications.getQuery(this.root, uri);
+                                        }
+                                        if (res && res.getType().toString()==="success"){
+                                                var json = JSON.parse(res.toString());
+                                                if (option.success) option.success(json);
+                                        }else{
+                                                if (option.failure) option.failure(((res) ? JSON.parse(res.toString()) : null));
+                                        }
+                                        return res;
+                                }catch(e){
+                                        if (option.failure) option.failure(e);
+                                }
+                        }
+                };
+        }
+})();
+var _Actions = {
+        "loadedActions": {},
+        "load": function(root){
+                if (this.loadedActions[root]) return this.loadedActions[root];
+                var jaxrsString = bind.applications.describeApi(root);
+                var json = JSON.parse(jaxrsString.toString());
+                if (json && json.jaxrs){
+                        var actionObj = {};
+                        json.jaxrs.each(function(o){
+                                if (o.methods && o.methods.length){
+                                        var actions = {};
+                                        o.methods.each(function(m){
+
+                                                var o = {"uri": "/"+m.uri};
+                                                if (m.method) o.method = m.method;
+                                                if (m.enctype) o.enctype = m.enctype;
+                                                actions[m.name] = o;
+                                        }.bind(this));
+                                        actionObj[o.name] = new bind.Action(root, actions);
+                                }
+                        }.bind(this));
+                        this.loadedActions[root] = actionObj;
+                        return actionObj;
+                }
+                return null;
+        }
+};
+bind.Actions = _Actions;
+
+//定义所需的服务
+var _processActions = new _Action("x_processplatform_assemble_surface", {
+        "getDictionary": {"uri": "/jaxrs/applicationdict/{applicationDict}/application/{applicationFlag}"},
+        "getDictRoot": {"uri": "/jaxrs/applicationdict/{applicationDict}/application/{application}/data"},
+        "getDictData": {"uri": "/jaxrs/applicationdict/{applicationDict}/application/{application}/{path}/data"},
+        "setDictData": {"uri": "/jaxrs/applicationdict/{applicationDict}/application/{application}/{path}/data", "method": "PUT"},
+        "addDictData": {"uri": "/jaxrs/applicationdict/{applicationDict}/application/{application}/{path}/data", "method": "POST"},
+        "deleteDictData": {"uri": "/jaxrs/applicationdict/{applicationDict}/application/{application}/{path}/data", "method": "DELETE"},
+        "getScript": {"uri": "/jaxrs/script/{flag}/application/{applicationFlag}", "method": "POST"},
+});
+var _cmsActions = new _Action("x_cms_assemble_control", {
+        "getDictionary": {"uri": "/jaxrs/design/appdict/{appDictId}"},
+        "getDictRoot": {"uri": "/jaxrs/surface/appdict/{appDictId}/appInfo/{appId}/data"},
+        "getDictData": {"uri": "/jaxrs/surface/appdict/{appDictId}/appInfo/{appId}/{path}/data"},
+        "setDictData": {"uri": "/jaxrs/surface/appdict/{appDictId}/appInfo/{appId}/{path}/data", "method": "PUT"},
+        "addDictData": {"uri": "/jaxrs/surface/appdict/{appDictId}/appInfo/{appId}/{path}/data", "method": "POST"},
+        "deleteDictData": {"uri": "/jaxrs/surface/appdict/{appDictId}/appInfo/{appId}/{path}/data", "method": "DELETE"},
+        "getDictRootAnonymous" : {"uri": "/jaxrs/anonymous/surface/appdict/{appDictId}/appInfo/{appId}/data"},
+        "getDictDataAnonymous" : {"uri": "/jaxrs/anonymous/surface/appdict/{appDictId}/appInfo/{appId}/{path}/data"},
+        "getScript": {"uri": "/jaxrs/script/{flag}/appInfo/{appInfoFlag}", "method": "POST"},
+});
+var _portalActions = new _Action("x_portal_assemble_surface", {
+        "getScript":  {"uri": "/jaxrs/script/portal/{portal}/name/{ }","method": "POST"}
+});
+
+
+//include 引用脚本
+//optionsOrName : {
+//  type : "", 默认为process, 可以为 portal  process  cms
+//  application : "", 门户/流程/CMS的名称/别名/id, 默认为当前应用
+//  name : "" // 脚本名称/别名/id
+//}
+//或者name: "" // 脚本名称/别名/id
+var _exec = function(code, _self){
+        var returnValue;
+        //try{
+        if (!_self) _self = this;
+        try {
+                var f = eval("(function(){return function(){\n"+code+"\n}})();");
+                returnValue = f.apply(_self);
+        }catch(e){
+                console.log("exec", new Error("exec script error"));
+                console.log(e);
+        }
+        return returnValue;
+}
+
+var includedScripts = this.includedScripts || {};
+this.includedScripts = includedScripts;
+
+var _include = function( optionsOrName , callback ){
+        var options = optionsOrName;
+        if( typeOf( options ) == "string" ){
+                options = { name : options };
+        }
+        var name = options.name;
+        var type = ( options.type && options.application ) ?  options.type : "process";
+        var application = options.application
+
+        if (!name || !type || !application){
+                console.log("include", new Error("can not find script. missing script name or application"));
+                return false;
+        }
+
+        if (!includedScripts[application]) includedScripts[application] = [];
+
+        if (includedScripts[application].indexOf( name )> -1){
+                if (callback) callback.apply(this);
+                return;
+        }
+
+        var scriptAction;
+        var scriptData;
+        switch ( type ){
+                case "portal" :
+                        _portalActions.getScript( application, name, {"importedList":includedScripts[application]}, function(json){
+                                if (json.data){
+                                        includedScripts[application] = includedScripts[application].concat(json.data.importedList);
+                                        scriptData = json.data;
+                                }
+                        }.bind(this));
+                        break;
+                case "process" :
+                        _processActions.getScript( name, application, {"importedList":includedScripts[application]}, function(json){
+                                if (json.data){
+                                        includedScripts[application] = includedScripts[application].concat(json.data.importedList);
+                                        scriptData = json.data;
+                                }
+                        }.bind(this));
+                        break;
+                case "cms" :
+                        _cmsActions.getScript(name, application, {"importedList":includedScripts[application]}, function(json){
+                                if (json.data){
+                                        includedScripts[application] = includedScripts[application].concat(json.data.importedList);
+                                        scriptData = json.data;
+                                }
+                        }.bind(this));
+                        break;
+        }
+        includedScripts[application].push(name);
+        if (scriptData && scriptData.text){
+                bind.exec(scriptData.text, this);
+                if (callback) callback.apply(this);
+        }
+};
+
+var _createDict = function(application){
+        //optionsOrName : {
+        //  type : "", //默认为process, 可以为  process  cms
+        //  application : "", //流程/CMS的名称/别名/id, 默认为当前应用
+        //  name : "", // 数据字典名称/别名/id
+        //  enableAnonymous : false //允许在未登录的情况下读取CMS的数据字典
+        //}
+        //或者name: "" // 数据字典名称/别名/id
+        return function(optionsOrName){
+                var options = optionsOrName;
+                if( typeOf( options ) == "string" ){
+                        options = { name : options };
+                }
+                var name = this.name = options.name;
+                var type = ( options.type && options.application ) ?  options.type : "process";
+                var applicationId = options.application || application;
+                var enableAnonymous = options.enableAnonymous || false;
+
+                //MWF.require("MWF.xScript.Actions.DictActions", null, false);
+                if( type == "cms" ){
+                        var action = bind.cmsActions;
+                }else{
+                        var action = bind.processActions;
+                }
+
+                var encodePath = function( path ){
+                        var arr = path.split(/\./g);
+                        var ar = arr.map(function(v){
+                                return encodeURIComponent(v);
+                        });
+                        return ar.join("/");
+                };
+
+                this.get = function(path, success, failure){
+                        var value = null;
+                        if (path){
+                                var p = encodePath( path );
+                                action[(enableAnonymous && type == "cms") ? "getDictDataAnonymous" : "getDictData"](encodeURIComponent(this.name), applicationId, p, function(json){
+                                        value = json.data;
+                                        if (success) success(json.data);
+                                }, function(xhr, text, error){
+                                        if (failure) failure(xhr, text, error);
+                                });
+                        }else{
+                                action[(enableAnonymous && type == "cms") ? "getDictRootAnonymous" : "getDictRoot"](encodeURIComponent(this.name), applicationId, function(json){
+                                        value = json.data;
+                                        if (success) success(json.data);
+                                }, function(xhr, text, error){
+                                        if (failure) failure(xhr, text, error);
+                                }, false);
+                        }
+
+                        return value;
+                };
+
+                this.set = function(path, value, success, failure){
+                        var p = encodePath( path );
+                        //var p = path.replace(/\./g, "/");
+                        action.setDictData(encodeURIComponent(this.name), applicationId, p, value, function(json){
+                                if (success) success(json.data);
+                        }, function(xhr, text, error){
+                                if (failure) failure(xhr, text, error);
+                        }, false, false);
+                };
+                this.add = function(path, value, success, failure){
+                        var p = encodePath( path );
+                        //var p = path.replace(/\./g, "/");
+                        action.addDictData(encodeURIComponent(this.name), applicationId, p, value, function(json){
+                                if (success) success(json.data);
+                        }, function(xhr, text, error){
+                                if (failure) failure(xhr, text, error);
+                        }, false, false);
+                };
+                this["delete"] = function(path, success, failure){
+                        var p = encodePath( path );
+                        //var p = path.replace(/\./g, "/");
+                        action.deleteDictData(encodeURIComponent(this.name), applicationId, p, function(json){
+                                if (success) success(json.data);
+                        }, function(xhr, text, error){
+                                if (failure) failure(xhr, text, error);
+                        }, false, false);
+                };
+                this.destory = this["delete"];
+        }
+};
+
+var getNameFlag = function(name){
+        var t = library.typeOf(name);
+        if (t==="array"){
+                var v = [];
+                name.forEach(function(id){
+                        v.push((library.typeOf(id)==="object") ? (id.distinguishedName || id.id || id.unique || id.name) : id);
+                });
+                return v;
+        }else{
+                return [(t==="object") ? (name.distinguishedName || name.id || name.unique || name.name) : name];
+        }
+};
+var _org = {
+        "oGroup": this.organization.group(),
+        "oIdentity": this.organization.identity(),
+        "oPerson": this.organization.person(),
+        "oPersonAttribute": this.organization.personAttribute(),
+        "oRole": this.organization.role(),
+        "oUnit": this.organization.unit(),
+        "oUnitAttribute": this.organization.unitAttribute(),
+        "oUnitDuty": this.organization.unitDuty(),
+
+        "group": function() { return this.oGroup},
+        "identity": function() { return this.oIdentity},
+        "person": function() { return this.oPerson},
+        "personAttribute": function() { return this.oPersonAttribute},
+        "role": function() { return this.oRole},
+        "unit": function() { return this.oUnit},
+        "unitAttribute": function() { return this.oUnitAttribute},
+        "unitDuty": function() { return this.oUnitDuty},
+
+        "getObject": function(o, v){
+                var arr = [];
+                if (!v || !v.length){
+                        return null;
+                }else{
+                        for (var i=0; i<v.length; i++){
+                                var g = o.getObject(v[i]);
+                                if (g) arr.push(JSON.parse(g.toString()));
+                        }
+                }
+                return arr;
+        },
+        //群组***************
+        //获取群组--返回群组的对象数组
+        getGroup: function(name){
+                var v = this.oGroup.listObject(getNameFlag(name));
+                var v_json = (!v || !v.length) ? null: JSON.parse(v.toString());
+                return (v_json && v_json.length===1) ? v_json[0] : v_json;
+        },
+
+        //查询下级群组--返回群组的对象数组
+        //nested  布尔  true嵌套下级；false直接下级；默认false；
+        listSubGroup: function(name, nested){
+                var v = null;
+                if (nested){
+                        v = this.oGroup.listWithGroupSubNested(getNameFlag(name));
+                }else{
+                        v = this.oGroup.listWithGroupSubDirect(getNameFlag(name));
+                }
+                return this.getObject(this.oGroup, v);
+        },
+        //查询上级群组--返回群组的对象数组
+        //nested  布尔  true嵌套上级；false直接上级；默认false；
+        listSupGroup:function(name, nested){
+                var v = null;
+                if (nested){
+                        v = this.oGroup.listWithGroupSupNested(getNameFlag(name));
+                }else{
+                        v = this.oGroup.listWithGroupSupDirect(getNameFlag(name));
+                }
+                return this.getObject(this.oGroup, v);
+        },
+        //人员所在群组（嵌套）--返回群组的对象数组
+        listGroupWithPerson:function(name){
+                var v = this.oGroup.listWithPerson(getNameFlag(name));
+                return this.getObject(this.oGroup, v);
+        },
+        //群组是否拥有角色--返回true, false
+        groupHasRole: function(name, role){
+                nameFlag = (library.typeOf(name)==="object") ? (name.distinguishedName || name.id || name.unique || name.name) : name;
+                return this.oGroup.hasRole(nameFlag, getNameFlag(role));
+        },
+
+        //角色***************
+        //获取角色--返回角色的对象数组
+        getRole: function(name){
+                var v = this.oRole.listObject(getNameFlag(name));
+                var v_json = (!v || !v.length) ? null: JSON.parse(v.toString());
+                return (v_json && v_json.length===1) ? v_json[0] : v_json;
+        },
+        //人员所有角色（嵌套）--返回角色的对象数组
+        listRoleWithPerson:function(name){
+                var v = this.oRole.listWithPerson(getNameFlag(name));
+                return this.getObject(this.oRole, v);
+        },
+
+        //人员***************
+        //人员是否拥有角色--返回true, false
+        personHasRole: function(name, role){
+                nameFlag = (library.typeOf(name)==="object") ? (name.distinguishedName || name.id || name.unique || name.name) : name;
+                return this.oPerson.hasRole(nameFlag, getNameFlag(role));
+        },
+        //获取人员--返回人员的对象数组
+        getPerson: function(name){
+                var v = this.oPerson.listObject(getNameFlag(name));
+                var v_json = (!v || !v.length) ? null: JSON.parse(v.toString());
+                // if (!v || !v.length) v = null;
+                // return (v && v.length===1) ? v[0] : v;
+                return (v_json && v_json.length===1) ? v_json[0] : v_json;
+        },
+        //查询下级人员--返回人员的对象数组
+        //nested  布尔  true嵌套下级；false直接下级；默认false；
+        listSubPerson: function(name, nested){
+                var v = null;
+                if (nested){
+                        v = this.oPerson.listWithPersonSubNested(getNameFlag(name));
+                }else{
+                        v = this.oPerson.listWithPersonSubDirect(getNameFlag(name));
+                }
+                return this.getObject(this.oPerson, v);
+        },
+        //查询上级人员--返回人员的对象数组
+        //nested  布尔  true嵌套上级；false直接上级；默认false；
+        listSupPerson: function(name, nested){
+                var v = null;
+                if (nested){
+                        v = this.oPerson.listWithPersonSupNested(getNameFlag(name));
+                }else{
+                        v = this.oPerson.listWithPersonSupDirect(getNameFlag(name));
+                }
+                return this.getObject(this.oPerson, v);
+        },
+        //获取群组的所有人员--返回人员的对象数组
+        listPersonWithGroup: function(name){
+                var v = this.oPerson.listWithGroup(getNameFlag(name));
+                return this.getObject(this.oPerson, v);
+                // if (!v || !v.length) v = null;
+                // return v;
+                // var v_json = (!v || !v.length) ? null: JSON.parse(v.toString());
+                // return v_json;
+        },
+        //获取角色的所有人员--返回人员的对象数组
+        listPersonWithRole: function(name){
+                var v = this.oPerson.listWithRole(getNameFlag(name));
+                return this.getObject(this.oPerson, v);
+        },
+        //获取身份的所有人员--返回人员的对象数组
+        listPersonWithIdentity: function(name){
+                var v = this.oPerson.listWithIdentity(getNameFlag(name));
+                return this.getObject(this.oPerson, v);
+        },
+        //获取身份的所有人员--返回人员的对象数组
+        getPersonWithIdentity: function(name){
+                var v = this.oPerson.listWithIdentity(getNameFlag(name));
+                var arr = this.getObject(this.oPerson, v);
+                return (arr && arr.length) ? arr[0] : null;
+        },
+        //查询组织成员的人员--返回人员的对象数组
+        //nested  布尔  true嵌套的所有成员；false直接成员；默认false；
+        listPersonWithUnit: function(name, nested){
+                var v = null;
+                if (nested){
+                        v = this.oPerson.listWithUnitSubNested(getNameFlag(name));
+                }else{
+                        v = this.oPerson.listWithUnitSubDirect(getNameFlag(name));
+                }
+                return this.getObject(this.oPerson, v);
+        },
+
+        //人员属性************
+        //添加人员属性值(在属性中添加values值，如果没有此属性，则创建一个)
+        appendPersonAttribute: function(person, attr, values){
+                var personFlag = (library.typeOf(person)==="object") ? (person.distinguishedName || person.id || person.unique || person.name) : person;
+                return this.oPersonAttribute.appendWithPersonWithName(personFlag, attr, values);
+        },
+        //设置人员属性值(将属性值修改为values，如果没有此属性，则创建一个)
+        setPersonAttribute: function(person, attr, values){
+                var personFlag = (library.typeOf(person)==="object") ? (person.distinguishedName || person.id || person.unique || person.name) : person;
+                return this.oPersonAttribute.setWithPersonWithName(personFlag, attr, values);
+        },
+        //获取人员属性值
+        getPersonAttribute: function(person, attr){
+                var personFlag = (library.typeOf(person)==="object") ? (person.distinguishedName || person.id || person.unique || person.name) : person;
+                var v = this.oPersonAttribute.listAttributeWithPersonWithName(personFlag, attr);
+                var v_json = [];
+                if (v && v.length){
+                        for (var i=0; i<v.length; i++){
+                                v_json.push(v[i].toString());
+                        }
+                }
+                return v_json;
+        },
+        //列出人员所有属性的名称
+        listPersonAttributeName: function(name){
+                var p = getNameFlag(name);
+                var nameList = [];
+                for (var i=0; i<p.length; i++){
+                        var v = this.oPersonAttribute.listNameWithPerson(p[i]);
+                        if (v && v.length){
+                                for (var j=0; j<v.length; j++){
+                                        if (nameList.indexOf(v[j])==-1) nameList.push(v[j].toString());
+                                }
+                        }
+                }
+                return nameList;
+        },
+        //列出人员的所有属性
+        //listPersonAllAttribute: function(name){
+        // getOrgActions();
+        // var data = {"personList":getNameFlag(name)};
+        // var v = null;
+        // orgActions.listPersonAllAttribute(data, function(json){v = json.data;}, null, false);
+        // return v;
+        //},
+
+        //身份**********
+        //获取身份
+        getIdentity: function(name){
+                var v = this.oIdentity.listObject(getNameFlag(name));
+                var v_json = (!v || !v.length) ? null: JSON.parse(v.toString());
+                return (v_json && v_json.length===1) ? v_json[0] : v_json;
+                // if (!v || !v.length) v = null;
+                // return (v && v.length===1) ? v[0] : v;
+        },
+        //列出人员的身份
+        listIdentityWithPerson: function(name){
+                var v = this.oIdentity.listWithPerson(getNameFlag(name));
+                return this.getObject(this.oIdentity, v);
+        },
+        //查询组织成员身份--返回身份的对象数组
+        //nested  布尔  true嵌套的所有成员；false直接成员；默认false；
+        listIdentityWithUnit: function(name, nested){
+                var v = null;
+                if (nested){
+                        v = this.oIdentity.listWithUnitSubNested(getNameFlag(name));
+                }else{
+                        v = this.oIdentity.listWithUnitSubDirect(getNameFlag(name));
+                }
+                return this.getObject(this.oIdentity, v);
+        },
+
+        //组织**********
+        //获取组织
+        getUnit: function(name){
+                var v = this.oUnit.listObject(getNameFlag(name));
+                var v_json = (!v || !v.length) ? null: JSON.parse(v.toString());
+                return (v_json && v_json.length===1) ? v_json[0] : v_json;
+                // if (!v || !v.length) v = null;
+                // return (v && v.length===1) ? v[0] : v;
+        },
+        //查询组织的下级--返回组织的对象数组
+        //nested  布尔  true嵌套下级；false直接下级；默认false；
+        listSubUnit: function(name, nested){
+                var v = null;
+                if (nested){
+                        v = this.oUnit.listWithUnitSubNested(getNameFlag(name));
+                }else{
+                        v = this.oUnit.listWithUnitSubDirect(getNameFlag(name));
+                }
+                return this.getObject(this.oUnit, v);
+        },
+        //查询组织的上级--返回组织的对象数组
+        //nested  布尔  true嵌套上级；false直接上级；默认false；
+        listSupUnit: function(name, nested){
+                var v = null;
+                if (nested){
+                        v = this.oUnit.listWithUnitSupNested(getNameFlag(name));
+                }else{
+                        v = this.oUnit.listWithUnitSupDirect(getNameFlag(name));
+                }
+                return this.getObject(this.oUnit, v);
+        },
+        //根据个人身份获取组织
+        //flag 数字    表示获取第几层的组织
+        //     字符串  表示获取指定类型的组织
+        //     空     表示获取直接所在的组织
+        getUnitByIdentity: function(name, flag){
+                //getOrgActions();
+                var getUnitMethod = "current";
+                var v;
+                if (flag){
+                        if (library.typeOf(flag)==="string") getUnitMethod = "type";
+                        if (library.typeOf(flag)==="number") getUnitMethod = "level";
+                }
+                var n = getNameFlag(name)[0];
+                switch (getUnitMethod){
+                        case "current":
+                                v = this.oUnit.getWithIdentity(n);
+                                break;
+                        case "type":
+                                v = this.oUnit.getWithIdentityWithType(n, flag);
+                                break;
+                        case "level":
+                                v = this.oUnit.getWithIdentityWithLevel(n, flag);
+                                break;
+                }
+                var o = this.getObject(this.oUnit, [v]);
+                return (o && o.length===1) ? o[0] : o;
+        },
+        //列出身份所在组织的所有上级组织
+        listAllSupUnitWithIdentity: function(name){
+                var v = this.oUnit.listWithIdentitySupNested(getNameFlag(name));
+                return this.getObject(this.oUnit, v);
+        },
+        //获取人员所在的所有组织（直接所在组织）
+        listUnitWithPerson: function(name){
+                var v = this.oUnit.listWithPerson(getNameFlag(name));
+                return this.getObject(this.oUnit, v);
+        },
+        //列出人员所在组织的所有上级组织
+        listAllSupUnitWithPerson: function(name){
+                var v = this.oUnit.listWithPersonSupNested(getNameFlag(name));
+                return this.getObject(this.oUnit, v);
+        },
+        //根据组织属性，获取所有符合的组织
+        listUnitWithAttribute: function(name, attribute){
+                var v = this.oUnit.listWithUnitAttribute(name, attribute);
+                return this.getObject(this.oUnit, v);
+        },
+        //根据组织职务，获取所有符合的组织
+        listUnitWithDuty: function(name, id){
+                var idflag = (library.typeOf(id)==="object") ? (id.distinguishedName || id.id || id.unique || id.name) : id;
+                var v = this.oUnit.listWithUnitDuty(name, idflag);
+                return this.getObject(this.oUnit, v);
+        },
+
+        //组织职务***********
+        //获取指定的组织职务的身份
+        getDuty: function(duty, id){
+                var unit = (library.typeOf(id)==="object") ? (id.distinguishedName || id.id || id.unique || id.name) : id;
+                var v = this.oUnitDuty.listIdentityWithUnitWithName(unit, duty);
+                return this.getObject(this.oIdentity, v);
+        },
+
+        //获取身份的所有职务名称
+        listDutyNameWithIdentity: function(name){
+                var ids = getNameFlag(name);
+                var nameList = [];
+                for (var i=0; i<ids.length; i++){
+                        var v = this.oUnitDuty.listNameWithIdentity(ids[i]);
+                        if (v && v.length){
+                                for (var j=0; j<v.length; j++){
+                                        if (nameList.indexOf(v[j])==-1) nameList.push(v[j].toString());
+                                }
+                        }
+                }
+                return nameList;
+        },
+        //获取组织的所有职务名称
+        listDutyNameWithUnit: function(name){
+                var ids = getNameFlag(name);
+                var nameList = [];
+                for (var i=0; i<ids.length; i++){
+                        var v = this.oUnitDuty.listNameWithUnit(ids[i]);
+                        if (v && v.length){
+                                for (var j=0; j<v.length; j++){
+                                        if (nameList.indexOf(v[j])==-1) nameList.push(v[j].toString());
+                                }
+                        }
+                }
+                return nameList;
+        },
+        //获取组织的所有职务
+        listUnitAllDuty: function(name){
+                var u = getNameFlag(name)[0];
+                var ds = this.oUnitDuty.listNameWithUnit(u);
+                var o = []
+                for (var i=0; i<ds.length; i++){
+                        v = this.oUnitDuty.listIdentityWithUnitWithName(u, ds[i]);
+                        o.push({"name": ds[i], "identityList": this.getObject(this.oIdentity, v)});
+                }
+                return o;
+        },
+
+        //组织属性**************
+        //添加组织属性值(在属性中添加values值，如果没有此属性，则创建一个)
+        appendUnitAttribute: function(unit, attr, values){
+                var unitFlag = (library.typeOf(unit)==="object") ? (unit.distinguishedName || unit.id || unit.unique || unit.name) : unit;
+                return this.oUnitAttribute.appendWithUnitWithName(unitFlag, attr, values);
+        },
+        //设置组织属性值(将属性值修改为values，如果没有此属性，则创建一个)
+        setUnitAttribute: function(unit, attr, values){
+                var unitFlag = (library.typeOf(unit)==="object") ? (unit.distinguishedName || unit.id || unit.unique || unit.name) : unit;
+                return this.oUnitAttribute.setWithUnitWithName(unitFlag, attr, values);
+        },
+        //获取组织属性值
+        getUnitAttribute: function(unit, attr){
+                var unitFlag = (library.typeOf(unit)==="object") ? (unit.distinguishedName || unit.id || unit.unique || unit.name) : unit;
+                var v = this.oUnitAttribute.listAttributeWithUnitWithName(unitFlag, attr);
+                var v_json = [];
+                if (v && v.length){
+                        for (var i=0; i<v.length; i++){
+                                v_json.push(v[i].toString());
+                        }
+                }
+                return v_json;
+        },
+        //列出组织所有属性的名称
+        listUnitAttributeName: function(name){
+                var p = getNameFlag(name);
+                var nameList = [];
+                for (var i=0; i<p.length; i++){
+                        var v = this.oUnitAttribute.listNameWithUnit(p[i]);
+                        if (v && v.length){
+                                for (var j=0; j<v.length; j++){
+                                        if (nameList.indexOf(v[j])==-1) nameList.push(v[j]);
+                                }
+                        }
+                }
+                return nameList;
+        },
+        //列出组织的所有属性
+        listUnitAllAttribute: function(name){
+                var u = getNameFlag(name)[0];
+                var ds = this.oUnitAttribute.listNameWithUnit(u);
+                var o = []
+                for (var i=0; i<ds.length; i++){
+                        v = this.getUnitAttribute(u, ds[i]);
+                        o.push({"name": ds[i], "valueList":v});
+                }
+                return o;
+        }
+};
+
+bind.org = _org;
+bind.library = library;
+bind.define = _define;
+bind.Action = _Action;
+bind.Actions = _Actions;
+bind.processActions = _processActions;
+bind.cmsActions = _cmsActions;
+bind.portalActions = _portalActions;
+
+bind.exec = _exec;
+bind.include = _include;
+bind.Dict = _createDict();
+