diff --git a/backend/pom.xml b/backend/pom.xml index da52fa1f95..ced25a53f6 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -377,6 +377,12 @@ org.apache.maven.plugins maven-resources-plugin 3.1.0 + + UTF-8 + + xls + + org.springframework.boot diff --git a/backend/src/main/java/io/dataease/plugins/server/XUserServer.java b/backend/src/main/java/io/dataease/plugins/server/XUserServer.java index 00fe1961c8..38692b88a6 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XUserServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XUserServer.java @@ -14,6 +14,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; + @Api(tags = "xpack:用户导入") @RequestMapping("/plugin/user") @RestController diff --git a/backend/src/main/resources/excel/user.xls b/backend/src/main/resources/excel/user.xls new file mode 100644 index 0000000000..96e7fd1e01 Binary files /dev/null and b/backend/src/main/resources/excel/user.xls differ diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 2f5afb2967..633acaf268 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -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 diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 00a0f7d2fd..6cdae05932 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -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 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 41b412d5e8..300deecca8 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -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 diff --git a/frontend/src/views/chart/components/ChartComponentG2.vue b/frontend/src/views/chart/components/ChartComponentG2.vue index fe8b3576c7..a5ed4d4594 100644 --- a/frontend/src/views/chart/components/ChartComponentG2.vue +++ b/frontend/src/views/chart/components/ChartComponentG2.vue @@ -2,8 +2,8 @@
-
-

{{ chart.title }}

+
+

{{ chart.title }}

diff --git a/frontend/src/views/chart/components/ChartComponentS2.vue b/frontend/src/views/chart/components/ChartComponentS2.vue index c26fb10618..4d984a025e 100644 --- a/frontend/src/views/chart/components/ChartComponentS2.vue +++ b/frontend/src/views/chart/components/ChartComponentS2.vue @@ -2,8 +2,8 @@
-
-

{{ chart.title }}

+
+

{{ chart.title }}