Просмотр исходного кода

增加流程启动终端选择

huqi 5 лет назад
Родитель
Сommit
886e182c36

+ 1 - 0
o2web/source/o2_core/o2/framework.js

@@ -1,4 +1,5 @@
 layout.app = true;
+layout.apps = [];
 layout.addReady(function(){
     // MWF.require("MWF.xScript.Environment", null, false);
     // MWF.require("MWF.xScript.PageEnvironment", null, false);

+ 2 - 2
o2web/source/x_component_process_FormDesigner/Module/Documenteditor/documenteditor.html

@@ -86,8 +86,8 @@
 			<tr>
 				<td class="editTableTitle">全角转换:</td>
 				<td class="editTableValue">
-					<input class="editTableRadio" name="fullWidth" text{($.fullWidth=='y')?'checked':''} type="radio" value="y"/>是
-					<input class="editTableRadio" name="fullWidth" text{($.fullWidth!='y')?'checked':''} type="radio" value="n"/>否
+					<input class="editTableRadio" name="fullWidth" text{($.fullWidth!=='n')?'checked':''} type="radio" value="y"/>是
+					<input class="editTableRadio" name="fullWidth" text{($.fullWidth=='n')?'checked':''} type="radio" value="n"/>否
 					<div>选择“是”自动将输入的半角空格转换为全角</div>
 				</td>
 			</tr>

+ 29 - 8
o2web/source/x_component_process_ProcessDesigner/$Process/process.html

@@ -38,14 +38,6 @@
                 <td class="editTableTitle">描述:</td>
                 <td class="editTableValue"><textarea  name="description" class="editTableTextarea">text{$.description}</textarea></td>
             </tr>
-            <tr>
-                <td class="editTableTitle">版本:</td>
-                <td class="editTableValue">text{$.editionName}</td>
-            </tr>
-            <tr>
-                <td class="editTableTitle">版本描述:</td>
-                <td class="editTableValue"><textarea  name="editionDes" class="editTableTextarea">text{$.editionDes}</textarea></td>
-            </tr>
             <tr>
                 <td class="editTableTitle">图标:</td>
                 <td class="editTableValue"><div class="MWFIcon" name="icon"></div></td>
@@ -59,7 +51,35 @@
                 </td>
             </tr>
         </table>
+        <div style="height: 22px; line-height: 22px; background-color: #f1f1f1; text-align: center; font-weight: bold; border-top: 1px solid #cccccc">版 本</div>
+        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+            <tr>
+                <td class="editTableTitle">版本名称:</td>
+                <td class="editTableValue">text{$.editionName}</td>
+            </tr>
+            <tr>
+                <td class="editTableTitle">版本标识:</td>
+                <td class="editTableValue">text{$.edition}</td>
+            </tr>
+            <tr>
+                <td class="editTableTitle">版本描述:</td>
+                <td class="editTableValue"><textarea  name="editionDes" class="editTableTextarea">text{$.editionDes}</textarea></td>
+            </tr>
+        </table>
+
+
         <div style="height: 22px; line-height: 22px; background-color: #f1f1f1; text-align: center; font-weight: bold; border-top: 1px solid #cccccc">启 动</div>
+        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+            <tr>
+                <td class="editTableTitle">启动终端:</td>
+                <td class="editTableValue">
+                    <input class="editTableRadio" name="startableTerminal" text{($.startableTerminal!=='client' && $.startableTerminal!=='mobile')?'checked':''} type="radio" value="all"/>PC端和移动端
+                    <input class="editTableRadio" name="startableTerminal" text{($.startableTerminal==='client')?'checked':''} type="radio" value="client"/>仅PC端
+<!--                    <input class="editTableRadio" name="startableTerminal" text{($.startableTerminal==='mobile')?'checked':''} type="radio" value="mobile"/>移动端-->
+                </td>
+            </tr>
+        </table>
+
         <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
             <tr>
                 <td class="editTableTitle">启动模式:</td>
@@ -84,6 +104,7 @@
                 </tr>
             </table>
         </div>
+
         <div style="height: 22px; line-height: 22px; background-color: #f1f1f1; text-align: center; font-weight: bold; border-top: 1px solid #cccccc">权 限</div>
         <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable" id="processEditStarter">
             <tr>

+ 3 - 3
o2web/source/x_component_process_Xform/Documenteditor.js

@@ -1865,7 +1865,7 @@ debugger;
                     var pList = tmp.getElements("p");
                     pList.each(function(p, i){
                         //if (Browser.name=="ie"){
-                        if (this.json.fullWidth=="y") this.transWidth(p);
+                        if (this.json.fullWidth!=="n") this.transWidth(p);
                         if (!p.getParent("table")){
                             var text = p.get("text");
                             var rex = /^\u3000*/;
@@ -1906,7 +1906,7 @@ debugger;
                     // }.bind(this));
 
                 }
-                if (this.json.fullWidth=="y"){
+                if (this.json.fullWidth!=="n"){
                     this.filetextEditor.addCommand( 'insertHalfSpace', {
                         exec: function( editor ) {
                             editor.insertText(" ");
@@ -1915,7 +1915,7 @@ debugger;
                     this.filetextEditor.setKeystroke( CKEDITOR.SHIFT + 32, 'insertHalfSpace' );
 
                     this.filetextEditor.on("key", function(e){
-                        if (this.json.fullWidth=="y") if (e.data.keyCode==32){
+                        if (this.json.fullWidth!=="n") if (e.data.keyCode==32){
                             e.editor.insertText(" ");
                             e.cancel();
                         }