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

增加流程版本保存功能

huqi 5 лет назад
Родитель
Сommit
72259a6c94

+ 102 - 0
o2web/source/o2_core/o2/widget/$Menu/Process/css.wcss

@@ -0,0 +1,102 @@
+{
+	"container": {
+		"border-top": "1px solid #738ab5",
+		"border-left": "1px solid #738ab5",
+		"border-right": "1px solid #3c5b94",
+		"border-bottom": "1px solid #3c5b94",
+		"background-color": "#f7f3f7",
+		"padding-top": "2px",
+		"padding-bottom": "2px",
+		"padding-left": "2px",
+		"padding-right": "2px",
+		"overflow": "hidden",
+		"font-size": "12px",
+		"display": "none",
+		"z-index": "10000",
+		"opacity": 0,
+		"position": "absolute",
+		"float": "left",
+		"min-width": "120px",
+		"box-shadow": "3px 3px 10px #AAA", 
+		"cursor": "default"
+	},
+	"menuItem": {
+		"display":"block",
+		"position": "static",
+		"height": "24px",
+		"line-height": "24px",
+		"border": "1px solid #f7f3f7",
+		"background-color": "#f7f3f7"
+	},
+
+	"menuItemImgDiv": {
+		"display":"block",
+		"float": "left",
+		"width": "24px",
+		"height": "24px",
+		"text-align": "center"
+	},
+	"menuItemImg": {
+		"height": "16px",
+		"width": "16px",
+		"margin-top": "3px"
+	},
+	"menuItemSeparator": {
+		"display":"block",
+		"float": "left",
+		"height": "24px",
+		"width": "1px",
+		"background-color": "#CCCCCC",
+		"border-right": "1px solid #FFFFFF",
+		"overflow": "hidden"
+	},
+	"menuItemText": {
+		"display":"block",
+		"position": "static",
+		"height": "24px",
+		"margin-left": "35px",
+		"margin-right": "30px",
+		"line-height": "24px"
+	},
+	"menuLine": {
+		"position": "static",
+		"display":"block",
+		"height": "1px",
+		"overflow": "hidden",
+		"margin-left": "28px",
+		"background-color": "#CCCCCC",
+		"border-bottom": "1px solid #FFFFFF"
+	},
+	"menuItemDisable": {
+		"color": "#999"
+	},
+
+	"menuOver": {
+		"border": "1px solid #8d9cc3",
+		//"background-color": "#b5bed6"
+		"background-color": "#e3e7f1"
+	},
+	"menuOut": {
+		"border": "1px solid #f7f3f7",
+		"background-color": "#f7f3f7"
+	},
+	"menuDown": {
+		"border": "1px solid #000000",
+		"background-color": "#c6cde0"
+	},
+	"menuUp": {
+		"border": "1px solid #8d9cc3",
+		//"background-color": "#b5bed6"
+		"background-color": "#e3e7f1"
+	},
+	"toolbarButtonDownNode": {
+		"display":"block",
+		"float": "left",
+		"padding-left": "2px",
+		"padding-right": "2px",
+		"padding-top": "0px",
+		"height": "18px",
+		"color": "#ff0000",
+		"cursor": "pointer"
+	}
+}

+ 116 - 0
o2web/source/o2_core/o2/widget/$Toolbar/Process/css.wcss

