center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'dev' of github.com:dataease/dataease into dev

Browse Source
This commit is contained in:
taojinlong 2022-08-23 17:08:26 +08:00
commit 12d249f12b
8 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/pom.xml
View File

@ -377,6 +377,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<encoding>UTF-8</encoding>
<nonFilteredFileExtensions>
<nonFilteredFileExtension>xls</nonFilteredFileExtension>
</nonFilteredFileExtensions>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>

1
backend/src/main/java/io/dataease/plugins/server/XUserServer.java
View File

@ -14,6 +14,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@Api(tags = "xpack：用户导入")
@RequestMapping("/plugin/user")
@RestController

BIN
backend/src/main/resources/excel/user.xls Normal file
View File

Binary file not shown.

1
backend/src/main/resources/i18n/messages_en_US.properties
View File

@ -1,4 +1,5 @@
\u4E2A\u4EBA\u4FE1\u606F=Personal Information
\u6A21\u677F\u5E02\u573A=Template Market
\u4EEA\u8868\u677F=Dashboard
\u4FEE\u6539\u5BC6\u7801=Change Password
\u521B\u5EFA\u7528\u6237=Create User

1
backend/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -1,4 +1,5 @@
\u4E2A\u4EBA\u4FE1\u606F=\u4E2A\u4EBA\u4FE1\u606F
\u6A21\u677F\u5E02\u573A=\u6A21\u677F\u5E02\u573A
\u4EEA\u8868\u677F=\u4EEA\u8868\u677F
\u4FEE\u6539\u5BC6\u7801=\u4FEE\u6539\u5BC6\u7801
\u521B\u5EFA\u7528\u6237=\u521B\u5EFA\u7528\u6237

1
backend/src/main/resources/i18n/messages_zh_TW.properties
View File

@ -1,4 +1,5 @@
\u4E2A\u4EBA\u4FE1\u606F=\u500B\u4EBA\u4FE1\u606F
\u6A21\u677F\u5E02\u573A=\u6A21\u677F\u5E02\u5834
\u4EEA\u8868\u677F=\u5100\u8868\u677F
\u4FEE\u6539\u5BC6\u7801=\u4FEE\u6539\u5BC6\u78BC
\u521B\u5EFA\u7528\u6237=\u5275\u5EFA\u7528\u6236

4
frontend/src/views/chart/components/ChartComponentG2.vue
View File

@ -2,8 +2,8 @@
<div ref="chartContainer" style="padding: 0;width: 100%;height: 100%;overflow: hidden;" :style="bg_class">
<view-track-bar ref="viewTrack" :track-menu="trackMenu" class="track-bar" :style="trackBarStyleTime" @trackClick="trackClick" />
<span v-if="chart.type && antVRenderStatus" v-show="title_show" ref="title" :style="title_class" style="cursor: default;display: block;">
<div>
<p style="padding:6px 4px 0;margin: 0;overflow: hidden;white-space: pre;text-overflow: ellipsis;display: inline;">{{ chart.title }}</p>
<div style="padding:6px 4px 0;margin: 0;">
<p style="overflow: hidden;white-space: pre;text-overflow: ellipsis;display: inline;">{{ chart.title }}</p>
<title-remark v-if="remarkCfg.show" style="text-shadow: none!important;" :remark-cfg="remarkCfg" />
</div>
</span>

4
frontend/src/views/chart/components/ChartComponentS2.vue
View File

@ -2,8 +2,8 @@
<div ref="chartContainer" style="padding: 0;width: 100%;height: 100%;overflow: hidden;" :style="bg_class">
<view-track-bar ref="viewTrack" :track-menu="trackMenu" class="track-bar" :style="trackBarStyleTime" @trackClick="trackClick" />
<span v-if="chart.type" v-show="title_show" ref="title" :style="title_class" style="cursor: default;display: block;">
<div>
<p style="padding:6px 4px 0;margin: 0;overflow: hidden;white-space: pre;text-overflow: ellipsis;display: inline;">{{ chart.title }}</p>
<div style="padding:6px 4px 0;margin: 0;">
<p style="overflow: hidden;white-space: pre;text-overflow: ellipsis;display: inline;">{{ chart.title }}</p>
<title-remark v-if="remarkCfg.show" style="text-shadow: none!important;" :remark-cfg="remarkCfg" />
</div>
</span>