diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
index 471297caff..3fd116cee9 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
@@ -72,11 +72,12 @@ public class DataSetTableController {
}, logical = Logical.AND)
@ApiOperation("更新")
@PostMapping("update")
- public List save(@RequestBody DataSetTableRequest datasetTable) throws Exception {
+ public List save(@RequestBody DataSetTableRequest datasetTable) throws Exception {
if (datasetTable.getType().equalsIgnoreCase("excel")) {
- return dataSetTableService.saveExcel(datasetTable);
+ List ids = dataSetTableService.saveExcel(datasetTable).stream().map(DatasetTable::getId).collect(Collectors.toList());
+ return vAuthModelService.queryAuthModelByIds("dataset", ids);
} else {
- return Collections.singletonList(dataSetTableService.save(datasetTable));
+ return vAuthModelService.queryAuthModelByIds("dataset", Collections.singletonList(dataSetTableService.save(datasetTable).getId()));
}
}
diff --git a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
index ddbcb5c9e0..913168cf15 100644
--- a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
+++ b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
@@ -336,14 +336,15 @@ public class ApiProvider extends Provider {
o.put("deType", 0);
o.put("extField", 0);
o.put("checked", false);
-// for (DatasetTableFieldDTO fieldDTO : apiDefinition.getFields()) {
-// if (StringUtils.isNotEmpty(o.getString("jsonPath")) && StringUtils.isNotEmpty(fieldDTO.getJsonPath()) && fieldDTO.getJsonPath().equals(o.getString("jsonPath"))) {
-// o.put("checked", true);
-// o.put("deExtractType", fieldDTO.getDeExtractType());
-// o.put("name", fieldDTO.getName());
-// }
-// }
-
+ if (!apiDefinition.isUseJsonPath()) {
+ for (DatasetTableFieldDTO fieldDTO : apiDefinition.getFields()) {
+ if (StringUtils.isNotEmpty(o.getString("jsonPath")) && StringUtils.isNotEmpty(fieldDTO.getJsonPath()) && fieldDTO.getJsonPath().equals(o.getString("jsonPath"))) {
+ o.put("checked", true);
+ o.put("deExtractType", fieldDTO.getDeExtractType());
+ o.put("name", fieldDTO.getName());
+ }
+ }
+ }
}
static private boolean hasItem(ApiDefinition apiDefinition, List fields, JSONObject item) {
diff --git a/frontend/src/components/canvas/utils/style.js b/frontend/src/components/canvas/utils/style.js
index d6e254e97a..448ac7e418 100644
--- a/frontend/src/components/canvas/utils/style.js
+++ b/frontend/src/components/canvas/utils/style.js
@@ -381,7 +381,10 @@ export function adaptCurThemeCommonStyle(component) {
if (isFilterComponent(component.component)) {
const filterStyle = store.state.canvasStyleData.chartInfo.filterStyle
for (const styleKey in filterStyle) {
- Vue.set(component.style, styleKey, filterStyle[styleKey])
+ // 位置属性不修改
+ if (styleKey !== 'horizontal' && styleKey !== 'vertical') {
+ Vue.set(component.style, styleKey, filterStyle[styleKey])
+ }
}
} else if (isTabComponent(component.component)) {
const tabStyle = store.state.canvasStyleData.chartInfo.tabStyle
diff --git a/frontend/src/components/widget/deWidget/TitlePosition.vue b/frontend/src/components/widget/deWidget/TitlePosition.vue
index 1af68342f3..fb9b0e2645 100644
--- a/frontend/src/components/widget/deWidget/TitlePosition.vue
+++ b/frontend/src/components/widget/deWidget/TitlePosition.vue
@@ -19,12 +19,14 @@
{{ $t('chart.text_pos_left') }}
{{ $t('chart.text_pos_center') }}
+ >{{ $t('chart.text_pos_center') }}
+
{{ $t('chart.text_pos_right') }}
@@ -36,12 +38,14 @@
{{ $t('chart.text_pos_top') }}
{{ $t('chart.text_pos_center') }}
+ >{{ $t('chart.text_pos_center') }}
+
@@ -73,6 +77,12 @@ export default {
type: String,
default: ''
}
+ },
+
+ methods: {
+ styleChange() {
+ this.$store.commit('canvasChange')
+ }
}
}
diff --git a/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue b/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue
index 8439fa2b92..0068368aa7 100644
--- a/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue
+++ b/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue
@@ -393,7 +393,6 @@ export default {
},
getItemTagType() {
this.$refs['markForm'].validate((valid) => {
- console.log(valid)
})
}
}
diff --git a/frontend/src/views/dataset/add/AddCustom.vue b/frontend/src/views/dataset/add/AddCustom.vue
index d2d473d78e..e336ce4bb0 100644
--- a/frontend/src/views/dataset/add/AddCustom.vue
+++ b/frontend/src/views/dataset/add/AddCustom.vue
@@ -5,7 +5,7 @@
class="title-text"
>
- {{ param.tableId?$t('dataset.edit_custom_table'):$t('dataset.add_custom_table') }}
+ {{ param.tableId ? $t('dataset.edit_custom_table') : $t('dataset.add_custom_table') }}
-
+
diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue
index cae74db8ae..83c3f58d83 100644
--- a/frontend/src/views/dataset/add/AddExcel.vue
+++ b/frontend/src/views/dataset/add/AddExcel.vue
@@ -8,7 +8,7 @@
class="arrow-right"
@click="showLeft = true"
>
-
+
-
- {{ $t('dataset.excel_info_1') }}
- {{ $t('dataset.excel_info_2') }}
- {{ $t('dataset.excel_info_3') }}
-
-
-
+
+ {{ $t('dataset.excel_info_1') }}
+ {{ $t('dataset.excel_info_2') }}
+ {{ $t('dataset.excel_info_3') }}
+
+
+
handleCommand(type, field)"
>
-
+
-
+
{
+ if (!table.id) {
+ updateCacheTree('batchNew', 'dataset-tree', response.data, JSON.parse(localStorage.getItem('dataset-tree')))
+ }
this.openMessageSuccess('deDataset.set_saved_successfully')
this.cancel(response.data)
})
@@ -582,6 +594,9 @@ export default {
this.loading = true
post('/dataset/table/update', table)
.then((response) => {
+ if (!table.id) {
+ updateCacheTree('batchNew', 'dataset-tree', response.data, JSON.parse(localStorage.getItem('dataset-tree')))
+ }
this.openMessageSuccess('deDataset.set_saved_successfully')
this.cancel(response.data)
})
@@ -637,10 +652,12 @@ export default {
border-top-right-radius: 13px;
border-bottom-right-radius: 13px;
}
+
.table-list {
p {
margin: 0;
}
+
height: 100%;
width: 240px;
padding: 16px 12px;
@@ -653,6 +670,7 @@ export default {
display: flex;
justify-content: space-between;
color: var(--deTextPrimary, #1f2329);
+
i {
font-size: 14px;
color: var(--deTextPlaceholder, #8f959e);
@@ -666,10 +684,12 @@ export default {
.table-checkbox-list {
height: calc(100% - 100px);
overflow-y: auto;
+
.custom-tree-node {
position: relative;
width: 80%;
display: flex;
+
.label {
overflow: hidden;
white-space: nowrap;
@@ -677,11 +697,13 @@ export default {
width: 85%;
}
}
+
.error-name-exist {
position: absolute;
top: 0;
right: 0;
}
+
.item {
height: 40px;
width: 215px;
@@ -719,6 +741,7 @@ export default {
display: flex;
align-items: center;
position: relative;
+
.name {
font-size: 14px;
font-weight: 400;
@@ -749,10 +772,12 @@ export default {
padding: 2px 1.5px;
display: inline-block;
cursor: pointer;
+
i {
margin-left: 4px;
font-size: 12px;
}
+
&:hover {
background: rgba(31, 35, 41, 0.1);
border-radius: 4px;
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index d3cef63e5c..fb193a2f0e 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -70,7 +70,7 @@
class="de-text-btn"
@click="dataReference = true"
>
-
+
{{ $t('deDataset.data_reference') }}
-
+
{{ $t('sql_variable.variable_mgm') }}
-
+
-
+
{{ $t('deDataset.run_a_query') }}
@@ -111,7 +111,7 @@
dataTable = ''
;keywords = ''
"
- > {{ $t('chart.back') }}
+ > {{ $t('chart.back') }}
{{ $t('deDataset.data_reference') }}
-
+
{{ (showTable && dataTable) || selectedDatasource.name }}
@@ -146,59 +146,61 @@
v-if="!dataSource"
class="no-select-datasource"
>{{
- $t('deDataset.to_start_using')
- }}
+ $t('deDataset.to_start_using')
+ }}
-
+
-
+
{{ ele.fieldName }}
-
+
+
-
-
+
{{
- `(${$t('dataset.preview_show')} 1000 ${$t(
- 'dataset.preview_item'
- )})`
- }}
+ `(${$t('dataset.preview_show')} 1000 ${$t(
+ 'dataset.preview_item'
+ )})`
+ }}
{{ errMsgCont }}
+ >{{ errMsgCont }}
+
-
+
{{ $t('dataset.sql_variable_limit_1') }}
{{ $t('dataset.sql_variable_limit_2') }}
@@ -451,7 +454,7 @@
:content="$t('commons.parameter_effect')"
placement="top"
>
-
+
@@ -519,14 +522,16 @@
secondary
@click="closeVariableMgm"
>{{
- $t('dataset.cancel')
- }}
+ $t('dataset.cancel')
+ }}
+
{{
- $t('dataset.confirm')
- }}
+ $t('dataset.confirm')
+ }}
+
@@ -536,9 +541,8 @@