@@ -0,0 +1,116 @@
+{
+	"container": {
+		"border-top": "0px solid #cccccc",
+		"border-left": "0px solid #cccccc",
+		"border-right": "0px solid #888888",
+		"border-bottom": "1px solid #888888",
+		"background-color": "#eeeeee",
+
+		"word-wrap" : "normal",
+		"word-break" : "keep-all",
+		"cursor": "pointer",
+		"overflow": "hidden",
+		"height": "32px",
+		"display":"block",
+		"font-size": "12px"
+	},
+	"toolbarSeparator": {
+		"display":"block",
+		"float": "left",
+		"margin-bottom": "2px",
+		"margin-top": "6px",
+		"height": "20px",
+		"width": "1px",
+		"background-color": "#888888",
+		"border-right": "1px solid #FFFFFF",
+		"overflow": "hidden"
+	},
+
+	"button": {
+		"display":"block",
+		"position": "static",
+		"float": "left",
+		"border": "1px solid #eeeeee",
+		"background-color": "#eeeeee",
+		"height": "20px",
+		"margin-top": "4px",
+		"margin-right": "2px",
+		"padding-left": "2px",
+		"padding-right": "2px",
+		"cursor": "pointer"
+	},
+	"buttonImgDiv": {
+		"display":"block",
+		"float": "left",
+		"padding-top": "1px",
+		"padding-bottom": "1px",
+		"padding-left": "1px",
+		"padding-right": "1px",
+		"cursor": "pointer"
+	},
+	"buttonImg": {
+		"height": "16px",
+		"width": "16px",
+		"cursor": "pointer",
+		"margin-top": "0px"
+	},
+	"buttonTextDiv": {
+		"display":"block",
+		"float": "left",
+		"height": "20px",
+		"padding-left": "2px",
+		"padding-right": "2px",
+		"line-height": "18px",
+		"margin-left": "3px",
+		"color": "#333333",
+		"cursor": "pointer"
+	},
+	"buttonTextDivDown": {
+        "display":"block",
+        "float": "left",
+        "height": "20px",
+        "color": "#eeeeee",
+        "padding-left": "2px",
+        "padding-right": "2px",
+        "line-height": "18px",
+        "margin-left": "3px",
+        "cursor": "pointer"
+    },
+
+	"buttonDisable": {
+		"color": "#999"
+	},
+	"buttonImgDivDisable": {
+		"color": "#999"
+	},
+	"buttonTextDivDisable": {
+		"color": "#999"
+	},
+
+	"buttonOver": {
+		"border": "1px solid #000000",
+		"background-color": "#b5bed6"
+	},
+	"buttonOut": {
+		"border": "1px solid #eeeeee",
+		"background-color": "#eeeeee"
+	},
+	"buttonDown": {
+		"border": "1px solid #000000",
+		"background-color": "#8492b5"
+	},
+	"buttonUp": {
+		"border": "1px solid #000000",
+		"background-color": "#b5bed6"
+	},
+	"toolbarButtonDownNode": {
+		"display":"block",
+		"float": "left",
+		"padding-left": "2px",
+		"padding-right": "2px",
+		"padding-top": "0px",
+		"height": "18px",
+		"color": "#ff0000",
+		"cursor": "pointer"
+	}
+}

BIN
o2web/source/o2_core/o2/widget/$Toolbar/Process/downicon.gif


BIN
o2web/source/o2_core/o2/widget/$Toolbar/Process/separatorbg.gif


BIN
o2web/source/x_component_process_ProcessDesigner/$Main/default/toolbarIcon/edition.png


+ 15 - 7
o2web/source/x_component_process_ProcessDesigner/$Main/processToolbars.html

@@ -1,8 +1,8 @@
 <div id="MWFProcessToolbar">
 	<span MWFnodetype="MWFToolBarSeparator"></span>
 	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="save.gif" title="保存流程" MWFButtonAction="saveProcess" MWFButtonText=""></span>
-	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="saveNew.gif" title="保存为新流程" MWFButtonAction="saveNewProcess" MWFButtonText=""></span>
-	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="processProperty.gif" title="流程属性" MWFButtonAction="editProcess" MWFButtonText=""></span>
+<!--	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="saveNew.gif" title="保存为新流程" MWFButtonAction="saveNewProcess" MWFButtonText=""></span>-->
+<!--	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="processProperty.gif" title="流程属性" MWFButtonAction="editProcess" MWFButtonText=""></span>-->
 	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="print.gif" title="打印流程" MWFButtonAction="printProcess" MWFButtonText=""></span>
 	
 	<span MWFnodetype="MWFToolBarSeparator"></span>
