Browse Source

前端改造,使用FDUI

hc.tang 8 years ago
parent
commit
444aeb708c
100 changed files with 656 additions and 5267 deletions
  1. 60 0
      .classpath
  2. 2 0
      .gitignore
  3. 15 0
      .project
  4. 9 0
      .settings/org.eclipse.jdt.core.prefs
  5. 61 0
      .tomcatplugin
  6. 16 1
      pom.xml
  7. 79 0
      src/main/java/org/durcframework/autocode/common/PropertiesManager.java
  8. 1 2
      src/main/java/org/durcframework/autocode/controller/TemplateConfigController.java
  9. 1 2
      src/main/java/org/durcframework/autocode/entity/BackUser.java
  10. 15 15
      src/main/java/org/durcframework/autocode/service/GeneratorService.java
  11. 1 0
      src/main/resources/config.properties
  12. 38 10
      src/main/resources/springMVC.xml
  13. 4 7
      src/main/webapp/.#webclasspath
  14. 35 0
      src/main/webapp/WEB-INF/sitemesh3-config.txt
  15. 10 0
      src/main/webapp/WEB-INF/sitemesh3.xml
  16. 12 0
      src/main/webapp/WEB-INF/web.xml
  17. 0 66
      src/main/webapp/config/backUser.jsp
  18. 0 97
      src/main/webapp/config/dataSource.jsp
  19. 0 125
      src/main/webapp/config/template.jsp
  20. 18 0
      src/main/webapp/decorator/head.jsp
  21. 104 0
      src/main/webapp/decorator/main.jsp
  22. 23 0
      src/main/webapp/decorator/menu.jsp
  23. 97 0
      src/main/webapp/decorator/static.jsp
  24. 0 2
      src/main/webapp/easyui/jquery-1.8.0.min.js
  25. 0 68
      src/main/webapp/easyui/jquery.easyui.min.js
  26. 0 70
      src/main/webapp/easyui/locale/easyui-lang-zh_CN.js
  27. 0 41
      src/main/webapp/easyui/themes/default/accordion.css
  28. 0 185
      src/main/webapp/easyui/themes/default/calendar.css
  29. 0 58
      src/main/webapp/easyui/themes/default/combo.css
  30. 0 14
      src/main/webapp/easyui/themes/default/combobox.css
  31. 0 253
      src/main/webapp/easyui/themes/default/datagrid.css
  32. 0 40
      src/main/webapp/easyui/themes/default/datebox.css
  33. 0 30
      src/main/webapp/easyui/themes/default/dialog.css
  34. 0 2177
      src/main/webapp/easyui/themes/default/easyui.css
  35. BIN
      src/main/webapp/easyui/themes/default/images/Thumbs.db
  36. BIN
      src/main/webapp/easyui/themes/default/images/accordion_arrows.png
  37. BIN
      src/main/webapp/easyui/themes/default/images/blank.gif
  38. BIN
      src/main/webapp/easyui/themes/default/images/calendar_arrows.png
  39. BIN
      src/main/webapp/easyui/themes/default/images/combo_arrow.png
  40. BIN
      src/main/webapp/easyui/themes/default/images/datagrid_icons.png
  41. BIN
      src/main/webapp/easyui/themes/default/images/datebox_arrow.png
  42. BIN
      src/main/webapp/easyui/themes/default/images/layout_arrows.png
  43. BIN
      src/main/webapp/easyui/themes/default/images/linkbutton_bg.png
  44. BIN
      src/main/webapp/easyui/themes/default/images/loading.gif
  45. BIN
      src/main/webapp/easyui/themes/default/images/menu_arrows.png
  46. BIN
      src/main/webapp/easyui/themes/default/images/messager_icons.png
  47. BIN
      src/main/webapp/easyui/themes/default/images/pagination_icons.png
  48. BIN
      src/main/webapp/easyui/themes/default/images/panel_tools.png
  49. BIN
      src/main/webapp/easyui/themes/default/images/searchbox_button.png
  50. BIN
      src/main/webapp/easyui/themes/default/images/slider_handle.png
  51. BIN
      src/main/webapp/easyui/themes/default/images/spinner_arrows.png
  52. BIN
      src/main/webapp/easyui/themes/default/images/tabs_icons.png
  53. BIN
      src/main/webapp/easyui/themes/default/images/tree_icons.png
  54. BIN
      src/main/webapp/easyui/themes/default/images/validatebox_arrows.png
  55. BIN
      src/main/webapp/easyui/themes/default/images/validatebox_warning.png
  56. 0 91
      src/main/webapp/easyui/themes/default/layout.css
  57. 0 105
      src/main/webapp/easyui/themes/default/linkbutton.css
  58. 0 109
      src/main/webapp/easyui/themes/default/menu.css
  59. 0 30
      src/main/webapp/easyui/themes/default/menubutton.css
  60. 0 37
      src/main/webapp/easyui/themes/default/messager.css
  61. 0 66
      src/main/webapp/easyui/themes/default/pagination.css
  62. 0 124
      src/main/webapp/easyui/themes/default/panel.css
  63. 0 30
      src/main/webapp/easyui/themes/default/progressbar.css
  64. 0 28
      src/main/webapp/easyui/themes/default/propertygrid.css
  65. 0 79
      src/main/webapp/easyui/themes/default/searchbox.css
  66. 0 98
      src/main/webapp/easyui/themes/default/slider.css
  67. 0 59
      src/main/webapp/easyui/themes/default/spinner.css
  68. 0 42
      src/main/webapp/easyui/themes/default/splitbutton.css
  69. 0 361
      src/main/webapp/easyui/themes/default/tabs.css
  70. 0 157
      src/main/webapp/easyui/themes/default/tree.css
  71. 0 53
      src/main/webapp/easyui/themes/default/validatebox.css
  72. 0 87
      src/main/webapp/easyui/themes/default/window.css
  73. 0 67
      src/main/webapp/easyui/themes/icon.css
  74. BIN
      src/main/webapp/easyui/themes/icons/back.png
  75. BIN
      src/main/webapp/easyui/themes/icons/blank.gif
  76. BIN
      src/main/webapp/easyui/themes/icons/cancel.png
  77. BIN
      src/main/webapp/easyui/themes/icons/cut.png
  78. BIN
      src/main/webapp/easyui/themes/icons/edit_add.png
  79. BIN
      src/main/webapp/easyui/themes/icons/edit_remove.png
  80. BIN
      src/main/webapp/easyui/themes/icons/filesave.png
  81. BIN
      src/main/webapp/easyui/themes/icons/forward.png
  82. BIN
      src/main/webapp/easyui/themes/icons/help.png
  83. BIN
      src/main/webapp/easyui/themes/icons/mini_add.png
  84. BIN
      src/main/webapp/easyui/themes/icons/mini_edit.png
  85. BIN
      src/main/webapp/easyui/themes/icons/mini_refresh.png
  86. BIN
      src/main/webapp/easyui/themes/icons/no.png
  87. BIN
      src/main/webapp/easyui/themes/icons/ok.png
  88. BIN
      src/main/webapp/easyui/themes/icons/pencil.png
  89. BIN
      src/main/webapp/easyui/themes/icons/print.png
  90. BIN
      src/main/webapp/easyui/themes/icons/redo.png
  91. BIN
      src/main/webapp/easyui/themes/icons/reload.png
  92. BIN
      src/main/webapp/easyui/themes/icons/search.png
  93. BIN
      src/main/webapp/easyui/themes/icons/sum.png
  94. BIN
      src/main/webapp/easyui/themes/icons/tip.png
  95. BIN
      src/main/webapp/easyui/themes/icons/undo.png
  96. 0 23
      src/main/webapp/easyui_lib.jsp
  97. 0 357
      src/main/webapp/generator/generator.jsp
  98. 1 1
      src/main/webapp/js/MaskUtil.js
  99. 54 0
      src/main/webapp/login.html
  100. 0 0
      src/main/webapp/login.jsp

+ 60 - 0
.classpath

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="var" path="M2_REPO/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA.jar"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/net/oschina/durcframework/durcframework-core/1.0.16/durcframework-core-1.0.16.jar" sourcepath="M2_REPO/net/oschina/durcframework/durcframework-core/1.0.16/durcframework-core-1.0.16-sources.jar">
+    <attributes>
+      <attribute value="jar:file:/D:/dev/maven3/repository/net/oschina/durcframework/durcframework-core/1.0.16/durcframework-core-1.0.16-javadoc.jar!/" name="javadoc_location"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.2.2.RELEASE/spring-core-3.2.2.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aspects/3.2.2.RELEASE/spring-aspects-3.2.2.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/aspectj/aspectjweaver/1.6.12/aspectjweaver-1.6.12.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context-support/3.2.2.RELEASE/spring-context-support-3.2.2.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.2.2.RELEASE/spring-beans-3.2.2.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.2.2.RELEASE/spring-context-3.2.2.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/3.2.2.RELEASE/spring-aop-3.2.2.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.2.2.RELEASE/spring-expression-3.2.2.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/3.2.2.RELEASE/spring-jdbc-3.2.2.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-tx/3.2.2.RELEASE/spring-tx-3.2.2.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-orm/3.2.2.RELEASE/spring-orm-3.2.2.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/3.2.2.RELEASE/spring-test-3.2.2.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/3.2.2.RELEASE/spring-web-3.2.2.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-oxm/3.2.2.RELEASE/spring-oxm-3.2.2.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/3.2.2.RELEASE/spring-webmvc-3.2.2.RELEASE.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/aspectj/aspectjrt/1.6.12/aspectjrt-1.6.12.jar"/>
+  <classpathentry kind="var" path="M2_REPO/asm/asm/2.2.3/asm-2.2.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.3/commons-pool-1.3.jar" sourcepath="M2_REPO/commons-pool/commons-pool/1.3/commons-pool-1.3-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.5/commons-codec-1.5.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jstl/jstl/1.2/jstl-1.2.jar" sourcepath="M2_REPO/jstl/jstl/1.2/jstl-1.2-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/mybatis/mybatis/3.2.0/mybatis-3.2.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/mybatis/mybatis-spring/1.2.0/mybatis-spring-1.2.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/sf/jxls/jxls-core/1.0-RC-2/jxls-core-1.0-RC-2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.8.2/commons-beanutils-1.8.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/2.0/commons-digester-2.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jexl/2.0.1/commons-jexl-2.0.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.6/poi-3.6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi-ooxml/3.6/poi-ooxml-3.6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/4.3.1.Final/hibernate-validator-4.3.1.Final.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging/3.1.0.CR2/jboss-logging-3.1.0.CR2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/alibaba/druid/1.0.4/druid-1.0.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/alibaba/fastjson/1.1.41/fastjson-1.1.41.jar"/>
+  <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.31/mysql-connector-java-5.1.31.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/velocity/velocity/1.7/velocity-1.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/sitemesh/sitemesh/3.0.0/sitemesh-3.0.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.8/junit-4.8.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/servlet-api/6.0.29/servlet-api-6.0.29.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/sourceforge/jtds/jtds/1.2.2/jtds-1.2.2.jar" sourcepath="M2_REPO/net/sourceforge/jtds/jtds/1.2.2/jtds-1.2.2-sources.jar"/>
+</classpath>

+ 2 - 0
.gitignore

@@ -0,0 +1,2 @@
+/target
+/work

+ 15 - 0
.project

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+  <name>autoCode</name>
+  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+    <nature>com.sysdeo.eclipse.tomcat.tomcatnature</nature>
+  </natures>
+</projectDescription>

+ 9 - 0
.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,9 @@
+#Fri May 08 09:18:40 CST 2015
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+eclipse.preferences.version=1
+encoding/src/main/java=UTF-8
+org.eclipse.jdt.core.compiler.source=1.6
+encoding/src/test/resources=UTF-8
+encoding/src/main/resources=UTF-8
+encoding/src/test/java=UTF-8
+org.eclipse.jdt.core.compiler.compliance=1.6

+ 61 - 0
.tomcatplugin

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tomcatProjectProperties>
+    <rootDir>/src/main/webapp</rootDir>
+    <exportSource>false</exportSource>
+    <reloadable>false</reloadable>
+    <redirectLogger>false</redirectLogger>
+    <updateXml>true</updateXml>
+    <warLocation></warLocation>
+    <extraInfo></extraInfo>
+    <webPath>autoCode</webPath>
+    <webClassPathEntries>
+        <webClassPathEntry>/autoCode/target/classes</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/asm/asm/2.2.3/asm-2.2.3.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/com/alibaba/druid/1.0.4/druid-1.0.4.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/com/alibaba/fastjson/1.1.41/fastjson-1.1.41.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/commons-beanutils/commons-beanutils/1.8.2/commons-beanutils-1.8.2.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/commons-codec/commons-codec/1.5/commons-codec-1.5.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/commons-digester/commons-digester/2.0/commons-digester-2.0.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/commons-pool/commons-pool/1.3/commons-pool-1.3.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/jstl/jstl/1.2/jstl-1.2.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/junit/junit/4.8/junit-4.8.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/mysql/mysql-connector-java/5.1.31/mysql-connector-java-5.1.31.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/net/oschina/durcframework/durcframework-core/1.0.16/durcframework-core-1.0.16.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/net/sf/jxls/jxls-core/1.0-RC-2/jxls-core-1.0-RC-2.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/net/sourceforge/jtds/jtds/1.2.2/jtds-1.2.2.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/apache/commons/commons-jexl/2.0.1/commons-jexl-2.0.1.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/apache/poi/poi-ooxml/3.6/poi-ooxml-3.6.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/apache/poi/poi/3.6/poi-3.6.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/apache/velocity/velocity/1.7/velocity-1.7.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/aspectj/aspectjrt/1.6.12/aspectjrt-1.6.12.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/aspectj/aspectjweaver/1.6.12/aspectjweaver-1.6.12.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/hibernate/hibernate-validator/4.3.1.Final/hibernate-validator-4.3.1.Final.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/jboss/logging/jboss-logging/3.1.0.CR2/jboss-logging-3.1.0.CR2.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/mybatis/mybatis-spring/1.2.0/mybatis-spring-1.2.0.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/mybatis/mybatis/3.2.0/mybatis-3.2.0.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/sitemesh/sitemesh/3.0.0/sitemesh-3.0.0.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/springframework/spring-aop/3.2.2.RELEASE/spring-aop-3.2.2.RELEASE.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/springframework/spring-aspects/3.2.2.RELEASE/spring-aspects-3.2.2.RELEASE.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/springframework/spring-beans/3.2.2.RELEASE/spring-beans-3.2.2.RELEASE.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/springframework/spring-context-support/3.2.2.RELEASE/spring-context-support-3.2.2.RELEASE.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/springframework/spring-context/3.2.2.RELEASE/spring-context-3.2.2.RELEASE.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/springframework/spring-core/3.2.2.RELEASE/spring-core-3.2.2.RELEASE.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/springframework/spring-expression/3.2.2.RELEASE/spring-expression-3.2.2.RELEASE.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/springframework/spring-jdbc/3.2.2.RELEASE/spring-jdbc-3.2.2.RELEASE.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/springframework/spring-orm/3.2.2.RELEASE/spring-orm-3.2.2.RELEASE.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/springframework/spring-oxm/3.2.2.RELEASE/spring-oxm-3.2.2.RELEASE.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/springframework/spring-test/3.2.2.RELEASE/spring-test-3.2.2.RELEASE.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/springframework/spring-tx/3.2.2.RELEASE/spring-tx-3.2.2.RELEASE.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/springframework/spring-web/3.2.2.RELEASE/spring-web-3.2.2.RELEASE.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/org/springframework/spring-webmvc/3.2.2.RELEASE/spring-webmvc-3.2.2.RELEASE.jar</webClassPathEntry>
+        <webClassPathEntry>M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar</webClassPathEntry>
+    </webClassPathEntries>
+</tomcatProjectProperties>

+ 16 - 1
pom.xml

@@ -9,7 +9,7 @@
 		<dependency>
 			<groupId>net.oschina.durcframework</groupId>
 			<artifactId>durcframework-core</artifactId>
-			<version>1.0.4</version>
+			<version>1.0.16</version>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>
@@ -17,11 +17,26 @@
 			<version>1.0.4</version>
 		</dependency>
 		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.1.41</version>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.31</version>
+		</dependency>
+		<dependency>
 			<groupId>org.apache.velocity</groupId>
 			<artifactId>velocity</artifactId>
 			<version>1.7</version>
 		</dependency>
 		<dependency>
+		  <groupId>org.sitemesh</groupId>
+		  <artifactId>sitemesh</artifactId>
+		  <version>3.0.0</version>
+		</dependency>
+		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.8</version>

+ 79 - 0
src/main/java/org/durcframework/autocode/common/PropertiesManager.java

