diff --git a/core/core-frontend/config/dev.ts b/core/core-frontend/config/dev.ts
index ca7bea35d7..b3beee730c 100644
--- a/core/core-frontend/config/dev.ts
+++ b/core/core-frontend/config/dev.ts
@@ -8,7 +8,7 @@ export default {
},
// 使用 proxy 实例
'/api': {
- target: 'http://localhost:8100',
+ target: 'https://de2.fit2cloud.com',
changeOrigin: true,
rewrite: path => path.replace(/^\/api/, 'de2api')
}
diff --git a/core/core-frontend/src/components/color-scheme/src/ColorScheme.vue b/core/core-frontend/src/components/color-scheme/src/ColorScheme.vue
index 1a09ce0b84..acfb204d7e 100644
--- a/core/core-frontend/src/components/color-scheme/src/ColorScheme.vue
+++ b/core/core-frontend/src/components/color-scheme/src/ColorScheme.vue
@@ -1,4 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
- this is material test
-
-
- setting
-
-
-
-
-
diff --git a/core/core-frontend/src/components/dashboard/DbToolbar.vue b/core/core-frontend/src/components/dashboard/DbToolbar.vue
index 9c65c4c3c0..d85f86e81a 100644
--- a/core/core-frontend/src/components/dashboard/DbToolbar.vue
+++ b/core/core-frontend/src/components/dashboard/DbToolbar.vue
@@ -1,4 +1,20 @@
-
+
+ ts
+
diff --git a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
index 6b6e906c1a..68c87e5801 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
@@ -11,7 +11,7 @@
>
-
+
-
+
-
-
diff --git a/core/core-frontend/src/components/visualization/LinkageSet.vue b/core/core-frontend/src/components/visualization/LinkageSet.vue
index cae2f9c8b9..77d98a1f09 100644
--- a/core/core-frontend/src/components/visualization/LinkageSet.vue
+++ b/core/core-frontend/src/components/visualization/LinkageSet.vue
@@ -17,16 +17,19 @@
已选图表:
-
+
{{ state.curLinkageViewInfo.title }}
所用数据集:
-
+
{{ state.curDatasetInfo.name }}
@@ -82,11 +85,13 @@
-
+
{{ data.targetViewName }}
@@ -133,7 +138,8 @@
class-name="view-type-icon"
style="margin-right: 4px"
:name="data.targetViewType"
- />
+ >
{{ data.targetViewName }}
@@ -175,9 +181,9 @@
+ >
{{
item.name
}}
@@ -187,7 +193,9 @@
-
+
@@ -207,7 +215,8 @@
style="width: 14px; height: 14px"
:name="`field_${fieldType[item.deType]}`"
:className="`field-icon-${fieldType[item.deType]}`"
- />
+ >
{{
item.name
}}
@@ -219,7 +228,9 @@
-
+
@@ -232,7 +243,9 @@
-
+
请先勾选需要联动的图表
@@ -249,6 +262,12 @@
@@ -41,7 +46,7 @@ const cardInfoList = [
:class="{ 'is-light-setting': navigateBg && navigateBg === 'light' }"
>
-
+
diff --git a/core/core-frontend/src/layout/components/TopDocCard.vue b/core/core-frontend/src/layout/components/TopDocCard.vue
index 7b176eb66d..09f1126592 100644
--- a/core/core-frontend/src/layout/components/TopDocCard.vue
+++ b/core/core-frontend/src/layout/components/TopDocCard.vue
@@ -25,7 +25,9 @@ const openBlank = () => {
-
+
{{ cardInfo.name }}
diff --git a/core/core-frontend/src/views/401/index.vue b/core/core-frontend/src/views/401/index.vue
index f41c3bf2a4..b1c26790f6 100644
--- a/core/core-frontend/src/views/401/index.vue
+++ b/core/core-frontend/src/views/401/index.vue
@@ -1,11 +1,12 @@
-
+
{{ t('common.no_menu_tips') }}
+
-
+
当前为模板图表,请更换数据集...
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 d594293d2a..4e989b2ec1 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
@@ -1,4 +1,7 @@
@@ -1342,7 +1360,7 @@ const getDsIconName = data => {
-
+
{
-
+
{
{{ t('data_set.select_data_source') }}
-
+
@@ -1413,9 +1431,8 @@ const getDsIconName = data => {
-
{{ name }}
@@ -1434,7 +1451,7 @@ const getDsIconName = data => {
{{ t('datasource.data_table') }}
-
+
{{ datasourceTableData.length }}
@@ -1447,7 +1464,9 @@ const getDsIconName = data => {
>
-
+
@@ -1470,7 +1489,7 @@ const getDsIconName = data => {
@click="setActiveName(sqlNode)"
>
-
+
{{ t('data_set.custom_sql') }}
@@ -1495,7 +1514,7 @@ const getDsIconName = data => {
@click="setActiveName(datasourceTableData[index])"
>
-
+
{{ datasourceTableData[index].tableName }}
@@ -1506,7 +1525,7 @@ const getDsIconName = data => {
-
+
{{ t('data_set.be_reported_incorrectly') }}
@@ -1536,7 +1555,7 @@ const getDsIconName = data => {
-
+
{{ t('dataset.add_calc_field') }}
@@ -1550,7 +1569,9 @@ const getDsIconName = data => {
>
-
+
{{ t('data_set.refresh_data') }}
@@ -1566,7 +1587,9 @@ const getDsIconName = data => {
-
+
{{ t('chart.dimension') }}
@@ -1575,10 +1598,10 @@ const getDsIconName = data => {
{{ data.name }}
@@ -1597,7 +1620,9 @@ const getDsIconName = data => {
-
+
{{ t('chart.quota') }}
@@ -1606,10 +1631,10 @@ const getDsIconName = data => {
{{ data.name }}
@@ -1647,10 +1672,10 @@ const getDsIconName = data => {
@@ -1735,7 +1760,7 @@ const getDsIconName = data => {
:className="`field-icon-${
fieldType[[2, 3].includes(data.value) ? 2 : 0]
}`"
- :name="`field_${getIconName(data.value)}`"
+ >
{{ data.label }}
@@ -1747,7 +1772,9 @@ const getDsIconName = data => {
:className="`field-icon-${
fieldType[[2, 3].includes(scope.row.deType) ? 2 : 0]
}`"
- :name="`field_${getIconName(scope.row.deType)}`"
+ >
@@ -1763,9 +1790,11 @@ const getDsIconName = data => {
-
{{ fieldTypes(scope.row.deExtractType) }}
@@ -1785,7 +1814,9 @@ const getDsIconName = data => {
-
+
@@ -1799,7 +1830,9 @@ const getDsIconName = data => {
-
+
@@ -1809,7 +1842,9 @@ const getDsIconName = data => {
-
+
@@ -1823,7 +1858,9 @@ const getDsIconName = data => {
@click="handleFieldMore(scope.row, 'editor')"
>
-
+
@@ -1899,7 +1936,7 @@ const getDsIconName = data => {
:className="`field-icon-${
fieldType[[2, 3].includes(data.value) ? 2 : 0]
}`"
- :name="`field_${getIconName(data.value)}`"
+ >
{{ data.label }}
@@ -1911,7 +1948,9 @@ const getDsIconName = data => {
:className="`field-icon-${
fieldType[[2, 3].includes(scope.row.deType) ? 2 : 0]
}`"
- :name="`field_${getIconName(scope.row.deType)}`"
+ >
@@ -1927,9 +1966,11 @@ const getDsIconName = data => {
-
{{ fieldTypes(scope.row.deExtractType) }}
@@ -1949,7 +1990,9 @@ const getDsIconName = data => {
-
+
@@ -1963,7 +2006,9 @@ const getDsIconName = data => {
-
+
@@ -1973,7 +2018,9 @@ const getDsIconName = data => {
-
+
@@ -1987,7 +2034,9 @@ const getDsIconName = data => {
@click="handleFieldMore(scope.row, 'editor')"
>
-
+
@@ -2021,7 +2070,7 @@ const getDsIconName = data => {
{{ data.label }}
@@ -2029,9 +2078,12 @@ const getDsIconName = data => {
-
diff --git a/core/core-frontend/src/views/visualized/data/dataset/index.vue b/core/core-frontend/src/views/visualized/data/dataset/index.vue
index 2dbba88474..ba59f57757 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/index.vue
@@ -1,4 +1,21 @@