@@ -29,14 +29,22 @@
 	<!--<span MWFnodetype="MWFToolBarButton" MWFButtonImage="deleteRouter.gif" title="删除路由" MWFButtonAction="deleteRoute" MWFButtonText="" MWFButtonDisable="true"></span>-->
 	
 	<span MWFnodetype="MWFToolBarSeparator"></span>
+
+	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="saveNew.gif" title="保存为新版本" MWFButtonAction="saveNewEdition" MWFButtonText=""></span>
+	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="edition.png" title="查看所有版本" MWFButtonAction="listEdition" MWFButtonText=""></span>
 	
 	<!--<span MWFnodetype="MWFToolBarButton" MWFButtonImage="checkProcess.gif" title="流程检查" MWFButtonAction="checkProcess" MWFButtonText=""></span>-->
 	<!--<span MWFnodetype="MWFToolBarButton" MWFButtonImage="processExplode.gif" title="流程导出" MWFButtonAction="processExplode" MWFButtonText=""></span>-->
 	<!--<span MWFnodetype="MWFToolBarButton" MWFButtonImage="processImplode.gif" title="流程导入" MWFButtonAction="processImplode" MWFButtonText=""></span>-->
 	
-	<!--样式:<select>-->
-		<!--<option value="default">default</option>-->
-		<!--<option value="style1">style1</option>-->
-		<!--<option value="flat">flat</option>-->
-	<!--</select>-->
+<!--	样式:<select>-->
+<!--		<option value="default">default</option>-->
+<!--		<option value="style1">style1</option>-->
+<!--		<option value="flat">flat</option>-->
+<!--	</select>-->
+
+	<span class="mainColor_bg processEdition" style="margin-top: 3px; line-height: 14px; float: right; margin-right: 10px; padding: 5px 8px; border-radius: 30px;">当前版本已启用</span>
+	<span class="processEditionInfor" style="line-height: 32px; float: right; margin-right: 10px">版本号:1 (2020-04-10 13:50)</span>
+
+
 </div>

+ 3 - 1
o2web/source/x_component_process_ProcessDesigner/Main.js

@@ -621,7 +621,7 @@ MWF.xApplication.process.ProcessDesigner.Main = new Class({
 
             $(toolbarNode).inject(this.toolbarNode);
             MWF.require("MWF.widget.Toolbar", function(){
-                this.processToolbar = new MWF.widget.Toolbar(toolbarNode, {"style": "ProcessCategory"}, this);
+                this.processToolbar = new MWF.widget.Toolbar(toolbarNode, {"style": "Process"}, this);
                 this.processToolbar.load();
                 if (callback) callback();
             }.bind(this));
@@ -633,6 +633,8 @@ MWF.xApplication.process.ProcessDesigner.Main = new Class({
                 }.bind(this));
             }
 
+            this.processEditionNode = toolbarNode.getElement(".processEdition");
+            this.processEditionInforNode = toolbarNode.getElement(".processEditionInfor");
         }.bind(this));
     },
     getProcessToolbarHTML: function(callback){

+ 5 - 0
o2web/source/x_component_process_ProcessDesigner/Process.js

@@ -126,6 +126,7 @@ MWF.xApplication.process.ProcessDesigner.Process = new Class({
 		this.setEvent();
 		this.setMenu();
 		this.showProperty();
+		this.showEditionInfor();
 	},
 	checkLoadRoutes: function(){
 		Object.each(this.routes, function(route){
@@ -366,6 +367,10 @@ MWF.xApplication.process.ProcessDesigner.Process = new Class({
 		}
     //    this.isFocus = true;
 	},
+	showEditionInfor: function(){
+
+	},
+
 	unSelected: function(e){
 		//var els = this.paper.getElementsByPoint(e.event.layerX, e.event.layerY);
 		var els = this.paper.getElementsByPoint(e.event.offsetX, e.event.offsetY);