huqi 5 жил өмнө
parent
commit
b81a3ecb97

+ 2 - 1
gulpfile.js

@@ -527,12 +527,13 @@ function build_concat_basework() {
         'o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.js',
         '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/x_desktop/js/base_work_end.js',
         'o2web/source/x_desktop/js/base.js'
     ];
     var dest = 'target/o2server/servers/webServer/x_desktop/js/';
     return gulp.src(src)
-        .pipe(concat('bask_work.js'))
+        .pipe(concat('base_work.js'))
         .pipe(gulp.dest(dest))
         .pipe(uglify())
         .pipe(rename({ extname: '.min.js' }))

+ 1 - 0
o2web/gulpfile.js

@@ -390,6 +390,7 @@ function createBaseWorkConcatTask(path, isMin, thisOptions) {
             'source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.js',
             '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/' + path + '/js/base_work_end.js',
             'source/' + path + '/js/base.js'
         ];

+ 20 - 9
o2web/source/x_component_Selector/Person.js

@@ -48,14 +48,25 @@ MWF.xApplication.Selector.Person = new Class({
         this._loadCss(true);
 
         this.container = $(container);
-        this.orgAction = MWF.Actions.get("x_organization_assemble_control");
-        //this.org2Action = MWF.Actions.get("x_organization_assemble_express");
-        this.processAction = MWF.Actions.get("x_processplatform_assemble_surface");
-        this.designerAction = MWF.Actions.get("x_processplatform_assemble_designer");
-        this.portalAction = MWF.Actions.get("x_portal_assemble_surface");
-        this.portalDesignerAction = MWF.Actions.get("x_portal_assemble_designer");
-        this.cmsAction = MWF.Actions.get("x_cms_assemble_control");
-        this.queryAction = MWF.Actions.get("x_query_assemble_designer");
+
+        Object.defineProperties(this, {
+            "orgAction": {"get": function(){return o2.Actions.get("x_organization_assemble_control");}},
+            "processAction": {"get": function(){return o2.Actions.get("x_processplatform_assemble_surface");}},
+            "designerAction": {"get": function(){return o2.Actions.get("x_processplatform_assemble_designer");}},
+            "portalAction": {"get": function(){return o2.Actions.get("x_portal_assemble_surface");}},
+            "portalDesignerAction": {"get": function(){return o2.Actions.get("x_portal_assemble_designer");}},
+            "cmsAction": {"get": function(){return o2.Actions.get("x_cms_assemble_control");}},
+            "queryAction": {"get": function(){return o2.Actions.get("x_query_assemble_designer");}}
+        });
+
+        // this.orgAction = MWF.Actions.get("x_organization_assemble_control");
+        // //this.org2Action = MWF.Actions.get("x_organization_assemble_express");
+        // this.processAction = MWF.Actions.get("x_processplatform_assemble_surface");
+        // this.designerAction = MWF.Actions.get("x_processplatform_assemble_designer");
+        // this.portalAction = MWF.Actions.get("x_portal_assemble_surface");
+        // this.portalDesignerAction = MWF.Actions.get("x_portal_assemble_designer");
+        // this.cmsAction = MWF.Actions.get("x_cms_assemble_control");
+        // this.queryAction = MWF.Actions.get("x_query_assemble_designer");
 
         //this.action = new MWF.xApplication.Selector.Actions.RestActions();
 
@@ -2710,4 +2721,4 @@ MWF.xApplication.Selector.Person.Filter = new Class({
             if (callback) callback(data)
         }.bind(this), null, key);
     }
-});
+});

+ 8 - 8
o2web/source/x_desktop/js/base_work_end.js

@@ -1,16 +1,16 @@
 o2.xDesktop.$all=true;
 o2.xDesktop.Common=true;
-MWF.xApplication.Selector.package = MWF.O2Selector;
+o2.xApplication.Selector.package = MWF.O2Selector;
 
 //layout.addReady(function(){
-    MWF.Actions.actions["x_organization_assemble_authentication"] = new MWF.xAction.RestActions.Action["x_organization_assemble_authentication"]("x_organization_assemble_authentication", orgActins);
-    MWF.Actions.actions["x_processplatform_assemble_surface"] = new MWF.xAction.RestActions.Action["x_processplatform_assemble_surface"]("x_processplatform_assemble_surface", processActins);
-    MWF.Actions.actions["x_cms_assemble_control"] = new MWF.xAction.RestActions.Action["x_cms_assemble_control"]("x_cms_assemble_control", cmsActins);
-MWF.Actions.actions["x_organization_assemble_control"] = new MWF.xAction.RestActions.Action["x_organization_assemble_control"]("x_organization_assemble_control", orgControlActins);
-MWF.Actions.actions["x_query_assemble_surface"] = new MWF.xAction.RestActions.Action["x_query_assemble_surface"]("x_query_assemble_surface", queryActins);
+o2.Actions.actions["x_organization_assemble_authentication"] = new o2.xAction.RestActions.Action["x_organization_assemble_authentication"]("x_organization_assemble_authentication", orgActins);
+o2.Actions.actions["x_processplatform_assemble_surface"] = new o2.xAction.RestActions.Action["x_processplatform_assemble_surface"]("x_processplatform_assemble_surface", processActins);
+o2.Actions.actions["x_cms_assemble_control"] = new o2.xAction.RestActions.Action["x_cms_assemble_control"]("x_cms_assemble_control", cmsActins);
+o2.Actions.actions["x_organization_assemble_control"] = new o2.xAction.RestActions.Action["x_organization_assemble_control"]("x_organization_assemble_control", orgControlActins);
+o2.Actions.actions["x_query_assemble_surface"] = new o2.xAction.RestActions.Action["x_query_assemble_surface"]("x_query_assemble_surface", queryActins);
 
-MWF.xAction.RestActions.Action["x_program_center"] = new Class({Extends: MWF.xAction.RestActions.Action});
-this.actions["x_program_center"] = new MWF.xAction.RestActions.Action["x_program_center"]("x_program_center", centerActins);
+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);
 
 
 //});