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

Merge pull request #6084 from ulleo/dev

Browse Source 
fix: [AntV组合图] 标签设置不显示失效
This commit is contained in:
ulleo 2023-09-08 12:05:27 +08:00 committed by GitHub
commit bcdf387ce2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue
View File

@ -98,10 +98,10 @@
</template> </template>
<script> <script>
import DimensionItem from '@/components/views/DimensionItem' import DimensionItem from '../../../components/views/DimensionItem'
import QuotaItem from '@/components/views/QuotaItem' import QuotaItem from '../../../components/views/QuotaItem'
import QuotaExtItem from '@/components/views/QuotaExtItem' import QuotaExtItem from '../../../components/views/QuotaExtItem'
import FilterItem from '@/components/views/FilterItem' import FilterItem from '../../../components/views/FilterItem'
import messages from '@/de-base/lang/messages' import messages from '@/de-base/lang/messages'
export default { export default {

32
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue
View File

@ -33,20 +33,20 @@
<script> <script>
import {Mix} from '@antv/g2plot' import {Mix} from '@antv/g2plot'
import {uuid, hexColorToRGBA} from '@/utils/chartmix' import {uuid, hexColorToRGBA} from '../../../utils/chartmix'
import ViewTrackBar from '@/components/views/ViewTrackBar' import ViewTrackBar from '../../../components/views/ViewTrackBar'
import {getRemark} from "@/components/views/utils"; import {getRemark} from "../../../components/views/utils";
import { import {
DEFAULT_TITLE_STYLE, DEFAULT_TITLE_STYLE,
DEFAULT_XAXIS_STYLE, DEFAULT_XAXIS_STYLE,
DEFAULT_YAXIS_STYLE, DEFAULT_YAXIS_STYLE,
transAxisPosition, transAxisPosition,
getLineDash getLineDash
} from '@/utils/map'; } from '../../../utils/map';
import ChartTitleUpdate from '@/components/views/ChartTitleUpdate'; import ChartTitleUpdate from '../../../components/views/ChartTitleUpdate';
import _ from 'lodash'; import _ from 'lodash';
import {clear} from 'size-sensor' import {clear} from 'size-sensor'
import {valueFormatter} from '@/utils/formatter' import {valueFormatter} from '../../../utils/formatter'
export default { export default {
name: 'ChartComponent', name: 'ChartComponent',
@ -325,10 +325,12 @@ export default {
const _chartType = this.getChartType(yaxisList[_index].chartType); const _chartType = this.getChartType(yaxisList[_index].chartType);
if (_chartType === "column") { if (_labelSetting) {
_labelSetting.position = labelPosition; if (_chartType === "column") {
} else { _labelSetting.position = labelPosition;
_labelSetting.position = undefined; } else {
_labelSetting.position = undefined;
}
} }
return { return {
@ -378,10 +380,12 @@ export default {
const _chartType = this.getChartType(yaxisExtList[_index].chartType); const _chartType = this.getChartType(yaxisExtList[_index].chartType);
if (_chartType === "column") { if (_labelSetting) {
_labelSetting.position = labelPosition; if (_chartType === "column") {
} else { _labelSetting.position = labelPosition;
_labelSetting.position = undefined; } else {
_labelSetting.position = undefined;
}
} }
return { return {

8
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/style.vue
View File

@ -59,10 +59,10 @@
</template> </template>
<script> <script>
import ColorSelector from '@/components/selector/ColorSelector' import ColorSelector from '../../../components/selector/ColorSelector'
import TitleSelector from '@/components/selector/TitleSelector' import TitleSelector from '../../../components/selector/TitleSelector'
import TooltipSelectorAntV from '@/components/selector/TooltipSelectorAntV' import TooltipSelectorAntV from '../../../components/selector/TooltipSelectorAntV'
import LabelSelector from '@/components/selector/LabelSelector.vue' import LabelSelector from '../../../components/selector/LabelSelector.vue'
import messages from '@/de-base/lang/messages' import messages from '@/de-base/lang/messages'
export default { export default {
components: { components: {

6
extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/data.vue
View File

@ -105,9 +105,9 @@
</template> </template>
<script> <script>
import SankeyDimensionItem from '@/components/views/SankeyDimensionItem' import SankeyDimensionItem from '../../../components/views/SankeyDimensionItem'
import SankeyQuotaItem from '@/components/views/SankeyQuotaItem' import SankeyQuotaItem from '../../../components/views/SankeyQuotaItem'
import FilterItem from '@/components/views/FilterItem' import FilterItem from '../../../components/views/FilterItem'
import messages from '@/de-base/lang/messages' import messages from '@/de-base/lang/messages'
export default { export default {

10
extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/index.vue
View File

@ -33,11 +33,11 @@
<script> <script>
import {Sankey} from '@antv/g2plot' import {Sankey} from '@antv/g2plot'
import {uuid, hexColorToRGBA} from '@/utils/sankey' import {uuid, hexColorToRGBA} from '../../../utils/sankey'
import ViewTrackBar from '@/components/views/ViewTrackBar' import ViewTrackBar from '../../../components/views/ViewTrackBar'
import {getRemark} from "@/components/views/utils"; import {getRemark} from "../../../components/views/utils";
import {DEFAULT_TITLE_STYLE} from '@/utils/map'; import {DEFAULT_TITLE_STYLE} from '../../../utils/map';
import ChartTitleUpdate from '@/components/views/ChartTitleUpdate'; import ChartTitleUpdate from '../../../components/views/ChartTitleUpdate';
import _ from 'lodash'; import _ from 'lodash';
import {clear} from 'size-sensor' import {clear} from 'size-sensor'

8
extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/style.vue
View File

@ -59,10 +59,10 @@
</template> </template>
<script> <script>
import ColorSelector from '@/components/selector/ColorSelector' import ColorSelector from '../../../components/selector/ColorSelector'
import TitleSelector from '@/components/selector/TitleSelector' import TitleSelector from '../../../components/selector/TitleSelector'
import TooltipSelectorAntV from '@/components/selector/TooltipSelectorAntV' import TooltipSelectorAntV from '../../../components/selector/TooltipSelectorAntV'
import LabelSelector from '@/components/selector/LabelSelector.vue' import LabelSelector from '../../../components/selector/LabelSelector.vue'
import messages from '@/de-base/lang/messages' import messages from '@/de-base/lang/messages'
export default { export default {
components: { components: {