diff --git a/jflow-web/src/main/webapp/DataUser/AppCoder/FlowDesignerWelcome.htm b/jflow-web/src/main/webapp/DataUser/AppCoder/FlowDesignerWelcome.htm
index dcd729da6172ca21bf5a38505563a3a07100c062..bddfb3346a8789b7997498aba55a2229817851b2 100644
--- a/jflow-web/src/main/webapp/DataUser/AppCoder/FlowDesignerWelcome.htm
+++ b/jflow-web/src/main/webapp/DataUser/AppCoder/FlowDesignerWelcome.htm
@@ -258,7 +258,8 @@
var OverTimeByDept_X = new Array();
var OverTimeByDept_Y = new Array();
- $("#Msg").html(" 正在加载,请稍后......");
+ //$("#Msg").html("
正在加载,请稍后......");
+ $("#Msg").html("
正在加载,请稍后......");
//获得数数量,并把数量绑定.
var handler = new HttpHandler("BP.WF.HttpHandler.DataUser_AppCoder");
diff --git a/jflow-web/src/main/webapp/DataUser/Style/FoolFrmPreview.css b/jflow-web/src/main/webapp/DataUser/Style/FoolFrmPreview.css
new file mode 100644
index 0000000000000000000000000000000000000000..322f6490f853d39b157b4b25046ea4e9fb475628
--- /dev/null
+++ b/jflow-web/src/main/webapp/DataUser/Style/FoolFrmPreview.css
@@ -0,0 +1,202 @@
+
+.FoolFrmBody
+{
+ font-stylex:0;
+ selfbody-hight:;
+ selfbody-width-unit_Temp:px;
+ baorder-style:xxx;
+ font-size-unit:px;
+ border-style:solid;
+ background-color:#99FFFF;
+ border-which:bottom;
+ font-style:normal;
+ font-height:;
+ selfbody-width_Temp:;
+ font-color:red3;
+ font-height-unit:px;
+ font-family:SimSun;
+ border-width-unit:px;
+ selfbody-width:;
+ border-color:#666666;
+ font-weight:normal;
+ selfbody-hight-unit:px;
+ font-size:2444;
+ border-width:1;
+}
+.FoolFrmTable
+{
+ font-stylex:1;
+ selfbody-hight:;
+ selfbody-width-unit_Temp:px;
+ baorder-style:xxx;
+ font-size-unit:px;
+ border-style:solid;
+ background-color:#99FFFF;
+ border-which:bottom;
+ font-style:normal;
+ font-height:;
+ selfbody-width_Temp:;
+ font-color:red;
+ font-height-unit:px;
+ font-family:SimSun;
+ border-width-unit:px;
+ selfbody-width:;
+ border-color:#666666;
+ font-weight:normal;
+ selfbody-hight-unit:px;
+ font-size:242;
+ border-width:1;
+}
+.FoolFrmTitleTH
+{
+ borderwidth-unit:px;
+ selfbody-hight:;
+ selfbody-width:;
+ background-color:;
+ border-which:all;
+ font-style:normal;
+ fontheight-unit:px;
+ font-height:;
+ selfbodyhight-unit:px;
+ font-color:#33CCFF;
+ font-family:SimSun;
+ border-style:none;
+ fontsize-unit:px;
+ border-color:;
+ font-weight:normal;
+ selfbodywidth-unit:px;
+ font-size:18;
+ border-width:;
+}
+.FoolFrmTitleIcon
+{
+ selfbody-hight:;
+ selfbody-width-unit_Temp:px;
+ font-size-unit:px;
+ border-style:solid;
+ background-color:#99FFFF;
+ border-which:bottom;
+ font-style:normal;
+ font-height:;
+ selfbody-width_Temp:;
+ font-color:red;
+ font-height-unit:px;
+ font-family:SimSun;
+ border-width-unit:px;
+ selfbody-width:;
+ border-color:#666666;
+ font-weight:normal;
+ selfbody-hight-unit:px;
+ font-size:24;
+ border-width:1;
+}
+.FoolFrmTitleLable
+{
+ selfbody-hight:;
+ border-width-unit:px;
+ font-size-unit:px;
+ background-color:;
+ border-which:top;
+ font-style:italic;
+ selfbody-width-unit:px;
+ font-height:;
+ border-style:none;
+ font-color:red;
+ font-size:16;
+ font-family:SimSun;
+ selfbody-width:;
+ border-color:;
+ font-weight:normal;
+ selfbody-hight-unit:px;
+ font-height-unit:px;
+ border-width:;
+}
+.FoolFrmGroupBar
+{
+ borderwidth-unit:px;
+ selfbody-hight:11;
+ selfbody-width-unit:px;
+ selfbody-hight-unit:px;
+ selfbody-width-unit_Temp:px;
+ selfbody-width:;
+ background-color:#CCCCCC;
+ border-which:bottom;
+ font-style:normal;
+ fontheight-unit:px;
+ font-height:12;
+ selfbodyhight-unit:px;
+ font-color:#FFFFFF;
+ font-height-unit:px;
+ font-family:SimSun;
+ border-style:none;
+ font-size-unit:ex;
+ selfbody-width_Temp:1;
+ fontsize-unit:px;
+ border-width-unit:px;
+ border-color:;
+ font-weight:normal;
+ selfbodywidth-unit:px;
+ font-size:14;
+ border-width:;
+}
+.FoolFrmFieldTR
+{
+ font-color:red;
+ font-size:24;
+}
+.FoolFrmFieldName
+{
+ borderwidth-unit:px;
+ selfbody-hight:;
+ selfbody-width-unit:px;
+ selfbody-hight-unit:px;
+ selfbody-width-unit_Temp:px;
+ selfbody-width:;
+ background-color:;
+ border-which:all;
+ font-style:normal;
+ fontheight-unit:px;
+ font-height:;
+ selfbodyhight-unit:px;
+ font-color:red;
+ font-height-unit:px;
+ font-family:SimSun;
+ border-style:none;
+ font-size-unit:px;
+ selfbody-width_Temp:;
+ fontsize-unit:px;
+ border-width-unit:px;
+ border-color:;
+ font-weight:normal;
+ selfbodywidth-unit:px;
+ font-size:24;
+ border-width:;
+}
+.FoolFrmFieldCtrl
+{
+ borderwidth-unit:px;
+ selfbody-hight:;
+ selfbody-width-unit:px;
+ selfbody-hight-unit:px;
+ selfbody-width-unit_Temp:px;
+ selfbody-width:;
+ background-color:#99FFFF;
+ border-which:bottom;
+ font-style:normal;
+ fontheight-unit:px;
+ font-height:;
+ selfbodyhight-unit:px;
+ font-color:red;
+ font-height-unit:px;
+ font-family:SimSun;
+ border-style:solid;
+ font-size-unit:px;
+ selfbody-width_Temp:;
+ fontsize-unit:px;
+ border-width-unit:px;
+ border-color:#666666;
+ font-weight:normal;
+ selfbodywidth-unit:px;
+ font-size:24;
+ border-width:1;
+}
\ No newline at end of file
diff --git a/jflow-web/src/main/webapp/DataUser/Style/FoolFrmStyle/Default.css b/jflow-web/src/main/webapp/DataUser/Style/FoolFrmStyle/Default.css
new file mode 100644
index 0000000000000000000000000000000000000000..5fe434778e09492040b07314733d1bcb261b74ab
--- /dev/null
+++ b/jflow-web/src/main/webapp/DataUser/Style/FoolFrmStyle/Default.css
@@ -0,0 +1,171 @@
+
+/* 大框表格:FoolFrmTable */
+.FoolFrmTable
+{
+ border-color:#330099;
+ selfbody-hight:322px;
+ border-width:0px;
+ background-color:#FFFFFF;
+ border-which:all;
+ font-style:italic;
+ font-height:px;
+ border-style:solid;
+ font-family:SimSun;
+ color:;
+ selfbody-width:200px;
+ font-weight:bold;
+ font-size:20px;
+}
+/* 标题表头:FoolFrmTitleTR */
+.FoolFrmTitleTR
+{
+ border-color:;
+ selfbody-hight:px;
+ border-width:px;
+ background-color:;
+ border-which:all;
+ font-style:normal;
+ font-height:px;
+ border-style:none;
+ font-family:SimSun;
+ color:;
+ selfbody-width:200px;
+ font-weight:normal;
+ font-size:20px;
+}
+/* 标题图标:FoolFrmIcon */
+.FoolFrmTitleIcon
+{
+ border-color:#666666;
+ selfbody-hight:px;
+ border-width:0px;
+ background-color:#FFFFFF;
+ border-which:all;
+ font-style:normal;
+ font-height:px;
+ border-style:solid;
+ font-family:SimSun;
+ color:;
+ selfbody-width:px;
+ font-weight:normal;
+ font-size:px;
+}
+/* 标题:FoolFrmTitleLable */
+.FoolFrmTitleLable
+{
+ border-color:#FFFF00;
+ selfbody-hight:px;
+ border-width:5px;
+ background-color:none;
+ border-which:bottom;
+ font-style:italic;
+ font-height:35px;
+ border-style:none;
+ font-family:SimSun;
+ color:#663366;
+ selfbody-width:px;
+ font-weight:normal;
+ font-size:18px;
+}
+/* 分组字段:FoolFrmGroupBarTR */
+.FoolFrmGroupBarTR
+{
+ border-color:;
+ selfbody-hight:px;
+ border-width:px;
+ background-color:#CCCCFF;
+ border-which:bottom;
+ font-style:italic;
+ font-height:px;
+ border-style:none;
+ font-family:SimSun;
+ color:#FFFFFF;
+ selfbody-width:200px;
+ font-weight:normal;
+ font-size:20px;
+}
+/* 分组字段:FoolFrmGroupBarTD */
+.FoolFrmGroupBarTD
+{
+ border-color:;
+ selfbody-hight:px;
+ border-width:px;
+ background-color:#CCCCFF;
+ border-which:bottom;
+ font-style:italic;
+ font-height:px;
+ border-style:none;
+ font-family:SimSun;
+ color:#FFFFFF;
+ selfbody-width:200px;
+ font-weight:normal;
+ font-size:20px;
+}
+/* 字段行:FoolFrmFieldTR */
+.FoolFrmFieldTR
+{
+ border-color:;
+ selfbody-hight:px;
+ border-width:px;
+ background-color:;
+ border-which:bottom;
+ font-style:normal;
+ font-height:px;
+ font-color:red;
+ border-style:none;
+ font-family:SimSun;
+ selfbody-width:px;
+ font-weight:normal;
+ font-size:px;
+}
+/* 单元格TD:FoolFrmFieldTD */
+.FoolFrmFieldTD
+{
+ border-color:;
+ selfbody-hight:px;
+ border-width:px;
+ background-color:;
+ border-which:bottom;
+ font-style:normal;
+ font-height:px;
+ font-color:red;
+ border-style:none;
+ font-family:SimSun;
+ selfbody-width:px;
+ font-weight:normal;
+ font-size:px;
+}
+/* 字段名:FoolFrmFieldName */
+.FoolFrmFieldName
+{
+ border-color:#FFFFFF;
+ selfbody-hight:23pt;
+ border-width:1px;
+ background-color:#FFFFFF;
+ border-which:all;
+ font-style:italic;
+ font-height:px;
+ border-style:groove;
+ font-family:SimHei;
+ color:#663366;
+ selfbody-width:200in;
+ font-weight:normal;
+ font-size:16px;
+}
+/* 控件:FoolFrmFieldCtrl */
+.FoolFrmFieldCtrl
+{
+ border-color:#FFFFFF;
+ selfbody-hight:px;
+ border-width:0px;
+ background-color:#FFFFFF;
+ border-which:bottom;
+ font-style:italic;
+ font-height:px;
+ border-style:solid;
+ font-family:SimHei;
+ color:#663366;
+ selfbody-width:200em;
+ font-weight:normal;
+ font-size:16px;
+}
\ No newline at end of file
diff --git a/jflow-web/src/main/webapp/DataUser/Style/FoolFrmStyle/DefaultPreview.css b/jflow-web/src/main/webapp/DataUser/Style/FoolFrmStyle/DefaultPreview.css
index cb4b1cf979615392c64c46b70d577d509f524338..7a1d9a7ef774c97fdd3d1b4871fab068e541d902 100644
--- a/jflow-web/src/main/webapp/DataUser/Style/FoolFrmStyle/DefaultPreview.css
+++ b/jflow-web/src/main/webapp/DataUser/Style/FoolFrmStyle/DefaultPreview.css
@@ -1,121 +1,171 @@
-
-/* 大框表格:FoolFrmTable */
-.FoolFrmTable
-{
- font-size:24;
- font-color:red;
- }
-/* 标题:FoolFrmTitleTR */
-.FoolFrmTitleTR
-{
- font-height:px;
- font-style:normal;
- font-family:SimSun;
- selfbody-width:px;
- selfbody-hight:px;
- background-color:#00FF66;
- font-size:px;
- border-which:all;
- color:;
- border-width:px;
- border-color:;
- border-style:none;
- font-weight:normal;
- }
-/* 标题图标:FoolFrmIcon */
-.FoolFrmTitleIcon
-{
- font-height:px;
- font-style:normal;
- font-family:SimSun;
- selfbody-width:px;
- selfbody-hight:px;
- background-color:#99FF00;
- font-size:px;
- border-which:all;
- color:;
- border-width:px;
- border-color:;
- border-style:none;
- font-weight:normal;
- }
-/* 标题标签:FoolFrmTitleLable */
-.FoolFrmTitleLable
-{
- font-height:px;
- font-style:normal;
- font-family:SimSun;
- selfbody-width:px;
- selfbody-hight:px;
- background-color:#99FF00;
- font-size:px;
- border-which:all;
- color:;
- border-width:px;
- border-color:;
- border-style:none;
- font-weight:normal;
- }
-/* 分组字段:FoolFrmGroupBarTR */
-.FoolFrmGroupBarTR
-{
- font-size:24;
- font-color:red;
- }
-/* 分组字段:FoolFrmGroupBarTD */
-.FoolFrmGroupBarTD
-{
- font-height:px;
- font-style:normal;
- font-family:SimSun;
- selfbody-width:px;
- selfbody-hight:px;
- background-color:#99FF00;
- font-size:px;
- border-which:all;
- color:;
- border-width:px;
- border-color:;
- border-style:none;
- font-weight:normal;
- }
-/* 字段行:FoolFrmFieldTR */
-.FoolFrmFieldTR
-{
- font-size:24;
- font-color:red;
- }
-/* 字段名称:FoolFrmFieldName */
-.FoolFrmFieldName
-{
- font-height:px;
- font-style:normal;
- font-family:SimSun;
- selfbody-width:px;
- selfbody-hight:px;
- background-color:#99FF00;
- font-size:px;
- border-which:all;
- color:;
- border-width:px;
- border-color:;
- border-style:none;
- font-weight:normal;
- }
-/* 字段控件:FoolFrmFieldCtrl */
-.FoolFrmFieldCtrl
-{
- font-height:px;
- font-style:normal;
- font-family:SimSun;
- selfbody-width:px;
- selfbody-hight:px;
- background-color:#99FF00;
- font-size:px;
- border-which:all;
- color:;
- border-width:px;
- border-color:;
- border-style:none;
- font-weight:normal;
- }
\ No newline at end of file
+
+/* 大框表格:FoolFrmTable */
+.FoolFrmTable
+{
+ border-color:#330099;
+ selfbody-hight:322px;
+ border-width:0px;
+ background-color:#FFFFFF;
+ border-which:all;
+ font-style:italic;
+ font-height:px;
+ border-style:solid;
+ font-family:SimSun;
+ color:;
+ selfbody-width:200px;
+ font-weight:bold;
+ font-size:20px;
+}
+/* 标题表头:FoolFrmTitleTR */
+.FoolFrmTitleTR
+{
+ border-color:;
+ selfbody-hight:px;
+ border-width:px;
+ background-color:;
+ border-which:all;
+ font-style:normal;
+ font-height:px;
+ border-style:none;
+ font-family:SimSun;
+ color:;
+ selfbody-width:200px;
+ font-weight:normal;
+ font-size:20px;
+}
+/* 标题图标:FoolFrmIcon */
+.FoolFrmTitleIcon
+{
+ border-color:#666666;
+ selfbody-hight:px;
+ border-width:0px;
+ background-color:#FFFFFF;
+ border-which:all;
+ font-style:normal;
+ font-height:px;
+ border-style:solid;
+ font-family:SimSun;
+ color:;
+ selfbody-width:px;
+ font-weight:normal;
+ font-size:px;
+}
+/* 标题:FoolFrmTitleLable */
+.FoolFrmTitleLable
+{
+ border-color:#FFFF00;
+ selfbody-hight:px;
+ border-width:5px;
+ background-color:none;
+ border-which:bottom;
+ font-style:italic;
+ font-height:35px;
+ border-style:none;
+ font-family:SimSun;
+ color:#663366;
+ selfbody-width:px;
+ font-weight:normal;
+ font-size:18px;
+}
+/* 分组字段:FoolFrmGroupBarTR */
+.FoolFrmGroupBarTR
+{
+ border-color:;
+ selfbody-hight:px;
+ border-width:px;
+ background-color:#CCCCFF;
+ border-which:bottom;
+ font-style:italic;
+ font-height:px;
+ border-style:none;
+ font-family:SimSun;
+ color:#FFFFFF;
+ selfbody-width:200px;
+ font-weight:normal;
+ font-size:20px;
+}
+/* 分组字段:FoolFrmGroupBarTD */
+.FoolFrmGroupBarTD
+{
+ border-color:;
+ selfbody-hight:px;
+ border-width:px;
+ background-color:#CCCCFF;
+ border-which:bottom;
+ font-style:italic;
+ font-height:px;
+ border-style:none;
+ font-family:SimSun;
+ color:#FFFFFF;
+ selfbody-width:200px;
+ font-weight:normal;
+ font-size:20px;
+}
+/* 字段行:FoolFrmFieldTR */
+.FoolFrmFieldTR
+{
+ border-color:;
+ selfbody-hight:px;
+ border-width:px;
+ background-color:;
+ border-which:bottom;
+ font-style:normal;
+ font-height:px;
+ font-color:red;
+ border-style:none;
+ font-family:SimSun;
+ selfbody-width:px;
+ font-weight:normal;
+ font-size:px;
+}
+/* 单元格TD:FoolFrmFieldTD */
+.FoolFrmFieldTD
+{
+ border-color:;
+ selfbody-hight:px;
+ border-width:px;
+ background-color:;
+ border-which:bottom;
+ font-style:normal;
+ font-height:px;
+ font-color:red;
+ border-style:none;
+ font-family:SimSun;
+ selfbody-width:px;
+ font-weight:normal;
+ font-size:px;
+}
+/* 字段名:FoolFrmFieldName */
+.FoolFrmFieldName
+{
+ border-color:#FFFFFF;
+ selfbody-hight:23pt;
+ border-width:1px;
+ background-color:#FFFFFF;
+ border-which:all;
+ font-style:italic;
+ font-height:px;
+ border-style:groove;
+ font-family:SimHei;
+ color:#663366;
+ selfbody-width:200in;
+ font-weight:normal;
+ font-size:16px;
+}
+/* 控件:FoolFrmFieldCtrl */
+.FoolFrmFieldCtrl
+{
+ border-color:#FFFFFF;
+ selfbody-hight:px;
+ border-width:0px;
+ background-color:#FFFFFF;
+ border-which:bottom;
+ font-style:italic;
+ font-height:px;
+ border-style:solid;
+ font-family:SimHei;
+ color:#663366;
+ selfbody-width:200em;
+ font-weight:normal;
+ font-size:16px;
+}
\ No newline at end of file
diff --git a/jflow-web/src/main/webapp/DataUser/Style/GloVarsCSS.css b/jflow-web/src/main/webapp/DataUser/Style/GloVarsCSS.css
new file mode 100644
index 0000000000000000000000000000000000000000..bc7c3391d8d0aceb2e0021b88dfb51c246e87ac5
--- /dev/null
+++ b/jflow-web/src/main/webapp/DataUser/Style/GloVarsCSS.css
@@ -0,0 +1,86 @@
+
+/* 草原绿色 */
+.CaoYuanLuSe
+{
+ border-color:;
+ selfbody-hight:px;
+ border-width:px;
+ background-color:#FF6699;
+ border-which:all;
+ font-style:normal;
+ font-height:px;
+ border-style:none;
+ font-family:SimSun;
+ color:;
+ selfbody-width:px;
+ font-weight:normal;
+ font-size:px;
+}
+/* 红色TextBox风格 */
+.HongSeTEXTBOXFengGe
+{
+ border-color:#CC6600;
+ selfbody-hight:12px;
+ border-width:23px;
+ background-color:#CC0033;
+ border-which:all;
+ font-style:normal;
+ font-height:23px;
+ border-style:dashed;
+ font-family:PMingLiU;
+ color:#CC3399;
+ selfbody-width:23px;
+ font-weight:normal;
+ font-size:30pt;
+}
+/* 蓝色风格 */
+.LaSeFengGe
+{
+ border-color:#FF33CC;
+ selfbody-hight:90px;
+ border-width:10px;
+ background-color:#99CCFF;
+ border-which:all;
+ font-style:normal;
+ font-height:40pt;
+ border-style:solid;
+ font-family:SimSun;
+ color:#0066FF;
+ selfbody-width:100%;
+ font-weight:normal;
+ font-size:30px;
+}
+/* 无边框风格 */
+.WuBianKuangFengGe
+{
+ border-color:#999999;
+ selfbody-hight:45px;
+ border-width:0px;
+ background-color:#CC0033;
+ border-which:top;
+ font-style:normal;
+ font-height:px;
+ border-style:solid;
+ font-family:MicrosoftYaHei;
+ color:#3300FF;
+ selfbody-width:200px;
+ font-weight:normal;
+ font-size:30px;
+}
+/* 蓝色风格 */
+.草原绿
+{
+ border-color:;
+ selfbody-hight:px;
+ border-width:px;
+ background-color:#66FFCC;
+ border-which:all;
+ font-style:normal;
+ font-height:px;
+ border-style:none;
+ font-family:SimSun;
+ color:;
+ selfbody-width:px;
+ font-weight:bold;
+ font-size:px;
+}
\ No newline at end of file
diff --git a/jflow-web/src/main/webapp/DataUser/Style/GloVarsCSSTemp.css b/jflow-web/src/main/webapp/DataUser/Style/GloVarsCSSTemp.css
new file mode 100644
index 0000000000000000000000000000000000000000..7d617c80aef1e22ce0f54778e69a2c97283cf9d7
--- /dev/null
+++ b/jflow-web/src/main/webapp/DataUser/Style/GloVarsCSSTemp.css
@@ -0,0 +1,18 @@
+
+/* 草原绿色 */
+.GloValsTemp
+{
+ border-color:;
+ selfbody-hight:px;
+ border-width:px;
+ background-color:#FF6699;
+ border-which:all;
+ font-style:normal;
+ font-height:px;
+ border-style:none;
+ font-family:SimSun;
+ color:;
+ selfbody-width:px;
+ font-weight:normal;
+ font-size:px;
+}
\ No newline at end of file
diff --git a/jflow-web/src/main/webapp/WF/Admin/Admin.js b/jflow-web/src/main/webapp/WF/Admin/Admin.js
index 89d5ad039f5cc62a0d1b5d67391f50fa5cd4a0a3..34a495a09f9dfe4c298e90cce78171a7ca5345dd 100644
--- a/jflow-web/src/main/webapp/WF/Admin/Admin.js
+++ b/jflow-web/src/main/webapp/WF/Admin/Admin.js
@@ -140,7 +140,8 @@ function SetCSS() {
var _html = $(obj).html();
if (obj.id.indexOf("help") != -1) {
$(obj).html("");
- var div2 = "