@@ -0,0 +1,79 @@
+package org.durcframework.autocode.common;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PropertiesLoaderUtils;
+
+/**
+ * 属性文件管理器,可以获取Properties文件属性
+ */
+public enum PropertiesManager {
+	instance;
+
+	private Map<String, Properties> propMap = new HashMap<String, Properties>();
+	private String defProperties = "config.properties"; // 默认的属性文件
+
+	public static PropertiesManager getInstance() {
+		return instance;
+	}
+
+	PropertiesManager() {
+		// 默认读取config.properties
+		loadProp(defProperties);
+	}
+
+	private Properties loadProp(String fileName) {
+		Properties props = propMap.get(fileName);
+
+		if (props == null) {
+			Resource resource = new ClassPathResource(fileName);
+			try {
+				props = PropertiesLoaderUtils.loadProperties(resource);
+				propMap.put(fileName, props);
+			} catch (IOException e) {
+				props = new Properties();
+				e.printStackTrace();
+			}
+		}
+
+		return props;
+	}
+
+	private String getValue(String key, String fileName) {
+		Properties prop = propMap.get(fileName);
+		if (prop == null) {
+			prop = loadProp(fileName);
+		}
+		return prop.getProperty(key);
+	}
+
+	/**
+	 * 根据key获取属性值
+	 * 
+	 * @param key
+	 * @return
+	 */
+	public String get(String key) {
+		return getValue(key, defProperties);
+	}
+
+	/**
+	 * 根据key和文件名获取值
+	 * @param key
+	 * @param fileName 文件名,必须放在classpath根目录下
+	 * @return
+	 */
+	public String get(String key, String fileName) {
+		return getValue(key, fileName);
+	}
+
+	public static void main(String[] args) {
+		System.out.println(PropertiesManager.getInstance().get("debugModel"));
+	}
+
+}

+ 1 - 2
src/main/java/org/durcframework/autocode/controller/TemplateConfigController.java

@@ -1,7 +1,6 @@
 package org.durcframework.autocode.controller;
 
 import org.durcframework.autocode.common.AutoCodeContext;
-import org.durcframework.autocode.common.SearchEasyUI;
 import org.durcframework.autocode.entity.BackUser;
 import org.durcframework.autocode.entity.TemplateConfig;
 import org.durcframework.autocode.entity.TemplateConfigSch;
@@ -27,7 +26,7 @@ public class TemplateConfigController extends
 
 	@RequestMapping("/listTemplate.do")
 	public @ResponseBody
