manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade simple line icons to 2.4.0

Browse Source
This commit is contained in:
thinkgem
2018-01-02 20:57:24 +08:00
parent 6f50be34e7
commit 684353c01b
13 changed files with 1672 additions and 2552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/main/resources/static/fonts/font-icons.min.css vendored
View File

File diff suppressed because one or more lines are too long

BIN
common/src/main/resources/static/fonts/fonts/Simple-Line-Icons.eot
View File

Binary file not shown.

1567
common/src/main/resources/static/fonts/fonts/Simple-Line-Icons.svg
View File

File diff suppressed because it is too large Load Diff
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 175 KiB

After

Width:  |  Height:  |  Size: 233 KiB

BIN
common/src/main/resources/static/fonts/fonts/Simple-Line-Icons.ttf
View File

Binary file not shown.

BIN
common/src/main/resources/static/fonts/fonts/Simple-Line-Icons.woff
View File

Binary file not shown.

BIN
common/src/main/resources/static/fonts/fonts/Simple-Line-Icons.woff2 Normal file
View File

Binary file not shown.

1362
common/src/main/resources/static/fonts/simple-line-icons.css
View File

File diff suppressed because it is too large Load Diff

BIN
modules/core/src/main/java/com/jeesite/modules/db/InitCoreData.xlsx
View File

Binary file not shown.

2
modules/core/src/main/resources/views/modules/sys/sysIndex/topMenuOnline.html
View File

