nelson
/
ureport2
1
0
Forka 0
Codice Problemi Pull Requests Progetti Rilasci Wiki Attività
Sfoglia il codice sorgente

添加Chart工具栏

master
jacky6024 7 anni fa
parent
f584cf399b
commit
5363a38494
15 ha cambiato i file con 93322 aggiunte e 90 eliminazioni
Spazi bianchi
Visualizza tutti i cambiamenti Ignora spazi bianchi quando confronti le linee Ignora cambiamenti di quantità di spazi bianchi Ignora cambiamenti di spazi bianchi alla fine delle linee
Visualizzazione separata
Opzioni Diff
Mostra statistiche Scarica il file Patch Scarica il file Diff
  1. 8
      ureport2-console/pom.xml
  2. 92630
      ureport2-console/src/main/resources/asserts/js/designer.bundle.js
  3. 1
      ureport2-console/src/main/resources/asserts/js/designer.bundle.js.map
  4. 677
      ureport2-console/src/main/resources/asserts/js/preview.bundle.js
  5. 1
      ureport2-console/src/main/resources/asserts/js/preview.bundle.js.map
  6. 24
      ureport2-console/src/main/resources/template/template.ureport.xml
  7. 4
      ureport2-core/pom.xml
  8. 5
      ureport2-font/pom.xml
  9. 12
      ureport2-js/css/designer.css
  10. 20
      ureport2-js/css/iconfont.css
  11. BIN
      ureport2-js/css/iconfont.eot
  12. BIN
      ureport2-js/css/iconfont.ttf
  13. 2
      ureport2-js/src/designer.js
  14. 26
      ureport2-js/src/tools/ChartTool.js
  15. 2
      ureport2-parent/pom.xml

8
ureport2-console/pom.xml
Vedi File

@ -2,11 +2,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>ureport2-console</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
<parent>
<groupId>com.bstek.ureport</groupId>
<artifactId>ureport2-parent</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
</parent>
<dependencies>
<dependency>
@ -22,7 +22,7 @@
<dependency>
<groupId>com.bstek.ureport</groupId>
<artifactId>ureport2-core</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@ -33,7 +33,7 @@
<dependency>
<groupId>com.bstek.ureport</groupId>
<artifactId>ureport2-font</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
</dependency>
</dependencies>
<licenses>

92630
ureport2-console/src/main/resources/asserts/js/designer.bundle.js
Vedi File

File diff suppressed because one or more lines are too long

1
ureport2-console/src/main/resources/asserts/js/designer.bundle.js.map
Vedi File

File diff suppressed because one or more lines are too long

677
ureport2-console/src/main/resources/asserts/js/preview.bundle.js
Vedi File

File diff suppressed because one or more lines are too long

1
ureport2-console/src/main/resources/asserts/js/preview.bundle.js.map
Vedi File

File diff suppressed because one or more lines are too long

24
ureport2-console/src/main/resources/template/template.ureport.xml
Vedi File

