增加VUE-Element组件

3d5afa01 · NoSubject · bdab2925 · 3d5afa01 · 3d5afa01 · 3d5afa01
30 changed file
--- a/o2web/source/x_component_process_FormDesigner/Module/$ElElement.js
+++ b/o2web/source/x_component_process_FormDesigner/Module/$ElElement.js
@@ -127,7 +127,6 @@ MWF.xApplication.process.FormDesigner.Module.$ElElement = MWF.FC$ElElement = new
 		};
 	},
 	_afterMounted: function(el, callback){
-		debugger;
 		this.node = el;
 		this.node.store("module", this);
 		if (callback) callback();

--- a/o2web/source/x_component_process_FormDesigner/Module/Elicon.js
+++ b/o2web/source/x_component_process_FormDesigner/Module/Elicon.js
@@ -14,7 +14,6 @@ MWF.xApplication.process.FormDesigner.Module.Elicon = MWF.FCElicon = new Class({
 		this.moduleName = "elicon";
 	},
 	_createElementHtml: function(){
-		debugger;
 		var html = "<i class='"+(this.json.icon || "el-icon-platform-eleme")+"'";
 		if (this.json.elProperties){
 			Object.keys(this.json.elProperties).forEach(function(k){
@@ -22,10 +21,15 @@ MWF.xApplication.process.FormDesigner.Module.Elicon = MWF.FCElicon = new Class({
 			}, this);
 		}

-		if (this.json.elStyles){
+		var styles = {};
+		if (this.json.iconSize) styles["font-size"] = this.json.iconSize+"px";
+		if (this.json.iconColor) styles["color"] = this.json.iconColor;
+		styles = Object.merge(styles, this.json.elStyles);
+
+		if (styles){
 			var style = "";
-			Object.keys(this.json.elStyles).forEach(function(k){
-				if (this.json.elStyles[k]) style += k+":"+this.json.elStyles[k]+";";
+			Object.keys(styles).forEach(function(k){
+				if (styles[k]) style += k+":"+styles[k]+";";
 			}, this);
 			html += " style=\""+style+"\"";
 		}

--- a/o2web/source/x_component_process_FormDesigner/Module/Elicon/elicon.html
+++ b/o2web/source/x_component_process_FormDesigner/Module/Elicon/elicon.html
@@ -24,6 +24,34 @@
 			</tr>
 		</table>

+		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+			<tr>
+				<td class="editTableTitle">{{$.lp.size}}:</td>
+				<td class="editTableValue">
+					<select name="iconSize">
+						<option value="16" text{($.iconSize=='16') ? 'selected':''}>16</option>
+						<option value="24" text{($.iconSize=='24') ? 'selected':''}>24</option>
+						<option value="32" text{($.iconSize=='32') ? 'selected':''}>32</option>
+						<option value="40" text{($.iconSize=='40') ? 'selected':''}>40</option>
+						<option value="48" text{($.iconSize=='48') ? 'selected':''}>48</option>
+						<option value="56" text{($.iconSize=='56') ? 'selected':''}>56</option>
+						<option value="64" text{($.iconSize=='64') ? 'selected':''}>64</option>
+						<option value="72" text{($.iconSize=='72') ? 'selected':''}>72</option>
+						<option value="96" text{($.iconSize=='96') ? 'selected':''}>96</option>
+					</select>
+				</td>
+			</tr>
+			<tr>
+				<td class="editTableTitle">{{$.lp.color}}:</td>
+				<td class="editTableValue">
+					<div class="o2_vue MWFElementColor" name="iconColor"><el-color-picker v-model="iconColor" @change="change" size="mini" style="box-sizing: border-box!important;"></el-color-picker></div>
+				</td>
+			</tr>
+
+
+
+		</table>
+
 		
 		<div class="MWFMaplist" name="elStyles" title="{{$.lp.style}}"></div>
 		<div class="MWFMaplist" name="elProperties" title="{{$.lp.attribute}}"></div>

--- a/o2web/source/x_component_process_FormDesigner/lp/en.js
+++ b/o2web/source/x_component_process_FormDesigner/lp/en.js
@@ -804,7 +804,6 @@ MWF.xApplication.process.FormDesigner.LP = {
        "fileNo": "FileNo",
        "signer": "Signer",
        "subject": "Subject",
-        "allowEdit": "Allow Edit",
        "editSubjectInfo": "When the title allows editing, please do not bind value",
        "mainSend": "Main Send",
        "attachment": "Attachment",
@@ -918,6 +917,38 @@ MWF.xApplication.process.FormDesigner.LP = {
        "datatableEditMode": "Edit Mode",
        "datatableEditModeValue": ["single row","multiple rows"],
        "onlyPc": "Available on PC only",
+
+        "size": "Size",
+        "color": "Color",
+        "el_bt_default": "Default",
+        "el_bt_primary": "Primary",
+        "el_bt_success": "Success",
+        "el_bt_warning": "Warning",
+        "el_bt_danger": "Danger",
+        "el_bt_info": "Info",
+        "el_bt_text": "Text",
+
+        "el_plain": "Plain",
+        "el_round": "Round",
+        "el_circle": "Circle",
+        "el_icon": "Icon",
+        "el_disabled": "Disabled",
+        "el_loading": "Loading",
+        "el_autofocus": "Autofocus",
+        "el_isText": "Show Text",
+
+        "layout": "Layout",
+        "layoutCode": "Layout Code",
+        "layoutTemplate": "Layout Template",
+
+        "elGroupStyles": "Group Styles",
+        "elGroupProperties": "Group Properties",
+
+        "el_border": "Show Border",
+        "el_radioColor": "Font Color",
+        "el_radioFillColor": "Fill Color",
+        "el_buttonRadio": "Button Mode",
+
        "datatemplateOuterNote": "Note: The data template can have multiple layers, and the external component identifier must be filled in with the following rules:<br/>" +
            "1. Single layer or the outermost data template, fill in \"fieldId\" to indicate the direct component on the form.<br/>" +
            "2. If there are multiple data templates, \"./fieldId\" means components at the same level as the current data template, \"../fieldId\" means components at the same level as the previous data template, and so on .<br/>" +

--- a/o2web/source/x_component_process_FormDesigner/lp/zh-cn.js
+++ b/o2web/source/x_component_process_FormDesigner/lp/zh-cn.js
@@ -826,7 +826,6 @@ MWF.xApplication.process.FormDesigner.LP = {
        "fileNo": "文号",
        "signer": "签发人",
        "subject": "文件标题",
-        "allowEdit": "允许编辑",
        "editSubjectInfo": "标题允许编辑时，请不要绑定数据",
        "mainSend": "主送",
        "attachment": "附件",
@@ -942,6 +941,7 @@ MWF.xApplication.process.FormDesigner.LP = {
        "onlyPc": "仅PC端可用",

        "size": "尺寸",
+        "color": "颜色",
        "el_bt_default": "默认按钮",
        "el_bt_primary": "主要按钮",
        "el_bt_success": "成功按钮",
@@ -953,7 +953,7 @@ MWF.xApplication.process.FormDesigner.LP = {
        "el_plain": "朴素按钮",
        "el_round": "圆角按钮",
        "el_circle": "圆型按钮",
-        "el_icon": "按钮图标",
+        "el_icon": "图标",
        "el_disabled": "是否禁用",
        "el_loading": "加载中",
        "el_autofocus": "默认焦点",
@@ -971,6 +971,7 @@ MWF.xApplication.process.FormDesigner.LP = {
        "el_radioFillColor": "填充颜色",
        "el_buttonRadio": "按钮模式",

+
        "datatemplateOuterNote": "注: 位于当前数据模板外部的相关组件标识。数据模板可以有多层，外部组件标识填写有下列规则：<br/>" +
            "1、单层或者是最外层的数据模板，填\"fieldId\"，表示表单上的直接组件。<br/>" +
            "2、如果有多层数据模板，\"./fieldId\"表示和当前数据模板同层次的组件，\"../fieldId\"表示和上一层数据模板同层次的组件，以此类推。<br/>" +

--- a/o2web/source/x_component_process_Xform/Elicon.js
+++ b/o2web/source/x_component_process_Xform/Elicon.js
@@ -93,10 +93,15 @@ MWF.xApplication.process.Xform.Elicon = MWF.APPElicon =  new Class(
            }, this);
        }

-        if (this.json.elStyles){
+        var styles = {};
+        if (this.json.iconSize) styles["font-size"] = this.json.iconSize+"px";
+        if (this.json.iconColor) styles["color"] = this.json.iconColor;
+        styles = Object.merge(styles, this.json.elStyles);
+
+        if (styles){
            var style = "";
-            Object.keys(this.json.elStyles).forEach(function(k){
-                if (this.json.elStyles[k]) style += k+":"+this.json.elStyles[k]+";";
+            Object.keys(styles).forEach(function(k){
+                if (styles[k]) style += k+":"+styles[k]+";";
            }, this);
            html += " style=\""+style+"\"";
        }

--- a/o2web/source/x_component_process_Xform/widget/OOXML.js
+++ b/o2web/source/x_component_process_Xform/widget/OOXML.js
@@ -1692,6 +1692,7 @@ o2.xApplication.process.Xform.widget.OOXML.WordprocessingML = o2.OOXML.WML = new
    },

    processRunTextDom: function(span, oo_p, runPrs){
+        debugger;
        var node = span.firstChild;
        while (node){
            if (node.nodeType===Node.ELEMENT_NODE){

--- a/o2web/source/x_desktop/app.html
+++ b/o2web/source/x_desktop/app.html
@@ -10,7 +10,7 @@
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    </head>
    <body style="overflow: auto; margin:0px; height: 100%;">
-        <div id="appContent" style="overflow: auto; height:100%; background-color:#EEE">
+        <div id="appContent" class="appContent" style="overflow: auto; height:100%; background-color:#EEE">
            <div id="loaddingArea" style="overflow: hidden;width:0px; height:2px; background-color:#4e82bd; position: absolute; top: 0; z-index: 100"></div>
        </div>


--- a/o2web/source/x_desktop/appMobile.html
+++ b/o2web/source/x_desktop/appMobile.html
@@ -13,7 +13,7 @@
        <meta content="telephone=no" name="format-detection" />
    </head>
    <body style="overflow: auto; margin:0px; height: 100%;">
-        <div id="appContent" style="overflow: hidden; height:100%;">
+        <div id="appContent" class="appContent" style="overflow: hidden; height:100%;">
            <div id="loaddingArea" style="overflow: hidden;width:0px; height:2px; background-color:#4e82bd; position: absolute; top: 0; z-index: 100"></div>
        </div>
        <div id="appContentMask" style="overflow: hidden; height:100%; position: relative; top: -100%; background-image:url('../x_desktop/img/launch_background.png'); background-size: cover"></div>

--- a/o2web/source/x_desktop/cmsdoc.html
+++ b/o2web/source/x_desktop/cmsdoc.html
@@ -10,7 +10,7 @@
    </head>

    <body style="height: 100%; overflow: auto; margin:0px">
-        <div id="appContent" style="overflow: auto; height:100%">
+        <div id="appContent" class="appContent" style="overflow: auto; height:100%">
            <div id="loaddingArea" style="overflow: hidden;width:0px; height:2px; background-color:#4e82bd; position: absolute; top: 0; z-index: 100"></div>
        </div>


--- a/o2web/source/x_desktop/cmsdocMobile.html
+++ b/o2web/source/x_desktop/cmsdocMobile.html
@@ -15,7 +15,7 @@
 </head>

 <body style="overflow: auto; margin:0px">
-<div id="appContent" style="overflow: auto"></div>
+<div id="appContent" class="appContent" style="overflow: auto"></div>
 <!--<script src="res/framework/htmleditor/ckeditor451/ckeditor.js"></script>-->
 <script src="../o2_core/o2.min.js"></script>
 <script src="js/base_document.min.js"></script>

--- a/o2web/source/x_desktop/cmspreview.html
+++ b/o2web/source/x_desktop/cmspreview.html
@@ -72,7 +72,7 @@
    </script>
 </head>
 <body style="overflow: auto">
-<div id="layout" style="overflow: auto">
+<div id="layout" class="layout" style="overflow: auto">
    <div id="layout_top">

    </div>

--- a/o2web/source/x_desktop/css/style.css
+++ b/o2web/source/x_desktop/css/style.css
@@ -28,12 +28,15 @@ body {
 	-webkit-overflow-scrolling: touch;
 	/*background-color: #F1F1F1;*/
 }
-#appContent *{
+.appContent *{
 	box-sizing: content-box!important;
 }
-#layout_main *{
+.layout_main *{
 	box-sizing: content-box!important;
 }
+.o2_vue *{
+	box-sizing: border-box!important;
+}
 /*
 .table-tr-selected {
 	background-color: #FFFFDD;

--- a/o2web/source/x_desktop/css/style_flat.css
+++ b/o2web/source/x_desktop/css/style_flat.css
@@ -31,10 +31,12 @@ body {
 #layout {
 	background: #f0f0f0;
 }
-#layout *{
+.layout *{
 	box-sizing: content-box!important;
 }
-
+.o2_vue *{
+	box-sizing: border-box!important;
+}
 input,button,select,textarea{outline:none}

 /*

--- a/o2web/source/x_desktop/ddsso.html
+++ b/o2web/source/x_desktop/ddsso.html
@@ -19,6 +19,6 @@
 </head>
 <body>
 <!--<input id="testaaa"/>-->
-<div id="layout" style="overflow: auto; height:100%"></div>
+<div id="layout" class="layout" style="overflow: auto; height:100%"></div>
 </body>
 </html>
--- a/o2web/source/x_desktop/forum.html
+++ b/o2web/source/x_desktop/forum.html
@@ -15,6 +15,6 @@
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    </head>
    <body style="overflow: auto; margin:0px">
-        <div id="appContent" style="overflow: hidden; height:100%; background-color:#EEE"></div>
+        <div id="appContent" class="appContent" style="overflow: hidden; height:100%; background-color:#EEE"></div>
    </body>
 </html>
--- a/o2web/source/x_desktop/forumdocMobile.html
+++ b/o2web/source/x_desktop/forumdocMobile.html
@@ -21,7 +21,7 @@
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 </head>
 <body style="overflow: auto; margin:0px">
-<div id="layout" style="overflow: auto"></div>
+<div id="layout" class="layout" style="overflow: auto"></div>
 <script text="text/javascript">
    function addWxJsSdk() {
        //插入微信jssdk

--- a/o2web/source/x_desktop/index.html
+++ b/o2web/source/x_desktop/index.html
@@ -10,7 +10,7 @@
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 </head>
 <body>
-    <div id="layout_main" style="overflow: hidden; height: 100%; background-position-x: center; background-size: cover;">
+    <div id="layout_main" class="layout_main" style="overflow: hidden; height: 100%; background-position-x: center; background-size: cover;">
        <div id="layout_top_shim"></div>
        <div id="layout_top"></div>
        <div id="layout_desktop">
@@ -22,7 +22,7 @@
    <div id="loaddingArea" style="z-index: 200001;overflow: hidden;width:0px; height:2px; background-color:#999999; position: absolute; top: 0;"></div>
    <div id="browser_loading" style="z-index: 200000;background-image: url(img/loading_home3.gif); background-position: center center; background-repeat: no-repeat; overflow: hidden; position: absolute; top: 0px; left: 0px; width: 100%; height: 100%;background-color: #ffffff"></div>

-    <div id="appContent" style="overflow: hidden; height: 100%;"></div>
+    <div id="appContent" class="appContent" style="overflow: hidden; height: 100%;"></div>

    <div id="browser_error" style="overflow: hidden; position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; display: none;background: #f1f1f1">
        <div style="height:540px; width: 920px; overflow: hidden;  margin: 8% auto;">

--- a/o2web/source/x_desktop/portal.html
+++ b/o2web/source/x_desktop/portal.html
@@ -16,7 +16,7 @@
        <meta content="telephone=no" name="format-detection" />
    </head>
    <body style="overflow: auto; margin:0px; height: 100%;">
-        <div id="appContent" style="overflow: hidden; height:100%;">
+        <div id="appContent" class="appContent" style="overflow: hidden; height:100%;">
            <div id="loaddingArea" style="overflow: hidden;width:0px; height:2px; background-color:#4e82bd; position: absolute; top: 0; z-index: 10000"></div>
        </div>


--- a/o2web/source/x_desktop/portalmobile.html
+++ b/o2web/source/x_desktop/portalmobile.html
@@ -16,7 +16,7 @@
        <meta content="telephone=no" name="format-detection" />
    </head>
    <body style="overflow: auto; margin:0px; height: 100%;">
-        <div id="appContent" style="overflow: hidden; height:100%;">
+        <div id="appContent" class="appContent" style="overflow: hidden; height:100%;">
            <div id="loaddingArea" style="overflow: hidden;width:0px; height:2px; background-color:#4e82bd; position: absolute; top: 0; z-index: 100"></div>
        </div>
        <div id="appContentMask" style="overflow: hidden; height:100%; position: relative; top: -100%; background-size: cover"></div>

--- a/o2web/source/x_desktop/preview.html
+++ b/o2web/source/x_desktop/preview.html
@@ -72,7 +72,7 @@
    </script>
 </head>
 <body style="overflow: auto">
-<div id="layout" style="overflow: auto">
+<div id="layout" class="layout" style="overflow: auto">
    <div id="layout_top">

    </div>

--- a/o2web/source/x_desktop/printWork.html
+++ b/o2web/source/x_desktop/printWork.html
@@ -14,7 +14,7 @@
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    </head>
    <body style="height: 100%; overflow: auto; margin:0px; font-size:12px">
-        <div id="layout" style="height:100%">
+        <div id="layout" class="layout" style="height:100%">
            <div id="loaddingArea" style="overflow: hidden;width:0px; height:2px; background-color:#4e82bd; position: absolute; top: 0; z-index: 100"></div>
        </div>
    </body>

--- a/o2web/source/x_desktop/printcmsdoc.html
+++ b/o2web/source/x_desktop/printcmsdoc.html
@@ -14,7 +14,7 @@
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    </head>
    <body style="height: 100%; overflow: auto; margin:0px; font-size:12px">
-        <div id="layout" style="height:100%">
+        <div id="layout" class="layout" style="height:100%">
            <div id="loaddingArea" style="overflow: hidden;width:0px; height:2px; background-color:#4e82bd; position: absolute; top: 0; z-index: 100"></div>
        </div>
    </body>

--- a/o2web/source/x_desktop/processViewer.html
+++ b/o2web/source/x_desktop/processViewer.html
@@ -63,7 +63,7 @@
    </script>
 </head>
 <body style="overflow: auto; margin: 0px;">
-<div id="layout" style="overflow: auto; height:100%">
+<div id="layout" class="layout" style="overflow: auto; height:100%">
 </div>
 </body>
 </html>
--- a/o2web/source/x_desktop/qiyeweixinsso.html
+++ b/o2web/source/x_desktop/qiyeweixinsso.html
@@ -17,6 +17,6 @@
    <meta content="telephone=no" name="format-detection" />
 </head>
 <body>
-<div id="layout" style="overflow: auto; height:100%"></div>
+<div id="layout" class="layout" style="overflow: auto; height:100%"></div>
 </body>
 </html>
--- a/o2web/source/x_desktop/work.html
+++ b/o2web/source/x_desktop/work.html
@@ -8,7 +8,7 @@
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    </head>
    <body style="height: 100%; overflow: auto; margin:0px">
-        <div id="appContent" style="overflow: auto; height:100%">
+        <div id="appContent" class="appContent" style="overflow: auto; height:100%">
            <div id="loaddingArea" style="overflow: hidden;width:0px; height:2px; background-color:#4e82bd; position: absolute; top: 0; z-index: 100"></div>
        </div>


--- a/o2web/source/x_desktop/workmobile.html
+++ b/o2web/source/x_desktop/workmobile.html
@@ -18,7 +18,7 @@
    <body style="overflow: hidden; margin:0px;background:url(../o2_core/o2/xDesktop/$Default/blue/icons/loading.gif) center no-repeat;">
        <div style="-webkit-overflow-scrolling: touch; overflow: auto; height: 100%;">
            <div id="loaddingArea" style="overflow: hidden;width:0px; height:2px; background-color:#4e82bd; position: absolute; top: 0; z-index: 100"></div>
-            <div id="appContent" style="overflow: hidden; -webkit-transform: translateZ(0); "></div>
+            <div id="appContent" class="appContent" style="overflow: hidden; -webkit-transform: translateZ(0); "></div>
        </div>

        <script src="../o2_core/o2.min.js"></script>

--- a/o2web/source/x_desktop/workmobilewithaction.html
+++ b/o2web/source/x_desktop/workmobilewithaction.html
@@ -23,7 +23,7 @@
        <div id="loaddingArea"
            style="overflow: hidden;width:0px; height:2px; background-color:#4e82bd; position: absolute; top: 0; z-index: 100">
        </div>
-        <div id="appContent" style="overflow: hidden; -webkit-transform: translateZ(0); "></div>
+        <div id="appContent" class="appContent" style="overflow: hidden; -webkit-transform: translateZ(0); "></div>
    </div>
    <div class="o2_form_mobile_actions"
        style="height: 4em;overflow: hidden; border-top: 1px solid #dfdfdf; display: block; position: absolute; bottom: 0px; background: #ffffff; width: 100%; z-index:100;">

--- a/o2web/source/x_desktop/zhengwuDingdingSso.html
+++ b/o2web/source/x_desktop/zhengwuDingdingSso.html
@@ -19,7 +19,7 @@
 </head>
 <body>
 <!--<input id="testaaa"/>-->
-<div id="appContent" style="overflow: auto; height:99.9%; width:100%; border: 0px; margin: 0px; padding: 0px;"></div>
+<div id="appContent" class="appContent" style="overflow: auto; height:99.9%; width:100%; border: 0px; margin: 0px; padding: 0px;"></div>
 <div id="appContentMask" style="overflow: hidden; height:100%; position: relative; top: -100%; background-image:url('../x_desktop/res/img/launch_background.png'); background-size: cover"></div>
 </body>
 </html>
--- a/o2web/source/x_desktop/zwddssofp.html
+++ b/o2web/source/x_desktop/zwddssofp.html
@@ -19,6 +19,6 @@
 </head>
 <body>
 <!--<input id="testaaa"/>-->
-<div id="layout" style="overflow: auto; height:100%"></div>
+<div id="layout" class="layout" style="overflow: auto; height:100%"></div>
 </body>
 </html>