dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into v1.18

Browse Source
This commit is contained in:
taojinlong 2023-02-28 14:39:27 +08:00
commit 41c4af8146
7 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>dataease-server</artifactId> <artifactId>dataease-server</artifactId>
<groupId>io.dataease</groupId> <groupId>io.dataease</groupId>
<version>1.18.3</version> <version>1.18.4</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -204,7 +204,7 @@
<dependency> <dependency>
<groupId>io.dataease</groupId> <groupId>io.dataease</groupId>
<artifactId>dataease-plugin-interface</artifactId> <artifactId>dataease-plugin-interface</artifactId>
<version>1.18.3</version> <version>1.18.4</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
@ -215,12 +215,12 @@
<dependency> <dependency>
<groupId>io.dataease</groupId> <groupId>io.dataease</groupId>
<artifactId>dataease-plugin-view</artifactId> <artifactId>dataease-plugin-view</artifactId>
<version>1.18.3</version> <version>1.18.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.dataease</groupId> <groupId>io.dataease</groupId>
<artifactId>dataease-plugin-datasource</artifactId> <artifactId>dataease-plugin-datasource</artifactId>
<version>1.18.3</version> <version>1.18.4</version>
</dependency> </dependency>
<!-- kettle及数据源依赖 --> <!-- kettle及数据源依赖 -->
<dependency> <dependency>

2
frontend/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "dataease", "name": "dataease",
"version": "1.18.3", "version": "1.18.4",
"description": "dataease front", "description": "dataease front",
"private": true, "private": true,
"scripts": { "scripts": {

2
frontend/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<artifactId>dataease-server</artifactId> <artifactId>dataease-server</artifactId>
<groupId>io.dataease</groupId> <groupId>io.dataease</groupId>
<version>1.18.3</version> <version>1.18.4</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

27
frontend/src/views/dataset/add/AddSQL.vue
View File

@ -273,12 +273,27 @@
:description="$t('deDataset.run_failed')" :description="$t('deDataset.run_failed')"
>{{ errMsgCont }} >{{ errMsgCont }}
</el-empty> </el-empty>
<el-table <div style="float: left" v-else-if="fields.length">
v-else <el-table
:data="plxTableData" :data="plxTableData"
size="mini" size="mini"
border border
style="width: 100%; height: 100%;overflow-y: auto;" >
<el-table-column
v-for="field in fields"
:key="field.fieldName"
min-width="200px"
:prop="field.fieldName"
:label="field.remarks"
resizable
/>
</el-table>
</div>
<el-table
:data="plxTableData"
v-else
size="mini"
border
> >
<el-table-column <el-table-column
v-for="field in fields" v-for="field in fields"
@ -1300,9 +1315,9 @@ export default {
} }
.table-sql { .table-sql {
height: calc(100% - 110px); height: calc(100% - 128px);
padding: 0 25px 18px 25px; margin: 0 25px 18px 25px;
overflow-y: auto; overflow: auto;
box-sizing: border-box; box-sizing: border-box;
.el-empty__bottom, .el-empty__bottom,

2
mobile/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "dataease-mobile", "name": "dataease-mobile",
"version": "1.18.0", "version": "1.18.4",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "npm run dev:h5", "serve": "npm run dev:h5",

2
mobile/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<artifactId>dataease-server</artifactId> <artifactId>dataease-server</artifactId>
<groupId>io.dataease</groupId> <groupId>io.dataease</groupId>
<version>1.18.3</version> <version>1.18.4</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.dataease</groupId> <groupId>io.dataease</groupId>
<artifactId>dataease-server</artifactId> <artifactId>dataease-server</artifactId>
<version>1.18.3</version> <version>1.18.4</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>