@ -3,53 +3,53 @@
xsi:schemaLocation="http://www.example.org/ureport2 http://www.example.org/ureport2 ">
<cell expand="None" name="A1" col="1" row="1">
<simple-value><![CDATA[]]></simple-value>
<cell-style font-size="9" align="center" valign="middle"></cell-style>
<cell-style font-size="10" align="center" valign="middle"></cell-style>
</cell>
<cell expand="None" name="B1" col="2" row="1">
<simple-value><![CDATA[]]></simple-value>
<cell-style font-size="9" align="center" valign="middle"></cell-style>
<cell-style font-size="10" align="center" valign="middle"></cell-style>
</cell>
<cell expand="None" name="C1" col="3" row="1">
<simple-value><![CDATA[]]></simple-value>
<cell-style font-size="9" align="center" valign="middle"></cell-style>
<cell-style font-size="10" align="center" valign="middle"></cell-style>
</cell>
<cell expand="None" name="D1" col="4" row="1">
<simple-value><![CDATA[]]></simple-value>
<cell-style font-size="9" align="center" valign="middle"></cell-style>
<cell-style font-size="10" align="center" valign="middle"></cell-style>
</cell>
<cell expand="None" name="A2" col="1" row="2">
<simple-value><![CDATA[]]></simple-value>
<cell-style font-size="9" align="center" valign="middle"></cell-style>
<cell-style font-size="10" align="center" valign="middle"></cell-style>
</cell>
<cell expand="None" name="B2" col="2" row="2">
<simple-value><![CDATA[]]></simple-value>
<cell-style font-size="9" align="center" valign="middle"></cell-style>
<cell-style font-size="10" align="center" valign="middle"></cell-style>
</cell>
<cell expand="None" name="C2" col="3" row="2">
<simple-value><![CDATA[]]></simple-value>
<cell-style font-size="9" align="center" valign="middle"></cell-style>
<cell-style font-size="10" align="center" valign="middle"></cell-style>
</cell>
<cell expand="None" name="D2" col="4" row="2">
<simple-value><![CDATA[]]></simple-value>
<cell-style font-size="9" align="center" valign="middle"></cell-style>
<cell-style font-size="10" align="center" valign="middle"></cell-style>
</cell>
<cell expand="None" name="A3" col="1" row="3">
<simple-value><![CDATA[]]></simple-value>
<cell-style font-size="9" align="center" valign="middle"></cell-style>
<cell-style font-size="10" align="center" valign="middle"></cell-style>
</cell>
<cell expand="None" name="B3" col="2" row="3">
<simple-value><![CDATA[]]></simple-value>
<cell-style font-size="9" align="center" valign="middle"></cell-style>
<cell-style font-size="10" align="center" valign="middle"></cell-style>
</cell>
<cell expand="None" name="C3" col="3" row="3">
<simple-value><![CDATA[]]></simple-value>
<cell-style font-size="9" align="center" valign="middle"></cell-style>
<cell-style font-size="10" align="center" valign="middle"></cell-style>
</cell>
<cell expand="None" name="D3" col="4" row="3">
<simple-value><![CDATA[]]></simple-value>
<cell-style font-size="9" align="center" valign="middle"></cell-style>
<cell-style font-size="10" align="center" valign="middle"></cell-style>
</cell>
<row row-number="1" height="18"/>

4
ureport2-core/pom.xml
Vedi File

@ -2,11 +2,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>ureport2-core</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
<parent>
<groupId>com.bstek.ureport</groupId>
<artifactId>ureport2-parent</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.1</version>
</parent>
<dependencies>
<dependency>

5
ureport2-font/pom.xml
Vedi File

@ -4,13 +4,13 @@
<parent>
<groupId>com.bstek.ureport</groupId>
<artifactId>ureport2-parent</artifactId>
<version>2.0.0</version>
<version>2.0.1</version>
</parent>
<dependencies>
<dependency>
<groupId>com.bstek.ureport</groupId>
<artifactId>ureport2-core</artifactId>
<version>2.0.0</version>
<version>2.0.1</version>
</dependency>
</dependencies>
<licenses>
@ -38,5 +38,4 @@
</organization>
<name>UReport2 Font Project</name>
<url>https://github.com/youseries/ureport/tree/master/ureport2-font</url>
<version>2.0.0</version>
</project>

12
ureport2-js/css/designer.css
Vedi File

@ -12,4 +12,16 @@
position: absolute;
background: #ffffff;
box-shadow: 5px 5px 5px #888888;
}
.ud-select-color{
background: #000000;
width: 14px;
height: 4px;
display: block;
}
.ud-select-bgcolor{
background: #fff;
width: 14px;
height: 4px;
display: block;
}

20
ureport2-js/css/iconfont.css
Vedi File

