选择器增加脚本和数据字典的选择

o2web/source/x_component_Selector/Dictionary.js

@@ -21,15 +21,15 @@ MWF.xApplication.Selector.Dictionary = new Class({
             if( type === "process" ){
                 action = o2.Actions.load("x_processplatform_assemble_designer").ApplicationDictAction.listPaging;
             }else if( type === "cms" ){
-
+                action = o2.Actions.load("x_cms_assemble_control").AppDictDesignAction.listPaging;
             }
 
             var json = {};
             var array = [];
             action(1, 1000, {}, function( dictionaryJson ) {
                 dictionaryJson.data.each(function (dictionary) {
-                    var appName = dictionary.portalName || dictionary.applicationName;
-                    var appId = dictionary.portal || dictionary.application;
+                    var appName = dictionary.appName || dictionary.applicationName;
+                    var appId = dictionary.appId || dictionary.application;
                     if (!json[appId]) {
                         json[appId] = {
                             name: appName,

o2web/source/x_component_Selector/Script.js

@@ -23,15 +23,15 @@ MWF.xApplication.Selector.Script = new Class({
             }else if( type === "portal" ){
                 action = o2.Actions.load("x_portal_assemble_designer").ScriptAction.listPaging;
             }else if( type === "cms" ){
-
+                action = o2.Actions.load("x_cms_assemble_control").ScriptAction.listPaging;
             }
 
             var json = {};
             var array = [];
             action(1, 1000, {}, function( scriptJson ) {
                 scriptJson.data.each(function (script) {
-                    var appName = script.portalName || script.applicationName;
-                    var appId = script.portal || script.application;
+                    var appName = script.portalName || script.applicationName || script.appName;
+                    var appId = script.portal || script.application || script.appId;
                     if (!json[appId]) {
                         json[appId] = {
                             name: appName,