diff --git a/frontend/src/components/gridTable/index.vue b/frontend/src/components/gridTable/index.vue
index ab75046091..178f927aa7 100644
--- a/frontend/src/components/gridTable/index.vue
+++ b/frontend/src/components/gridTable/index.vue
@@ -25,7 +25,6 @@
+
+
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index e44b1daa2b..61dd8a8ca0 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -757,6 +757,7 @@
@onChangeSplitForm="onChangeSplitForm"
@onTextChange="onTextChange"
@onLegendChange="onLegendChange"
+ @onMarginChange="onMarginChange"
@onChangeBackgroundForm="onChangeBackgroundForm"
/>
@@ -1999,6 +2000,10 @@ export default {
this.view.customStyle.legend = val
this.calcStyle()
},
+ onMarginChange(val) {
+ this.view.customStyle.margin = val
+ this.calcStyle()
+ },
onLabelChange(val) {
this.view.customAttr.label = val
diff --git a/frontend/src/views/chart/view/ChartStyle.vue b/frontend/src/views/chart/view/ChartStyle.vue
index 77894e2236..8e41267a75 100644
--- a/frontend/src/views/chart/view/ChartStyle.vue
+++ b/frontend/src/views/chart/view/ChartStyle.vue
@@ -260,6 +260,21 @@
@onChangeBackgroundForm="onChangeBackgroundForm($event,'background-color-selector')"
/>
+
+
+
+
@@ -284,6 +299,7 @@ import YAxisExtSelectorAntV from '@/views/chart/components/component-style/YAxis
import TitleSelector from '@/views/chart/components/component-style/TitleSelector'
import TitleSelectorAntV from '@/views/chart/components/component-style/TitleSelectorAntV'
import LegendSelector from '@/views/chart/components/component-style/LegendSelector'
+import MarginSelector from '@/views/chart/components/component-style/MarginSelector'
import LegendSelectorAntV from '@/views/chart/components/component-style/LegendSelectorAntV'
import BackgroundColorSelector from '@/views/chart/components/component-style/BackgroundColorSelector'
import SplitSelector from '@/views/chart/components/component-style/SplitSelector'
@@ -314,6 +330,7 @@ export default {
SizeSelectorAntV,
SizeSelector,
ColorSelector,
+ MarginSelector,
PluginCom
},
props: {
@@ -432,6 +449,10 @@ export default {
val['propertyName'] = propertyName
this.$emit('onLegendChange', val)
},
+ onMarginChange(val, propertyName) {
+ val['propertyName'] = propertyName
+ this.$emit('onMarginChange', val)
+ },
onChangeBackgroundForm(val, propertyName) {
val['propertyName'] = propertyName
this.$emit('onChangeBackgroundForm', val)
diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue
index c71a903ed5..3c99b740f2 100644
--- a/frontend/src/views/system/task/DatasetTaskList.vue
+++ b/frontend/src/views/system/task/DatasetTaskList.vue
@@ -104,6 +104,7 @@
@selection-change="handleSelectionChange"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
+ ref="multipleTable"
>
{
+ const multipleSelection = this.multipleSelection.map(ele => ele.id)
this.data = response.data.listObject;
- // this.data.forEach((item) => {
- // this.taskStatus(item);
- // });
this.paginationConfig.total = response.data.itemCount;
+ if (multipleSelection.length) {
+ this.$nextTick(() => {
+ this.data.forEach(row => {
+ if (multipleSelection.includes(row.id)) {
+ this.$refs.multipleTable.toggleRowSelection(row);
+ }
+ });
+ })
+ }
}
);
},