diff --git a/core/core-frontend/src/views/chart/ChartView.vue b/core/core-frontend/src/views/chart/ChartView.vue index c8183af..42ceecd 100644 --- a/core/core-frontend/src/views/chart/ChartView.vue +++ b/core/core-frontend/src/views/chart/ChartView.vue @@ -29,6 +29,7 @@ const DashboardPanel = defineAsyncComponent( () => import('@/views/dashboard/DashboardPreviewShow.vue') ) const Copilot = defineAsyncComponent(() => import('@/views/copilot/index.vue')) +const TemplateManage = defineAsyncComponent(() => import('@/views/template/indexInject.vue')) const AsyncXpackComponent = defineAsyncComponent(() => import('@/components/plugin/src/index.vue')) @@ -42,7 +43,8 @@ const componentMap = { Datasource, ScreenPanel, DashboardPanel, - Copilot + Copilot, + TemplateManage } const iframeStyle = ref(null) const setStyle = debounce(() => { diff --git a/core/core-frontend/src/views/chart/components/editor/chart-type/ChartType.vue b/core/core-frontend/src/views/chart/components/editor/chart-type/ChartType.vue index 55b3c34..0c02628 100644 --- a/core/core-frontend/src/views/chart/components/editor/chart-type/ChartType.vue +++ b/core/core-frontend/src/views/chart/components/editor/chart-type/ChartType.vue @@ -127,19 +127,19 @@ const groupActiveChange = category => { .chart-light { color: #646a73 !important; :deep(.group-right) { - border-left: 1px solid @side-outline-border-color-light; + border-left: 1px solid @side-outline-border-color-light!important; } :deep(.item-top) { - background-color: #f5f6f7; + background-color: #f5f6f7 !important; } :deep(.ul-custom) { color: @chart-change-font-color-light!important; } :deep(.item-bottom) { - color: @chart-change-font-color-light; + color: @chart-change-font-color-light!important; } :deep(.item-top-icon) { - color: @chart-change-font-color-light; + color: @chart-change-font-color-light!important; } } .group { @@ -250,8 +250,8 @@ const groupActiveChange = category => { } .group .group-left .ul-custom{ color: #a6a6a6 !important; -} +} .chart-light .item-top{ background-color: #1a1a1a !important; -} +} diff --git a/core/core-frontend/src/views/chart/components/editor/common/ChartTemplateInfo.vue b/core/core-frontend/src/views/chart/components/editor/common/ChartTemplateInfo.vue index 7dd2256..4222402 100644 --- a/core/core-frontend/src/views/chart/components/editor/common/ChartTemplateInfo.vue +++ b/core/core-frontend/src/views/chart/components/editor/common/ChartTemplateInfo.vue @@ -1,45 +1,98 @@ + + diff --git a/core/core-frontend/src/views/chart/components/editor/common/TemplateTips.vue b/core/core-frontend/src/views/chart/components/editor/common/TemplateTips.vue new file mode 100644 index 0000000..745cc55 --- /dev/null +++ b/core/core-frontend/src/views/chart/components/editor/common/TemplateTips.vue @@ -0,0 +1,76 @@ + + + + diff --git a/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue b/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue index e6d62e0..dee7b51 100644 --- a/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue +++ b/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue @@ -373,13 +373,13 @@ onMounted(() => { - + @@ -395,7 +395,7 @@ onMounted(() => { :deep(.ed-input__wrapper) { cursor: pointer; padding: 1px 11px; - + .ed-input__inner { cursor: pointer; font-size: 12px; @@ -405,7 +405,6 @@ onMounted(() => { margin-bottom: 0; } :deep(.ed-form-item.is-error .ed-input__wrapper) { - box-shadow: none !important; input { color: var(--ed-color-danger); } diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue index 0399dc4..abee9c6 100644 --- a/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue +++ b/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue @@ -67,7 +67,7 @@ const emit = defineEmits([ const { item } = toRefs(props) const toolTip = computed(() => { - return props.themes === 'dark' ? 'ndark' : 'dark' + return props.themes || 'dark' }) const showValueFormatter = computed(() => { return ( @@ -192,17 +192,25 @@ const showCustomSort = item => { } return !item.chartId && (item.deType === 0 || item.deType === 5) } -const showSort = () => { + +const NOT_SUPPORT_SORT = ['word-cloud', 'stock-line', 'treemap', 'circle-packing'] +const showSort = computed(() => { const { type: chartType } = props.chart const { type: propType } = props - const notShowSort = ['word-cloud', 'stock-line'].includes(chartType) + const notShowSort = NOT_SUPPORT_SORT.includes(chartType) if (notShowSort || propType === 'extColor') { return false } const isChartMix = chartType.includes('chart-mix') const isDimensionType = ['dimension', 'dimensionStack', 'dimensionExt'].includes(propType) return !isChartMix || isDimensionType -} +}) +const showSortPriority = computed(() => { + if (props.chart.type.includes('chart-mix')) { + return false + } + return showSort.value +}) const toggleHide = () => { item.value.index = props.index item.value.hide = !item.value.hide @@ -212,6 +220,7 @@ const toggleHide = () => { const showHideIcon = computed(() => { return ['table-info', 'table-normal'].includes(props.chart.type) && item.value.hide }) + onMounted(() => { getItemTagType() }) @@ -226,17 +235,17 @@ onMounted(() => { :style="{ backgroundColor: tagType + '0a', border: '1px solid ' + tagType }" > - + - + - + @@ -283,7 +292,7 @@ onMounted(() => { class="item-span-style" :class="{ 'hidden-status': showHideIcon, - 'sort-status': showSort() && item.sort !== 'none' + 'sort-status': showSort && item.sort !== 'none' }" > {{ item.chartShowName ? item.chartShowName : item.name }} @@ -312,7 +321,7 @@ onMounted(() => { class="drop-style" :class="themes === 'dark' ? 'dark-dimension-quota' : ''" > - + { - + { + + + {{ t('chart.y_M_d_H') }} + + + + + { > - +