表单性能优化

gulpfile.js

@@ -516,6 +516,9 @@ function build_concat_basework() {
         'o2web/source/x_component_Selector/Person.js',
         'o2web/source/x_component_Selector/Identity.js',
         'o2web/source/x_component_Selector/Unit.js',
+        'o2web/source/x_component_Selector/IdentityWidthDuty.js',
+        'o2web/source/x_component_Selector/IdentityWidthDutyCategoryByUnit.js',
+        'o2web/source/x_component_Selector/UnitWithType.js',
         'o2web/source/o2_core/o2/xScript/Actions/UnitActions.js',
         'o2web/source/o2_core/o2/xScript/Actions/ScriptActions.js',
         'o2web/source/o2_core/o2/xScript/Actions/CMSScriptActions.js',
@@ -528,6 +531,7 @@ function build_concat_basework() {
         'o2web/source/o2_core/o2/xAction/services/x_cms_assemble_control.js',
         'o2web/source/o2_core/o2/xAction/services/x_organization_assemble_control.js',
         'o2web/source/o2_core/o2/xAction/services/x_query_assemble_surface.js',
+        'o2web/source/o2_core/o2/xAction/services/x_organization_assemble_personal.js',
         'o2web/source/x_desktop/js/base_work_end.js',
         'o2web/source/x_desktop/js/base.js'
     ];

o2web/gulpfile.js

@@ -379,6 +379,9 @@ function createBaseWorkConcatTask(path, isMin, thisOptions) {
             'source/x_component_Selector/Person.js',
             'source/x_component_Selector/Identity.js',
             'source/x_component_Selector/Unit.js',
+            'source/x_component_Selector/IdentityWidthDuty.js',
+            'source/x_component_Selector/IdentityWidthDutyCategoryByUnit.js',
+            'source/x_component_Selector/UnitWithType.js',
             'source/o2_core/o2/xScript/Actions/UnitActions.js',
             'source/o2_core/o2/xScript/Actions/ScriptActions.js',
             'source/o2_core/o2/xScript/Actions/CMSScriptActions.js',
@@ -391,6 +394,7 @@ function createBaseWorkConcatTask(path, isMin, thisOptions) {
             'source/o2_core/o2/xAction/services/x_cms_assemble_control.js',
             'source/o2_core/o2/xAction/services/x_organization_assemble_control.js',
             'source/o2_core/o2/xAction/services/x_query_assemble_surface.js',
+            'source/o2_core/o2/xAction/services/x_organization_assemble_personal.js',
             'source/' + path + '/js/base_work_end.js',
             'source/' + path + '/js/base.js'
         ];

o2web/source/o2_core/o2/xDesktop/UserData.js

@@ -4,47 +4,73 @@ MWF.require("MWF.xDesktop.Actions.RestActions", null, false);
 
 MWF.xDesktop.UserData = MWF.UD = {
     getAction: function(){
-        this.action = new MWF.xDesktop.Actions.RestActions("/xDesktop/Actions/action.json", "x_organization_assemble_personal");
+        //this.action = new MWF.xDesktop.Actions.RestActions("/xDesktop/Actions/action.json", "x_organization_assemble_personal");
+        this.action = o2.Actions.get("x_organization_assemble_personal");
     },
     getData: function(name, callback, async){
         if (!this.action) this.getAction();
-        this.action.invoke({"name": "getUserData", "async": async, "parameter": {"name": name}, "success": function(json){
+        this.action.getUserData(name, function(json){
             if (callback) callback(json);
-        }.bind(this)});
+        }, null, async)
+
+        // this.action.invoke({"name": "getUserData", "async": async, "parameter": {"name": name}, "success": function(json){
+        //     if (callback) callback(json);
+        // }.bind(this)});
     },
     getDataJson: function(name, callback, async){
         if (!this.action) this.getAction();
-        this.action.invoke({"name": "getUserData", "async": async, "parameter": {"name": name}, "success": function(json){
+        this.action.getUserData(name, function(json){
             var returnJson = null;
             if (json.data) returnJson = JSON.decode(json.data);
             if (callback) callback(returnJson);
-        }.bind(this)});
+        }, null, async)
+
+        // this.action.invoke({"name": "getUserData", "async": async, "parameter": {"name": name}, "success": function(json){
+        //     var returnJson = null;
+        //     if (json.data) returnJson = JSON.decode(json.data);
+        //     if (callback) callback(returnJson);
+        // }.bind(this)});
     },
 
     putData: function(name, data, callback, async){
         if (!this.action) this.getAction();
-        this.action.invoke({"name": "putUserData", "async": async, "data": data, "parameter": {"name": name}, "success": function(json){
+        this.action.putUserData(name, data, function(json){
             if (callback) callback(json);
-        }.bind(this)});
+        }, null, async)
+
+        // this.action.invoke({"name": "putUserData", "async": async, "data": data, "parameter": {"name": name}, "success": function(json){
+        //     if (callback) callback(json);
+        // }.bind(this)});
     },
     deleteData: function(name, callback, async){
         if (!this.action) this.getAction();
-        this.action.invoke({"name": "deleteUserData", "async": async, "parameter": {"name": name}, "success": function(json){
+        this.action.deleteUserData(name, function(json){
             if (callback) callback(json);
-        }.bind(this)});
+        }, null, async)
+
+        // this.action.invoke({"name": "deleteUserData", "async": async, "parameter": {"name": name}, "success": function(json){
+        //     if (callback) callback(json);
+        // }.bind(this)});
     },
 
     getPublicData: function(name, callback, async){
         if (!this.action) this.getAction();
-        this.action.invoke({"name": "getPublicUserData", "async": async, "parameter": {"name": name}, "success": function(json){
+        this.action.getPublicUserData(name, function(json){
             var returnJson = null;
             if (json.data) returnJson = JSON.decode(json.data);
             if (callback) callback(returnJson);
-        }.bind(this)});
+        }, null, async)
+
+        // this.action.invoke({"name": "getPublicUserData", "async": async, "parameter": {"name": name}, "success": function(json){
+        //     var returnJson = null;
+        //     if (json.data) returnJson = JSON.decode(json.data);
+        //     if (callback) callback(returnJson);
+        // }.bind(this)});
     },
     putPublicData: function(name, data, callback, async){
         if (!this.action) this.getAction();
-        this.action.invoke({"name": "putPublicUserData", "async": async, "data": data, "parameter": {"name": name}, "success": function(json){
+
+        this.action.putPublicUserData(name, data, function(json){
             if (callback){
                 if (callback.success){
                     callback.success(json);
@@ -52,7 +78,7 @@ MWF.xDesktop.UserData = MWF.UD = {
                     callback(json);
                 }
             }
-        }.bind(this), "failure": function(xhr, text, error){
+        }, function(xhr, text, error){
             if (xhr.status!=0){
                 var errorText = error;
                 if (xhr){
@@ -66,12 +92,40 @@ MWF.xDesktop.UserData = MWF.UD = {
                 MWF.xDesktop.notice("error", {x: "right", y:"top"}, errorText);
             }
             if (callback) if (callback.failure) callback.failure(xhr, text, error);
-        }});
+        }, async);
+
+        // this.action.invoke({"name": "putPublicUserData", "async": async, "data": data, "parameter": {"name": name}, "success": function(json){
+        //     if (callback){
+        //         if (callback.success){
+        //             callback.success(json);
+        //         }else{
+        //             callback(json);
+        //         }
+        //     }
+        // }.bind(this), "failure": function(xhr, text, error){
+        //     if (xhr.status!=0){
+        //         var errorText = error;
+        //         if (xhr){
+        //             var json = JSON.decode(xhr.responseText);
+        //             if (json){
+        //                 errorText = json.message.trim() || "request json error";
+        //             }else{
+        //                 errorText = "request json error: "+xhr.responseText;
+        //             }
+        //         }
+        //         MWF.xDesktop.notice("error", {x: "right", y:"top"}, errorText);
+        //     }
+        //     if (callback) if (callback.failure) callback.failure(xhr, text, error);
+        // }});
     },
     deletePublicData: function(name, callback, async){
         if (!this.action) this.getAction();
-        this.action.invoke({"name": "deletePublicUserData", "async": async, "parameter": {"name": name}, "success": function(json){
+        this.action.deletePublicUserData(name, function(json){
             if (callback) callback(json);
-        }.bind(this)});
+        }, null, async);
+
+        // this.action.invoke({"name": "deletePublicUserData", "async": async, "parameter": {"name": name}, "success": function(json){
+        //     if (callback) callback(json);
+        // }.bind(this)});
     }
-};
\ No newline at end of file
+};

o2web/source/x_component_process_Xform/Documenteditor.js

@@ -103,7 +103,7 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
         var control = this.getShowControl();
         this.json.fileup =  !!(control.signer);
 
-        if (this.json.css && this.json.css.code){
+        if (this.json.css && this.json.css.code && !this.styleNode){
             var cssText = this.form.parseCSS(this.json.css.code);
             cssText = cssText.replace(/documenteditor_table/g, 'documenteditor_table'+this.form.json.id+this.json.id)
 
@@ -134,7 +134,8 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
             var styleNode = document.createElement("style");
             styleNode.setAttribute("type", "text/css");
             styleNode.id="style"+this.json.id;
-            styleNode.inject(pageContentNode);
+            //styleNode.inject(pageContentNode);
+            styleNode.inject(this.node, "top");
 
             if(styleNode.styleSheet){
                 var setFunc = function(){
@@ -149,6 +150,7 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
                 var cssTextNode = document.createTextNode(cssText);
                 styleNode.appendChild(cssTextNode);
             }
+            this.styleNode = styleNode;
         }
 
         if (this.json.documentTempleteType=="cus"){
@@ -1522,7 +1524,9 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
             if (this.options.pageShow!=="double"){
                 this._doublePage();
             }else{
-                this._singlePage();
+                this.options.pageShow="single";
+                this.reload();
+                //this._singlePage();
             }
         }.bind(this));
         if (layout.mobile) this.doublePageAction.hide();

o2web/source/x_desktop/js/base_work_begin.js

@@ -32,3 +32,4 @@ var cmsActins = {"listApplication": {"uri": "/jaxrs/appinfo/list/user/view/all"
 var orgControlActins = {"addPerson": {"uri": "/jaxrs/person", "method": "POST"},"getPerson": {"uri": "/jaxrs/person/{id}"},"updatePerson": {"uri": "/jaxrs/person/{id}", "method": "PUT"},"removePerson": {"uri": "/jaxrs/person/{id}", "method": "DELETE"},"deletePerson": {"uri": "/jaxrs/person/{id}", "method": "DELETE"},"listPersonDirect": {"uri": "/jaxrs/person/list/group/{id}/sub/direct"},"listPersonNested": {"uri": "/jaxrs/person/list/group/{id}/sub/nested"},"listPersonByPinyin": {"uri": "/jaxrs/person/list/like/pinyin", "method": "PUT"},"listPersonByPinyininitial": {"uri": "/jaxrs/person/list/pinyininitial", "method": "PUT"},"listPersonByKey": {"uri": "/jaxrs/person/list/like", "method": "PUT"},"changePersonIcon": {"uri": "/jaxrs/person/{id}/icon", "method": "PUT", "enctype": "formData"},"getPersonIcon": {"uri": "/jaxrs/person/{flag}/icon"},"listPersonNext": {"uri": "/jaxrs/person/list/{id}/next/{count}"},"listPersonPrev": {"uri": "/jaxrs/person/list/{id}/prev/{count}"},"changePassword": {"uri": "/jaxrs/person/{name}/set/password", "method": "PUT"},"resetPassword": {"uri": "/jaxrs/person/{flag}/reset/password"},"addPersonAttribute": {"uri": "/jaxrs/personattribute", "method": "POST"},"getPersonAttribute": {"uri": "/jaxrs/personattribute/{id}"},"updatePersonAttribute": {"uri": "/jaxrs/personattribute/{id}", "method": "PUT"},"removePersonAttribute": {"uri": "/jaxrs/personattribute/{id}", "method": "DELETE"},"deletePersonAttribute": {"uri": "/jaxrs/personattribute/{id}", "method": "DELETE"},"listPersonAttribute": {"uri": "/jaxrs/personattribute/list/person/{id}"},"addIdentity": {"uri": "/jaxrs/identity", "method": "POST"},"getIdentity": {"uri": "/jaxrs/identity/{id}"},"updateIdentity": {"uri": "/jaxrs/identity/{id}", "method": "PUT"},"removeIdentity": {"uri": "/jaxrs/identity/{id}", "method": "DELETE"},"deleteIdentity": {"uri": "/jaxrs/identity/{id}", "method": "DELETE"},"orderIdentity": {"uri": "/jaxrs/identity/{flag}/order/before/{followFlag}"},"listIdentityByPinyin": {"uri": "/jaxrs/identity/list/like/pinyin", "method": "PUT"},"listIdentityByPinyininitial": {"uri": "/jaxrs/identity/list/pinyininitial", "method": "PUT"},"listIdentityByKey": {"uri": "/jaxrs/identity/list/like", "method": "PUT"},"listIdentityByPerson": {"uri": "/jaxrs/identity/list/person/{id}"},"listIdentityWithUnit": {"uri": "/jaxrs/identity/list/unit/{unit}"},"listIdentityWithDuty": {"uri": "/jaxrs/identity/list/unitduty/name/{flag}"},"listIdentityNext": {"uri": "/jaxrs/identity/list/{id}/next/{count}"},"listIdentityPrev": {"uri": "/jaxrs/identity/list/{id}/prev/{count}"},"listIdentityWidthUnitWithDutyName": {"uri": "/jaxrs/identity/list/{unit}/unitduty/name/{duty}"},"addRole": {"uri": "/jaxrs/role", "method": "POST"},"getRole": {"uri": "/jaxrs/role/{id}"},"updateRole": {"uri": "/jaxrs/role/{id}", "method": "PUT"},"removeRole": {"uri": "/jaxrs/role/{id}", "method": "DELETE" },"deleteRole": {"uri": "/jaxrs/role/{id}", "method": "DELETE" },"listRoleByPinyin": {"uri": "/jaxrs/role/list/like/pinyin", "method": "PUT"},"listRoleByPinyininitial": {"uri": "/jaxrs/role/list/pinyininitial", "method": "PUT"},"listRoleByKey": {"uri": "/jaxrs/role/list/like", "method": "PUT"},"listRoleByGroup": {"uri": "/jaxrs/role/list/group/{id}"},"listRoleByPerson": {"uri": "/jaxrs/role/list/person/{id}"},"listRoleNext": {"uri": "/jaxrs/role/list/{id}/next/{count}"},"listRolePrev": {"uri": "/jaxrs/role/list/{id}/prev/{count}"},"addGroup": {"uri": "/jaxrs/group", "method": "POST"},"getGroup": {"uri": "/jaxrs/group/{id}"},"updateGroup": {"uri": "/jaxrs/group/{id}", "method": "PUT"},"removeGroup": {"uri": "/jaxrs/group/{id}", "method": "DELETE"},"deleteGroup": {"uri": "/jaxrs/group/{id}", "method": "DELETE"},"listGroupByPinyin": {"uri": "/jaxrs/group/list/like/pinyin", "method": "PUT"},"listGroupByPinyininitial": {"uri": "/jaxrs/group/list/pinyininitial", "method": "PUT"},"listGroupByKey": {"uri": "/jaxrs/group/list/like", "method": "PUT"},"listGroupDirectByPerson": {"uri": "/jaxrs/group/list/person/{id}/sup/direct"},"listGroupNestedByPerson": {"uri": "/jaxrs/group/list/person/{id}/sup/nested"},"listSubGroupDirect": {"uri": "/jaxrs/group/list/{id}/sub/direct"},"listSubGroupNested": {"uri": "/jaxrs/group/list/{id}/sub/nested"},"listSupGroupDirect": {"uri": "/jaxrs/group/list/{id}/sup/direct"},"listSupGroupNested": {"uri": "/jaxrs/group/list/{id}/sup/nested"},"listGroupNext": {"uri": "/jaxrs/group/list/{id}/next/{count}"},"listGroupPrev": {"uri": "/jaxrs/group/list/{id}/prev/{count}"},"addUnit": {"uri": "/jaxrs/unit", "method": "POST"},"getUnit": {"uri": "/jaxrs/unit/{id}"},"updateUnit": {"uri": "/jaxrs/unit/{id}", "method": "PUT"},"removeUnit": {"uri": "/jaxrs/unit/{id}", "method": "DELETE"},"deleteUnit": {"uri": "/jaxrs/unit/{id}", "method": "DELETE"},"listUnitByPinyin": {"uri": "/jaxrs/unit/list/like/pinyin", "method": "PUT"},"listUnitByPinyininitial": {"uri": "/jaxrs/unit/list/pinyininitial", "method": "PUT"},"listUnitByKey": {"uri": "/jaxrs/unit/list/like", "method": "PUT"},"listTopUnit": {"uri": "/jaxrs/unit/list/top"},"listUnitByType": {"uri": "/jaxrs/unit/list/unit/type", "method": "PUT"},"listUnitType": {"uri": "/jaxrs/unit/list/type"},"listUnitNext": {"uri": "/jaxrs/unit/list/{id}/next/{count}"},"listUnitPrev": {"uri": "/jaxrs/unit/list/{id}/prev/{count}"},"listSubUnitDirect": {"uri": "/jaxrs/unit/list/{id}/sub/direct"},"listSubUnitNested": {"uri": "/jaxrs/unit/list/{id}/sub/nested"},"listSubUnitNestedByType": {"uri": "/jaxrs/unit/list/{flag}/sub/direct/type/{type}"},"getSupUnitDirect": {"uri": "/jaxrs/unit/{id}/sup/direct"},"listSupUnitNested": {"uri": "/jaxrs/unit/list/{id}/sup/nested"},"listSupUnitNestedByType": {"uri": "/jaxrs/unit/list/{flag}/sup/nested/type/{type}"},"getUnitWithIdentityWithLevel": {"uri": "/jaxrs/unit/identity/{id}/level/{level}"},"getUnitWithIdentityWithType": {"uri": "/jaxrs/unit/identity/{id}/type/{type}"},"addUnitattribute": {"uri": "/jaxrs/unitattribute", "method": "POST"},"getUnitattribute": {"uri": "/jaxrs/unitattribute/{id}"},"updateUnitattribute": {"uri": "/jaxrs/unitattribute/{id}", "method": "PUT"},"removeUnitattribute": {"uri": "/jaxrs/unitattribute/{id}", "method": "DELETE"},"deleteUnitattribute": {"uri": "/jaxrs/unitattribute/{id}", "method": "DELETE"},"listUnitattribute": {"uri": "/jaxrs/unitattribute/list/unit/{id}"},"listUnitattributeNext": {"uri": "/jaxrs/unitattribute/list/{id}/next/{count}"},"listUnitattributePrev": {"uri": "/jaxrs/unitattribute/list/{id}/prev/{count}"},"addUnitduty": {"uri": "/jaxrs/unitduty", "method": "POST"},"getUnitduty": {"uri": "/jaxrs/unitduty/{id}"},"updateUnitduty": {"uri": "/jaxrs/unitduty/{id}", "method": "PUT"},"removeUnitduty": {"uri": "/jaxrs/unitduty/{id}", "method": "DELETE"},"deleteUnitduty": {"uri": "/jaxrs/unitduty/{id}", "method": "DELETE"},"listUnitdutyName": {"uri": "/jaxrs/unitduty/distinct/name"},"listUnitdutyNameByKey": {"uri": "/jaxrs/unitduty/distinct/name/like/{key}"},"listUnitdutyByKey": {"uri": "/jaxrs/unitduty/distinct/name/like/{key}"},"listUnitdutyByIdentity": {"uri": "/jaxrs/unitduty/list/identity/{flag}"},"listUnitdutyByUnit": {"uri": "/jaxrs/unitduty/list/unit/{flag}"},"listUnitdutyByName": {"uri": "/jaxrs/unitduty/list/name/{name}"},"listUnitdutyNext": {"uri": "/jaxrs/unitduty/list/{id}/next/{count}"},"listUnitdutyPrev": {"uri": "/jaxrs/unitduty/list/{id}/prev/{count}"},"getImportPersonTemplate": {"uri": "/jaxrs/inputperson/template"},"getImportPersonResault": {"uri": "/jaxrs/inputperson/result/flag/{flag}"},"importPerson": {"uri": "/jaxrs/inputperson", "method": "POST", "enctype": "formData"},"wipeAll": {"uri": "/jaxrs/inputperson/wipe"},"clazz": "x_organization_assemble_control"};
 var queryActins = {"getQuery": {"uri": "/jaxrs/query/{flag}"},"listQuery": {"uri": "/jaxrs/query/list"},"listQueryByKey": {"uri": "/jaxrs/query/list/key/{key}"},"getStatById": {"uri": "/jaxrs/stat/{id}"},"getStat": {"uri": "/jaxrs/stat/flag/{flag}/query/{queryFlag}"},"listStat": {"uri": "/jaxrs/stat/list/query/{queryFlag}"},"loadStatById": {"uri": "/jaxrs/stat/{id}/execute", "method": "PUT"},"loadStat": {"uri": "/jaxrs/stat/flag/{flag}/query/{queryFlag}/execute", "method": "PUT"},"getViewById": {"uri": "/jaxrs/view/{id}"},"getView": {"uri": "/jaxrs/view/flag/{flag}/query/{queryFlag}"},"listView": {"uri": "/jaxrs/view/list/query/{queryFlag}"},"loadViewById": {"uri": "/jaxrs/view/{id}/execute", "method": "PUT"},"loadView": {"uri": "/jaxrs/view/flag/{flag}/query/{queryFlag}/execute", "method": "PUT"},"bundleView": {"uri": "/jaxrs/view/{id}/bundle", "method": "PUT"},"exportViewWithQuery": {"uri": "/jaxrs/view/flag/{flag}/query/{queryFlag}/excel", "method": "PUT"},"exportView": {"uri": "/jaxrs/view/{id}/excel", "method": "PUT"},"getViewExcel": {"uri": "/jaxrs/view/excel/result/{flag}"},"search": {"uri": "/jaxrs/segment/key/{key}"},"listSearchEntry": {"uri": "/jaxrs/segment/list/entry", "method": "POST"},"executeStatement" : { "uri": "/jaxrs/statement/{flag}/execute/page/{page}/size/{size}", "method": "POST" },"listRowNext" : { "uri" : "/jaxrs/table/list/{tableFlag}/row/{id}/next/{count}" },"listRowPrev" : { "uri" : "/jaxrs/table/list/{tableFlag}/row/{id}/prev/{count}" },"listRowSelectWhere" : { "uri" : "/jaxrs/table/list/{tableFlag}/row/select/where/{where}" },"listRowCountWhere" : { "uri" : "/jaxrs/table/{tableFlag}/row/count/where/{where}" },"getRow" : { "uri": "/jaxrs/table/{tableFlag}/row/{id}" },"updateRow":{ "uri": "/jaxrs/table/{tableFlag}/row/{id}", "method": "PUT" },"insertRow":{ "uri": "/jaxrs/table/{tableFlag}/row", "method": "POST" },"countRowWhere" : { "uri": "/jaxrs/table/{tableFlag}/row/count/where/{where}"},"deleteRow" : { "uri": "/jaxrs/table/{tableFlag}/row/{id}", "method": "DELETE" },"deleteAllRow" : { "uri": "/jaxrs/table/{tableFlag}/row/delete/all", "method": "DELETE"},"calculateNeural": {"uri": "/jaxrs/neural/list/calculate/model/{modelFlag}/work/{workId}"},"clazz": "x_query_assemble_surface"};
 var centerActins = {"collectConnected": {"uri": "/jaxrs/collect/connect"},"getCollectConfig": {"uri": "/jaxrs/collect"},"disconnect": {"uri": "/jaxrs/collect/disconnect"},"collectValidate": {"uri": "/jaxrs/collect/validate"},"updateCollect": {"uri": "/jaxrs/collect", "method": "PUT"},"updateUnitCollect": {"uri": "/jaxrs/collect/updateUnit", "method": "PUT"},"deleteCollect": {"uri": "/jaxrs/collect/name/{name}/mobile/{mobile}/code/{code}", "method": "DELETE"},"createCollect": {"uri": "/jaxrs/collect", "method": "POST"},"collectValidateInput": {"uri": "/jaxrs/collect/validate/direct", "method": "PUT"},"getCode": {"uri": "/jaxrs/collect/code/mobile/{mobile}"},"codeValidate": {"uri": "/jaxrs/collect/validate/codeanswer", "method": "PUT"},"resetPassword": {"uri": "/jaxrs/collect/resetpassword", "method": "PUT"},"nameExist": {"uri": "/jaxrs/collect/name/{name}/exist"},"passwordValidate": {"uri": "/jaxrs/collect/validate/password", "method": "PUT"},"listModuleCategory": {"uri": "/jaxrs/module/list/category"},"listModule": {"uri": "/jaxrs/module/list", "method": "PUT"},"compareModule": {"uri": "/jaxrs/module/{id}/compare"},"importModule": {"uri": "/jaxrs/module/write/{flag}", "method": "PUT"},"compareUpload": {"uri": "/jaxrs/module/compare/upload", "method": "PUT", "enctype": "formData"},"outputStructure": {"uri": "/jaxrs/module/output/structure"},"removeStructure": {"uri": "/jaxrs/module/remove/structure/{id}", "method": "DELETE"},"outputCreate": {"uri": "/jaxrs/module/output", "method": "PUT"},"output": {"uri": "/jaxrs/module/output", "method": "PUT"},"download": {"uri": "/jaxrs/module/output/{flag}/file"},"listStructure": {"uri": "/jaxrs/module/output/list/structure"},"getCollect": {"uri": "/jaxrs/config/collect"},"getPerson": {"uri": "/jaxrs/config/person"},"getToken": {"uri": "/jaxrs/config/token"},"getPortal": {"uri": "/jaxrs/config/portal"},"setCollect": {"uri": "/jaxrs/config/collect", "method": "PUT"},"setPerson": {"uri": "/jaxrs/config/person", "method": "PUT"},"setToken": {"uri": "/jaxrs/config/token", "method": "PUT"},"setPortal": {"uri": "/jaxrs/config/portal", "method": "PUT"},"getCenterServer": {"uri": "/jaxrs/config/centerserver"},"setCenterServer": {"uri": "/jaxrs/config/centerserver", "method": "PUT"},"getProxy": {"uri": "/jaxrs/config/proxy"},"setProxy": {"uri": "/jaxrs/config/proxy", "method": "PUT"},"mobile_defaultStyle": {"uri": "/jaxrs/appstyle/default/style"},"mobile_currentStyle": {"uri": "/jaxrs/appstyle/current/style"},"imageLaunchLogo": {"uri": "/jaxrs/appstyle/image/launch/logo", "method": "PUT", "enctype": "formData"},"imageLaunchLogoErase": {"uri": "/jaxrs/appstyle/image/launch/logo/erase"},"imageLoginAvatar": {"uri": "/jaxrs/appstyle/image/login/avatar", "method": "PUT", "enctype": "formData"},"imageLoginAvatarErase": {"uri": "/jaxrs/appstyle/image/login/avatar/erase"},"imageMenuLogoBlur": {"uri": "/jaxrs/appstyle/image/menu/logo/blur", "method": "PUT", "enctype": "formData"},"imageMenuLogoBlurErase": {"uri": "/jaxrs/appstyle/image/menu/logo/blur/erase"},"imageMenuLogoFocus": {"uri": "/jaxrs/appstyle/image/menu/logo/focus", "method": "PUT", "enctype": "formData"},"imageMenuLogoFocusErase": {"uri": "/jaxrs/appstyle/image/menu/logo/focus/erase"},"imagePeopleAvatarDefault": {"uri": "/jaxrs/appstyle/image/people/avatar/default", "method": "PUT", "enctype": "formData"},"imagePeopleAvatarDefaultErase": {"uri": "/jaxrs/appstyle/image/people/avatar/default/erase"},"imageProcessDefault": {"uri": "/jaxrs/appstyle/image/process/default", "method": "PUT", "enctype": "formData"},"imageProcessDefaultErase": {"uri": "/jaxrs/appstyle/image/process/default/erase"},"imageSetupAboutLogo": {"uri": "/jaxrs/appstyle/image/setup/about/logo", "method": "PUT", "enctype": "formData"},"imageSetupAboutLogoErase": {"uri": "/jaxrs/appstyle/image/setup/about/logo/erase"},"setAppStyle": {"uri": "/jaxrs/appstyle", "method": "PUT"},"listAgent": {"uri": "/jaxrs/agent"},"createAgent" : {"uri": "/jaxrs/agent", "method": "POST"},"updateAgent" : {"uri": "/jaxrs/agent/{flag}", "method": "PUT"},"updateAgentByUploadFile" : {"uri": "/jaxrs/agent/{flag}/file", "method": "PUT", "enctype": "formData"},"deleteAgent" : {"uri": "/jaxrs/agent/{flag}", "method": "DELETE"},"getAgent" : {"uri": "/jaxrs/agent/{flag}"},"disableAgent" : {"uri": "/jaxrs/agent/{flag}/disable"},"enableAgent" : {"uri": "/jaxrs/agent/{flag}/enable"},"executeAgent" : {"uri": "/jaxrs/agent/{flag}/execute"},"listInvoke": {"uri": "/jaxrs/invoke"},"createInvoke" : {"uri": "/jaxrs/invoke", "method": "POST"},"updateInvoke" : {"uri": "/jaxrs/invoke/{flag}", "method": "PUT"},"updateInvokeByUploadFile" : {"uri": "/jaxrs/invoke/{flag}/file", "method": "PUT", "enctype": "formData"},"deleteInvoke" : {"uri": "/jaxrs/invoke/{flag}", "method": "DELETE"},"getInvoke" : {"uri": "/jaxrs/invoke/{flag}"},"executeInvoke" : {"uri": "/jaxrs/invoke/{flag}/execute", "method": "POST"},"listPromptErrorLog" : {"uri": "/jaxrs/prompterrorlog/list/{id}/next/{count}"},"listPromptErrorLogWithDate" : {"uri": "/jaxrs/prompterrorlog/list/{id}/next/{count}/date/{date}"},"listUnexpectedErrorLog" : {"uri": "/jaxrs/unexpectederrorlog/list/{id}/next/{count}"},"listUnexpectedErrorLogWithDate" : {"uri": "/jaxrs/unexpectederrorlog/list/{id}/next/{count}/date/{date}"},"listWarnLog" : {"uri": "/jaxrs/warnlog/list/{id}/next/{count}"},"listWarnLogWithDate" : {"uri": "/jaxrs/warnlog/list/{id}/next/{count}/date/{date}"},"listSystemLog" : {"uri": "/jaxrs/warnlog/view/system/log/tag/{tag}"},"echo" : {"uri": "/jaxrs/echo"}};
+var personalActions = {"changePassword": {"uri": "/jaxrs/person/password", "method": "PUT"},"getPerson": {"uri": "/jaxrs/person"},"updatePerson": {"uri": "/jaxrs/person", "method": "PUT"},"changeIcon": {"uri": "/jaxrs/person/icon", "method": "PUT", "enctype": "formData"},"checkPassword" : {"uri":"/jaxrs/reset/check/password/{password}"},"getPersonIcon": {"uri": "/jaxrs/person/icon"},"getIcon": {"uri": "/jaxrs/icon/{person}"},"getRegisterMode" : { "uri" : "/jaxrs/regist/mode" },"getRegisterCaptcha" : {"uri":"/jaxrs/regist/captcha/width/{width}/height/{height}"},"createRegisterCode" : {"uri":"/jaxrs/regist/code/mobile/{mobile}"},"checkRegisterName" : {"uri":"/jaxrs/regist/check/name/{name}"},"checkRegisterPassword" : {"uri":"/jaxrs/regist/check/password/{password}"},"checkRegisterMobile" : {"uri":"/jaxrs/regist/check/mobile/{mobile}"},"register" : {"uri":"/jaxrs/regist", "method": "POST"},"resetPassword" : {"uri":"/jaxrs/reset", "method": "PUT"},"checkCredentialOnResetPassword" : {"uri":"/jaxrs/reset/check/credential/{credential}"},"checkPasswordOnResetPassword" : {"uri":"/jaxrs/reset/check/password/{password}"},"createCodeOnResetPassword" :  {"uri":"/jaxrs/reset/code/credential/{credential}"},"getUserData": {"uri": "/jaxrs/custom/{name}"},"putUserData": {"uri": "/jaxrs/custom/{name}", "method": "PUT"},"deleteUserData": {"uri": "/jaxrs/custom/{name}", "method": "DELETE"},"getPublicUserData": {"uri": "/jaxrs/definition/{name}"},"putPublicUserData": {"uri": "/jaxrs/definition/{name}", "method": "PUT"},"deletePublicUserData": {"uri": "/jaxrs/definition/{name}", "method": "DELETE"},"getMyEmPower": {"uri": "/jaxrs/empower/list/currentperson", "method": "GET"},"getReceiveEmPower": {"uri": "/jaxrs/empower/list/to", "method": "GET"},"createEmPower": {"uri": "/jaxrs/empower", "method": "POST"},"editEmPower": {"uri": "/jaxrs/empower/{id}", "method": "PUT"},"deleteEmPower": {"uri": "/jaxrs/empower/{id}", "method": "DELETE"},"getMyEmPowerLog": {"uri": "/jaxrs/empowerlog/list/currentperson", "method": "GET"},"getReceiveEmPowerLog": {"uri": "/jaxrs/empowerlog/list/to", "method": "GET"},"listToCurrentPersonPaging": {"uri": "/jaxrs/empowerlog/list/to/currentperson/paging/{page}/size/{size}", "method": "POST"},"listWithCurrentPersonPaging": {"uri": "/jaxrs/empowerlog/list/currentperson/paging/{page}/size/{size}", "method": "POST"},"clazz": "x_organization_assemble_personal"}

o2web/source/x_desktop/js/base_work_end.js

@@ -12,5 +12,7 @@ o2.Actions.actions["x_query_assemble_surface"] = new o2.xAction.RestActions.Acti
 o2.xAction.RestActions.Action["x_program_center"] = new Class({Extends: o2.xAction.RestActions.Action});
 o2.Actions.actions["x_program_center"] = new o2.xAction.RestActions.Action["x_program_center"]("x_program_center", centerActins);
 
+o2.Actions.actions["x_organization_assemble_personal"] = new o2.xAction.RestActions.Action["x_organization_assemble_personal"]("x_organization_assemble_personal", personalActions);
+
 
 //});