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

fix: API 数据源

Browse Source
This commit is contained in:
taojinlong 2022-02-20 15:54:50 +08:00
parent 287948c426
commit fe01f43d8c
10 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -447,8 +447,8 @@ public class ExtractDataService {
bw.close();
File scriptFile = new File(root_path + datasetTable.getId() + ".sh");
scriptFile.setExecutable(true);
scriptFile.createNewFile();
scriptFile.setExecutable(true);
BufferedWriter scriptFileBw = new BufferedWriter(new FileWriter(root_path + datasetTable.getId() + ".sh"));
scriptFileBw.write("#!/bin/sh");

1
frontend/src/icons/svg/ds-api.svg Normal file
View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1645342109651" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7289" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 170.666667H398.222222v682.666666h56.888889V512h56.888889c91.022222 0 170.666667-73.955556 170.666667-170.666667s-73.955556-170.666667-170.666667-170.666666z m113.777778 170.666666c0 62.577778-51.2 113.777778-113.777778 113.777778H455.111111V227.555556h56.888889c62.577778 0 113.777778 51.2 113.777778 113.777777zM910.222222 227.555556V170.666667h-170.666666v56.888889h56.888888v568.888888h-56.888888v56.888889h170.666666v-56.888889h-56.888889V227.555556zM199.111111 170.666667C119.466667 170.666667 56.888889 233.244444 56.888889 312.888889V853.333333h56.888889V512h170.666666v341.333333h56.888889V312.888889C341.333333 233.244444 278.755556 170.666667 199.111111 170.666667zM284.444444 455.111111H113.777778V312.888889C113.777778 267.377778 153.6 227.555556 199.111111 227.555556h5.688889C244.622222 227.555556 284.444444 267.377778 284.444444 312.888889V455.111111z" fill="#13227a" p-id="7290"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

3
frontend/src/lang/en.js
View File

@ -1253,7 +1253,8 @@ export default {
union_error: 'Union relation and field can not be empty',
union_repeat: 'This dataset is already union，do not union repeat',
preview_result: 'Preview',
sql_ds_union_error: 'Direct connect SQL dataset can not be union'
sql_ds_union_error: 'Direct connect SQL dataset can not be union',
api_data: 'API dataset'
},
datasource: {
datasource: 'Data Source',

3
frontend/src/lang/tw.js
View File

@ -1253,7 +1253,8 @@ export default {
union_error: '關聯關繫與關聯字段不能為空',
union_repeat: '當前數據集已被關聯，請勿重復關聯',
preview_result: '預覽結果',
sql_ds_union_error: '直連模式下SQL數據集，不支持關聯'
sql_ds_union_error: '直連模式下SQL數據集，不支持關聯',
api_data: 'API 數據集'
},
datasource: {
datasource: '數據源',

3
frontend/src/lang/zh.js
View File

@ -1256,7 +1256,8 @@ export default {
union_error: '关联关系与关联字段不能为空',
union_repeat: '当前数据集已被关联，请勿重复关联',
preview_result: '预览结果',
sql_ds_union_error: '直连模式下SQL数据集，不支持关联'
sql_ds_union_error: '直连模式下SQL数据集，不支持关联',
api_data: 'API 数据集'
},
datasource: {
datasource: '数据源',

8
frontend/src/styles/index.scss
View File

@ -350,6 +350,14 @@ div:focus {
margin: 0 2px 0 0;
}
.ds-icon-api {
width: 14px;
height: 14px;
color: #13227a;
margin: 0 2px 0 0;
}
.showRightPanel {
.el-popper {
position: fixed !important;

1
frontend/src/views/dataset/common/DatasetGroupSelector.vue
View File

@ -97,6 +97,7 @@
<svg-icon v-if="data.type === 'excel'" icon-class="ds-excel" class="ds-icon-excel" />
<svg-icon v-if="data.type === 'custom'" icon-class="ds-custom" class="ds-icon-custom" />
<svg-icon v-if="data.type === 'union'" icon-class="ds-union" class="ds-icon-union" />
<svg-icon v-if="data.type === 'api'" icon-class="ds-api" class="ds-icon-api" />
</span>
<span v-if="data.type === 'db' || data.type === 'sql'">
<span v-if="data.mode === 0" style="margin-left: 6px"><i class="el-icon-s-operation" /></span>

1
frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
View File

@ -62,6 +62,7 @@
<svg-icon v-if="data.modelInnerType === 'excel'" icon-class="ds-excel" class="ds-icon-excel" />
<svg-icon v-if="data.modelInnerType === 'custom'" icon-class="ds-custom" class="ds-icon-custom" />
<svg-icon v-if="data.modelInnerType === 'union'" icon-class="ds-union" class="ds-icon-union" />
<svg-icon v-if="data.modelInnerType === 'api'" icon-class="ds-api" class="ds-icon-api" />
</span>
<span v-if="data.modelInnerType === 'db' || data.modelInnerType === 'sql'">
<span v-if="data.mode === 0" style="margin-left: 6px"><i class="el-icon-s-operation" /></span>

5
frontend/src/views/dataset/group/Group.vue
View File

@ -100,8 +100,8 @@
{{ $t('dataset.union_data') }}
</el-dropdown-item>
<el-dropdown-item :command="beforeClickAddData('api',data)">
<svg-icon icon-class="ds-union" class="ds-icon-union" />
{{ $t('dataset.union_data') }}
<svg-icon icon-class="ds-api" class="ds-icon-api" />
{{ $t('dataset.api_data') }}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@ -141,6 +141,7 @@
<svg-icon v-if="data.modelInnerType === 'excel'" icon-class="ds-excel" class="ds-icon-excel" />
<svg-icon v-if="data.modelInnerType === 'custom'" icon-class="ds-custom" class="ds-icon-custom" />
<svg-icon v-if="data.modelInnerType === 'union'" icon-class="ds-union" class="ds-icon-union" />
<svg-icon v-if="data.modelInnerType === 'api'" icon-class="ds-api" class="ds-icon-api" />
</span>
<span v-if="data.modelInnerType === 'db' || data.modelInnerType === 'sql'">
<span v-if="data.mode === 0" style="margin-left: 6px"><i class="el-icon-s-operation" /></span>

1
frontend/src/views/panel/filter/filterDialog.vue
View File

@ -46,6 +46,7 @@
<svg-icon v-if="data.type === 'excel'" icon-class="ds-excel" class="ds-icon-excel" />
<svg-icon v-if="data.type === 'custom'" icon-class="ds-custom" class="ds-icon-custom" />
<svg-icon v-if="data.type === 'union'" icon-class="ds-union" class="ds-icon-union" />
<svg-icon v-if="data.type === 'api'" icon-class="ds-api" class="ds-icon-api" />
</span>
<el-tooltip class="item" effect="dark" placement="top">
<div slot="content">{{ node.label }}</div>