@ -20,7 +20,7 @@
.ureport-bar:before { content: "\e66b"; }
.ureport-bgcolor:before { content: "\e76c"; }
.ureport-bgcolor2:before { content: "\e76c"; }
.ureport-crosstab:before { content: "\e60b"; }
@ -28,14 +28,22 @@
.ureport-underline:before { content: "\e8ab"; }
.ureport-horizontal-bar:before { content: "\e62d"; }
.ureport-scatter:before { content: "\e632"; }
.ureport-sqlds:before { content: "\e6b6"; }
.ureport-qrcode:before { content: "\e72c"; }
.ureport-bgcolor:before { content: "\e62c"; }
.ureport-fontsize:before { content: "\e63f"; }
.ureport-fontfamily:before { content: "\e618"; }
.ureport-area:before { content: "\e9d7"; }
.ureport-italic:before { content: "\eb31"; }
.ureport-bold:before { content: "\e61f"; }
@ -74,6 +82,8 @@
.ureport-clean:before { content: "\e628"; }
.ureport-forecolor:before { content: "\e670"; }
.ureport-footer-repeat:before { content: "\e62b"; }
.ureport-pdf:before { content: "\e68f"; }
@ -90,8 +100,6 @@
.ureport-redo:before { content: "\e61c"; }
.ureport-radar:before { content: "\e7f6"; }
.ureport-import:before { content: "\e609"; }
.ureport-clean-content:before { content: "\e604"; }
@ -114,6 +122,8 @@
.ureport-21print:before { content: "\e644"; }
.ureport-radar:before { content: "\e671"; }
.ureport-image:before { content: "\e626"; }
.ureport-bottom-border:before { content: "\e61e"; }
@ -132,11 +142,13 @@
.ureport-pdf-printer:before { content: "\e607"; }
.ureport-forecolor:before { content: "\e601"; }
.ureport-forecolor1:before { content: "\e601"; }
.ureport-end:before { content: "\e60a"; }
.ureport-insert-column:before { content: "\e619"; }
.ureport-polar:before { content: "\e60e"; }
.ureport-header-repeat:before { content: "\e696"; }

BIN
ureport2-js/css/iconfont.eot
Vedi File

File binario non mostrato.

BIN
ureport2-js/css/iconfont.ttf
Vedi File

File binario non mostrato.

2
ureport2-js/src/designer.js
Vedi File

@ -138,7 +138,7 @@ export default class UReportDesigner{
this.tools.push(new CrosstabTool(context));
this.tools.push(new ImageTool(context));
this.tools.push(new ZxingTool(context));
//this.tools.push(new ChartTool(context));
this.tools.push(new ChartTool(context));
this.tools.push(new SettingsTool(context));
for(const tool of this.tools){
toolbar.append(tool.buildButton());

26
ureport2-js/src/tools/ChartTool.js
Vedi File

@ -10,7 +10,7 @@ export default class ChartTool extends Tool{
buildButton(){
const group=$(`<div class="btn-group"></div>`);
const mainBtn=$(`<button type="button" class="btn btn-default dropdown-toggle" style="border:none;border-radius:0;background: #f8f8f8;padding: 6px 5px;" data-toggle="dropdown" title="图表">
<i class="ureport ureport-bar" style="color: #0e90d2;"></i>
<i class="ureport ureport-pie" style="color: #0e90d2;"></i>
<span class="caret"></span>
</button>`);
const ul=$(`<ul class="dropdown-menu" role="menu"></ul>`);
@ -32,12 +32,36 @@ export default class ChartTool extends Tool{
</a>
</li>`);
ul.append(bar);
const horBar=$(`<li>
<a href="###">
<i class="ureport ureport-horizontal-bar" style="color: #0e90d2;"></i> 水平柱状图
</a>
</li>`);
ul.append(horBar);
const area=$(`<li>
<a href="###">
<i class="ureport ureport-area" style="color: #0e90d2;"></i> 面积图
</a>
</li>`);
ul.append(area);
const radar=$(`<li>
<a href="###">
<i class="ureport ureport-radar" style="color: #0e90d2;"></i> 雷达图
</a>
</li>`);
ul.append(radar);
const polar=$(`<li>
<a href="###">
<i class="ureport ureport-polar" style="color: #0e90d2;"></i> 极坐标图
</a>
</li>`);
ul.append(polar);
const scatter=$(`<li>
<a href="###">
<i class="ureport ureport-scatter" style="color: #0e90d2;"></i> 散点图
</a>
</li>`);
ul.append(scatter);
const bubble=$(`<li>
<a href="###">
<i class="ureport ureport-bubble" style="color: #0e90d2;"></i> 气泡图

2
ureport2-parent/pom.xml
Vedi File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.bstek.ureport</groupId>
<artifactId>ureport2-parent</artifactId>
<version>2.0.0</version>
<version>2.0.1</version>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

Scrivi Anteprima
Caricamento…
Annulla
Salva