diff --git a/o2web/source/x_component_process_FormDesigner/Module/Elicon.js b/o2web/source/x_component_process_FormDesigner/Module/Elicon.js
index db9d6022d785e793aa091907c84b2ba8e37dd099..ad72b94ff2b30d0f13e9ebb613db2f4a742f318d 100644
--- a/o2web/source/x_component_process_FormDesigner/Module/Elicon.js
+++ b/o2web/source/x_component_process_FormDesigner/Module/Elicon.js
@@ -64,5 +64,20 @@ MWF.xApplication.process.FormDesigner.Module.Elicon = MWF.FCElicon = new Class({
return this.copyNode;
},
setPropertyName: function(){},
- setPropertyId: function(){}
+ setPropertyId: function(){},
+ _preprocessingModuleData: function(){
+ this.node.clearStyles();
+ //if (this.initialStyles) this.node.setStyles(this.initialStyles);
+ this.json.recoveryStyles = Object.clone(this.json.styles);
+
+ if (this.json.recoveryStyles) Object.each(this.json.recoveryStyles, function(value, key){
+ if ((value.indexOf("x_processplatform_assemble_surface")!=-1 || value.indexOf("x_portal_assemble_surface")!=-1)){
+ //需要运行时处理
+ }else{
+ this.node.setStyle(key, value);
+ delete this.json.styles[key];
+ }
+ }.bind(this));
+ this.json.preprocessing = "y";
+ },
});
diff --git a/o2web/source/x_component_process_Xform/Elicon.js b/o2web/source/x_component_process_Xform/Elicon.js
index 0f8cbbaa34378a335bec097e932683bb43214029..9100752ee76931e7e1795e7aa660034aabc5bc93 100644
--- a/o2web/source/x_component_process_Xform/Elicon.js
+++ b/o2web/source/x_component_process_Xform/Elicon.js
@@ -16,6 +16,17 @@ MWF.xApplication.process.Xform.Elicon = MWF.APPElicon = new Class(
{
Implements: [Events],
Extends: MWF.APP$Module,
+ _loadVue: function(callback){
+ if (!window.Vue){
+ var vue = (o2.session.isDebugger) ? "vue_develop" : "vue";
+ o2.loadAll({"css": "../o2_lib/vue/element/index.css", "js": [vue, "elementui"]}, { "sequence": true }, callback);
+ }else{
+ if (callback) callback();
+ }
+ },
+ _queryLoaded: function(){
+ this._loadVue();
+ }
// load: function(){
// this._loadModuleEvents();
@@ -69,9 +80,9 @@ MWF.xApplication.process.Xform.Elicon = MWF.APPElicon = new Class(
// }
// };
// },
- _createVueData: function(){
- return this.json;
- },
+ // _createVueData: function(){
+ // return this.json;
+ // },
// _afterMounted: function(el){
// this.node = el;
// this.node.set({
@@ -83,33 +94,34 @@ MWF.xApplication.process.Xform.Elicon = MWF.APPElicon = new Class(
// this.fireEvent("postLoad");
// this.fireEvent("load");
// },
- _createElementHtml: function(){
- var html = "";
- return html;
- }
+ // _createElementHtml: function(){
+ // debugger;
+ // var html = "";
+ // return html;
+ // }
});