-
-
- {{ $t('chart.show') }}
+
+
+ {{ $t('chart.show') }}
-
- {{ $t('chart.pie_label_line_show') }}
+
+ {{ $t('chart.pie_label_line_show') }}
-
-
+
+
-
-
+
+
-
-
+
+
-
+
{{ $t('chart.content_formatter') }}
@@ -34,30 +34,16 @@
-
+
-
-
-
-
- {{ $t('chart.show') }}
-
-
-
-
-
-
-
-
-
-
+
{{ $t('chart.content_formatter') }}
-
+
@@ -77,6 +63,13 @@ export default {
chart: {
type: Object,
required: true
+ },
+ propertyInner: {
+ type: Array,
+ required: false,
+ default: function() {
+ return []
+ }
}
},
data() {
@@ -143,10 +136,11 @@ export default {
}
this.fontSize = arr
},
- changeLabelAttr() {
+ changeLabelAttr(modifyName) {
if (!this.labelForm.show) {
this.isSetting = false
}
+ this.labelForm['modifyName'] = modifyName
this.$emit('onLabelChange', this.labelForm)
},
initOptions() {
@@ -160,6 +154,9 @@ export default {
this.labelPosition = this.labelPositionV
}
}
+ },
+ showProperty(property) {
+ return this.propertyInner.includes(property)
}
}
}
diff --git a/frontend/src/views/chart/components/shape-attr/LabelSelectorAntV.vue b/frontend/src/views/chart/components/shape-attr/LabelSelectorAntV.vue
index e71bc008e6..cf1405838c 100644
--- a/frontend/src/views/chart/components/shape-attr/LabelSelectorAntV.vue
+++ b/frontend/src/views/chart/components/shape-attr/LabelSelectorAntV.vue
@@ -1,43 +1,26 @@
-
-
- {{ $t('chart.show') }}
+
+
+ {{ $t('chart.show') }}
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
- {{ $t('chart.show') }}
-
-
-
-
-
-
-
-
-
-
@@ -55,6 +38,13 @@ export default {
chart: {
type: Object,
required: true
+ },
+ propertyInner: {
+ type: Array,
+ required: false,
+ default: function() {
+ return []
+ }
}
},
data() {
@@ -121,10 +111,11 @@ export default {
}
this.fontSize = arr
},
- changeLabelAttr() {
+ changeLabelAttr(modifyName) {
if (!this.labelForm.show) {
this.isSetting = false
}
+ this.labelForm['modifyName'] = modifyName
this.$emit('onLabelChange', this.labelForm)
},
initOptions() {
@@ -138,6 +129,9 @@ export default {
this.labelPosition = this.labelPositionV
}
}
+ },
+ showProperty(property) {
+ return this.propertyInner.includes(property)
}
}
}
diff --git a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
index aef968009d..ed7872ccfb 100644
--- a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
@@ -1,30 +1,31 @@
-
-
- {{ $t('chart.adapt') }}
+
+
+
+ {{ $t('chart.adapt') }}
-
-
+
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
+
+
{{ $t('chart.line_type_solid') }}
{{ $t('chart.line_type_dashed') }}
-
-
+
+
-
-
-
-
- {{ $t('chart.line_smooth') }}
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {{ $t('chart.line_smooth') }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
{{ $t('chart.radius_mode') }}
{{ $t('chart.area_mode') }}
-
-
+
+
-
+
+
-
-
-
+
+
-
-
-
-
+
+
+
+
{{ $t('chart.polygon') }}
{{ $t('chart.circle') }}
-
-
+
+
-
+
+
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
-
- {{ $t('chart.show') }}
+
+ {{ $t('chart.show') }}
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
+
-
{{ $t('chart.chart_bar') }}
-
- {{ $t('chart.adapt') }}
+
+ {{ $t('chart.adapt') }}
-
-
+
+
-
-
+
+
{{ $t('chart.chart_line') }}
-
-
+
+
-
-
+
+
{{ $t('chart.line_type_solid') }}
{{ $t('chart.line_type_dashed') }}
-
-
+
+
-
-
-
-
- {{ $t('chart.line_smooth') }}
-
-
- {{ $t('chart.show') }}
+
+ {{ $t('chart.show') }}
{{ $t('chart.chart_scatter') }}
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
@@ -282,6 +269,13 @@ export default {
chart: {
type: Object,
required: true
+ },
+ propertyInner: {
+ type: Array,
+ required: false,
+ default: function() {
+ return []
+ }
}
},
data() {
@@ -364,8 +358,12 @@ export default {
}
this.fontSize = arr
},
- changeBarSizeCase() {
+ changeBarSizeCase(modifyName) {
+ this.sizeForm['modifyName'] = modifyName
this.$emit('onSizeChange', this.sizeForm)
+ },
+ showProperty(property) {
+ return this.propertyInner.includes(property)
}
}
}
diff --git a/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue b/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
index 6bde9cd971..3fa88f6dbb 100644
--- a/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
+++ b/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
@@ -1,30 +1,43 @@
-
-
- {{ $t('chart.adapt') }}
+
+
+
+ {{ $t('chart.adapt') }}
-
-
-
-
-
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
- {{ $t('chart.line_smooth') }}
+
+ {{ $t('chart.line_smooth') }}
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
{{ $t('chart.polygon') }}
{{ $t('chart.circle') }}
-
-
+
+
-
+
+
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
{{ $t('chart.table_column_adapt') }}
{{ $t('chart.table_column_custom') }}
@@ -139,48 +257,102 @@
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
-
- {{ $t('chart.show') }}
+
+ {{ $t('chart.show') }}
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('chart.chart_bar') }}
-
- {{ $t('chart.adapt') }}
-
-
-
-
-
-
-
- {{ $t('chart.chart_line') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('chart.line_smooth') }}
-
-
-
-
- {{ $t('chart.chart_scatter') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/views/chart/components/shape-attr/TooltipSelector.vue b/frontend/src/views/chart/components/shape-attr/TooltipSelector.vue
index a66584501e..904c4f5626 100644
--- a/frontend/src/views/chart/components/shape-attr/TooltipSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/TooltipSelector.vue
@@ -2,25 +2,25 @@
-
- {{ $t('chart.show') }}
+
+ {{ $t('chart.show') }}
-
-
+
+
{{ $t('chart.tooltip_item') }}
{{ $t('chart.tooltip_axis') }}
-
-
+
+
-
-
+
+
-
+
{{ $t('chart.content_formatter') }}
@@ -44,7 +44,7 @@
-
+
@@ -65,6 +65,13 @@ export default {
chart: {
type: Object,
required: true
+ },
+ propertyInner: {
+ type: Array,
+ required: false,
+ default: function() {
+ return []
+ }
}
},
data() {
@@ -111,11 +118,15 @@ export default {
}
this.fontSize = arr
},
- changeTooltipAttr() {
+ changeTooltipAttr(modifyName) {
if (!this.tooltipForm.show) {
this.isSetting = false
}
+ this.tooltipForm['modifyName'] = modifyName
this.$emit('onTooltipChange', this.tooltipForm)
+ },
+ showProperty(property) {
+ return this.propertyInner.includes(property)
}
}
}
diff --git a/frontend/src/views/chart/components/shape-attr/TooltipSelectorAntV.vue b/frontend/src/views/chart/components/shape-attr/TooltipSelectorAntV.vue
index 914e2e639a..ffc51aab38 100644
--- a/frontend/src/views/chart/components/shape-attr/TooltipSelectorAntV.vue
+++ b/frontend/src/views/chart/components/shape-attr/TooltipSelectorAntV.vue
@@ -2,17 +2,17 @@
-
- {{ $t('chart.show') }}
+
+ {{ $t('chart.show') }}
-
-
+
+
-
-
+
+
@@ -33,6 +33,13 @@ export default {
chart: {
type: Object,
required: true
+ },
+ propertyInner: {
+ type: Array,
+ required: false,
+ default: function() {
+ return []
+ }
}
},
data() {
@@ -79,11 +86,15 @@ export default {
}
this.fontSize = arr
},
- changeTooltipAttr() {
+ changeTooltipAttr(modifyName) {
if (!this.tooltipForm.show) {
this.isSetting = false
}
+ this.tooltipForm['modifyName'] = modifyName
this.$emit('onTooltipChange', this.tooltipForm)
+ },
+ showProperty(property) {
+ return this.propertyInner.includes(property)
}
}
}
diff --git a/frontend/src/views/chart/components/shape-attr/TotalCfg.vue b/frontend/src/views/chart/components/shape-attr/TotalCfg.vue
index e8f4cec72e..cd6b549103 100644
--- a/frontend/src/views/chart/components/shape-attr/TotalCfg.vue
+++ b/frontend/src/views/chart/components/shape-attr/TotalCfg.vue
@@ -2,28 +2,28 @@
- {{ $t('chart.row_cfg') }}
-
- {{ $t('chart.show') }}
+ {{ $t('chart.row_cfg') }}
+
+ {{ $t('chart.show') }}
-
+
-
+
{{ $t('chart.total_pos_top') }}
{{ $t('chart.total_pos_bottom') }}
-
+
-
- {{ $t('chart.show') }}
+
+ {{ $t('chart.show') }}
-
+
-
+
{{ $t('chart.total_pos_top') }}
{{ $t('chart.total_pos_bottom') }}
@@ -33,34 +33,34 @@
-
{{ $t('chart.col_cfg') }}
-
- {{ $t('chart.show') }}
+ {{ $t('chart.col_cfg') }}
+
+ {{ $t('chart.show') }}
-
+
-
+
{{ $t('chart.total_pos_left') }}
{{ $t('chart.total_pos_right') }}
-
+
-
- {{ $t('chart.show') }}
+
+ {{ $t('chart.show') }}
-
+
-
+
{{ $t('chart.total_pos_left') }}
{{ $t('chart.total_pos_right') }}
-
+
@@ -77,6 +77,13 @@ export default {
chart: {
type: Object,
required: true
+ },
+ propertyInner: {
+ type: Array,
+ required: false,
+ default: function() {
+ return []
+ }
}
},
data() {
@@ -139,8 +146,12 @@ export default {
}
}
},
- changeTotalCfg() {
+ changeTotalCfg(modifyName) {
+ this.totalForm['modifyName'] = modifyName
this.$emit('onTotalCfgChange', this.totalForm)
+ },
+ showProperty(property) {
+ return this.propertyInner.includes(property)
}
}
}
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 932d6c9595..b5f4b023c8 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -657,6 +657,7 @@
:view="view"
:chart="chart"
:properties="chartProperties"
+ :property-inner-all="chartPropertyInnerAll"
:dimension-data="dimensionData"
:quota-data="quotaData"
@calcStyle="calcStyle"
@@ -1170,19 +1171,25 @@ export default {
}
},
computed: {
- chartProperties() {
+ chartConfig() {
const _this = this
if (_this.chart && _this.chart.render) {
const viewConfig = this.allViewRender.filter(item => item.render === _this.chart.render && item.value === _this.chart.type)
if (viewConfig && viewConfig.length) {
- return viewConfig[0].properties || []
+ return viewConfig[0]
} else {
- return []
+ return null
}
} else {
- return []
+ return null
}
},
+ chartProperties() {
+ return this.chartConfig ? this.chartConfig.properties : null
+ },
+ chartPropertyInnerAll() {
+ return this.chartConfig ? this.chartConfig.propertyInner : null
+ },
chartType() {
return this.chart.type
},
@@ -2377,7 +2384,7 @@ export default {
resetViewCacheCallBack(_this.param.id, _this.panelInfo.id, function(rsp) {
_this.changeEditStatus(false)
_this.getChart(_this.param.id, 'panel')
- _this.getData(_this.param.id)
+ // _this.getData(_this.param.id)
bus.$emit('view-in-cache', { type: 'propChange', viewId: _this.param.id })
})
},
diff --git a/frontend/src/views/chart/view/ChartStyle.vue b/frontend/src/views/chart/view/ChartStyle.vue
index 0e786a4854..7f6fb161a8 100644
--- a/frontend/src/views/chart/view/ChartStyle.vue
+++ b/frontend/src/views/chart/view/ChartStyle.vue
@@ -1,7 +1,7 @@
{{ $t('chart.shape_attr') }}
-
-
+
@@ -66,6 +60,7 @@
:param="param"
class="attr-selector"
:chart="chart"
+ :property-inner="propertyInnerAll['size-selector-ant-v']"
@onSizeChange="onSizeChange($event,'size-selector-ant-v')"
/>
@@ -79,6 +74,7 @@
:param="param"
class="attr-selector"
:chart="chart"
+ :property-inner="propertyInnerAll['label-selector']"
@onLabelChange="onLabelChange($event,'label-selector')"
/>
@@ -99,6 +96,7 @@
:param="param"
class="attr-selector"
:chart="chart"
+ :property-inner="propertyInnerAll['tooltip-selector']"
@onTooltipChange="onTooltipChange($event,'tooltip-selector')"
/>
@@ -118,6 +117,7 @@
:param="param"
class="attr-selector"
:chart="chart"
+ :property-inner="propertyInnerAll['total-cfg']"
@onTotalCfgChange="onTotalCfgChange($event,'total-cfg')"
/>
@@ -136,6 +136,7 @@
:param="param"
class="attr-selector"
:chart="chart"
+ :property-inner="propertyInnerAll['x-axis-selector']"
@onChangeXAxisForm="onChangeXAxisForm($event,'x-axis-selector')"
/>
@@ -156,6 +158,7 @@
:param="param"
class="attr-selector"
:chart="chart"
+ :property-inner="propertyInnerAll['y-axis-selector']"
@onChangeYAxisForm="onChangeYAxisForm($event,'y-axis-selector')"
/>
@@ -176,6 +180,7 @@
:param="param"
class="attr-selector"
:chart="chart"
+ :property-inner="propertyInnerAll['y-axis-ext-selector']"
@onChangeYAxisForm="onChangeYAxisExtForm($event,'y-axis-ext-selector')"
/>
@@ -196,6 +202,7 @@
:param="param"
class="attr-selector"
:chart="chart"
+ :property-inner="propertyInnerAll['split-selector']"
@onChangeSplitForm="onChangeSplitForm($event,'split-selector')"
/>
@@ -212,6 +220,7 @@
:param="param"
class="attr-selector"
:chart="chart"
+ :property-inner="propertyInnerAll['title-selector']"
@onTextChange="onTextChange($event,'title-selector')"
/>
@@ -232,6 +242,7 @@
:param="param"
class="attr-selector"
:chart="chart"
+ :property-inner="propertyInnerAll['legend-selector']"
@onLegendChange="onLegendChange($event,'legend-selector')"
/>
@@ -262,7 +274,6 @@
diff --git a/frontend/src/views/panel/enshrine/index.vue b/frontend/src/views/panel/enshrine/index.vue
index c6fdba4507..ee84c8905b 100644
--- a/frontend/src/views/panel/enshrine/index.vue
+++ b/frontend/src/views/panel/enshrine/index.vue
@@ -10,9 +10,13 @@
-
+
- {{ scope.row.name }}
+ {{ scope.row.name }}
@@ -29,6 +33,7 @@ import { deleteEnshrine, enshrineList } from '@/api/panel/enshrine'
import { uuid } from 'vue-uuid'
import { initPanelData } from '@/api/panel/panel'
import bus from '@/utils/bus'
+
export default {
name: 'Enshrine',
data() {
@@ -83,24 +88,35 @@ export default {
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index 76aa8a3e86..ebfdd2655f 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -97,7 +97,7 @@
-
{{ data.name }}
+
{{ data.name }}
@@ -866,4 +866,11 @@ export default {
visibility: visible;
}
+ .unpublished {
+ color: #b2b2b2
+ }
+
+ .publish {
+ }
+
diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue
index cb64a036d0..345f7874ea 100644
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@@ -90,7 +90,7 @@
@@ -147,7 +147,7 @@ import ShareHead from '@/views/panel/GrantAuth/ShareHead'
import { initPanelData, updatePanelStatus } from '@/api/panel/panel'
import { proxyInitPanelData } from '@/api/panel/shareProxy'
import { dataURLToBlob } from '@/components/canvas/utils/utils'
-import { findResourceAsBase64, readFile } from '@/api/staticResource/staticResource'
+import { findResourceAsBase64 } from '@/api/staticResource/staticResource'
export default {
name: 'PanelViewShow',