-	Object listTemplate(SearchEasyUI searchEntity) {
+	Object listTemplate(TemplateConfigSch searchEntity) {
 		BackUser user = AutoCodeContext.getInstance().getUser();
 		searchEntity.setSortname("`name`");
 		ExpressionQuery query = this.buildExpressionQuery(searchEntity);

+ 1 - 2
src/main/java/org/durcframework/autocode/entity/BackUser.java

@@ -6,9 +6,8 @@ import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
 import org.durcframework.core.IUser;
-import org.durcframework.core.ValidateAware;
 
-public class BackUser implements IUser,ValidateAware{
+public class BackUser implements IUser{
 	@Pattern(regexp="\\w+",message="用户名只能由数字,字母,下划线组成")
 	@Size(min=4,max=20,message="用户名长度范围在4-20之间")
 	private String username;

+ 15 - 15
src/main/java/org/durcframework/autocode/service/GeneratorService.java

@@ -59,21 +59,21 @@ public class GeneratorService {
                  * 1.包名不为空,则利用用户自定义包名
                  * 2.包名为空,则生成AutoCodeSource目录
                 */
-                String CodeDirPath = "";
-                if (generatorParam.getPackageName().length() > 0) {
-                    CodeDirPath = (generatorParam.getPackageName() + "/" + generatorParam.getPackageName().replaceAll("\\.", Matcher.quoteReplacement("/")) + "/" + template.getSavePath() + "/");
-                } else {
-                    CodeDirPath = ("AutoCodeSource" + "/" + template.getSavePath() + "/");
-                }
-
-                File directory = new File(".");
-                try {
-                    createDir(directory.getCanonicalPath() + "/" + CodeDirPath);
-                    File f = new File(directory.getCanonicalPath() + "/" + CodeDirPath + sqlContext.getJavaBeanName() + "." + template.getSuffix());
-                    writeFile(f, content);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
+//                String CodeDirPath = "";
+//                if (generatorParam.getPackageName().length() > 0) {
+//                    CodeDirPath = (generatorParam.getPackageName() + "/" + generatorParam.getPackageName().replaceAll("\\.", Matcher.quoteReplacement("/")) + "/" + template.getSavePath() + "/");
+//                } else {
+//                    CodeDirPath = ("AutoCodeSource" + "/" + template.getSavePath() + "/");
+//                }
+//
+//                File directory = new File(".");
+//                try {
+//                    createDir(directory.getCanonicalPath() + "/" + CodeDirPath);
+//                    File f = new File(directory.getCanonicalPath() + "/" + CodeDirPath + sqlContext.getJavaBeanName() + "." + template.getSuffix());
+//                    writeFile(f, content);
+//                } catch (IOException e) {
+//                    e.printStackTrace();
+//                }
                 codeFileList.add(codeFile);
             }
         }

+ 1 - 0
src/main/resources/config.properties

@@ -8,3 +8,4 @@ jdbc.maxPoolSize=20
 jdbc.maxIdleTime=60
 jdbc.acquireIncrement=3
 
+debugModel=true

+ 38 - 10
src/main/resources/springMVC.xml

@@ -1,17 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
-
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+						http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+						http://www.springframework.org/schema/context 
+						http://www.springframework.org/schema/context/spring-context-3.2.xsd
+						http://www.springframework.org/schema/mvc
+						http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
+						http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd">
 	
 
     <!-- 支持spring mvc新的注解类型 详细spring3.0手册 15.12.1 mvc:annotation-driven -->
-	<mvc:annotation-driven />
+	<mvc:annotation-driven>
+	    <!-- 强化参数接收 -->
+		<mvc:argument-resolvers>
+			<bean class="org.durcframework.core.form.FormModelMethodArgumentResolver" />
+		</mvc:argument-resolvers>
+		 
+        <mvc:message-converters>  
+            <ref bean="fastJsonHttpMessageConverter" />
+        </mvc:message-converters>
+	</mvc:annotation-driven>
 	
 	<!-- 导入durcframework配置 -->
 	<import resource="classpath*:/durcframework_spring/*.xml"/>
@@ -34,5 +45,22 @@
 		<property name="prefix" value="/WEB-INF/jsp/" />
 		<property name="suffix" value=".jsp" />
 	</bean>
+	
+	<bean id="fastJsonHttpMessageConverter"  
+        class="com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter">  
+  
+        <property name="supportedMediaTypes">  
+            <list>  
+                <value>text/html;charset=UTF-8</value><!-- 避免IE出现下载JSON文件的情况 -->  
+                <value>application/json;charset=UTF-8</value>
+            </list>  
+        </property>  
+        <property name="features">
+        	<list>
+        		<!-- 格式化时间 -->
+                <value>WriteDateUseDateFormat</value>  
+        	</list>  
+        </property>  
+    </bean>  
 
 </beans>

+ 4 - 7
src/main/webapp/.#webclasspath

@@ -1,6 +1,6 @@
 C:\Users\hc.tang\git\autoCode\target\classes
 D:\dev\maven3\repository\javax\validation\validation-api\1.0.0.GA\validation-api-1.0.0.GA.jar
-D:\dev\maven3\repository\net\oschina\durcframework\durcframework-core\1.0.4\durcframework-core-1.0.4.jar
+D:\dev\maven3\repository\net\oschina\durcframework\durcframework-core\1.0.16\durcframework-core-1.0.16.jar
 D:\dev\maven3\repository\org\springframework\spring-core\3.2.2.RELEASE\spring-core-3.2.2.RELEASE.jar
 D:\dev\maven3\repository\commons-logging\commons-logging\1.1.1\commons-logging-1.1.1.jar
 D:\dev\maven3\repository\org\springframework\spring-aspects\3.2.2.RELEASE\spring-aspects-3.2.2.RELEASE.jar
@@ -19,9 +19,6 @@ D:\dev\maven3\repository\org\springframework\spring-web\3.2.2.RELEASE\spring-web
 D:\dev\maven3\repository\org\springframework\spring-oxm\3.2.2.RELEASE\spring-oxm-3.2.2.RELEASE.jar
 D:\dev\maven3\repository\commons-lang\commons-lang\2.4\commons-lang-2.4.jar
 D:\dev\maven3\repository\org\springframework\spring-webmvc\3.2.2.RELEASE\spring-webmvc-3.2.2.RELEASE.jar
-D:\dev\maven3\repository\com\fasterxml\jackson\core\jackson-core\2.4.2\jackson-core-2.4.2.jar
-D:\dev\maven3\repository\com\fasterxml\jackson\core\jackson-databind\2.4.2\jackson-databind-2.4.2.jar
-D:\dev\maven3\repository\com\fasterxml\jackson\core\jackson-annotations\2.4.2\jackson-annotations-2.4.2.jar
 D:\dev\maven3\repository\org\aspectj\aspectjrt\1.6.12\aspectjrt-1.6.12.jar
 D:\dev\maven3\repository\asm\asm\2.2.3\asm-2.2.3.jar
 D:\dev\maven3\repository\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar
@@ -30,7 +27,6 @@ D:\dev\maven3\repository\commons-codec\commons-codec\1.5\commons-codec-1.5.jar
 D:\dev\maven3\repository\jstl\jstl\1.2\jstl-1.2.jar
 D:\dev\maven3\repository\taglibs\standard\1.1.2\standard-1.1.2.jar
 D:\dev\maven3\repository\log4j\log4j\1.2.16\log4j-1.2.16.jar
-D:\dev\maven3\repository\mysql\mysql-connector-java\5.0.4\mysql-connector-java-5.0.4.jar
 D:\dev\maven3\repository\org\mybatis\mybatis\3.2.0\mybatis-3.2.0.jar
 D:\dev\maven3\repository\org\mybatis\mybatis-spring\1.2.0\mybatis-spring-1.2.0.jar
 D:\dev\maven3\repository\net\sf\jxls\jxls-core\1.0-RC-2\jxls-core-1.0-RC-2.jar
@@ -41,11 +37,12 @@ D:\dev\maven3\repository\org\apache\commons\commons-jexl\2.0.1\commons-jexl-2.0.
 D:\dev\maven3\repository\org\apache\poi\poi\3.6\poi-3.6.jar
 D:\dev\maven3\repository\org\apache\poi\poi-ooxml\3.6\poi-ooxml-3.6.jar
 D:\dev\maven3\repository\dom4j\dom4j\1.6.1\dom4j-1.6.1.jar
-D:\dev\maven3\repository\org\slf4j\slf4j-jdk14\1.6.1\slf4j-jdk14-1.6.1.jar
-D:\dev\maven3\repository\org\slf4j\slf4j-api\1.6.1\slf4j-api-1.6.1.jar
 D:\dev\maven3\repository\org\hibernate\hibernate-validator\4.3.1.Final\hibernate-validator-4.3.1.Final.jar
 D:\dev\maven3\repository\org\jboss\logging\jboss-logging\3.1.0.CR2\jboss-logging-3.1.0.CR2.jar
 D:\dev\maven3\repository\com\alibaba\druid\1.0.4\druid-1.0.4.jar
+D:\dev\maven3\repository\com\alibaba\fastjson\1.1.41\fastjson-1.1.41.jar
+D:\dev\maven3\repository\mysql\mysql-connector-java\5.1.31\mysql-connector-java-5.1.31.jar
 D:\dev\maven3\repository\org\apache\velocity\velocity\1.7\velocity-1.7.jar
+D:\dev\maven3\repository\org\sitemesh\sitemesh\3.0.0\sitemesh-3.0.0.jar
 D:\dev\maven3\repository\junit\junit\4.8\junit-4.8.jar
 D:\dev\maven3\repository\net\sourceforge\jtds\jtds\1.2.2\jtds-1.2.2.jar

+ 35 - 0
src/main/webapp/WEB-INF/sitemesh3-config.txt

@@ -0,0 +1,35 @@
+<sitemesh>
+    <!--默认情况下,
+        sitemesh 只对 HTTP 响应头中 Content-Type 为 text/html 的类型进行拦截和装饰,
+        我们可以添加更多的 mime 类型-->
+  <mime-type>text/html</mime-type>
+  <mime-type>application/vnd.wap.xhtml+xml</mime-type>
+  <mime-type>application/xhtml+xml</mime-type>
+  ...
+  
+  <!-- 默认装饰器,当下面的路径都不匹配时,启用该装饰器进行装饰 -->
+  <mapping decorator="/default-decorator.html"/>
+  
+  <!-- 对不同的路径,启用不同的装饰器 -->
+  <mapping path="/admin/*" decorator="/another-decorator.html"/>
+  <mapping path="/*.special.jsp" decorator="/special-decorator.html"/>
+
+  <!-- 对同一路径,启用多个装饰器 -->
+  <mapping>
+    <path>/articles/*</path>
+    <decorator>/decorators/article.html</decorator>
+    <decorator>/decorators/two-page-layout.html</decorator>
+    <decorator>/decorators/common.html</decorator>
+  </mapping>
+
+  <!-- 排除,不进行装饰的路径 -->
+  <mapping path="/javadoc/*" exclue="true"/>
+  <mapping path="/brochures/*" exclue="true"/>
+  
+  <!-- 自定义 tag 规则 -->
+  <content-processor>
+    <tag-rule-bundle class="com.something.CssCompressingBundle" />
+    <tag-rule-bundle class="com.something.LinkRewritingBundle"/>
+  </content-processor>
+
+</sitemesh>

+ 10 - 0
src/main/webapp/WEB-INF/sitemesh3.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sitemesh>
+    <!-- 指明满足“*.do*”请求页面,将被“/decorator/main.jsp”所装饰 
+		    应该与springmvc的dispatcherServlet的url-pattern一致
+    -->
+    <mapping path="/sys/*.jsp*" decorator="/decorator/main.jsp" />
+    
+    <mapping path="/sys/*_sd.jsp*" decorator="/decorator/static.jsp" />
+    
+</sitemesh>

+ 12 - 0
src/main/webapp/WEB-INF/web.xml

@@ -30,6 +30,18 @@
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
 	
+	<!-- sitemesh -->
+	<filter>
+		<filter-name>sitemesh</filter-name>
+		<filter-class>org.sitemesh.config.ConfigurableSiteMeshFilter</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>sitemesh</filter-name>
+		<url-pattern>*.jsp</url-pattern>
+		<dispatcher>FORWARD</dispatcher>
+   	 	<dispatcher>REQUEST</dispatcher>
+	</filter-mapping>
+	
 	<!-- 统一编码 -->
 	<filter>
 		<filter-name>characterEncodingFilter</filter-name>

+ 0 - 66
src/main/webapp/config/backUser.jsp

@@ -1,66 +0,0 @@
-<%@page import="org.durcframework.autocode.common.AutoCodeContext"%>
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@ include file="../taglib.jsp" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>用户管理</title>
-<style type="text/css">
-.fm_lab{text-align: right;padding:10px;}
-</style>
-</head>
-<body>
-<%
-	if(!AutoCodeContext.getInstance().isAdmin()){
-	request.getRequestDispatcher("/login.jsp").forward(request, response);
-	return;
-}
-%>
-     <div id="toolbar">
-        <a href="#" class="easyui-linkbutton" iconCls="icon-add" plain="true" onclick="crud.add()">添加</a>
-    </div>
-    <table id="dg"></table>
-    
-    <div id="dlg" class="easyui-dialog" style="width:520px;height:220px;padding:10px 20px"
-            closed="true" modal="true" buttons="#dlg-buttons">
-        <form id="fm" method="post">
-            <table>
-        <tr>
-            <td class="fm_lab">用户名:</td><td><input id="username" name="username" class="easyui-validatebox" required="true"></td>
-        </tr>
-        <tr>
-            <td class="fm_lab">密码:</td><td><input name="password" class="easyui-validatebox" required="true"></td>
-        </tr>
-            </table>
-        </form>
-    </div>
-    <div id="dlg-buttons">
-        <a href="#" class="easyui-linkbutton" iconCls="icon-ok" onclick="crud.save(); return false;">保存</a>
-        <a href="#" class="easyui-linkbutton" iconCls="icon-cancel" onclick="crud.closeDlg(); return false;">取消</a>
-    </div>
-    
-<jsp:include page="../easyui_lib.jsp"></jsp:include>
-<script type="text/javascript">
-var that = this;
-var crud = Crud.create({
-    pk:'username'
-    ,listUrl:ctx + 'listBackUser.do'
-    ,addUrl:ctx + 'addBackUser.do'
-    ,updateUrl:ctx + 'updateBackUser.do'
-    ,delUrl:ctx + 'delBackUser.do'
-    ,dlgId:'dlg'
-    ,formId:'fm'
-    ,gridId:'dg'
-});
-
-crud.buildGrid([
-        {field:'username',title:'用户名'}
-    ,    {field:'password',title:'密码'}
-    ,    {field:'addTime',title:'添加时间'}
-    ,crud.createOperColumn()   
-]);
-</script>
-</body>
-</html>

+ 0 - 97
src/main/webapp/config/dataSource.jsp

@@ -1,97 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@ include file="../taglib.jsp" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>数据源配置</title>
-<style type="text/css">
-.fm_lab{text-align: right;padding:10px;}
-</style>
-</head>
-<body>
-	 <div id="toolbar">
-		<a href="#" class="easyui-linkbutton" iconCls="icon-add" plain="true" onclick="crud.add()">添加数据源</a>
-	</div>
-	<table id="dg"></table>
-	
-	<div id="dlg" class="easyui-dialog" style="width:500px;padding:10px 20px"
-			closed="true" modal="true" buttons="#dlg-buttons" doSize="true">
-		<form id="fm" method="post">
-			<table>
-				<tr>
-					<td class="fm_lab">名称(Alias):</td><td><input name="name" class="easyui-validatebox" required="true"></td>
-				</tr>
-				<tr><td class="fm_lab">驱动(Driver):</td>
-					<td>
-						<select class="easyui-combobox" name="driverClass" required="true">
-							<option value="com.mysql.jdbc.Driver" selected>com.mysql.jdbc.Driver</option>
-							<option value="net.sourceforge.jtds.jdbc.Driver">net.sourceforge.jtds.jdbc.Driver</option>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<td class="fm_lab">连接(Url):</td><td><input name="jdbcUrl" class="easyui-validatebox" style="width: 300px;" required="true"></td>
-				</tr>
-				<tr>
-					<td class="fm_lab">用户名(Username):</td><td><input name="username" class="easyui-validatebox" required="true"></td>
-				<tr>
-					<td class="fm_lab">密码(Password):</td><td><input name="password" class="easyui-validatebox" required="true"></td>
-				</tr>
-			</table>
-		</form>
-	</div>
-	<div id="dlg-buttons">
-		<a href="#" class="easyui-linkbutton" iconCls="icon-ok" onclick="crud.save(); return false;">保存</a>
-		<a href="#" class="easyui-linkbutton" iconCls="icon-cancel" onclick="crud.closeDlg(); return false;">取消</a>
-	</div>
-	
-<jsp:include page="../easyui_lib.jsp"></jsp:include>
-<script type="text/javascript">
-var that = this;
-var crud = Crud.create({
-	pk:'dcId'
-	,listUrl:ctx + 'listDataSource.do'
-	,addUrl:ctx + 'addDataSource.do'
-	,updateUrl:ctx + 'updateDataSource.do'
-	,delUrl:ctx + 'delDataSource.do'
-	,dlgId:'dlg'
-	,formId:'fm'
-	,gridId:'dg'
-});
-
-crud.buildGrid([
-	{field:'name',title:'名称'}  
-	,{field:'driverClass',title:'驱动'}
-	,{field:'jdbcUrl',title:'连接'}
-	,{field:'_account',title:'账号/密码',formatter:accountFormater}    
-	,{field:'_oper',title:'操作',formatter:formatOper}     
-]);
-
-function formatOper(val,row,index){
-	return '<a href="#" onclick="'+FunUtil.createFun(that,'testConnection',row)+'">连接测试</a>'+
-		' | <a href="#" onclick="'+FunUtil.createFun(crud,'update',row)+'">修改</a>'+
-		' | <a href="#" onclick="'+FunUtil.createFun(crud,'del',row)+'">删除</a>';
-}
-
-function accountFormater(val,row,index){
-	return row.username + "/" + row.password;
-}
-
-function testConnection(row){
-	MaskUtil.mask('测试连接中...');
-	
-	Action.jsonAsyncActByData(ctx + 'connectionTest.do',row,function(e){
-		MaskUtil.unmask();
-		if(e.success){
-			MsgUtil.alert('连接成功');
-		}else{
-			MsgUtil.error(e.errorMsg);
-		}
-	});
-}
-
-</script>
-</body>
-</html>

+ 0 - 125
src/main/webapp/config/template.jsp

@@ -1,125 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@ include file="../taglib.jsp" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>模板配置</title>
-<style type="text/css">
-	.fitem{margin: 4px;}
-	.fitem input{width:200px;}
-	.codeArea{
-		font-size:13px;
-		border: dotted #ccc 1px;
-		padding: 3px;
-		font-family: 宋体,Consolas,sans-serif;
-	}
-	.codeText{
-		width: 100%;font-size:13px;font-family: 宋体,Consolas,sans-serif;
-	}
-</style>
-</head>
-<body>
- <div id="toolbar">
-		<a href="#" class="easyui-linkbutton" iconCls="icon-add" plain="true" onclick="add()">添加模板</a>
-	</div>
-	<table id="dg" title="模板列表" class="easyui-datagrid"
-			style="width:500px;"
-			url="${ctx}listTemplate.do"
-			toolbar="#toolbar" pagination="true" striped="true"
-			rownumbers="false" fitColumns="true" singleSelect="true">
-		<thead>
-			<tr>
-				<th data-options="field:'name',align:'center'">模板名</th>
-				<th data-options="field:'content',align:'center',formatter:formatContent">内容</th>
-				<th data-options="field:'_operate',align:'center',formatter:formatOper">操作</th>
-			</tr>
-		</thead>
-	</table>
-<br>
-	<div id="dlg" class="easyui-window" 
-		style="width:1000px;height:600px;padding:10px 20px"
-		data-options="closed:true,minimizable:false,collapsible:false">
-		
-		<div class="easyui-layout" data-options="fit:true">
-			<div data-options="region:'center'" style="padding:10px;">
-				<form id="fm" method="post" novalidate>
-					<div class="fitem">
-						<label>模板名:</label><br>
-						<input name="name" class="easyui-validatebox" required="true">
-					</div>
-					<hr style="border-bottom: dotted 1px gray;border-top: 0px;">
-					<div class="fitem">
-						<label>内容:</label><br>
-						<textarea class="codeText" name="content" rows="22" required="true"></textarea>
-					</div>
-				</form>
-			</div>
-			<div data-options="region:'south',border:false" style="text-align:right;padding:5px 0 0;">
-				<a href="#" class="easyui-linkbutton" iconCls="icon-ok" onclick="crud.save(); return false;">保存</a>
-				<a href="#" class="easyui-linkbutton" iconCls="icon-cancel" onclick="crud.closeDlg(); return false;">取消</a>
-			</div>
-		</div>
-		
-	</div>
-	
-<div id="viewWin"
-	class="easyui-window" 
-	title="模板内容" 
-	style="width:800px;height:450px;padding:5px;"   
-    data-options="closed:true,minimizable:false,collapsible:false">   
-	    
-	<div class="easyui-layout" data-options="fit:true">
-		<div data-options="region:'center'" style="padding:10px;">
-			<div id="viewCode" class="codeArea"></div>
-		</div>
-		<div data-options="region:'south',border:false" style="text-align:right;padding:5px 0 0;">
-			<a class="easyui-linkbutton" data-options="iconCls:'icon-ok'" href="javascript:void(0)" onclick="$('#viewWin').window('close');">确定</a>
-		</div>
-	</div>
-</div> 
-
-<jsp:include page="../easyui_lib.jsp"></jsp:include>
-<script type="text/javascript">
-function showEg(){
-	$('#eg').show(500);
-}
-
-var url;
-var that = this;
-var crud = Crud.create({
-	pk:'tcId'
-	,addUrl:ctx + 'addTemplate.do'
-	,updateUrl:ctx + 'updateTemplate.do'
-	,delUrl:ctx + 'delTemplate.do'
-	,dlgId:'dlg'
-	,formId:'fm'
-	,gridId:'dg'
-});
-
-function add(){
-	crud.add('添加模板');
-	//$('#dlg').panel('maximize');
-}
-
-function formatOper(val,row,index){
-	return '<a href="#" onclick="'+FunUtil.createFun(crud,'update',row)+'">修改</a>'+
-		' | <a href="#" onclick="'+FunUtil.createFun(crud,'del',row)+'">删除</a>';
-}
-
-function formatContent(val,row){
-	return '<a href="#" onclick="'+FunUtil.createFun(that,'showContent',row)+'">查看</a>';
-}
-
-// 展示内容
-function showContent(row){
-	$('#viewCode').html(HtmlUtil.parseToHtml(row.content));
-	$('#viewWin').window('open');
-}
-</script>
-
-<!-- 保持session -->
-<iframe src="${ctx}keepSession.jsp" frameborder="0" height="0" width="0" style="height: 0px;width: 0px;"></iframe>
-</body>
-</html>

+ 18 - 0
src/main/webapp/decorator/head.jsp

@@ -0,0 +1,18 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ include file="../taglib.jsp" %>
+<title><sitemesh:write property="title" /></title>
+<link rel="stylesheet" type="text/css" href="${resources}css/common.css"/>
+<link rel="stylesheet" type="text/css" href="${resources}css/main.css"/>
+<!-- fdui css -->
+<link id="fd_theme" href="${resources}fdui/theme/aristo/theme.css" rel="stylesheet" type="text/css" />
+<link href="${resources}fdui/primeui-1.1-min.css" rel="stylesheet" type="text/css" />
+<!-- fdui js -->
+<c:when test="${debugModel}">
+<script type="text/javascript" src="${resources}fdui/fdui.all.js"></script>
+</c:when>
+<c:otherwise>
+    <script type="text/javascript" src="${resources}fdui/fdui.all.min.js"></script>
+</c:otherwise>
+   <script type="text/javascript" src="${resources}js/libs/jquery.min.js"></script>
+<script type="text/javascript" src="${resources}js/libs/modernizr.min.js"></script>

+ 104 - 0
src/main/webapp/decorator/main.jsp

@@ -0,0 +1,104 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ include file="../taglib.jsp" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title><sitemesh:write property="title" /></title>
+	<link href="${ctx}favicon.ico" rel="SHORTCUT ICON">
+	<link rel="stylesheet" type="text/css" href="${resources}css/common.css"/>
+	<link rel="stylesheet" type="text/css" href="${resources}css/main.css"/>
+	<!-- fdui css -->
+	<link href="${resources}fdui/theme/aristo/theme.css" rel="stylesheet" type="text/css" />
+	<link href="${resources}fdui/primeui-1.1-min.css" rel="stylesheet" type="text/css" />
+	<script type="text/javascript">var ctx = '${ctx}';</script>
+	<!-- fdui js -->
+	<c:choose>
+		<c:when test="${debugModel}">
+			<script type="text/javascript" src="${resources}fdui/fdui.all.js"></script>
+		</c:when>
+		<c:otherwise>
+		    <script type="text/javascript" src="${resources}fdui/fdui.all.min.js"></script>
+		</c:otherwise>
+	</c:choose>
+	<script type="text/javascript" src="${resources}js/libs/jquery.min.js"></script>
+	<script type="text/javascript" src="${resources}js/libs/modernizr.min.js"></script>
+	<script type="text/javascript" src="${resources}js/libs/Action.js"></script>
+	<script type="text/javascript" src="${resources}js/util/NavUtil.js"></script>
+	<script type="text/javascript" src="${resources}js/util/MaskUtil.js"></script>
+	<script type="text/javascript" src="${resources}js/util/HtmlUtil.js"></script>
+	<script type="text/javascript" src="${resources}js/util/FunUtil.js"></script>
+	
+	<style type="text/css">
+		.sub-body{margin: 10px;}
+	</style>
+	<sitemesh:write property="head" />
+</head>
+<body>
+<div class="topbar-wrap white">
+    <div class="topbar-inner clearfix">
+        <div class="topbar-logo-wrap clearfix">
+            <h1 class="topbar-logo none"><a href="${ctx}sys/home.jsp" class="navbar-brand">后台管理</a></h1>
+            <ul class="navbar-list clearfix">
+                <li><a href="${ctx}sys/home.jsp">首页</a></li>
+            </ul>
+        </div>
+        <div class="top-info-wrap">
+            <ul class="top-info-list clearfix">
+                <li><a href="${ctx}sys/updatePswd.jsp">修改密码</a></li>
+                <li><a href="javascript:void(0)" onclick="logout();">退出</a></li>
+            </ul>
+        </div>
+    </div>
+</div>
+<div class="container clearfix">
+    <!-- 菜单 -->
+    <%@ include file="menu.jsp" %>
+    <!--/sidebar-->
+    <div class="main-wrap">
+         <div class="crumb-wrap" id="nav-content">
+            <div id="crumbId" class="crumb-list"><i class="icon-font"></i><a href="${ctx}sys/home.jsp">首页</a><span class="crumb-step">&gt;</span><span class="crumb-name"><sitemesh:write property="title" /></span></div>
+        </div>
+        <div class="sub-body">
+	        <sitemesh:write property="body" />
+        </div>
+    </div>
+    <!--/main-->
+</div>
+<script type="text/javascript">
+function logout() {
+	$.ajax({
+		type: "POST",
+	    url: ctx + 'logout.do',
+	  	dataType:'json',
+	    success: function(result){
+			if (result.success){
+				goLogin();
+			} 
+		},
+		error:function(){
+			goLogin();
+		}
+	});
+}
+
+if (typeof(jQuery) != 'undefined') {
+    $(document).ajaxError(function (event, request, settings) {
+        if (request.getResponseHeader("X-timeout") && request.status == 401) {
+        	goLogin();
+        }else{
+        	alert("系统异常");
+        }
+    });
+}
+
+function goLogin() {
+	// 页面跳转
+	location.replace(ctx + 'needLogin.html');
+}
+
+// 菜单高亮
+$(".uuid-${param.srId}").parent().addClass('on');
+</script>
+</body>
+</html>

+ 23 - 0
src/main/webapp/decorator/menu.jsp

@@ -0,0 +1,23 @@
+<%@page import="org.durcframework.autocode.common.AutoCodeContext"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+<%@ include file="../taglib.jsp"%>
+<div class="sidebar-wrap">
+	<div class="sidebar-title">
+		<h1>菜单</h1>
+	</div>
+	<div class="sidebar-content">
+		<ul class="sidebar-list">
+			<li><a href="#"><i class="icon-font">&#xe003;</i>常用操作</a>
+				<ul class="sub-menu">
+					<li><a href="${ctx}sys/generator.jsp"><i class="icon-font">&#xe008;</i>生成代码</a></li>
+					<li><a href="${ctx}sys/dataSource.jsp"><i class="icon-font">&#xe052;</i>配置数据源</a></li>
+					<li><a href="${ctx}sys/template.jsp"><i class="icon-font">&#xe005;</i>配置模板</a></li>
+					<c:if test="<%=AutoCodeContext.getInstance().isAdmin() %>">
+						<li><a href="${ctx}sys/backUser.jsp"><i class="icon-font">&#xe014;</i>用户管理</a></li>
+					</c:if>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>

+ 97 - 0
src/main/webapp/decorator/static.jsp

@@ -0,0 +1,97 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ include file="../taglib.jsp" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title><sitemesh:write property="title" /></title>
+	<link href="${ctx}favicon.ico" rel="SHORTCUT ICON">
+	<link rel="stylesheet" type="text/css" href="${resources}css/common.css"/>
+	<link rel="stylesheet" type="text/css" href="${resources}css/main.css"/>
+	<!-- fdui css -->
+	<link id="fd_theme" href="${resources}fdui/theme/aristo/theme.css" rel="stylesheet" type="text/css" />
+	<link href="${resources}fdui/primeui-1.1-min.css" rel="stylesheet" type="text/css" />
+	<script type="text/javascript">var ctx = '${ctx}';</script>
+	<!-- fdui js -->
+	<c:choose>
+		<c:when test="${debugModel}">
+			<script type="text/javascript" src="${resources}fdui/fdui.all.js"></script>
+		</c:when>
+		<c:otherwise>
+		    <script type="text/javascript" src="${resources}fdui/fdui.all.min.js"></script>
+		</c:otherwise>
+	</c:choose>
+	<script type="text/javascript" src="${resources}js/libs/jquery.min.js"></script>
+	<script type="text/javascript" src="${resources}js/libs/modernizr.min.js"></script>
+	<script type="text/javascript" src="${resources}js/libs/Action.js"></script>
+	<script type="text/javascript" src="${resources}js/plugin/NavUtil.js"></script>
+	<script type="text/javascript" src="${resources}js/plugin/MaskUtil.js"></script>
+	<style type="text/css">
+		.sub-body{margin: 10px;}
+		.main-wrap1{margin: 0px auto 0;}
+	</style>
+	<sitemesh:write property="head" />
+</head>
+<body>
+<div class="topbar-wrap white">
+    <div class="topbar-inner clearfix">
+        <div class="topbar-logo-wrap clearfix">
+            <h1 class="topbar-logo none"><a href="${ctx}sys/home.jsp" class="navbar-brand">后台管理</a></h1>
+            <ul class="navbar-list clearfix">
+                <li><a href="${ctx}sys/home.jsp">首页</a></li>
+            </ul>
+        </div>
+        <div class="top-info-wrap">
+            <ul class="top-info-list clearfix">
+                <li><a href="${ctx}sys/updatePswd.jsp">修改密码</a></li>
+                <li><a href="javascript:void(0)" onclick="logout();">退出</a></li>
+            </ul>
+        </div>
+    </div>
+</div>
+<div class="container clearfix">
+    <!--/sidebar-->
+    <div class="main-wrap">
+        <div class="sub-body">
+	        <sitemesh:write property="body" />
+        </div>
+    </div>
+    <!--/main-->
+</div>
+<script type="text/javascript">
+function logout() {
+	$.ajax({
+		type: "POST",
+	    url: ctx + 'logout.do',
+	  	dataType:'json',
+	    success: function(result){
+			if (result.success){
+				goLogin();
+			} 
+		},
+		error:function(){
+			goLogin();
+		}
+	});
+}
+
+if (typeof(jQuery) != 'undefined') {
+    $(document).ajaxError(function (event, request, settings) {
+        if (request.getResponseHeader("X-timeout") && request.status == 401) {
+        	goLogin();
+        }else{
+        	alert("系统异常");
+        }
+    });
+}
+
+function goLogin() {
+	// 页面跳转
+	location.replace(ctx + 'needLogin.html');
+}
+
+// 菜单高亮
+$(".uuid-${param.srId}").parent().addClass('on');
+</script>
+</body>
+</html>

File diff suppressed because it is too large
+ 0 - 2
src/main/webapp/easyui/jquery-1.8.0.min.js


File diff suppressed because it is too large
+ 0 - 68
src/main/webapp/easyui/jquery.easyui.min.js


+ 0 - 70
src/main/webapp/easyui/locale/easyui-lang-zh_CN.js

@@ -1,70 +0,0 @@
-if ($.fn.pagination){
-	$.fn.pagination.defaults.beforePageText = '第';
-	$.fn.pagination.defaults.afterPageText = '共{pages}页';
-	$.fn.pagination.defaults.displayMsg = '显示{from}到{to},共{total}条记录';
-}
-if ($.fn.datagrid){
-	$.fn.datagrid.defaults.loadMsg = '正在处理,请稍后...';
-}
-if ($.fn.treegrid && $.fn.datagrid){
-	$.fn.treegrid.defaults.loadMsg = $.fn.datagrid.defaults.loadMsg;
-}
-if ($.messager){
-	$.messager.defaults.ok = '确定';
-	$.messager.defaults.cancel = '取消';
-}
-if ($.fn.validatebox){
-	$.fn.validatebox.defaults.missingMessage = '该输入项为必输项';
-	$.fn.validatebox.defaults.rules.email.message = '请输入有效的电子邮件地址';
-	$.fn.validatebox.defaults.rules.url.message = '请输入有效的URL地址';
-	$.fn.validatebox.defaults.rules.length.message = '输入内容长度必须介于{0}和{1}之间';
-	$.fn.validatebox.defaults.rules.remote.message = '请修正该字段';
-}
-if ($.fn.numberbox){
-	$.fn.numberbox.defaults.missingMessage = '该输入项为必输项';
-}
-if ($.fn.combobox){
-	$.fn.combobox.defaults.missingMessage = '该输入项为必输项';
-}
-if ($.fn.combotree){
-	$.fn.combotree.defaults.missingMessage = '该输入项为必输项';
-}
-if ($.fn.combogrid){
-	$.fn.combogrid.defaults.missingMessage = '该输入项为必输项';
-}
-if ($.fn.calendar){
-	$.fn.calendar.defaults.weeks = ['日','一','二','三','四','五','六'];
-	$.fn.calendar.defaults.months = ['一月','二月','三月','四月','五月','六月','七月','八月','九月','十月','十一月','十二月'];
-}
-if ($.fn.datebox){
-	$.fn.datebox.defaults.currentText = '今天';
-	$.fn.datebox.defaults.closeText = '关闭';
-	$.fn.datebox.defaults.okText = '确定';
-	$.fn.datebox.defaults.missingMessage = '该输入项为必输项';
-	$.fn.datebox.defaults.formatter = function(date){
-		var y = date.getFullYear();
-		var m = date.getMonth()+1;
-		var d = date.getDate();
-		return y+'-'+(m<10?('0'+m):m)+'-'+(d<10?('0'+d):d);
-	};
-	$.fn.datebox.defaults.parser = function(s){
-		if (!s) return new Date();
-		var ss = s.split('-');
-		var y = parseInt(ss[0],10);
-		var m = parseInt(ss[1],10);
-		var d = parseInt(ss[2],10);
-		if (!isNaN(y) && !isNaN(m) && !isNaN(d)){
-			return new Date(y,m-1,d);
-		} else {
-			return new Date();
-		}
-	};
-}
-if ($.fn.datetimebox && $.fn.datebox){
-	$.extend($.fn.datetimebox.defaults,{
-		currentText: $.fn.datebox.defaults.currentText,
-		closeText: $.fn.datebox.defaults.closeText,
-		okText: $.fn.datebox.defaults.okText,
-		missingMessage: $.fn.datebox.defaults.missingMessage
-	});
-}

+ 0 - 41
src/main/webapp/easyui/themes/default/accordion.css

@@ -1,41 +0,0 @@
-.accordion {
-  overflow: hidden;
-  border-width: 1px;
-  border-style: solid;
-}
-.accordion .accordion-header {
-  border-width: 0 0 1px;
-  cursor: pointer;
-}
-.accordion .accordion-body {
-  border-width: 0 0 1px;
-}
-.accordion-noborder {
-  border-width: 0;
-}
-.accordion-noborder .accordion-header {
-  border-width: 0 0 1px;
-}
-.accordion-noborder .accordion-body {
-  border-width: 0 0 1px;
-}
-.accordion-collapse {
-  background: url('images/accordion_arrows.png') no-repeat 0 0;
-}
-.accordion-expand {
-  background: url('images/accordion_arrows.png') no-repeat -16px 0;
-}
-.accordion {
-  background: #ffffff;
-  border-color: #95B8E7;
-}
-.accordion .accordion-header {
-  background: #E0ECFF;
-  filter: none;
-}
-.accordion .accordion-header-selected {
-  background: #FBEC88;
-}
-.accordion .accordion-header-selected .panel-title {
-  color: #000000;
-}

+ 0 - 185
src/main/webapp/easyui/themes/default/calendar.css

@@ -1,185 +0,0 @@
-.calendar {
-  border-width: 1px;
-  border-style: solid;
-  padding: 1px;
-  overflow: hidden;
-  font-size: 12px;
-}
-.calendar table {
-  border-collapse: separate;
-  font-size: 12px;
-  width: 100%;
-  height: 100%;
-}
-.calendar-noborder {
-  border: 0;
-}
-.calendar-header {
-  position: relative;
-  height: 22px;
-}
-.calendar-title {
-  text-align: center;
-  height: 22px;
-}
-.calendar-title span {
-  position: relative;
-  display: inline-block;
-  top: 2px;
-  padding: 0 3px;
-  height: 18px;
-  line-height: 18px;
-  cursor: pointer;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
-}
-.calendar-prevmonth,
-.calendar-nextmonth,
-.calendar-prevyear,
-.calendar-nextyear {
-  position: absolute;
-  top: 50%;
-  margin-top: -7px;
-  width: 14px;
-  height: 14px;
-  cursor: pointer;
-  font-size: 1px;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
-}
-.calendar-prevmonth {
-  left: 20px;
-  background: url('images/calendar_arrows.png') no-repeat -18px -2px;
-}
-.calendar-nextmonth {
-  right: 20px;
-  background: url('images/calendar_arrows.png') no-repeat -34px -2px;
-}
-.calendar-prevyear {
-  left: 3px;
-  background: url('images/calendar_arrows.png') no-repeat -1px -2px;
-}
-.calendar-nextyear {
-  right: 3px;
-  background: url('images/calendar_arrows.png') no-repeat -49px -2px;
-}
-.calendar-body {
-  position: relative;
-}
-.calendar-body th,
-.calendar-body td {
-  text-align: center;
-}
-.calendar-day {
-  border: 0;
-  padding: 1px;
-  cursor: pointer;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
-}
-.calendar-other-month {
-  opacity: 0.3;
-  filter: alpha(opacity=30);
-}
-.calendar-menu {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 180px;
-  height: 150px;
-  padding: 5px;
-  font-size: 12px;
-  display: none;
-  overflow: hidden;
-}
-.calendar-menu-year-inner {
-  text-align: center;
-  padding-bottom: 5px;
-}
-.calendar-menu-year {
-  width: 40px;
-  text-align: center;
-  border-width: 1px;
-  border-style: solid;
-  margin: 0;
-  padding: 2px;
-  font-weight: bold;
-}
-.calendar-menu-prev,
-.calendar-menu-next {
-  display: inline-block;
-  width: 21px;
-  height: 21px;
-  vertical-align: top;
-  cursor: pointer;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
-}
-.calendar-menu-prev {
-  margin-right: 10px;
-  background: url('images/calendar_arrows.png') no-repeat 2px 2px;
-}
-.calendar-menu-next {
-  margin-left: 10px;
-  background: url('images/calendar_arrows.png') no-repeat -45px 2px;
-}
-.calendar-menu-month {
-  text-align: center;
-  cursor: pointer;
-  font-weight: bold;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
-}
-.calendar-body th,
-.calendar-menu-month {
-  color: #4d4d4d;
-}
-.calendar-day {
-  color: #000000;
-}
-.calendar-sunday {
-  color: #CC2222;
-}
-.calendar-saturday {
-  color: #00ee00;
-}
-.calendar-today {
-  color: #0000ff;
-}
-.calendar-menu-year {
-  border-color: #95B8E7;
-}
-.calendar {
-  border-color: #95B8E7;
-}
-.calendar-header {
-  background: #E0ECFF;
-}
-.calendar-body,
-.calendar-menu {
-  background: #ffffff;
-}
-.calendar-body th {
-  background: #F4F4F4;
-}
-.calendar-hover,
-.calendar-nav-hover,
-.calendar-menu-hover {
-  background-color: #eaf2ff;
-  color: #000000;
-}
-.calendar-hover {
-  border: 1px solid #b7d2ff;
-  padding: 0;
-}
-.calendar-selected {
-  background-color: #FBEC88;
-  color: #000000;
-  border: 1px solid #E2C608;
-  padding: 0;
-}

+ 0 - 58
src/main/webapp/easyui/themes/default/combo.css

@@ -1,58 +0,0 @@
-.combo {
-  display: inline-block;
-  white-space: nowrap;
-  margin: 0;
-  padding: 0;
-  border-width: 1px;
-  border-style: solid;
-  overflow: hidden;
-  vertical-align: middle;
-}
-.combo .combo-text {
-  font-size: 12px;
-  border: 0px;
-  line-height: 20px;
-  height: 20px;
-  margin: 0;
-  padding: 0px 2px;
-  *margin-top: -1px;
-  *height: 18px;
-  *line-height: 18px;
-  _height: 18px;
-  _line-height: 18px;
-  vertical-align: baseline;
-}
-.combo-arrow {
-  width: 18px;
-  height: 20px;
-  overflow: hidden;
-  display: inline-block;
-  vertical-align: top;
-  cursor: pointer;
-  opacity: 0.6;
-  filter: alpha(opacity=60);
-}
-.combo-arrow-hover {
-  opacity: 1.0;
-  filter: alpha(opacity=100);
-}
-.combo-panel {
-  overflow: auto;
-}
-.combo-arrow {
-  background: url('images/combo_arrow.png') no-repeat center center;
-}
-.combo,
-.combo-panel {
-  background-color: #ffffff;
-}
-.combo {
-  border-color: #95B8E7;
-  background-color: #ffffff;
-}
-.combo-arrow {
-  background-color: #E0ECFF;
-}
-.combo-arrow-hover {
-  background-color: #eaf2ff;
-}

+ 0 - 14
src/main/webapp/easyui/themes/default/combobox.css

@@ -1,14 +0,0 @@
-.combobox-item {
-  padding: 2px;
-  font-size: 12px;
-  padding: 3px;
-  padding-right: 0px;
-}
-.combobox-item-hover {
-  background-color: #eaf2ff;
-  color: #000000;
-}
-.combobox-item-selected {
-  background-color: #FBEC88;
-  color: #000000;
-}

+ 0 - 253
src/main/webapp/easyui/themes/default/datagrid.css

@@ -1,253 +0,0 @@
-.datagrid .panel-body {
-  overflow: hidden;
-  position: relative;
-}
-.datagrid-view {
-  position: relative;
-  overflow: hidden;
-}
-.datagrid-view1,
-.datagrid-view2 {
-  position: absolute;
-  overflow: hidden;
-  top: 0;
-}
-.datagrid-view1 {
-  left: 0;
-}
-.datagrid-view2 {
-  right: 0;
-}
-.datagrid-mask {
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  opacity: 0.3;
-  filter: alpha(opacity=30);
-  display: none;
-}
-.datagrid-mask-msg {
-  position: absolute;
-  top: 50%;
-  margin-top: -20px;
-  padding: 12px 5px 10px 30px;
-  width: auto;
-  height: 16px;
-  border-width: 2px;
-  border-style: solid;
-  display: none;
-}
-.datagrid-sort-icon {
-  padding: 0;
-}
-.datagrid-toolbar {
-  height: auto;
-  padding: 1px 2px;
-  border-width: 0 0 1px 0;
-  border-style: solid;
-}
-.datagrid-btn-separator {
-  float: left;
-  height: 24px;
-  border-left: 1px solid #ccc;
-  border-right: 1px solid #fff;
-  margin: 2px 1px;
-}
-.datagrid .datagrid-pager {
-  margin: 0;
-  border-width: 1px 0 0 0;
-  border-style: solid;
-}
-.datagrid .datagrid-pager-top {
-  border-width: 0 0 1px 0;
-}
-.datagrid-header {
-  overflow: hidden;
-  cursor: default;
-  border-width: 0 0 1px 0;
-  border-style: solid;
-}
-.datagrid-header-inner {
-  float: left;
-  width: 10000px;
-}
-.datagrid-header-row,
-.datagrid-row {
-  height: 25px;
-}
-.datagrid-header td,
-.datagrid-body td,
-.datagrid-footer td {
-  border-width: 0 1px 1px 0;
-  border-style: dotted;
-  margin: 0;
-  padding: 0;
-}
-.datagrid-cell,
-.datagrid-cell-group,
-.datagrid-header-rownumber,
-.datagrid-cell-rownumber {
-  margin: 0;
-  padding: 0 4px;
-  white-space: nowrap;
-  word-wrap: normal;
-  overflow: hidden;
-  height: 18px;
-  line-height: 18px;
-  font-weight: normal;
-  font-size: 12px;
-}
-.datagrid-cell-group {
-  text-align: center;
-}
-.datagrid-header-rownumber,
-.datagrid-cell-rownumber {
-  width: 25px;
-  text-align: center;
-  margin: 0;
-  padding: 0;
-}
-.datagrid-body {
-  margin: 0;
-  padding: 0;
-  overflow: auto;
-  zoom: 1;
-}
-.datagrid-view1 .datagrid-body-inner {
-  padding-bottom: 20px;
-}
-.datagrid-view1 .datagrid-body {
-  overflow: hidden;
-}
-.datagrid-footer {
-  overflow: hidden;
-}
-.datagrid-footer-inner {
-  border-width: 1px 0 0 0;
-  border-style: solid;
-  width: 10000px;
-  float: left;
-}
-.datagrid-row-editing .datagrid-cell {
-  height: auto;
-}
-.datagrid-header-check,
-.datagrid-cell-check {
-  padding: 0;
-  width: 27px;
-  height: 18px;
-  font-size: 1px;
-  text-align: center;
-  overflow: hidden;
-}
-.datagrid-header-check input,
-.datagrid-cell-check input {
-  margin: 0;
-  padding: 0;
-  width: 15px;
-  height: 18px;
-}
-.datagrid-resize-proxy {
-  position: absolute;
-  width: 1px;
-  height: 10000px;
-  top: 0;
-  cursor: e-resize;
-  display: none;
-}
-.datagrid-body .datagrid-editable {
-  margin: 0;
-  padding: 0;
-}
-.datagrid-body .datagrid-editable table {
-  width: 100%;
-  height: 100%;
-}
-.datagrid-body .datagrid-editable td {
-  border: 0;
-  margin: 0;
-  padding: 0;
-}
-.datagrid-body .datagrid-editable .datagrid-editable-input {
-  margin: 0;
-  padding: 2px;
-  border-width: 1px;
-  border-style: solid;
-}
-.datagrid-sort-desc .datagrid-sort-icon {
-  padding: 0 13px 0 0;
-  background: url('images/datagrid_icons.png') no-repeat -16px center;
-}
-.datagrid-sort-asc .datagrid-sort-icon {
-  padding: 0 13px 0 0;
-  background: url('images/datagrid_icons.png') no-repeat 0px center;
-}
-.datagrid-row-collapse {
-  background: url('images/datagrid_icons.png') no-repeat -48px center;
-}
-.datagrid-row-expand {
-  background: url('images/datagrid_icons.png') no-repeat -32px center;
-}
-.datagrid-mask-msg {
-  background: #ffffff url('images/loading.gif') no-repeat scroll 5px center;
-}
-.datagrid-header,
-.datagrid-td-rownumber {
-  background-color: #efefef;
-  background: -webkit-linear-gradient(top,#F9F9F9 0,#efefef 100%);
-  background: -moz-linear-gradient(top,#F9F9F9 0,#efefef 100%);
-  background: -o-linear-gradient(top,#F9F9F9 0,#efefef 100%);
-  background: linear-gradient(to bottom,#F9F9F9 0,#efefef 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#F9F9F9,endColorstr=#efefef,GradientType=0);
-}
-.datagrid-cell-rownumber {
-  color: #000000;
-}
-.datagrid-resize-proxy {
-  background: #aac5e7;
-}
-.datagrid-mask {
-  background: #ccc;
-}
-.datagrid-mask-msg {
-  border-color: #95B8E7;
-}
-.datagrid-toolbar,
-.datagrid-pager {
-  background: #F4F4F4;
-}
-.datagrid-header,
-.datagrid-toolbar,
-.datagrid-pager,
-.datagrid-footer-inner {
-  border-color: #dddddd;
-}
-.datagrid-header td,
-.datagrid-body td,
-.datagrid-footer td {
-  border-color: #ccc;
-}
-.datagrid-htable,
-.datagrid-btable,
-.datagrid-ftable {
-  color: #000000;
-}
-.datagrid-row-alt {
-  background: #fafafa;
-}
-.datagrid-row-over,
-.datagrid-header td.datagrid-header-over {
-  background: #eaf2ff;
-  color: #000000;
-  cursor: default;
-}
-.datagrid-row-selected {
-  background: #FBEC88;
-  color: #000000;
-}
-.datagrid-body .datagrid-editable .datagrid-editable-input {
-  border-color: #95B8E7;
-}

+ 0 - 40
src/main/webapp/easyui/themes/default/datebox.css

@@ -1,40 +0,0 @@
-.datebox-calendar-inner {
-  height: 180px;
-}
-.datebox-button {
-  height: 18px;
-  padding: 2px 5px;
-  font-size: 12px;
-  text-align: center;
-}
-.datebox-current,
-.datebox-close,
-.datebox-ok {
-  text-decoration: none;
-  font-weight: bold;
-  opacity: 0.6;
-  filter: alpha(opacity=60);
-}
-.datebox-current,
-.datebox-close {
-  float: left;
-}
-.datebox-close {
-  float: right;
-}
-.datebox-button-hover {
-  opacity: 1.0;
-  filter: alpha(opacity=100);
-}
-.datebox .combo-arrow {
-  background-image: url('images/datebox_arrow.png');
-  background-position: center center;
-}
-.datebox-button {
-  background-color: #F4F4F4;
-}
-.datebox-current,
-.datebox-close,
-.datebox-ok {
-  color: #444;
-}

+ 0 - 30
src/main/webapp/easyui/themes/default/dialog.css

@@ -1,30 +0,0 @@
-.dialog-content {
-  overflow: auto;
-}
-.dialog-toolbar {
-  padding: 2px 5px;
-}
-.dialog-tool-separator {
-  float: left;
-  height: 24px;
-  border-left: 1px solid #ccc;
-  border-right: 1px solid #fff;
-  margin: 2px 1px;
-}
-.dialog-button {
-  padding: 5px;
-  text-align: right;
-}
-.dialog-button .l-btn {
-  margin-left: 5px;
-}
-.dialog-toolbar,
-.dialog-button {
-  background: #F4F4F4;
-}
-.dialog-toolbar {
-  border-bottom: 1px solid #dddddd;
-}
-.dialog-button {
-  border-top: 1px solid #dddddd;
-}

File diff suppressed because it is too large
+ 0 - 2177
src/main/webapp/easyui/themes/default/easyui.css


BIN
src/main/webapp/easyui/themes/default/images/Thumbs.db


BIN
src/main/webapp/easyui/themes/default/images/accordion_arrows.png


BIN
src/main/webapp/easyui/themes/default/images/blank.gif


BIN
src/main/webapp/easyui/themes/default/images/calendar_arrows.png


BIN
src/main/webapp/easyui/themes/default/images/combo_arrow.png


BIN
src/main/webapp/easyui/themes/default/images/datagrid_icons.png


BIN
src/main/webapp/easyui/themes/default/images/datebox_arrow.png


BIN
src/main/webapp/easyui/themes/default/images/layout_arrows.png


BIN
src/main/webapp/easyui/themes/default/images/linkbutton_bg.png


BIN
src/main/webapp/easyui/themes/default/images/loading.gif


BIN
src/main/webapp/easyui/themes/default/images/menu_arrows.png


BIN
src/main/webapp/easyui/themes/default/images/messager_icons.png


BIN
src/main/webapp/easyui/themes/default/images/pagination_icons.png


BIN
src/main/webapp/easyui/themes/default/images/panel_tools.png


BIN
src/main/webapp/easyui/themes/default/images/searchbox_button.png


BIN
src/main/webapp/easyui/themes/default/images/slider_handle.png


BIN
src/main/webapp/easyui/themes/default/images/spinner_arrows.png


BIN
src/main/webapp/easyui/themes/default/images/tabs_icons.png


BIN
src/main/webapp/easyui/themes/default/images/tree_icons.png


BIN
src/main/webapp/easyui/themes/default/images/validatebox_arrows.png


BIN
src/main/webapp/easyui/themes/default/images/validatebox_warning.png


+ 0 - 91
src/main/webapp/easyui/themes/default/layout.css

@@ -1,91 +0,0 @@
-.layout {
-  position: relative;
-  overflow: hidden;
-  margin: 0;
-  padding: 0;
-  z-index: 0;
-}
-.layout-panel {
-  position: absolute;
-  overflow: hidden;
-}
-.layout-panel-east,
-.layout-panel-west {
-  z-index: 2;
-}
-.layout-panel-north,
-.layout-panel-south {
-  z-index: 3;
-}
-.layout-expand {
-  position: absolute;
-  padding: 0px;
-  font-size: 1px;
-  cursor: pointer;
-  z-index: 1;
-}
-.layout-expand .panel-header,
-.layout-expand .panel-body {
-  background: transparent;
-  filter: none;
-  overflow: hidden;
-}
-.layout-expand .panel-header {
-  border-bottom-width: 0px;
-}
-.layout-split-proxy-h,
-.layout-split-proxy-v {
-  position: absolute;
-  font-size: 1px;
-  display: none;
-  z-index: 5;
-}
-.layout-split-proxy-h {
-  width: 5px;
-  cursor: e-resize;
-}
-.layout-split-proxy-v {
-  height: 5px;
-  cursor: n-resize;
-}
-.layout-mask {
-  position: absolute;
-  background: #fafafa;
-  filter: alpha(opacity=10);
-  opacity: 0.10;
-  z-index: 4;
-}
-.layout-button-up {
-  background: url('images/layout_arrows.png') no-repeat -16px -16px;
-}
-.layout-button-down {
-  background: url('images/layout_arrows.png') no-repeat -16px 0;
-}
-.layout-button-left {
-  background: url('images/layout_arrows.png') no-repeat 0 0;
-}
-.layout-button-right {
-  background: url('images/layout_arrows.png') no-repeat 0 -16px;
-}
-.layout-split-proxy-h,
-.layout-split-proxy-v {
-  background-color: #aac5e7;
-}
-.layout-split-north {
-  border-bottom: 5px solid #E6EEF8;
-}
-.layout-split-south {
-  border-top: 5px solid #E6EEF8;
-}
-.layout-split-east {
-  border-left: 5px solid #E6EEF8;
-}
-.layout-split-west {
-  border-right: 5px solid #E6EEF8;
-}
-.layout-expand {
-  background-color: #E0ECFF;
-}
-.layout-expand-over {
-  background-color: #E0ECFF;
-}

+ 0 - 105
src/main/webapp/easyui/themes/default/linkbutton.css

@@ -1,105 +0,0 @@
-a.l-btn {
-  background-position: right 0;
-  font-size: 12px;
-  text-decoration: none;
-  display: inline-block;
-  zoom: 1;
-  height: 24px;
-  padding-right: 18px;
-  cursor: pointer;
-  outline: none;
-}
-a.l-btn-plain {
-  padding-right: 5px;
-  border: 0;
-  padding: 1px 6px 1px 1px;
-}
-a.l-btn-disabled {
-  color: #ccc;
-  opacity: 0.5;
-  filter: alpha(opacity=50);
-  cursor: default;
-}
-a.l-btn span.l-btn-left {
-  display: inline-block;
-  background-position: 0 -48px;
-  padding: 4px 0px 4px 18px;
-  line-height: 16px;
-  height: 16px;
-}
-a.l-btn-plain span.l-btn-left {
-  padding-left: 5px;
-}
-a.l-btn span span.l-btn-text {
-  display: inline-block;
-  vertical-align: baseline;
-  width: auto;
-  height: 16px;
-  line-height: 16px;
-  padding: 0;
-  margin: 0;
-}
-a.l-btn span span.l-btn-icon-left {
-  padding: 0 0 0 20px;
-  background-position: left center;
-}
-a.l-btn span span.l-btn-icon-right {
-  padding: 0 20px 0 0;
-  background-position: right center;
-}
-a.l-btn span span span.l-btn-empty {
-  display: inline-block;
-  margin: 0;
-  padding: 0;
-  width: 16px;
-}
-a:hover.l-btn {
-  background-position: right -24px;
-  outline: none;
-  text-decoration: none;
-}
-a:hover.l-btn span.l-btn-left {
-  background-position: 0 bottom;
-}
-a:hover.l-btn-plain {
-  padding: 0 5px 0 0;
-}
-a:hover.l-btn-disabled {
-  background-position: right 0;
-}
-a:hover.l-btn-disabled span.l-btn-left {
-  background-position: 0 -48px;
-}
-a.l-btn .l-btn-focus {
-  outline: #0000FF dotted thin;
-}
-a.l-btn {
-  color: #444;
-  background-image: url('images/linkbutton_bg.png');
-  background-repeat: no-repeat;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
-}
-a.l-btn span.l-btn-left {
-  background-image: url('images/linkbutton_bg.png');
-  background-repeat: no-repeat;
-}
-a.l-btn-plain,
-a.l-btn-plain span.l-btn-left {
-  background: transparent;
-  border: 0;
-  filter: none;
-}
-a:hover.l-btn-plain {
-  background: #eaf2ff;
-  color: #000000;
-  border: 1px solid #b7d2ff;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
-}
-a.l-btn-disabled,
-a:hover.l-btn-disabled {
-  filter: alpha(opacity=50);
-}

+ 0 - 109
src/main/webapp/easyui/themes/default/menu.css

@@ -1,109 +0,0 @@
-.menu {
-  position: absolute;
-  margin: 0;
-  padding: 2px;
-  border-width: 1px;
-  border-style: solid;
-  overflow: hidden;
-}
-.menu-item {
-  position: relative;
-  margin: 0;
-  padding: 0;
-  overflow: hidden;
-  white-space: nowrap;
-  cursor: pointer;
-  border-width: 1px;
-  border-style: solid;
-}
-.menu-text {
-  height: 20px;
-  line-height: 20px;
-  float: left;
-  padding-left: 28px;
-}
-.menu-icon {
-  position: absolute;
-  width: 16px;
-  height: 16px;
-  left: 2px;
-  top: 50%;
-  margin-top: -8px;
-}
-.menu-rightarrow {
-  position: absolute;
-  width: 16px;
-  height: 16px;
-  right: 0;
-  top: 50%;
-  margin-top: -8px;
-}
-.menu-line {
-  position: absolute;
-  left: 26px;
-  top: 0;
-  height: 2000px;
-  font-size: 1px;
-}
-.menu-sep {
-  margin: 3px 0px 3px 25px;
-  font-size: 1px;
-}
-.menu-active {
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
-}
-.menu-item-disabled {
-  opacity: 0.5;
-  filter: alpha(opacity=50);
-  cursor: default;
-}
-.menu-text,
-.menu-text span {
-  font-size: 12px;
-}
-.menu-shadow {
-  position: absolute;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
-  background: #ccc;
-  -moz-box-shadow: 2px 2px 3px #cccccc;
-  -webkit-box-shadow: 2px 2px 3px #cccccc;
-  box-shadow: 2px 2px 3px #cccccc;
-  filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=2,MakeShadow=false,ShadowOpacity=0.2);
-}
-.menu-rightarrow {
-  background: url('images/menu_arrows.png') no-repeat -32px center;
-}
-.menu-line {
-  border-left: 1px solid #ccc;
-  border-right: 1px solid #fff;
-}
-.menu-sep {
-  border-top: 1px solid #ccc;
-  border-bottom: 1px solid #fff;
-}
-.menu {
-  background-color: #fafafa;
-  border-color: #ddd;
-  color: #444;
-}
-.menu-content {
-  background: #ffffff;
-}
-.menu-item {
-  border-color: transparent;
-  _border-color: #fafafa;
-}
-.menu-active {
-  border-color: #b7d2ff;
-  color: #000000;
-  background: #eaf2ff;
-}
-.menu-active-disabled {
-  border-color: transparent;
-  background: transparent;
-  color: #444;
-}

+ 0 - 30
src/main/webapp/easyui/themes/default/menubutton.css

@@ -1,30 +0,0 @@
-.m-btn-downarrow {
-  display: inline-block;
-  width: 16px;
-  height: 16px;
-  line-height: 16px;
-  _vertical-align: middle;
-}
-a.m-btn-active {
-  background-position: bottom right;
-}
-a.m-btn-active span.l-btn-left {
-  background-position: bottom left;
-}
-a.m-btn-plain-active {
-  background: transparent;
-  padding: 0 5px 0 0;
-  border-width: 1px;
-  border-style: solid;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
-}
-.m-btn-downarrow {
-  background: url('images/menu_arrows.png') no-repeat 2px center;
-}
-a.m-btn-plain-active {
-  border-color: #b7d2ff;
-  background-color: #eaf2ff;
-  color: #000000;
-}

+ 0 - 37
src/main/webapp/easyui/themes/default/messager.css

@@ -1,37 +0,0 @@
-.messager-body {
-  padding: 10px;
-  overflow: hidden;
-}
-.messager-button {
-  text-align: center;
-  padding-top: 10px;
-}
-.messager-icon {
-  float: left;
-  width: 32px;
-  height: 32px;
-  margin: 0 10px 10px 0;
-}
-.messager-error {
-  background: url('images/messager_icons.png') no-repeat scroll -64px 0;
-}
-.messager-info {
-  background: url('images/messager_icons.png') no-repeat scroll 0 0;
-}
-.messager-question {
-  background: url('images/messager_icons.png') no-repeat scroll -32px 0;
-}
-.messager-warning {
-  background: url('images/messager_icons.png') no-repeat scroll -96px 0;
-}
-.messager-progress {
-  padding: 10px;
-}
-.messager-p-msg {
-  margin-bottom: 5px;
-}
-.messager-body .messager-input {
-  width: 100%;
-  padding: 1px 0;
-  border: 1px solid #95B8E7;
-}

+ 0 - 66
src/main/webapp/easyui/themes/default/pagination.css

@@ -1,66 +0,0 @@
-.pagination {
-  zoom: 1;
-}
-.pagination table {
-  float: left;
-  height: 30px;
-}
-.pagination td {
-  border: 0;
-}
-.pagination-btn-separator {
-  float: left;
-  height: 24px;
-  border-left: 1px solid #ccc;
-  border-right: 1px solid #fff;
-  margin: 3px 1px;
-}
-.pagination .pagination-num {
-  border-width: 1px;
-  border-style: solid;
-  margin: 0 2px;
-  padding: 2px;
-  width: 2em;
-  height: auto;
-}
-.pagination-page-list {
-  margin: 0px 6px;
-  padding: 1px 2px;
-  width: auto;
-  height: auto;
-  border-width: 1px;
-  border-style: solid;
-}
-.pagination-info {
-  float: right;
-  margin: 0 6px 0 0;
-  padding: 0;
-  height: 30px;
-  line-height: 30px;
-  font-size: 12px;
-}
-.pagination span {
-  font-size: 12px;
-}
-.pagination-first {
-  background: url('images/pagination_icons.png') no-repeat 0 0;
-}
-.pagination-prev {
-  background: url('images/pagination_icons.png') no-repeat -16px 0;
-}
-.pagination-next {
-  background: url('images/pagination_icons.png') no-repeat -32px 0;
-}
-.pagination-last {
-  background: url('images/pagination_icons.png') no-repeat -48px 0;
-}
-.pagination-load {
-  background: url('images/pagination_icons.png') no-repeat -64px 0;
-}
-.pagination-loading {
-  background: url('images/loading.gif') no-repeat;
-}
-.pagination-page-list,
-.pagination .pagination-num {
-  border-color: #95B8E7;
-}

+ 0 - 124
src/main/webapp/easyui/themes/default/panel.css

@@ -1,124 +0,0 @@
-.panel {
-  overflow: hidden;
-  font-size: 12px;
-  text-align: left;
-}
-.panel-header,
-.panel-body {
-  border-width: 1px;
-  border-style: solid;
-}
-.panel-header {
-  padding: 5px;
-  position: relative;
-}
-.panel-title {
-  background: url('images/blank.gif') no-repeat;
-}
-.panel-header-noborder {
-  border-width: 0 0 1px 0;
-}
-.panel-body {
-  overflow: auto;
-  border-top-width: 0px;
-}
-.panel-body-noheader {
-  border-top-width: 1px;
-}
-.panel-body-noborder {
-  border-width: 0px;
-}
-.panel-with-icon {
-  padding-left: 18px;
-}
-.panel-icon,
-.panel-tool {
-  position: absolute;
-  top: 50%;
-  margin-top: -8px;
-  height: 16px;
-  overflow: hidden;
-}
-.panel-icon {
-  left: 5px;
-  width: 16px;
-}
-.panel-tool {
-  right: 5px;
-  width: auto;
-}
-.panel-tool a {
-  display: inline-block;
-  width: 16px;
-  height: 16px;
-  opacity: 0.6;
-  filter: alpha(opacity=60);
-  margin: 0 0 0 2px;
-  vertical-align: top;
-}
-.panel-tool a:hover {
-  opacity: 1;
-  filter: alpha(opacity=100);
-  background-color: #eaf2ff;
-  -moz-border-radius: 3px 3px 3px 3px;
-  -webkit-border-radius: 3px 3px 3px 3px;
-  border-radius: 3px 3px 3px 3px;
-}
-.panel-loading {
-  padding: 11px 0px 10px 30px;
-}
-.panel-noscroll {
-  overflow: hidden;
-}
-.panel-fit,
-.panel-fit body {
-  height: 100%;
-  margin: 0;
-  padding: 0;
-  border: 0;
-  overflow: hidden;
-}
-.panel-loading {
-  background: url('images/loading.gif') no-repeat 10px 10px;
-}
-.panel-tool-close {
-  background: url('images/panel_tools.png') no-repeat -16px 0px;
-}
-.panel-tool-min {
-  background: url('images/panel_tools.png') no-repeat 0px 0px;
-}
-.panel-tool-max {
-  background: url('images/panel_tools.png') no-repeat 0px -16px;
-}
-.panel-tool-restore {
-  background: url('images/panel_tools.png') no-repeat -16px -16px;
-}
-.panel-tool-collapse {
-  background: url('images/panel_tools.png') no-repeat -32px 0;
-}
-.panel-tool-expand {
-  background: url('images/panel_tools.png') no-repeat -32px -16px;
-}
-.panel-header,
-.panel-body {
-  border-color: #95B8E7;
-}
-.panel-header {
-  background-color: #E0ECFF;
-  background: -webkit-linear-gradient(top,#EFF5FF 0,#E0ECFF 100%);
-  background: -moz-linear-gradient(top,#EFF5FF 0,#E0ECFF 100%);
-  background: -o-linear-gradient(top,#EFF5FF 0,#E0ECFF 100%);
-  background: linear-gradient(to bottom,#EFF5FF 0,#E0ECFF 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#EFF5FF,endColorstr=#E0ECFF,GradientType=0);
-}
-.panel-body {
-  background-color: #ffffff;
-  color: #000000;
-}
-.panel-title {
-  font-weight: bold;
-  color: #0E2D5F;
-  height: 16px;
-  line-height: 16px;
-}

+ 0 - 30
src/main/webapp/easyui/themes/default/progressbar.css

@@ -1,30 +0,0 @@
-.progressbar {
-  border-width: 1px;
-  border-style: solid;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
-  overflow: hidden;
-}
-.progressbar-text {
-  text-align: center;
-  position: absolute;
-}
-.progressbar-value {
-  position: relative;
-  overflow: hidden;
-  width: 0;
-  -moz-border-radius: 5px 0 0 5px;
-  -webkit-border-radius: 5px 0 0 5px;
-  border-radius: 5px 0 0 5px;
-}
-.progressbar {
-  border-color: #95B8E7;
-}
-.progressbar-text {
-  color: #000000;
-}
-.progressbar-value .progressbar-text {
-  background-color: #FBEC88;
-  color: #000000;
-}

+ 0 - 28
src/main/webapp/easyui/themes/default/propertygrid.css

@@ -1,28 +0,0 @@
-.propertygrid .datagrid-view1 .datagrid-body td {
-  padding-bottom: 1px;
-  border-width: 0 1px 0 0;
-}
-.propertygrid .datagrid-group {
-  height: 21px;
-  overflow: hidden;
-  border-width: 0 0 1px 0;
-  border-style: solid;
-}
-.propertygrid .datagrid-group span {
-  font-weight: bold;
-}
-.propertygrid .datagrid-view1 .datagrid-body td {
-  border-color: #dddddd;
-}
-.propertygrid .datagrid-view1 .datagrid-group {
-  border-color: #E0ECFF;
-}
-.propertygrid .datagrid-view2 .datagrid-group {
-  border-color: #dddddd;
-}
-.propertygrid .datagrid-group,
-.propertygrid .datagrid-view1 .datagrid-body,
-.propertygrid .datagrid-view1 .datagrid-row-over,
-.propertygrid .datagrid-view1 .datagrid-row-selected {
-  background: #E0ECFF;
-}

+ 0 - 79
src/main/webapp/easyui/themes/default/searchbox.css

@@ -1,79 +0,0 @@
-.searchbox {
-  display: inline-block;
-  white-space: nowrap;
-  margin: 0;
-  padding: 0;
-  border-width: 1px;
-  border-style: solid;
-  overflow: hidden;
-}
-.searchbox .searchbox-text {
-  font-size: 12px;
-  border: 0;
-  margin: 0;
-  padding: 0;
-  line-height: 20px;
-  height: 20px;
-  *margin-top: -1px;
-  *height: 18px;
-  *line-height: 18px;
-  _height: 18px;
-  _line-height: 18px;
-  vertical-align: baseline;
-}
-.searchbox .searchbox-prompt {
-  font-size: 12px;
-  color: #ccc;
-}
-.searchbox-button {
-  width: 18px;
-  height: 20px;
-  overflow: hidden;
-  display: inline-block;
-  vertical-align: top;
-  cursor: pointer;
-  opacity: 0.6;
-  filter: alpha(opacity=60);
-}
-.searchbox-button-hover {
-  opacity: 1.0;
-  filter: alpha(opacity=100);
-}
-.searchbox a.l-btn-plain {
-  height: 20px;
-  border: 0;
-  padding: 0 6px 0 0;
-  vertical-align: top;
-  -moz-border-radius: 0;
-  -webkit-border-radius: 0;
-  border-radius: 0;
-  opacity: 0.6;
-  filter: alpha(opacity=60);
-}
-.searchbox a.l-btn .l-btn-left {
-  padding: 2px 0 2px 4px;
-}
-.searchbox a.l-btn-plain:hover {
-  -moz-border-radius: 0;
-  -webkit-border-radius: 0;
-  border-radius: 0;
-  border: 0;
-  padding: 0 6px 0 0;
-  opacity: 1.0;
-  filter: alpha(opacity=100);
-}
-.searchbox a.m-btn-plain-active {
-  -moz-border-radius: 0;
-  -webkit-border-radius: 0;
-  border-radius: 0;
-}
-.searchbox-button {
-  background: url('images/searchbox_button.png') no-repeat center center;
-}
-.searchbox {
-  border-color: #95B8E7;
-  background-color: #fff;
-}
-.searchbox a.l-btn-plain {
-  background: #E0ECFF;
-}

+ 0 - 98
src/main/webapp/easyui/themes/default/slider.css

@@ -1,98 +0,0 @@
-.slider-disabled {
-  opacity: 0.5;
-  filter: alpha(opacity=50);
-}
-.slider-h {
-  height: 22px;
-}
-.slider-v {
-  width: 22px;
-}
-.slider-inner {
-  position: relative;
-  height: 6px;
-  top: 7px;
-  border-width: 1px;
-  border-style: solid;
-  border-radius: 3px;
-}
-.slider-handle {
-  position: absolute;
-  display: block;
-  outline: none;
-  width: 20px;
-  height: 20px;
-  top: -7px;
-  margin-left: -10px;
-}
-.slider-tip {
-  position: absolute;
-  display: inline-block;
-  line-height: 12px;
-  white-space: nowrap;
-  top: -22px;
-}
-.slider-rule {
-  position: relative;
-  top: 15px;
-}
-.slider-rule span {
-  position: absolute;
-  display: inline-block;
-  font-size: 0;
-  height: 5px;
-  border-width: 0 0 0 1px;
-  border-style: solid;
-}
-.slider-rulelabel {
-  position: relative;
-  top: 20px;
-}
-.slider-rulelabel span {
-  position: absolute;
-  display: inline-block;
-}
-.slider-v .slider-inner {
-  width: 6px;
-  left: 7px;
-  top: 0;
-  float: left;
-}
-.slider-v .slider-handle {
-  left: 3px;
-  margin-top: -10px;
-}
-.slider-v .slider-tip {
-  left: -10px;
-  margin-top: -6px;
-}
-.slider-v .slider-rule {
-  float: left;
-  top: 0;
-  left: 16px;
-}
-.slider-v .slider-rule span {
-  width: 5px;
-  height: 'auto';
-  border-left: 0;
-  border-width: 1px 0 0 0;
-  border-style: solid;
-}
-.slider-v .slider-rulelabel {
-  float: left;
-  top: 0;
-  left: 23px;
-}
-.slider-handle {
-  background: url('images/slider_handle.png') no-repeat;
-}
-.slider-inner {
-  border-color: #95B8E7;
-  background: #E0ECFF;
-}
-.slider-rule span {
-  border-color: #95B8E7;
-}
-.slider-rulelabel span {
-  color: #000000;
-}

+ 0 - 59
src/main/webapp/easyui/themes/default/spinner.css

@@ -1,59 +0,0 @@
-.spinner {
-  display: inline-block;
-  white-space: nowrap;
-  margin: 0;
-  padding: 0;
-  border-width: 1px;
-  border-style: solid;
-  overflow: hidden;
-  vertical-align: middle;
-}
-.spinner .spinner-text {
-  font-size: 12px;
-  border: 0px;
-  line-height: 20px;
-  height: 20px;
-  margin: 0;
-  padding: 0 2px;
-  *margin-top: -1px;
-  *height: 18px;
-  *line-height: 18px;
-  _height: 18px;
-  _line-height: 18px;
-  vertical-align: baseline;
-}
-.spinner-arrow {
-  display: inline-block;
-  overflow: hidden;
-  vertical-align: top;
-  margin: 0;
-  padding: 0;
-}
-.spinner-arrow-up,
-.spinner-arrow-down {
-  opacity: 0.6;
-  filter: alpha(opacity=60);
-  display: block;
-  font-size: 1px;
-  width: 18px;
-  height: 10px;
-}
-.spinner-arrow-hover {
-  opacity: 1.0;
-  filter: alpha(opacity=100);
-}
-.spinner-arrow-up {
-  background: url('images/spinner_arrows.png') no-repeat 1px center;
-}
-.spinner-arrow-down {
-  background: url('images/spinner_arrows.png') no-repeat -15px center;
-}
-.spinner {
-  border-color: #95B8E7;
-}
-.spinner-arrow {
-  background-color: #E0ECFF;
-}
-.spinner-arrow-hover {
-  background-color: #eaf2ff;
-}

+ 0 - 42
src/main/webapp/easyui/themes/default/splitbutton.css

@@ -1,42 +0,0 @@
-.s-btn-downarrow {
-  display: inline-block;
-  margin: 0 0 0 4px;
-  padding: 0 0 0 1px;
-  width: 14px;
-  height: 16px;
-  line-height: 16px;
-  border-width: 0;
-  border-style: solid;
-  _vertical-align: middle;
-}
-a.s-btn-active {
-  background-position: bottom right;
-}
-a.s-btn-active span.l-btn-left {
-  background-position: bottom left;
-}
-a.s-btn-plain-active {
-  background: transparent;
-  padding: 0 5px 0 0;
-  border-width: 1px;
-  border-style: solid;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
-}
-.s-btn-downarrow {
-  background: url('images/menu_arrows.png') no-repeat 2px center;
-  border-color: #aac5e7;
-}
-a:hover.l-btn .s-btn-downarrow,
-a.s-btn-active .s-btn-downarrow,
-a.s-btn-plain-active .s-btn-downarrow {
-  background-position: 1px center;
-  padding: 0;
-  border-width: 0 0 0 1px;
-}
-a.s-btn-plain-active {
-  border-color: #b7d2ff;
-  background-color: #eaf2ff;
-  color: #000000;
-}

+ 0 - 361
src/main/webapp/easyui/themes/default/tabs.css

@@ -1,361 +0,0 @@
-.tabs-container {
-  overflow: hidden;
-}
-.tabs-header {
-  border-width: 1px;
-  border-style: solid;
-  border-bottom-width: 0;
-  position: relative;
-  padding: 0;
-  padding-top: 2px;
-  overflow: hidden;
-}
-.tabs-header-plain {
-  border: 0;
-  background: transparent;
-}
-.tabs-scroller-left,
-.tabs-scroller-right {
-  position: absolute;
-  top: auto;
-  bottom: 0;
-  width: 18px;
-  height: 28px !important;
-  height: 30px;
-  font-size: 1px;
-  display: none;
-  cursor: pointer;
-  border-width: 1px;
-  border-style: solid;
-}
-.tabs-scroller-left {
-  left: 0;
-}
-.tabs-scroller-right {
-  right: 0;
-}
-.tabs-header-plain .tabs-scroller-left,
-.tabs-header-plain .tabs-scroller-right {
-  height: 25px !important;
-  height: 27px;
-}
-.tabs-tool {
-  position: absolute;
-  bottom: 0;
-  padding: 1px;
-  overflow: hidden;
-  border-width: 1px;
-  border-style: solid;
-}
-.tabs-header-plain .tabs-tool {
-  padding: 0 1px;
-}
-.tabs-wrap {
-  position: relative;
-  left: 0;
-  overflow: hidden;
-  width: 100%;
-  margin: 0;
-  padding: 0;
-}
-.tabs-scrolling {
-  margin-left: 18px;
-  margin-right: 18px;
-}
-.tabs-disabled {
-  opacity: 0.3;
-  filter: alpha(opacity=30);
-}
-.tabs {
-  list-style-type: none;
-  height: 26px;
-  margin: 0px;
-  padding: 0px;
-  padding-left: 4px;
-  font-size: 12px;
-  width: 5000px;
-  border-style: solid;
-  border-width: 0 0 1px 0;
-}
-.tabs li {
-  float: left;
-  display: inline-block;
-  margin: 0 4px -1px 0;
-  padding: 0;
-  position: relative;
-  border: 0;
-}
-.tabs li a.tabs-inner {
-  display: inline-block;
-  text-decoration: none;
-  margin: 0;
-  padding: 0 10px;
-  height: 25px;
-  line-height: 25px;
-  text-align: center;
-  white-space: nowrap;
-  border-width: 1px;
-  border-style: solid;
-  -moz-border-radius: 5px 5px 0 0;
-  -webkit-border-radius: 5px 5px 0 0;
-  border-radius: 5px 5px 0 0;
-}
-.tabs li.tabs-selected a.tabs-inner {
-  font-weight: bold;
-  outline: none;
-}
-.tabs li.tabs-selected a:hover.tabs-inner {
-  cursor: default;
-  pointer: default;
-}
-.tabs li a.tabs-close,
-.tabs-p-tool {
-  position: absolute;
-  font-size: 1px;
-  display: block;
-  height: 12px;
-  padding: 0;
-  top: 50%;
-  margin-top: -6px;
-  overflow: hidden;
-}
-.tabs li a.tabs-close {
-  width: 12px;
-  right: 5px;
-  opacity: 0.6;
-  filter: alpha(opacity=60);
-}
-.tabs-p-tool {
-  right: 16px;
-}
-.tabs-p-tool a {
-  display: inline-block;
-  font-size: 1px;
-  width: 12px;
-  height: 12px;
-  margin: 0;
-  opacity: 0.6;
-  filter: alpha(opacity=60);
-}
-.tabs li a:hover.tabs-close,
-.tabs-p-tool a:hover {
-  opacity: 1;
-  filter: alpha(opacity=100);
-  cursor: hand;
-  cursor: pointer;
-}
-.tabs-with-icon {
-  padding-left: 18px;
-}
-.tabs-icon {
-  position: absolute;
-  width: 16px;
-  height: 16px;
-  left: 10px;
-  top: 50%;
-  margin-top: -8px;
-}
-.tabs-closable {
-  padding-right: 8px;
-}
-.tabs-panels {
-  margin: 0px;
-  padding: 0px;
-  border-width: 1px;
-  border-style: solid;
-  border-top-width: 0;
-  overflow: hidden;
-}
-.tabs-header-bottom {
-  border-width: 0 1px 1px 1px;
-  padding: 0 0 2px 0;
-}
-.tabs-header-bottom .tabs {
-  border-width: 1px 0 0 0;
-}
-.tabs-header-bottom .tabs li {
-  margin: -1px 4px 0 0;
-}
-.tabs-header-bottom .tabs li a.tabs-inner {
-  -moz-border-radius: 0 0 5px 5px;
-  -webkit-border-radius: 0 0 5px 5px;
-  border-radius: 0 0 5px 5px;
-}
-.tabs-header-bottom .tabs-tool {
-  top: 0;
-}
-.tabs-header-bottom .tabs-scroller-left,
-.tabs-header-bottom .tabs-scroller-right {
-  top: 0;
-  bottom: auto;
-}
-.tabs-panels-top {
-  border-width: 1px 1px 0 1px;
-}
-.tabs-header-left {
-  float: left;
-  border-width: 1px 0 1px 1px;
-  padding: 0;
-}
-.tabs-header-right {
-  float: right;
-  border-width: 1px 1px 1px 0;
-  padding: 0;
-}
-.tabs-header-left .tabs-wrap,
-.tabs-header-right .tabs-wrap {
-  height: 100%;
-}
-.tabs-header-left .tabs {
-  height: 100%;
-  padding: 4px 0 0 4px;
-  border-width: 0 1px 0 0;
-}
-.tabs-header-right .tabs {
-  height: 100%;
-  padding: 4px 4px 0 0;
-  border-width: 0 0 0 1px;
-}
-.tabs-header-left .tabs li,
-.tabs-header-right .tabs li {
-  display: block;
-  width: 100%;
-  position: relative;
-}
-.tabs-header-left .tabs li {
-  left: auto;
-  right: 0;
-  margin: 0 -1px 4px 0;
-  float: right;
-}
-.tabs-header-right .tabs li {
-  left: 0;
-  right: auto;
-  margin: 0 0 4px -1px;
-  float: left;
-}
-.tabs-header-left .tabs li a.tabs-inner {
-  display: block;
-  text-align: left;
-  -moz-border-radius: 5px 0 0 5px;
-  -webkit-border-radius: 5px 0 0 5px;
-  border-radius: 5px 0 0 5px;
-}
-.tabs-header-right .tabs li a.tabs-inner {
-  display: block;
-  text-align: left;
-  -moz-border-radius: 0 5px 5px 0;
-  -webkit-border-radius: 0 5px 5px 0;
-  border-radius: 0 5px 5px 0;
-}
-.tabs-panels-right {
-  float: right;
-  border-width: 1px 1px 1px 0;
-}
-.tabs-panels-left {
-  float: left;
-  border-width: 1px 0 1px 1px;
-}
-.tabs-header-noborder,
-.tabs-panels-noborder {
-  border: 0px;
-}
-.tabs-header-plain {
-  border: 0px;
-  background: transparent;
-}
-.tabs-scroller-left {
-  background: #E0ECFF url('images/tabs_icons.png') no-repeat 1px center;
-}
-.tabs-scroller-right {
-  background: #E0ECFF url('images/tabs_icons.png') no-repeat -15px center;
-}
-.tabs li a.tabs-close {
-  background: url('images/tabs_icons.png') no-repeat -34px center;
-}
-.tabs li a.tabs-inner:hover {
-  background: #eaf2ff;
-  color: #000000;
-  filter: none;
-}
-.tabs li.tabs-selected a.tabs-inner {
-  background-color: #ffffff;
-  color: #0E2D5F;
-  background: -webkit-linear-gradient(top,#EFF5FF 0,#ffffff 100%);
-  background: -moz-linear-gradient(top,#EFF5FF 0,#ffffff 100%);
-  background: -o-linear-gradient(top,#EFF5FF 0,#ffffff 100%);
-  background: linear-gradient(to bottom,#EFF5FF 0,#ffffff 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#EFF5FF,endColorstr=#ffffff,GradientType=0);
-}
-.tabs-header-bottom .tabs li.tabs-selected a.tabs-inner {
-  background: -webkit-linear-gradient(top,#ffffff 0,#EFF5FF 100%);
-  background: -moz-linear-gradient(top,#ffffff 0,#EFF5FF 100%);
-  background: -o-linear-gradient(top,#ffffff 0,#EFF5FF 100%);
-  background: linear-gradient(to bottom,#ffffff 0,#EFF5FF 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffffff,endColorstr=#EFF5FF,GradientType=0);
-}
-.tabs-header-left .tabs li.tabs-selected a.tabs-inner {
-  background: -webkit-linear-gradient(left,#EFF5FF 0,#ffffff 100%);
-  background: -moz-linear-gradient(left,#EFF5FF 0,#ffffff 100%);
-  background: -o-linear-gradient(left,#EFF5FF 0,#ffffff 100%);
-  background: linear-gradient(to right,#EFF5FF 0,#ffffff 100%);
-  background-repeat: repeat-y;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#EFF5FF,endColorstr=#ffffff,GradientType=1);
-}
-.tabs-header-right .tabs li.tabs-selected a.tabs-inner {
-  background: -webkit-linear-gradient(left,#ffffff 0,#EFF5FF 100%);
-  background: -moz-linear-gradient(left,#ffffff 0,#EFF5FF 100%);
-  background: -o-linear-gradient(left,#ffffff 0,#EFF5FF 100%);
-  background: linear-gradient(to right,#ffffff 0,#EFF5FF 100%);
-  background-repeat: repeat-y;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffffff,endColorstr=#EFF5FF,GradientType=1);
-}
-.tabs li a.tabs-inner {
-  color: #0E2D5F;
-  background-color: #E0ECFF;
-  background: -webkit-linear-gradient(top,#EFF5FF 0,#E0ECFF 100%);
-  background: -moz-linear-gradient(top,#EFF5FF 0,#E0ECFF 100%);
-  background: -o-linear-gradient(top,#EFF5FF 0,#E0ECFF 100%);
-  background: linear-gradient(to bottom,#EFF5FF 0,#E0ECFF 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#EFF5FF,endColorstr=#E0ECFF,GradientType=0);
-}
-.tabs-header,
-.tabs-tool {
-  background-color: #E0ECFF;
-}
-.tabs-header-plain {
-  background: transparent;
-}
-.tabs-header,
-.tabs-scroller-left,
-.tabs-scroller-right,
-.tabs-tool,
-.tabs,
-.tabs-panels,
-.tabs li a.tabs-inner,
-.tabs li.tabs-selected a.tabs-inner,
-.tabs-header-bottom .tabs li.tabs-selected a.tabs-inner,
-.tabs-header-left .tabs li.tabs-selected a.tabs-inner,
-.tabs-header-right .tabs li.tabs-selected a.tabs-inner {
-  border-color: #95B8E7;
-}
-.tabs-p-tool a:hover,
-.tabs li a:hover.tabs-close,
-.tabs-scroller-over {
-  background-color: #eaf2ff;
-}
-.tabs li.tabs-selected a.tabs-inner {
-  border-bottom: 1px solid #ffffff;
-}
-.tabs-header-bottom .tabs li.tabs-selected a.tabs-inner {
-  border-top: 1px solid #ffffff;
-}
-.tabs-header-left .tabs li.tabs-selected a.tabs-inner {
-  border-right: 1px solid #ffffff;
-}
-.tabs-header-right .tabs li.tabs-selected a.tabs-inner {
-  border-left: 1px solid #ffffff;
-}

+ 0 - 157
src/main/webapp/easyui/themes/default/tree.css

@@ -1,157 +0,0 @@
-.tree {
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-}
-.tree li {
-  white-space: nowrap;
-}
-.tree li ul {
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
-}
-.tree-node {
-  height: 18px;
-  white-space: nowrap;
-  cursor: pointer;
-}
-.tree-hit {
-  cursor: pointer;
-}
-.tree-expanded,
-.tree-collapsed,
-.tree-folder,
-.tree-file,
-.tree-checkbox,
-.tree-indent {
-  display: inline-block;
-  width: 16px;
-  height: 18px;
-  vertical-align: top;
-  overflow: hidden;
-}
-.tree-expanded {
-  background: url('images/tree_icons.png') no-repeat -18px 0px;
-}
-.tree-expanded-hover {
-  background: url('images/tree_icons.png') no-repeat -50px 0px;
-}
-.tree-collapsed {
-  background: url('images/tree_icons.png') no-repeat 0px 0px;
-}
-.tree-collapsed-hover {
-  background: url('images/tree_icons.png') no-repeat -32px 0px;
-}
-.tree-lines .tree-expanded,
-.tree-lines .tree-root-first .tree-expanded {
-  background: url('images/tree_icons.png') no-repeat -144px 0;
-}
-.tree-lines .tree-collapsed,
-.tree-lines .tree-root-first .tree-collapsed {
-  background: url('images/tree_icons.png') no-repeat -128px 0;
-}
-.tree-lines .tree-node-last .tree-expanded,
-.tree-lines .tree-root-one .tree-expanded {
-  background: url('images/tree_icons.png') no-repeat -80px 0;
-}
-.tree-lines .tree-node-last .tree-collapsed,
-.tree-lines .tree-root-one .tree-collapsed {
-  background: url('images/tree_icons.png') no-repeat -64px 0;
-}
-.tree-line {
-  background: url('images/tree_icons.png') no-repeat -176px 0;
-}
-.tree-join {
-  background: url('images/tree_icons.png') no-repeat -192px 0;
-}
-.tree-joinbottom {
-  background: url('images/tree_icons.png') no-repeat -160px 0;
-}
-.tree-folder {
-  background: url('images/tree_icons.png') no-repeat -208px 0;
-}
-.tree-folder-open {
-  background: url('images/tree_icons.png') no-repeat -224px 0;
-}
-.tree-file {
-  background: url('images/tree_icons.png') no-repeat -240px 0;
-}
-.tree-loading {
-  background: url('images/loading.gif') no-repeat center center;
-}
-.tree-checkbox0 {
-  background: url('images/tree_icons.png') no-repeat -208px -18px;
-}
-.tree-checkbox1 {
-  background: url('images/tree_icons.png') no-repeat -224px -18px;
-}
-.tree-checkbox2 {
-  background: url('images/tree_icons.png') no-repeat -240px -18px;
-}
-.tree-title {
-  font-size: 12px;
-  display: inline-block;
-  text-decoration: none;
-  vertical-align: top;
-  white-space: nowrap;
-  padding: 0 2px;
-  height: 18px;
-  line-height: 18px;
-}
-.tree-node-proxy {
-  font-size: 12px;
-  line-height: 20px;
-  padding: 0 2px 0 20px;
-  border-width: 1px;
-  border-style: solid;
-  z-index: 9900000;
-}
-.tree-dnd-icon {
-  display: inline-block;
-  position: absolute;
-  width: 16px;
-  height: 18px;
-  left: 2px;
-  top: 50%;
-  margin-top: -9px;
-}
-.tree-dnd-yes {
-  background: url('images/tree_icons.png') no-repeat -256px 0;
-}
-.tree-dnd-no {
-  background: url('images/tree_icons.png') no-repeat -256px -18px;
-}
-.tree-node-top {
-  border-top: 1px dotted red;
-}
-.tree-node-bottom {
-  border-bottom: 1px dotted red;
-}
-.tree-node-append .tree-title {
-  border: 1px dotted red;
-}
-.tree-editor {
-  border: 1px solid #ccc;
-  font-size: 12px;
-  height: 14px !important;
-  height: 18px;
-  line-height: 14px;
-  padding: 1px 2px;
-  width: 80px;
-  position: absolute;
-  top: 0;
-}
-.tree-node-proxy {
-  background-color: #ffffff;
-  color: #000000;
-  border-color: #95B8E7;
-}
-.tree-node-hover {
-  background: #eaf2ff;
-  color: #000000;
-}
-.tree-node-selected {
-  background: #FBEC88;
-  color: #000000;
-}

+ 0 - 53
src/main/webapp/easyui/themes/default/validatebox.css

@@ -1,53 +0,0 @@
-.validatebox-tip {
-  position: absolute;
-  width: 200px;
-  height: auto;
-  display: none;
-  z-index: 9900000;
-}
-.validatebox-tip-content {
-  display: inline-block;
-  position: absolute;
-  top: 0px;
-  left: 8px;
-  width: 150px;
-  border-width: 1px;
-  border-style: solid;
-  padding: 3px 5px;
-  z-index: 9900001;
-  font-size: 12px;
-}
-.validatebox-tip-pointer {
-  display: inline-block;
-  width: 8px;
-  height: 16px;
-  position: absolute;
-  left: 1px;
-  top: 0px;
-  z-index: 9900002;
-}
-.validatebox-tip-left .validatebox-tip-content {
-  left: auto;
-  right: 8px;
-}
-.validatebox-tip-left .validatebox-tip-pointer {
-  background-position: -20px center;
-  left: auto;
-  right: 1px;
-}
-.validatebox-invalid {
-  background-image: url('images/validatebox_warning.png');
-  background-repeat: no-repeat;
-  background-position: right center;
-  border-color: #ffa8a8;
-  background-color: #fff3f3;
-  color: #000;
-}
-.validatebox-tip-pointer {
-  background: url('images/validatebox_arrows.png') no-repeat -4px center;
-}
-.validatebox-tip-content {
-  border-color: #CC9933;
-  background-color: #FFFFCC;
-  color: #000;
-}

+ 0 - 87
src/main/webapp/easyui/themes/default/window.css

@@ -1,87 +0,0 @@
-.window {
-  overflow: hidden;
-  padding: 5px;
-  border-width: 1px;
-  border-style: solid;
-}
-.window .window-header {
-  background: transparent;
-  padding: 0px 0px 6px 0px;
-}
-.window .window-body {
-  border-width: 1px;
-  border-style: solid;
-  border-top-width: 0px;
-}
-.window .window-body-noheader {
-  border-top-width: 1px;
-}
-.window .window-header .panel-icon,
-.window .window-header .panel-tool {
-  top: 50%;
-  margin-top: -11px;
-}
-.window .window-header .panel-icon {
-  left: 1px;
-}
-.window .window-header .panel-tool {
-  right: 1px;
-}
-.window .window-header .panel-with-icon {
-  padding-left: 18px;
-}
-.window-proxy {
-  position: absolute;
-  overflow: hidden;
-}
-.window-proxy-mask {
-  position: absolute;
-  filter: alpha(opacity=5);
-  opacity: 0.05;
-}
-.window-mask {
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  filter: alpha(opacity=40);
-  opacity: 0.40;
-  font-size: 1px;
-  *zoom: 1;
-  overflow: hidden;
-}
-.window,
-.window-shadow {
-  position: absolute;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
-}
-.window-shadow {
-  background: #ccc;
-  -moz-box-shadow: 2px 2px 3px #cccccc;
-  -webkit-box-shadow: 2px 2px 3px #cccccc;
-  box-shadow: 2px 2px 3px #cccccc;
-  filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=2,MakeShadow=false,ShadowOpacity=0.2);
-}
-.window,
-.window .window-body {
-  border-color: #95B8E7;
-}
-.window {
-  background-color: #E0ECFF;
-  background: -webkit-linear-gradient(top,#EFF5FF 0,#E0ECFF 20%);
-  background: -moz-linear-gradient(top,#EFF5FF 0,#E0ECFF 20%);
-  background: -o-linear-gradient(top,#EFF5FF 0,#E0ECFF 20%);
-  background: linear-gradient(to bottom,#EFF5FF 0,#E0ECFF 20%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#EFF5FF,endColorstr=#E0ECFF,GradientType=0);
-}
-.window-proxy {
-  border: 1px dashed #95B8E7;
-}
-.window-proxy-mask,
-.window-mask {
-  background: #ccc;
-}

+ 0 - 67
src/main/webapp/easyui/themes/icon.css

@@ -1,67 +0,0 @@
-.icon-blank{
-	background:url('icons/blank.gif') no-repeat center center;
-}
-.icon-add{
-	background:url('icons/edit_add.png') no-repeat center center;
-}
-.icon-edit{
-	background:url('icons/pencil.png') no-repeat center center;
-}
-.icon-remove{
-	background:url('icons/edit_remove.png') no-repeat center center;
-}
-.icon-save{
-	background:url('icons/filesave.png') no-repeat center center;
-}
-.icon-cut{
-	background:url('icons/cut.png') no-repeat center center;
-}
-.icon-ok{
-	background:url('icons/ok.png') no-repeat center center;
-}
-.icon-no{
-	background:url('icons/no.png') no-repeat center center;
-}
-.icon-cancel{
-	background:url('icons/cancel.png') no-repeat center center;
-}
-.icon-reload{
-	background:url('icons/reload.png') no-repeat center center;
-}
-.icon-search{
-	background:url('icons/search.png') no-repeat center center;
-}
-.icon-print{
-	background:url('icons/print.png') no-repeat center center;
-}
-.icon-help{
-	background:url('icons/help.png') no-repeat center center;
-}
-.icon-undo{
-	background:url('icons/undo.png') no-repeat center center;
-}
-.icon-redo{
-	background:url('icons/redo.png') no-repeat center center;
-}
-.icon-back{
-	background:url('icons/back.png') no-repeat center center;
-}
-.icon-sum{
-	background:url('icons/sum.png') no-repeat center center;
-}
-.icon-tip{
-	background:url('icons/tip.png') no-repeat center center;
-}
-
-.icon-mini-add{
-	background:url('icons/mini_add.png') no-repeat center center;
-}
-.icon-mini-edit{
-	background:url('icons/mini_edit.png') no-repeat center center;
-}
-.icon-mini-refresh{
-	background:url('icons/mini_refresh.png') no-repeat center center;
-}
-.icon-forward{
-	background:url('icons/forward.png') no-repeat center center;
-}

BIN
src/main/webapp/easyui/themes/icons/back.png


BIN
src/main/webapp/easyui/themes/icons/blank.gif


BIN
src/main/webapp/easyui/themes/icons/cancel.png


BIN
src/main/webapp/easyui/themes/icons/cut.png


BIN
src/main/webapp/easyui/themes/icons/edit_add.png


BIN
src/main/webapp/easyui/themes/icons/edit_remove.png


BIN
src/main/webapp/easyui/themes/icons/filesave.png


BIN
src/main/webapp/easyui/themes/icons/forward.png


BIN
src/main/webapp/easyui/themes/icons/help.png


BIN
src/main/webapp/easyui/themes/icons/mini_add.png


BIN
src/main/webapp/easyui/themes/icons/mini_edit.png


BIN
src/main/webapp/easyui/themes/icons/mini_refresh.png


BIN
src/main/webapp/easyui/themes/icons/no.png


BIN
src/main/webapp/easyui/themes/icons/ok.png


BIN
src/main/webapp/easyui/themes/icons/pencil.png


BIN
src/main/webapp/easyui/themes/icons/print.png


BIN
src/main/webapp/easyui/themes/icons/redo.png


BIN
src/main/webapp/easyui/themes/icons/reload.png


BIN
src/main/webapp/easyui/themes/icons/search.png


BIN
src/main/webapp/easyui/themes/icons/sum.png


BIN
src/main/webapp/easyui/themes/icons/tip.png


BIN
src/main/webapp/easyui/themes/icons/undo.png


+ 0 - 23
src/main/webapp/easyui_lib.jsp

@@ -1,23 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@ include file="taglib.jsp" %>
-<link href="${ctx}favicon.ico" rel="SHORTCUT ICON">
-<link rel="stylesheet" type="text/css" id="easyuiCssId" href="${easyui}themes/default/easyui.css">
-<link rel="stylesheet" type="text/css" href="${easyui}themes/icon.css">
-<script type="text/javascript" src="${easyui}jquery-1.8.0.min.js"></script>
-<script type="text/javascript" src="${easyui}jquery.easyui.min.js"></script>
-<script type="text/javascript" src="${easyui}locale/easyui-lang-zh_CN.js"></script>
-<script type="text/javascript" src="${ctx}js/common.min.js"></script>
-<script type="text/javascript">
-var ctx = '${ctx}';
-if (typeof(jQuery) != 'undefined') {
-    $(document).ajaxError(function (event, request, settings) {
-        if (request.getResponseHeader("X-timeout") && request.status == 401) {
-            // 页面跳转
-        	top.location.href = ctx;
-        }else{
-        	alert("系统异常");
-        }
-    });
-}
-</script>

+ 0 - 357
src/main/webapp/generator/generator.jsp

@@ -1,357 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@ include file="../taglib.jsp" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>文件生成</title>
-<style type="text/css">
-	.step{margin-bottom: 20px;padding:5px;border-bottom: 2px solid #95b8e7;}
-	.codeArea{font-size:13px;border: dotted #ccc 1px;padding: 3px;font-family: 宋体,Consolas,sans-serif ;}
-</style>
-</head>
-<body>
-<div id="stepMsg" class="step">第一步,选择数据源</div>
-
-<div id="step1">
-	<table id="gdDataSource" title="数据源列表" class="easyui-datagrid"
-			url="${ctx}listDataSource.do"
-			toolbar="#toolbar" pagination="true"
-			rownumbers="false" fitColumns="true" singleSelect="true">
-		<thead>
-			<tr>
-				<th data-options="field:'name',align:'center'">名称</th>
-				<th data-options="field:'jdbcUrl',align:'center'">连接</th>
-				<th data-options="field:'_operate',align:'center',align:'center',formatter:formatOper">操作</th>
-			</tr>
-		</thead>
-	</table>
-</div>
-
-<div id="step2" style="display: none;width: 600px;">
-	<fieldset style="border: 1px solid #ccc;font-size: 12px;">
-	    <legend>输入包名</legend>
-	    package: <input id="packageName" type="text" style="width:260px; "/> (不填则表名作为包名)
-	</fieldset>
-	<br>
-	<table id="dgTable"></table>
-	<br>
-	<a href="#" class="easyui-linkbutton" iconCls="icon-forward" onclick="goStep3(); return false;">下一步</a>
-</div>
-
-<div id="step3" style="display: none;">
-	<div id="templateTb">
-		模板名:&nbsp;<input id="tempSch" class="easyui-textbox" type="text"></input>
-		<a href="#" class="easyui-linkbutton" iconCls="icon-search" onclick="searchTemplate(); return false;">搜索</a>
-	</div>
-	<table id="dgTemplate"></table>
-	<br>
-	<a href="#" class="easyui-linkbutton" iconCls="icon-ok" onclick="finish(); return false;">生成</a>
-</div>
-
-<div id="win"
-	class="easyui-window" 
-	title="代码生成结果" 
-	style="width:800px;height:450px;padding:5px;"   
-    data-options="modal:true,closed:true,minimizable:false,collapsible:false">   
-	    
-	<div class="easyui-layout" data-options="fit:true">
-		<div data-options="region:'west',split:true" style="width:150px">
-			<div id="tree"></div>
-		</div>
-		<div data-options="region:'center'" style="padding:10px;">
-			<a id="copyCode" href="javascript:void(0)" style="cursor:default;display: none;">复制代码</a>
-			<div id="codeContent" class="codeArea">点击树菜单查看代码</div>
-		</div>
-		<div data-options="region:'south',border:false" style="text-align:right;padding:5px 0 0;">
-			<a class="easyui-linkbutton" data-options="iconCls:'icon-ok'" href="javascript:void(0)" onclick="$('#win').window('close');">确定</a>
-		</div>
-	</div>
-</div>  
-
-<div id="viewWin"
-	class="easyui-window" 
-	title="模板内容" 
-	style="width:800px;height:450px;padding:5px;"   
-    data-options="modal:true,maximizable:true,closed:true,minimizable:false">   
-	    
-	<div class="easyui-layout" data-options="fit:true">
-		<div data-options="region:'center'" style="padding:10px;">
-			<div id="viewCode" class="codeArea"></div>
-		</div>
-		<div data-options="region:'south',border:false" style="text-align:right;padding:5px 0 0;">
-			<a class="easyui-linkbutton" data-options="iconCls:'icon-ok'" href="javascript:void(0)" onclick="$('#viewWin').window('close');">确定</a>
-		</div>
-	</div>
-</div>  
-
-
-<jsp:include page="../easyui_lib.jsp"></jsp:include>
-<script type="text/javascript" src="${ctx}js/jquery.zclip/jquery.zclip.min.js"></script>
-<script type="text/javascript">
-var that = this;
-// 请求参数
-var GeneratorParam = {
-	dcId:0
-	,tableNames:[]
-	,tcIds:[]
-	,packageName:''
-}
-
-function formatOper(val,row,index){
-	return '<a href="javascript:void(0)" onclick="'+FunUtil.createFun(that,'selectDataSource',row)+'">选择</a>';
-}
-
-// 选择数据源
-function selectDataSource(row){
-	
-	MaskUtil.mask();
-	
-	testConnection(row,function(row){
-		MaskUtil.unmask();
-		
-		GeneratorParam.dcId = row.dcId;
-		
-		showStep2(function(){
-			$('#dgTable').datagrid({    
-				title:'数据源['+row.jdbcUrl+']',
-			    url:ctx + 'listTable.do?dcId='+row.dcId,
-			    columns:[[    
-			        {field:'ck',title:'',checkbox:true}  
-			        ,{field:'tableName',title:'表名'}  
-			    ]]
-			    ,width:500
-			    ,striped:true
-			    ,checkOnSelect:true
-			    ,onLoadSuccess:function(e){
-			    	if(e.errorMsg){
-						MsgUtil.error(e.errorMsg);
-					}
-			    }
-			});
-		})
-	})
-}
-
-// 显示第二步
-function showStep2(callback){
-	$('#step1').hide(500,callback);
-	$('#stepMsg').html('第二步,选择表');
-	$('#step2').show(500);
-}
-
-// 显示第三步
-function showStep3(callback){
-	$('#step2').hide(500,callback);
-	$('#stepMsg').html('第三步,选择模板');
-	$('#step3').show(500);
-}
-
-// 转向第三步
-function goStep3(){
-	
-	var packageName = $.trim($('#packageName').val());
-	if(!validatePackage(packageName)){
-		MsgUtil.topMsg('包名不正确');
-		return false;
-	}
-	
-	var rows = $('#dgTable').datagrid('getSelections');
-	if(!validateTableSelect(rows)){
-		MsgUtil.topMsg('请选择表');
-		return false;
-	}
-	
-	GeneratorParam.packageName = packageName;
-	GeneratorParam.tableNames = [];
-	
-	for(var i=0,len=rows.length;i<len;i++){
-		GeneratorParam.tableNames.push(rows[i].tableName);
-	}
-	showStep3(listTemplate);
-}
-
-function validateTableSelect(rows){
-	return rows && rows.length > 0;
-}
-
-var regexPackage = /^([a-zA-Z_\$]{1}[\w\$]*)(\.[a-zA-Z_\$]{1}[\w\$]*)*$/;
-function validatePackage(packageName){
-	if(packageName == ''){
-		return true;
-	}
-	
-	return regexPackage.test(packageName);
-}
-
-// 查询模板
-function listTemplate(){
-	$('#dgTemplate').datagrid({    
-		title:'模板列表',
-	    url:ctx + 'listUserTepmlate.do',
-	    toolbar: '#templateTb',
-	    columns:[[    
-	        {field:'ck',title:'',checkbox:true}  
-	        ,{field:'name',title:'模板名'}  
-	        ,{field:'content',title:'内容',formatter: function(value,row,index){
-	        		return '<a href="javascript:void(0)" onclick="'+FunUtil.createFun(that,'showContent',row)+'">查看</a>';
-	        	}
-			}  
-	    ]]
-	    ,pagination:true
-	    ,width:500
-	    ,striped:true
-	    ,checkOnSelect:true
-	    ,onLoadSuccess:function(e){
-	    	if(e.errorMsg){
-				MsgUtil.error(e.errorMsg);
-			}
-	    }
-	});
-}
-
-function searchTemplate(){
-	var value = $('#tempSch').val();
-	$('#dgTemplate').datagrid('load',{
-		nameSch: value
-	});
-}
-
-// 展示内容
-function showContent(row){
-	$('#viewCode').html(HtmlUtil.parseToHtml(row.content));
-	$('#viewWin').window('open');
-}
-
-// 完成
-function finish(){
-	reset();
-	var rows = $('#dgTemplate').datagrid('getSelections');
-	
-	if(rows && rows.length > 0){
-		GeneratorParam.tcIds = [];
-		for(var i=0,len=rows.length;i<len;i++){
-			GeneratorParam.tcIds.push(rows[i].tcId);
-		}
-		generate();
-	}else{
-		MsgUtil.topMsg('请选择模板');
-	}
-}
-
-function reset(){
-	$("#copyCode").hide();
-	$('#codeContent').html('点击树菜单查看代码');
-}
-
-// 生成代码
-function generate(){
-	MaskUtil.mask('代码生成中,请稍后...');
-	Action.jsonAsyncActByData(ctx + 'generatFile.do',GeneratorParam,function(rows){
-		MaskUtil.unmask();
-		if(rows){
-			showGeneratCode(rows);
-		}else{
-			MsgUtil.error(e.errorMsg);
-		}
-	});
-}
-
-// 显示结果
-function showGeneratCode(rows){
-	var treeData = buildTreeData(rows);
-	$('#tree').tree({
-		data:treeData
-		// 点击树节点显示代码
-		,onClick: function(node){
-			var attributes = node.attributes;
-			if(attributes){
-				$("#copyCode").show();
-				$('#codeContent').html(attributes.content);
-				
-				if(!bindCopyEvent.binded){
-					bindCopyEvent();
-					bindCopyEvent.binded = true;
-				}
-			}
-		}
-	});
-	
-	$('#win').window('open');
-}
-
-// 绑定复制代码事件
-function bindCopyEvent(){
-	$('#copyCode').show().zclip({ 
-		path:ctx + 'js/jquery.zclip/ZeroClipboard.swf', 
-		copy:function(){
-			return HtmlUtil.parseToText($('#codeContent').html());
-		},
-		afterCopy:function(){ 
-			MsgUtil.topMsg('复制成功');
-		} 
-	});
-}
-
-// 构建树菜单数据
-function buildTreeData(rows){
-	var treeData = [];
-	var codeMap = {};
-	// 把列表数据转换到map中,key为表名
-	// value是个List
-	for(var i=0,len=rows.length;i<len;i++){
- 		var row = rows[i];
- 		var list = codeMap[row.tableName];
- 		if(!list){
- 			list = [];
-	 		codeMap[row.tableName] = list;
- 		}
- 		
- 		list.push({templateName:row.templateName,content:row.content});
-	}
-	// 把这个map对象转成tree格式数据
-	for(var tableName in codeMap){
-		var codeFileArr = codeMap[tableName];
-		var treeElement = {
-			text:tableName
-			//,state:'closed' // 默认关闭
-			,children:buildChildren(codeFileArr)
-		};
-	
-		treeData.push(treeElement);
-	}
-	
-	return treeData;
-}
-
-function buildChildren(codeFileArr){
-	var children = [];
-	for(var i=0,len=codeFileArr.length;i<len;i++){
-		var codeFile = codeFileArr[i];
-		var child = {
-			text:codeFile.templateName
-			,attributes:{
-				content:HtmlUtil.parseToHtml(codeFile.content)
-			}
-		};
-		
-		children.push(child);
-	}
-	
-	return children;
-}
-
-function testConnection(row,callback){
-	Action.jsonAsyncActByData(ctx + 'connectionTest.do',row,function(e){
-		if(e.success){
-			callback(row);
-		}else{
-			MsgUtil.error(e.errorMsg);
-		}
-		
-	})
-}
-</script>
-</body>
-</html>

+ 1 - 1
src/main/webapp/js/MaskUtil.js

@@ -9,7 +9,7 @@ var MaskUtil = (function(){
 	
 	var $mask,$maskMsg;
 	
-	var defMsg = '正在处理,请稍待。。。';
+	var defMsg = '正在处理,请稍候...';
 	
 	function init(){
 		if(!$mask){

+ 54 - 0
src/main/webapp/login.html

@@ -0,0 +1,54 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>代码生成系统</title>
+    <link href="resources/css/admin_login.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<div class="admin_login_wrap">
+    <h1 style="text-align: center;">代码生成系统</h1>
+    <div class="adming_login_border">
+        <div class="admin_input">
+        		<div id="msg" style="color: red;"></div>
+               <ul class="admin_items">
+                   <li>
+                       <label for="user">用户名:</label>
+                       <input type="text" name="username" value="" id="username" size="40" class="admin_input_style" />
+                   </li>
+                   <li>
+                       <label for="pwd">密码:</label>
+                       <input onkeyup="keyPress(event);" type="password" name="pwd" value="" id="password" size="40" class="admin_input_style" />
+                   </li>
+                   <li>
+                       <input type="button" tabindex="3" value="登   录" onclick="login();" class="btn btn-primary" />
+                   </li>
+               </ul>
+        </div>
+    </div>
+</div>
+
+<script type="text/javascript" src="resources/js/libs/jquery.min.js"></script>
+<script type="text/javascript" src="resources/js/libs/Action.js"></script>
+<script type="text/javascript">
+function login(){
+	var data = {username:$('#username').val(),password:$('#password').val()};
+	Action.post('login.do',data,function(result){
+		if (result.success){
+			window.location = 'sys/home.jsp';
+		} else {
+			var errorMsg = result.message;
+			$('#msg').html(errorMsg);
+		}
+	});
+}
+
+function keyPress(event){
+	if(event.keyCode == 13){
+		login();
+	}
+}
+
+</script>
+</body>
+</html>

+ 0 - 0
src/main/webapp/login.jsp


Some files were not shown because too many files changed in this diff