diff --git a/o2web/source/x_component_process_FormDesigner/Module/$ElElement.js b/o2web/source/x_component_process_FormDesigner/Module/$ElElement.js index 551a4464c56e7ce661092b9d9edf8f406095f7bf..81366d8a915b15091eed4066d7b36ea7e15f93dc 100644 --- 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(); diff --git a/o2web/source/x_component_process_FormDesigner/Module/Elicon.js b/o2web/source/x_component_process_FormDesigner/Module/Elicon.js index 2910daba67792e5792aaa700bcbef209da59a5e5..dcc69f887d83c14eb874c893bc41fe8b935583f2 100644 --- 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 = " + + + + + + + + + + + + +
{{$.lp.size}}: + +
{{$.lp.color}}: +
+
+
diff --git a/o2web/source/x_component_process_FormDesigner/lp/en.js b/o2web/source/x_component_process_FormDesigner/lp/en.js index 9505bc2d0e0ddad04b3f17fca632a5339a072807..d055c89d4feb19d6c4d09bc515effeed30aab8b6 100644 --- 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:
" + "1. Single layer or the outermost data template, fill in \"fieldId\" to indicate the direct component on the form.
" + "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 .
" + diff --git a/o2web/source/x_component_process_FormDesigner/lp/zh-cn.js b/o2web/source/x_component_process_FormDesigner/lp/zh-cn.js index 66ee5b44ac1c3e39f7b78c4207bdb6c7e8e73a88..a1e91e1a2496270c99b219cdf763bd5335b9d96c 100644 --- 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": "注: 位于当前数据模板外部的相关组件标识。数据模板可以有多层，外部组件标识填写有下列规则：
" + "1、单层或者是最外层的数据模板，填\"fieldId\"，表示表单上的直接组件。
" + "2、如果有多层数据模板，\"./fieldId\"表示和当前数据模板同层次的组件，\"../fieldId\"表示和上一层数据模板同层次的组件，以此类推。
" + diff --git a/o2web/source/x_component_process_Xform/Elicon.js b/o2web/source/x_component_process_Xform/Elicon.js index 06f0d73896ae9db9b388cdec673bb587cf2613d8..79fd7576eb950b5a83bfb848bdf1a07e3b51fd86 100644 --- 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+"\""; } diff --git a/o2web/source/x_component_process_Xform/widget/OOXML.js b/o2web/source/x_component_process_Xform/widget/OOXML.js index 367e275c310822046e2bb31174899571edabe8e8..32bc8242e5703ee2290c5e0c90f5aec031134ba5 100644 --- 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){ diff --git a/o2web/source/x_desktop/app.html b/o2web/source/x_desktop/app.html index ddd5e51f93a692a13007a9d0e5917cd9e1cc8153..94961ef7f5ceab5757ef2895909727308b5492c0 100644 --- a/o2web/source/x_desktop/app.html +++ b/o2web/source/x_desktop/app.html @@ -10,7 +10,7 @@ -
+
diff --git a/o2web/source/x_desktop/appMobile.html b/o2web/source/x_desktop/appMobile.html index a8c9e076ff8deeef757c1bb6824e477c8744b35b..8b192ee0aa20cb33b99d33790833754af083eb86 100644 --- a/o2web/source/x_desktop/appMobile.html +++ b/o2web/source/x_desktop/appMobile.html @@ -13,7 +13,7 @@ -
+
diff --git a/o2web/source/x_desktop/cmsdoc.html b/o2web/source/x_desktop/cmsdoc.html index 2a82eca1d68c59b9e801b1a67fa6f6fd43661aff..b6f605940b96bbc99bd6dda5059ddfd79c5ca775 100644 --- a/o2web/source/x_desktop/cmsdoc.html +++ b/o2web/source/x_desktop/cmsdoc.html @@ -10,7 +10,7 @@ -
+
diff --git a/o2web/source/x_desktop/cmsdocMobile.html b/o2web/source/x_desktop/cmsdocMobile.html index 287ef1c6ffcac4a694e936555ace75a40aa200a9..765dfee2fb5e4b4c19ca79871ce1e43aebb48124 100644 --- a/o2web/source/x_desktop/cmsdocMobile.html +++ b/o2web/source/x_desktop/cmsdocMobile.html @@ -15,7 +15,7 @@ -
+
diff --git a/o2web/source/x_desktop/cmspreview.html b/o2web/source/x_desktop/cmspreview.html index 0e4c8c95c740657fb13e7eec79dae9063204a63c..f4da9088993211fe8bfbdd226ef5965fa65c7b05 100644 --- a/o2web/source/x_desktop/cmspreview.html +++ b/o2web/source/x_desktop/cmspreview.html @@ -72,7 +72,7 @@ -
+
diff --git a/o2web/source/x_desktop/css/style.css b/o2web/source/x_desktop/css/style.css index 7340a8a4f0d37dda4b4ba18638db793ea859e7e9..9ace98fa1daab5be2bb1973dfbbd1210b6b2e972 100644 --- 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; diff --git a/o2web/source/x_desktop/css/style_flat.css b/o2web/source/x_desktop/css/style_flat.css index f393ede67e102c2934086f3142010d1dfff37b54..ff7eec7e7b159ca8658997b5cf0f1635e22331e6 100644 --- 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} /* diff --git a/o2web/source/x_desktop/ddsso.html b/o2web/source/x_desktop/ddsso.html index 0d8ddda87c1ee1aabb1ee9d1ab01675286320324..b3cbe426261bcb54e66e25fbdf2104471bf72e21 100644 --- a/o2web/source/x_desktop/ddsso.html +++ b/o2web/source/x_desktop/ddsso.html @@ -19,6 +19,6 @@ -
+
diff --git a/o2web/source/x_desktop/forum.html b/o2web/source/x_desktop/forum.html index 3ff7b0c3e576d6ba532a7f1fc62e7c99dd230bdb..12f89db4fa17a68b97241c4a8af27789d77069a4 100644 --- a/o2web/source/x_desktop/forum.html +++ b/o2web/source/x_desktop/forum.html @@ -15,6 +15,6 @@ -
+
diff --git a/o2web/source/x_desktop/forumdocMobile.html b/o2web/source/x_desktop/forumdocMobile.html index f437e352cb8b01a4d8aad06866f820e58e2f6776..8281ba7a38e4cd0a123fc7097a9000c82077226d 100644 --- a/o2web/source/x_desktop/forumdocMobile.html +++ b/o2web/source/x_desktop/forumdocMobile.html @@ -21,7 +21,7 @@ -
+
-
+
diff --git a/o2web/source/x_desktop/printWork.html b/o2web/source/x_desktop/printWork.html index 861d83a3173afbce194363a0074792745ee11d77..0dd1c3f4180744a354dde5ad4ee98a993e881cef 100644 --- a/o2web/source/x_desktop/printWork.html +++ b/o2web/source/x_desktop/printWork.html @@ -14,7 +14,7 @@ -
+
diff --git a/o2web/source/x_desktop/printcmsdoc.html b/o2web/source/x_desktop/printcmsdoc.html index e3beea35da5e2d1f7a50acb14898d21ecba817e9..28c6f6374646ab2fec34622abb56fd00d6fadef9 100644 --- a/o2web/source/x_desktop/printcmsdoc.html +++ b/o2web/source/x_desktop/printcmsdoc.html @@ -14,7 +14,7 @@ -
+
diff --git a/o2web/source/x_desktop/processViewer.html b/o2web/source/x_desktop/processViewer.html index 307e7b4469e3825c57cfdae6f5337afa674232a3..815c2b1f9ca3b2227d51ce333bebf6441163f8d3 100644 --- a/o2web/source/x_desktop/processViewer.html +++ b/o2web/source/x_desktop/processViewer.html @@ -63,7 +63,7 @@ -
+
diff --git a/o2web/source/x_desktop/qiyeweixinsso.html b/o2web/source/x_desktop/qiyeweixinsso.html index c4149dde1efb821bea8789b4d88b7a5424d6a7d1..dd0d5e61ec2c81b99419a2baf46421b03cff71b0 100644 --- a/o2web/source/x_desktop/qiyeweixinsso.html +++ b/o2web/source/x_desktop/qiyeweixinsso.html @@ -17,6 +17,6 @@ -
+
diff --git a/o2web/source/x_desktop/work.html b/o2web/source/x_desktop/work.html index 44915b2dafa103a2748292d7039745aa33e27ab5..0417cb358faa2049fe4899ee5e30658082192c27 100644 --- a/o2web/source/x_desktop/work.html +++ b/o2web/source/x_desktop/work.html @@ -8,7 +8,7 @@ -
+
diff --git a/o2web/source/x_desktop/workmobile.html b/o2web/source/x_desktop/workmobile.html index 875d0049b7e019023fa94429dcb2cc37904f4aaf..ab7d4b8b04e548756713b294336dd1acffcaed91 100644 --- a/o2web/source/x_desktop/workmobile.html +++ b/o2web/source/x_desktop/workmobile.html @@ -18,7 +18,7 @@
-
+
diff --git a/o2web/source/x_desktop/workmobilewithaction.html b/o2web/source/x_desktop/workmobilewithaction.html index b3ed855e4f0845d0bd8c5b81dc5fe60c3b78461b..dc686c55c7ccab1e40675fa4fd03afb113d36e9e 100644 --- a/o2web/source/x_desktop/workmobilewithaction.html +++ b/o2web/source/x_desktop/workmobilewithaction.html @@ -23,7 +23,7 @@
-
+
diff --git a/o2web/source/x_desktop/zhengwuDingdingSso.html b/o2web/source/x_desktop/zhengwuDingdingSso.html index 3bfa131e81473ec48fe58848e72bf7ff1105d081..905bf1a2524c3af13364430724fd4d6c81982166 100644 --- a/o2web/source/x_desktop/zhengwuDingdingSso.html +++ b/o2web/source/x_desktop/zhengwuDingdingSso.html @@ -19,7 +19,7 @@ -
+
diff --git a/o2web/source/x_desktop/zwddssofp.html b/o2web/source/x_desktop/zwddssofp.html index 4e397e7925af55dafde32c6cfdf09b7a833643bb..79d9ff21a64a53fe2178eb594fe177a4f80579e7 100644 --- a/o2web/source/x_desktop/zwddssofp.html +++ b/o2web/source/x_desktop/zwddssofp.html @@ -19,6 +19,6 @@ -
+