@@ -1,7 +1,7 @@
<li> <li>
<a href="javascript:" data-href="${ctx}/sys/online/list" data-title="在线人员" title="在线人员" <a href="javascript:" data-href="${ctx}/sys/online/list" data-title="在线人员" title="在线人员"
class="${hasPermi('sys:online:view') ? 'addTabPage' : ''}"> class="${hasPermi('sys:online:view') ? 'addTabPage' : ''}">
<i class="icon-users"></i><span id="onlineCount" class="label label-success">0</span> <i class="icon-people"></i><span id="onlineCount" class="label label-success">0</span>
</a> </a>
<script> <script>
function refreshOnlineCount(){ function refreshOnlineCount(){

2
modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html
View File

@@ -3,7 +3,7 @@
<div class="box box-main"> <div class="box box-main">
<div class="box-header"> <div class="box-header">
<div class="box-title"> <div class="box-title">
<i class="fa icon-users"></i> 用户授权数据权限 <i class="fa icon-people"></i> 用户授权数据权限
</div> </div>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button> <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>

2
modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html
View File

@@ -3,7 +3,7 @@
<div class="box box-main"> <div class="box box-main">
<div class="box-header"> <div class="box-header">
<div class="box-title"> <div class="box-title">
<i class="fa icon-users"></i> 二级管理员管理数据权限 <i class="fa icon-people"></i> 二级管理员管理数据权限
</div> </div>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button> <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>

7
parent/pom.xml
View File

@@ -51,7 +51,8 @@
<!-- environment setting --> <!-- environment setting -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jdk.version>1.7</jdk.version> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.7</java.version>
<downloadSources>false</downloadSources> <downloadSources>false</downloadSources>
<downloadJavadocs>false</downloadJavadocs> <downloadJavadocs>false</downloadJavadocs>
@@ -80,8 +81,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version> <version>3.7.0</version>
<configuration> <configuration>
<source>${jdk.version}</source> <source>${java.version}</source>
<target>${jdk.version}</target> <target>${java.version}</target>
<showWarnings>true</showWarnings> <showWarnings>true</showWarnings>
<compilerArguments> <compilerArguments>
<!-- <verbose /> 输出有关编译器正在执行的操作的消息 --> <!-- <verbose /> 输出有关编译器正在执行的操作的消息 -->

375
web/db/test.erm
View File

@@ -663,6 +663,38 @@
<physical_name>test_checkbox</physical_name> <physical_name>test_checkbox</physical_name>
<type>varchar(n)</type> <type>varchar(n)</type>
</word> </word>
<word>
<id>a5742c4c2c1fd5c201d5d34d977964f97f0fe2c4</id>
<length>64</length>
<decimal>null</decimal>
<array>false</array>
<array_dimension>null</array_dimension>
<unsigned>false</unsigned>
<zerofill>false</zerofill>
<binary>false</binary>
<args></args>
<char_semantics>false</char_semantics>
<description></description>
<logical_name>公司选择</logical_name>
<physical_name>test_company_code</physical_name>
<type>varchar(n)</type>
</word>
<word>
<id>d829e707316a49d39e5a11da5f5d36030a856b86</id>
<length>64</length>
<decimal>null</decimal>
<array>false</array>
<array_dimension>null</array_dimension>
<unsigned>false</unsigned>
<zerofill>false</zerofill>
<binary>false</binary>
<args></args>
<char_semantics>false</char_semantics>
<description></description>
<logical_name>父表主键</logical_name>
<physical_name>test_data_id</physical_name>
<type>varchar(n)</type>
</word>
<word> <word>
<id>ffd84f2ff6d4918bb700605c5a46d3642eac6bcd</id> <id>ffd84f2ff6d4918bb700605c5a46d3642eac6bcd</id>
<length>null</length> <length>null</length>
@@ -695,22 +727,6 @@
<physical_name>test_datetime</physical_name> <physical_name>test_datetime</physical_name>
<type>timestamp</type> <type>timestamp</type>
</word> </word>
<word>
<id>7e7a140b5d69e5c594108bb75e2d59b326b11c0b</id>
<length>64</length>
<decimal>null</decimal>
<array>false</array>
<array_dimension>null</array_dimension>
<unsigned>false</unsigned>
<zerofill>false</zerofill>
<binary>false</binary>
<args></args>
<char_semantics>false</char_semantics>
<description></description>
<logical_name>用户员工选择</logical_name>
<physical_name>test_emp_user</physical_name>
<type>varchar(n)</type>
</word>
<word> <word>
<id>ac02f2d1fff63fa66db583735eb1c8e9b466872f</id> <id>ac02f2d1fff63fa66db583735eb1c8e9b466872f</id>
<length>200</length> <length>200</length>
@@ -727,6 +743,22 @@
<physical_name>test_input</physical_name> <physical_name>test_input</physical_name>
<type>varchar(n)</type> <type>varchar(n)</type>
</word> </word>
<word>
<id>5d32d32e3e7a7e115fe0ec3dff297801019dcd78</id>
<length>64</length>
<decimal>null</decimal>
<array>false</array>
<array_dimension>null</array_dimension>
<unsigned>false</unsigned>
<zerofill>false</zerofill>
<binary>false</binary>
<args></args>
<char_semantics>false</char_semantics>
<description></description>
<logical_name>部门选择</logical_name>
<physical_name>test_office_code</physical_name>
<type>varchar(n)</type>
</word>
<word> <word>
<id>791691b791efedc2d14867a152b4de58f4567326</id> <id>791691b791efedc2d14867a152b4de58f4567326</id>
<length>10</length> <length>10</length>
@@ -775,6 +807,22 @@
<physical_name>test_select_multiple</physical_name> <physical_name>test_select_multiple</physical_name>
<type>varchar(n)</type> <type>varchar(n)</type>
</word> </word>
<word>
<id>ae103dc1fb50094552e56afd72015481271913db</id>
<length>null</length>
<decimal>null</decimal>
<array>false</array>
<array_dimension>null</array_dimension>
<unsigned>false</unsigned>
<zerofill>false</zerofill>
<binary>false</binary>
<args></args>
<char_semantics>false</char_semantics>
<description></description>
<logical_name>排序号</logical_name>
<physical_name>test_sort</physical_name>
<type>integer</type>
</word>
<word> <word>
<id>68b1f859bfea8bf1733964c0ccaf826fc05f3b1f</id> <id>68b1f859bfea8bf1733964c0ccaf826fc05f3b1f</id>
<length>200</length> <length>200</length>
@@ -792,7 +840,7 @@
<type>varchar(n)</type> <type>varchar(n)</type>
</word> </word>
<word> <word>
<id>577aaa30e264c0599bf74be399f18ad2db387160</id> <id>2eda719a62fb7e1d3face62555046d938abddda9</id>
<length>64</length> <length>64</length>
<decimal>null</decimal> <decimal>null</decimal>
<array>false</array> <array>false</array>
@@ -804,7 +852,7 @@
<char_semantics>false</char_semantics> <char_semantics>false</char_semantics>
<description></description> <description></description>
<logical_name>用户选择</logical_name> <logical_name>用户选择</logical_name>
<physical_name>test_user</physical_name> <physical_name>test_user_code</physical_name>
<type>varchar(n)</type> <type>varchar(n)</type>
</word> </word>
<word> <word>
@@ -939,6 +987,105 @@
<tablespace_set> <tablespace_set>
</tablespace_set> </tablespace_set>
<contents> <contents>
<table>
<id>b7226377b79c26a490f7bf5789c1f74ed96e1b6f</id>
<height>359</height>
<width>323</width>
<font_name>Segoe UI</font_name>
<font_size>9</font_size>
<x>756</x>
<y>36</y>
<color>
<r>128</r>
<g>128</g>
<b>192</b>
</color>
<connections>
</connections>
<physical_name>test_tree</physical_name>
<logical_name>test_tree</logical_name>
<description></description>
<constraint></constraint>
<primary_key_name></primary_key_name>
<option></option>
<columns>
<normal_column>
<word_id>869fc70cf3a4e92e8056b40814df8e03f9f9efde</word_id>
<id>c43aabb7788441b65957230fef18799d704e19b1</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>varchar(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>true</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<column_group>a535b6c506004a7fdf4d48984c9ff2cfa59c157a</column_group>
<normal_column>
<word_id>a1ea53e86b9fdaedab01cfce6fe86c610d539368</word_id>
<id>39f501890586173d229e83610cfbfaa6e3a85374</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>nvarchar(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<column_group>35ae805d1da92afdb99b2fe8c536d1649356fccd</column_group>
</columns>
<indexes>
</indexes>
<complex_unique_key_list>
</complex_unique_key_list>
<table_properties>
<schema></schema>
</table_properties>
</table>
<table> <table>
<id>5435ef11ea53f170fe3491b199c113e47932e175</id> <id>5435ef11ea53f170fe3491b199c113e47932e175</id>
<height>401</height> <height>401</height>
@@ -1259,8 +1406,8 @@
</sequence> </sequence>
</normal_column> </normal_column>
<normal_column> <normal_column>
<word_id>577aaa30e264c0599bf74be399f18ad2db387160</word_id> <word_id>2eda719a62fb7e1d3face62555046d938abddda9</word_id>
<id>b1fe1fa16a9245d23025a5ef70e8d94ab365a785</id> <id>cfe3c330968a9a824c2cf933b227887d3e9615ac</id>
<description></description> <description></description>
<unique_key_name></unique_key_name> <unique_key_name></unique_key_name>
<logical_name></logical_name> <logical_name></logical_name>
@@ -1292,8 +1439,41 @@
</sequence> </sequence>
</normal_column> </normal_column>
<normal_column> <normal_column>
<word_id>7e7a140b5d69e5c594108bb75e2d59b326b11c0b</word_id> <word_id>5d32d32e3e7a7e115fe0ec3dff297801019dcd78</word_id>
<id>e454dabc647abd4e3a6772dc484b2d4fb6e3f46b</id> <id>23041cb30875514136904ea11043c7ea1924f048</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>varchar(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>false</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>a5742c4c2c1fd5c201d5d34d977964f97f0fe2c4</word_id>
<id>463f8c1eeb29b2c87bebef4217202772169d1b67</id>
<description></description> <description></description>
<unique_key_name></unique_key_name> <unique_key_name></unique_key_name>
<logical_name></logical_name> <logical_name></logical_name>
@@ -1335,8 +1515,8 @@
</table_properties> </table_properties>
</table> </table>
<table> <table>
<id>13e232e8745538ec21bbae7e4569bcda69d93131</id> <id>fb11bc47b30b0d8e468d3cd16ed660bf57bc8863</id>
<height>401</height> <height>217</height>
<width>320</width> <width>320</width>
<font_name>Segoe UI</font_name> <font_name>Segoe UI</font_name>
<font_size>9</font_size> <font_size>9</font_size>
@@ -1389,6 +1569,72 @@
<decimal_size>0</decimal_size> <decimal_size>0</decimal_size>
</sequence> </sequence>
</normal_column> </normal_column>
<normal_column>
<word_id>ae103dc1fb50094552e56afd72015481271913db</word_id>
<id>ec8a047dffe3cf2e4d95ba3e26c3bac0382d95c9</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>integer</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>false</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>d829e707316a49d39e5a11da5f5d36030a856b86</word_id>
<id>b095c44611ed08156277676d9a3a0ce52b9b05ef</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>varchar(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>false</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column> <normal_column>
<word_id>ac02f2d1fff63fa66db583735eb1c8e9b466872f</word_id> <word_id>ac02f2d1fff63fa66db583735eb1c8e9b466872f</word_id>
<id>78715aa66a10a9b190ad69b8ed792e9a2f4946e3</id> <id>78715aa66a10a9b190ad69b8ed792e9a2f4946e3</id>
@@ -1654,8 +1900,8 @@
</sequence> </sequence>
</normal_column> </normal_column>
<normal_column> <normal_column>
<word_id>577aaa30e264c0599bf74be399f18ad2db387160</word_id> <word_id>2eda719a62fb7e1d3face62555046d938abddda9</word_id>
<id>57d712a76c0dce4350a6f5ad29961ff39c5ded31</id> <id>9f33d190101e56f93f5ece0fd7c5cdda3e704b4c</id>
<description></description> <description></description>
<unique_key_name></unique_key_name> <unique_key_name></unique_key_name>
<logical_name></logical_name> <logical_name></logical_name>
@@ -1687,8 +1933,8 @@
</sequence> </sequence>
</normal_column> </normal_column>
<normal_column> <normal_column>
<word_id>7e7a140b5d69e5c594108bb75e2d59b326b11c0b</word_id> <word_id>5d32d32e3e7a7e115fe0ec3dff297801019dcd78</word_id>
<id>5656ef4015fd5f2e80bcc1f42f7060a55b660516</id> <id>16121b5aa08fc170883408ec2d0487281a132d9d</id>
<description></description> <description></description>
<unique_key_name></unique_key_name> <unique_key_name></unique_key_name>
<logical_name></logical_name> <logical_name></logical_name>
@@ -1719,41 +1965,9 @@
<decimal_size>0</decimal_size> <decimal_size>0</decimal_size>
</sequence> </sequence>
</normal_column> </normal_column>
<column_group>35ae805d1da92afdb99b2fe8c536d1649356fccd</column_group>
</columns>
<indexes>
</indexes>
<complex_unique_key_list>
</complex_unique_key_list>
<table_properties>
<schema></schema>
</table_properties>
</table>
<table>
<id>b7226377b79c26a490f7bf5789c1f74ed96e1b6f</id>
<height>359</height>
<width>323</width>
<font_name>Segoe UI</font_name>
<font_size>9</font_size>
<x>756</x>
<y>36</y>
<color>
<r>128</r>
<g>128</g>
<b>192</b>
</color>
<connections>
</connections>
<physical_name>test_tree</physical_name>
<logical_name>test_tree</logical_name>
<description></description>
<constraint></constraint>
<primary_key_name></primary_key_name>
<option></option>
<columns>
<normal_column> <normal_column>
<word_id>869fc70cf3a4e92e8056b40814df8e03f9f9efde</word_id> <word_id>a5742c4c2c1fd5c201d5d34d977964f97f0fe2c4</word_id>
<id>c43aabb7788441b65957230fef18799d704e19b1</id> <id>fd675547aecaf4cab579decef6612af613c9fb55</id>
<description></description> <description></description>
<unique_key_name></unique_key_name> <unique_key_name></unique_key_name>
<logical_name></logical_name> <logical_name></logical_name>
@@ -1763,41 +1977,7 @@
<default_value></default_value> <default_value></default_value>
<auto_increment>false</auto_increment> <auto_increment>false</auto_increment>
<foreign_key>false</foreign_key> <foreign_key>false</foreign_key>
<not_null>true</not_null> <not_null>false</not_null>
<primary_key>true</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<column_group>a535b6c506004a7fdf4d48984c9ff2cfa59c157a</column_group>
<normal_column>
<word_id>a1ea53e86b9fdaedab01cfce6fe86c610d539368</word_id>
<id>39f501890586173d229e83610cfbfaa6e3a85374</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>nvarchar(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>false</primary_key> <primary_key>false</primary_key>
<unique_key>false</unique_key> <unique_key>false</unique_key>
<character_set></character_set> <character_set></character_set>
@@ -1818,7 +1998,6 @@
<decimal_size>0</decimal_size> <decimal_size>0</decimal_size>
</sequence> </sequence>
</normal_column> </normal_column>
<column_group>35ae805d1da92afdb99b2fe8c536d1649356fccd</column_group>
</columns> </columns>
<indexes> <indexes>
</indexes> </indexes>