From 1a341726025fced4125d88b777673b661edbb2e7 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 11 Oct 2021 18:22:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E5=AE=8C=E5=96=84API=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/base/domain/Datasource.java | 19 +++++++++++-------- .../controller/chart/ChartViewController.java | 3 ++- .../dataset/DataSetTableController.java | 14 ++++++++------ .../dataset/DataSetTableFieldController.java | 11 ++++++----- .../controller/response/ChartDetail.java | 13 +++++++++++++ .../controller/response/DataSetDetail.java | 14 ++++++++++++++ .../response/DatasetTableField4Type.java | 15 +++++++++++++++ .../service/chart/ChartViewService.java | 15 +++++++++------ .../service/dataset/DataSetTableService.java | 19 ++++++++++--------- 9 files changed, 88 insertions(+), 35 deletions(-) create mode 100644 backend/src/main/java/io/dataease/controller/response/ChartDetail.java create mode 100644 backend/src/main/java/io/dataease/controller/response/DataSetDetail.java create mode 100644 backend/src/main/java/io/dataease/controller/response/DatasetTableField4Type.java diff --git a/backend/src/main/java/io/dataease/base/domain/Datasource.java b/backend/src/main/java/io/dataease/base/domain/Datasource.java index 37dfeefa85..a564406ec2 100644 --- a/backend/src/main/java/io/dataease/base/domain/Datasource.java +++ b/backend/src/main/java/io/dataease/base/domain/Datasource.java @@ -1,26 +1,29 @@ package io.dataease.base.domain; import java.io.Serializable; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class Datasource implements Serializable { + @ApiModelProperty("ID") private String id; - + @ApiModelProperty("名称") private String name; - + @ApiModelProperty("描述") private String desc; - + @ApiModelProperty("类型") private String type; - + @ApiModelProperty("创建时间") private Long createTime; - + @ApiModelProperty("更新时间") private Long updateTime; - + @ApiModelProperty("创建者") private String createBy; - + @ApiModelProperty("状态") private String status; - + @ApiModelProperty("配置详情") private String configuration; private static final long serialVersionUID = 1L; diff --git a/backend/src/main/java/io/dataease/controller/chart/ChartViewController.java b/backend/src/main/java/io/dataease/controller/chart/ChartViewController.java index d9498513f6..8ce32d17ac 100644 --- a/backend/src/main/java/io/dataease/controller/chart/ChartViewController.java +++ b/backend/src/main/java/io/dataease/controller/chart/ChartViewController.java @@ -5,6 +5,7 @@ import io.dataease.base.domain.ChartViewWithBLOBs; import io.dataease.commons.utils.AuthUtils; import io.dataease.controller.request.chart.ChartExtRequest; import io.dataease.controller.request.chart.ChartViewRequest; +import io.dataease.controller.response.ChartDetail; import io.dataease.dto.chart.ChartViewDTO; import io.dataease.service.chart.ChartViewService; import io.swagger.annotations.Api; @@ -66,7 +67,7 @@ public class ChartViewController { @ApiOperation("视图详情") @PostMapping("chartDetail/{id}") - public Map chartDetail(@PathVariable String id) { + public ChartDetail chartDetail(@PathVariable String id) { return chartViewService.getChartDetail(id); } diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java index 76c2288b81..be0d595749 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java @@ -5,12 +5,14 @@ import io.dataease.base.domain.DatasetTable; import io.dataease.base.domain.DatasetTableField; import io.dataease.base.domain.DatasetTableIncrementalConfig; import io.dataease.controller.request.dataset.DataSetTableRequest; +import io.dataease.controller.response.DataSetDetail; import io.dataease.datasource.dto.TableFiled; import io.dataease.dto.dataset.DataSetTableDTO; import io.dataease.dto.dataset.ExcelFileData; import io.dataease.service.dataset.DataSetTableService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -54,7 +56,7 @@ public class DataSetTableController { @ApiOperation("删除") @PostMapping("delete/{id}") - public void delete(@PathVariable String id) throws Exception { + public void delete( @ApiParam(name = "id", value = "数据集ID", required = true) @PathVariable String id) throws Exception { dataSetTableService.delete(id); } @@ -72,7 +74,7 @@ public class DataSetTableController { @ApiOperation("详息") @PostMapping("get/{id}") - public DatasetTable get(@PathVariable String id) { + public DatasetTable get(@ApiParam(name = "id", value = "数据集ID", required = true) @PathVariable String id) { return dataSetTableService.get(id); } @@ -84,8 +86,8 @@ public class DataSetTableController { @ApiOperation("查询原始字段") @PostMapping("getFields") - public List getFields(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception { - return dataSetTableService.getFields(dataSetTableRequest); + public List getFields(@RequestBody DatasetTable datasetTable) throws Exception { + return dataSetTableService.getFields(datasetTable); } @ApiOperation("查询生成字段") @@ -126,11 +128,11 @@ public class DataSetTableController { @ApiOperation("数据集详息") @PostMapping("datasetDetail/{id}") - public Map datasetDetail(@PathVariable String id) { + public DataSetDetail datasetDetail(@PathVariable String id) { return dataSetTableService.getDatasetDetail(id); } - @ApiOperation("excel上传") +// @ApiOperation("excel上传") @PostMapping("excel/upload") public ExcelFileData excelUpload(@RequestParam("file") MultipartFile file, @RequestParam("tableId") String tableId, @RequestParam("editType") Integer editType ) throws Exception { return dataSetTableService.excelSaveAndParse(file, tableId, editType); diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java index 882f06c7f4..17414dfdb4 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java @@ -2,6 +2,7 @@ package io.dataease.controller.dataset; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.base.domain.DatasetTableField; +import io.dataease.controller.response.DatasetTableField4Type; import io.dataease.service.dataset.DataSetFieldService; import io.dataease.service.dataset.DataSetTableFieldsService; import io.swagger.annotations.Api; @@ -39,7 +40,7 @@ public class DataSetTableFieldController { @ApiOperation("分组查询表下属字段") @PostMapping("listByDQ/{tableId}") - public Map> listByDQ(@PathVariable String tableId) { + public DatasetTableField4Type listByDQ(@PathVariable String tableId) { DatasetTableField datasetTableField = DatasetTableField.builder().build(); datasetTableField.setTableId(tableId); datasetTableField.setGroupType("d"); @@ -47,10 +48,10 @@ public class DataSetTableFieldController { datasetTableField.setGroupType("q"); List quotaList = dataSetTableFieldsService.list(datasetTableField); - Map> map = new HashMap<>(); - map.put("dimensionList", dimensionList); - map.put("quotaList", quotaList); - return map; + DatasetTableField4Type datasetTableField4Type = new DatasetTableField4Type(); + datasetTableField4Type.setDimensionList(dimensionList); + datasetTableField4Type.setQuotaList(quotaList); + return datasetTableField4Type; } @ApiOperation("批量更新") diff --git a/backend/src/main/java/io/dataease/controller/response/ChartDetail.java b/backend/src/main/java/io/dataease/controller/response/ChartDetail.java new file mode 100644 index 0000000000..4da1875a8b --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/response/ChartDetail.java @@ -0,0 +1,13 @@ +package io.dataease.controller.response; + +import io.dataease.base.domain.ChartViewWithBLOBs; +import io.dataease.base.domain.DatasetTable; +import io.dataease.base.domain.Datasource; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class ChartDetail extends DataSetDetail{ + @ApiModelProperty("视图") + private ChartViewWithBLOBs chart; +} diff --git a/backend/src/main/java/io/dataease/controller/response/DataSetDetail.java b/backend/src/main/java/io/dataease/controller/response/DataSetDetail.java new file mode 100644 index 0000000000..79038fa39b --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/response/DataSetDetail.java @@ -0,0 +1,14 @@ +package io.dataease.controller.response; + +import io.dataease.base.domain.DatasetTable; +import io.dataease.base.domain.Datasource; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class DataSetDetail { + @ApiModelProperty("数据集") + private DatasetTable table; + @ApiModelProperty("数据源") + private Datasource datasource; +} diff --git a/backend/src/main/java/io/dataease/controller/response/DatasetTableField4Type.java b/backend/src/main/java/io/dataease/controller/response/DatasetTableField4Type.java new file mode 100644 index 0000000000..493fb49c8f --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/response/DatasetTableField4Type.java @@ -0,0 +1,15 @@ +package io.dataease.controller.response; + +import io.dataease.base.domain.DatasetTableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class DatasetTableField4Type { + @ApiModelProperty("维度") + List dimensionList; + @ApiModelProperty("指标") + List quotaList; +} diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 92e0f1c6e7..2f19f844d4 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -12,6 +12,8 @@ import io.dataease.commons.utils.BeanUtils; import io.dataease.commons.utils.CommonBeanFactory; import io.dataease.commons.utils.LogUtil; import io.dataease.controller.request.chart.*; +import io.dataease.controller.response.ChartDetail; +import io.dataease.controller.response.DataSetDetail; import io.dataease.datasource.provider.DatasourceProvider; import io.dataease.datasource.provider.ProviderFactory; import io.dataease.datasource.request.DatasourceRequest; @@ -1055,15 +1057,16 @@ public class ChartViewService { } } - public Map getChartDetail(String id) { - Map map = new HashMap<>(); + public ChartDetail getChartDetail(String id) { + ChartDetail chartDetail = new ChartDetail(); ChartViewWithBLOBs chartViewWithBLOBs = chartViewMapper.selectByPrimaryKey(id); - map.put("chart", chartViewWithBLOBs); + chartDetail.setChart(chartViewWithBLOBs); if (ObjectUtils.isNotEmpty(chartViewWithBLOBs)) { - Map datasetDetail = dataSetTableService.getDatasetDetail(chartViewWithBLOBs.getTableId()); - map.putAll(datasetDetail); + DataSetDetail datasetDetail = dataSetTableService.getDatasetDetail(chartViewWithBLOBs.getTableId()); + chartDetail.setTable(datasetDetail.getTable()); + chartDetail.setDatasource(datasetDetail.getDatasource()); } - return map; + return chartDetail; } public List viewsByIds(List viewIds) { diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index e7eab0b4b2..af288d0ae7 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -15,6 +15,7 @@ import io.dataease.commons.utils.*; import io.dataease.controller.request.dataset.DataSetGroupRequest; import io.dataease.controller.request.dataset.DataSetTableRequest; import io.dataease.controller.request.dataset.DataSetTaskRequest; +import io.dataease.controller.response.DataSetDetail; import io.dataease.datasource.constants.DatasourceTypes; import io.dataease.datasource.dto.TableFiled; import io.dataease.datasource.provider.DatasourceProvider; @@ -382,13 +383,13 @@ public class DataSetTableService { return extDataSetTableMapper.searchOne(dataSetTableRequest); } - public List getFields(DataSetTableRequest dataSetTableRequest) throws Exception { - Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId()); + public List getFields(DatasetTable datasetTable) throws Exception { + Datasource ds = datasourceMapper.selectByPrimaryKey(datasetTable.getDataSourceId()); DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType()); DatasourceRequest datasourceRequest = new DatasourceRequest(); datasourceRequest.setDatasource(ds); QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); - datasourceRequest.setQuery(qp.convertTableToSql(new Gson().fromJson(dataSetTableRequest.getInfo(), DataTableInfoDTO.class).getTable(), ds)); + datasourceRequest.setQuery(qp.convertTableToSql(new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class).getTable(), ds)); return datasourceProvider.fetchResultField(datasourceRequest); } @@ -966,7 +967,7 @@ public class DataSetTableService { List fields = new ArrayList<>(); long syncTime = System.currentTimeMillis(); if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "db")) { - fields = getFields(dataSetTableRequest); + fields = getFields(datasetTable); } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "sql")) { DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType()); DatasourceRequest datasourceRequest = new DatasourceRequest(); @@ -1198,15 +1199,15 @@ public class DataSetTableService { } } - public Map getDatasetDetail(String id) { - Map map = new HashMap<>(); + public DataSetDetail getDatasetDetail(String id) { + DataSetDetail dataSetDetail = new DataSetDetail(); DatasetTable table = datasetTableMapper.selectByPrimaryKey(id); - map.put("table", table); + dataSetDetail.setTable(table); if (ObjectUtils.isNotEmpty(table)) { Datasource datasource = datasourceMapper.selectByPrimaryKey(table.getDataSourceId()); - map.put("datasource", datasource); + dataSetDetail.setDatasource(datasource); } - return map; + return dataSetDetail; } public ExcelFileData excelSaveAndParse(MultipartFile file, String tableId, Integer editType) throws Exception { From 4161aa6f838d41f9af4a7a220e1858e4904c90aa Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 11 Oct 2021 18:39:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?style:=20=E5=AE=8C=E5=96=84=E6=B7=B1?= =?UTF-8?q?=E8=89=B2=E4=B8=BB=E9=A2=98=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/Notification/index.vue | 10 ++ .../canvas/components/Editor/ContextMenu.vue | 2 +- .../canvas/components/Editor/SettingMenu.vue | 2 +- .../components/Editor/SettingMenuTest.vue | 2 +- frontend/src/layout/components/Topbar.vue | 2 +- frontend/src/styles/index.scss | 81 ++++++++++--- frontend/src/styles/theme/dark.scss | 8 +- frontend/src/styles/theme/default.scss | 35 ------ frontend/src/views/chart/view/ChartEdit.vue | 16 +-- frontend/src/views/dataset/add/AddCustom.vue | 7 +- frontend/src/views/dataset/add/AddDB.vue | 2 +- frontend/src/views/dataset/add/AddExcel.vue | 112 +++++++++--------- frontend/src/views/dataset/add/AddSQL.vue | 4 +- .../dataset/common/DatasetCustomField.vue | 2 +- .../src/views/dataset/data/CalcFieldEdit.vue | 38 ++++++ frontend/src/views/login/index.vue | 4 +- .../src/views/panel/AssistComponent/index.vue | 8 +- .../src/views/panel/SubjectSetting/index.vue | 39 +++--- frontend/src/views/panel/edit/index.vue | 17 +-- .../src/views/panel/filter/filterDialog.vue | 4 +- frontend/src/views/panel/filter/index.vue | 8 +- .../src/views/system/task/DatasetTaskList.vue | 34 +++--- frontend/src/views/system/task/TaskRecord.vue | 29 +++-- 23 files changed, 278 insertions(+), 188 deletions(-) delete mode 100644 frontend/src/styles/theme/default.scss diff --git a/frontend/src/components/Notification/index.vue b/frontend/src/components/Notification/index.vue index 29290eec5b..aad83b84da 100644 --- a/frontend/src/components/Notification/index.vue +++ b/frontend/src/components/Notification/index.vue @@ -262,7 +262,17 @@ export default { padding-top: 5px; :hover { cursor: pointer; + background-color: #f4f4f5; } } + +.blackTheme .msg-foot-class { + padding-top: 5px; + :hover { + cursor: pointer; + + background-color: #171422; + } +} diff --git a/frontend/src/components/canvas/components/Editor/ContextMenu.vue b/frontend/src/components/canvas/components/Editor/ContextMenu.vue index 5a1e319f18..873117ae63 100644 --- a/frontend/src/components/canvas/components/Editor/ContextMenu.vue +++ b/frontend/src/components/canvas/components/Editor/ContextMenu.vue @@ -155,7 +155,7 @@ export default { cursor: pointer; &:hover { - background-color: #f5f7fa; + background-color: var(--background-color-base, #f5f7fa); } } } diff --git a/frontend/src/components/canvas/components/Editor/SettingMenu.vue b/frontend/src/components/canvas/components/Editor/SettingMenu.vue index 339f9f3268..36e4c13da2 100644 --- a/frontend/src/components/canvas/components/Editor/SettingMenu.vue +++ b/frontend/src/components/canvas/components/Editor/SettingMenu.vue @@ -175,7 +175,7 @@ export default { cursor: pointer; &:hover { - background-color: #f5f7fa; + background-color: var(--background-color-base, #f5f7fa); } } } diff --git a/frontend/src/components/canvas/components/Editor/SettingMenuTest.vue b/frontend/src/components/canvas/components/Editor/SettingMenuTest.vue index 7e1376cbcf..3144ff9c82 100644 --- a/frontend/src/components/canvas/components/Editor/SettingMenuTest.vue +++ b/frontend/src/components/canvas/components/Editor/SettingMenuTest.vue @@ -173,7 +173,7 @@ export default { cursor: pointer; &:hover { - background-color: #f5f7fa; + background-color: var(--background-color-base, #f5f7fa); } } } diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue index f78fe8bc5e..38ec468d53 100644 --- a/frontend/src/layout/components/Topbar.vue +++ b/frontend/src/layout/components/Topbar.vue @@ -34,7 +34,7 @@ - + {{ name }} diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index dd52aecd24..6b63f7a000 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -1,10 +1,10 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; -.defaultTheme { +/* .defaultTheme { @import './theme/default.scss'; @import "~element-ui/packages/theme-chalk/src/index"; -} +} */ .blackTheme { @import './theme/dark.scss'; @import "~element-ui/packages/theme-chalk/src/index"; @@ -360,13 +360,21 @@ div:focus { z-index: 10000 !important; } -::-webkit-scrollbar-thumb { +/* ::-webkit-scrollbar-thumb { width: 10px; height: 10px; background: #d7d9e3; border-radius: 4px; +} */ + +::-webkit-scrollbar-thumb { + width: 10px; + height: 10px; + background: #38393a !important; + border-radius: 4px; } + ::-webkit-scrollbar { width: 5px; height: 5px; @@ -455,9 +463,9 @@ div:focus { border-color: var(--border-color-input) !important; } -.blackTheme .el-popover { +/* .blackTheme .el-popover { background-color: var(--MainBG); -} +} */ .blackTheme .main-area-input { input.el-input__inner { @@ -497,12 +505,13 @@ div:focus { background-color: var(--MainBG) !important; color: var(--Main) !important; } -.blackTheme .el-dialog { +/* .blackTheme .el-dialog { background: var(--ContentBG) !important; color: var(--TextPrimary) !important; } + */ .blackTheme .el-dialog__title { - color: var(--TextPrimary) !important; + color: #ffffff !important; } .blackTheme .title-text { @@ -557,12 +566,56 @@ div:focus { .blackTheme .el-submenu__title { color: var(--TextPrimary) ; } +.blackTheme .el-drawer__body { + background-color: var(--MainContentBG); +} + +.blackTheme .el-select-dropdown__item.hover { + background-color: #171B22 !important; +} +.blackTheme .el-select-dropdown__item:hover { + background-color: #171B22 !important; +} + +.blackTheme .el-dropdown-menu__item:not(.is-disabled):hover { + background-color: #171B22 !important; +} + +.blackTheme .el-dropdown-menu__item:focus { + background-color: #171B22 !important; +} + + +.blackTheme .el-dropdown-menu__item--divided:before { + background-color: #000000 !important; +} + + +.blackTheme .el-card__header { + border-color: var(--TableBorderColor) !important; +} + +.blackTheme .CodeMirror { + background-color: #000000 ; + color: #ffffff; +} +.blackTheme .CodeMirror-code { + background-color: transparent; +} + +.blackTheme .CodeMirror-gutters { + background-color: #000000 ; +} + +.blackTheme .el-radio-button__inner { + background-color: var(--TableBG); + color: var(--TableColor); + border: var(--TableBorder); +} + +.blackTheme .el-loading-mask { + background-color: rgb(135 131 131 / 70%); +} + -/* .chart-radio-div { - label.el-radio { - span.el-radio__input { - display: none !important; - } - } -} */ diff --git a/frontend/src/styles/theme/dark.scss b/frontend/src/styles/theme/dark.scss index 3ca0793b42..5cae28f8fb 100644 --- a/frontend/src/styles/theme/dark.scss +++ b/frontend/src/styles/theme/dark.scss @@ -16,10 +16,8 @@ $--border-color-light: #495865; $--border-color-lighter: #495865; $--border-color-extra-light: #495865; -$--color-white: #FFFFFF; -$--color-black: #000000; - -$--color-text-regular: #fff; +$--color-white: #21333b; +$--color-black: #FFFFFF; $--background-color-base: #171b22; @@ -53,6 +51,8 @@ $--background-color-base: #171b22; --TableColor: #acbac3; --TableBorder: .05rem solid #495865; --TableBorderColor: #495865; + + --background-color-base: #171b22; } diff --git a/frontend/src/styles/theme/default.scss b/frontend/src/styles/theme/default.scss deleted file mode 100644 index e0cfcefc32..0000000000 --- a/frontend/src/styles/theme/default.scss +++ /dev/null @@ -1,35 +0,0 @@ -/* 改变主题色变量 */ -$--color-primary: #409EFF; -$--color-success: #67C23A; -$--color-warning: #E6A23C; -$--color-danger: #F56C6C; -$--color-info: #909399; - -$--color-text-primary: #303133; -$--color-text-regular: #606266; -$--color-text-secondary: #909399; -$--color-text-placeholder: #C0C4CC; - -$--border-color-base: #DCDFE6; -$--border-color-light: #E4E7ED; -$--border-color-lighter: #EBEEF5; -$--border-color-extra-light: #F2F6FC; - -$--color-white: #FFFFFF; -$--color-black: #000000; - - -$--background-color-base: #F5F7FA; - - -// 与CSS原生变量映射 -#app { - --Main:#00B9AD; - --test:#FF9227; - --color-primary: #00B9AD; - --MainBG: #FFFFFF; - - - --border-color-input: #DCDFE6; - --border-color-input-hovor: #C0C4CC; -} \ No newline at end of file diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 4daf893549..34a27cb828 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -1672,7 +1672,7 @@ export default { .blackTheme .item-dimension { border: solid 1px ; - border-color: var(--MainBorderColor); + border-color: var(--TableBorderColor); color: var(--TextPrimary); background-color: var(--MainBG); } @@ -1710,7 +1710,7 @@ export default { .blackTheme .item-quota { border: solid 1px ; - border-color: var(--MainBorderColor); + border-color: var(--TableBorderColor); color: var(--TextPrimary); background-color: var(--MainBG); @@ -1802,7 +1802,7 @@ export default { } .blackTheme .attr-style{ - border-color: var(--MainBorderColor) !important; + border-color: var(--TableBorderColor) !important; color: var(--TextPrimary); } @@ -1873,7 +1873,7 @@ export default { .blackTheme .field-height{ border-top: 1px solid ; - border-color: var(--MainBorderColor) !important; + border-color: var(--TableBorderColor) !important; } .padding-tab{ padding: 0; @@ -1899,7 +1899,7 @@ export default { } .blackTheme .drag-block-style{ border: 1px solid ; - border-color: var(--MainBorderColor); + border-color: var(--TableBorderColor); background-color: var(--ContentBG); } @@ -1918,16 +1918,16 @@ export default { } .blackTheme .theme-border-class { - border-color: var(--MainBorderColor) !important; + border-color: var(--TableBorderColor) !important; color: var(--TextPrimary) !important; background-color: var(--ContentBG); } .blackTheme .padding-lr { - border-color: var(--MainBorderColor) !important; + border-color: var(--TableBorderColor) !important; } .blackTheme .theme-item-class { background-color: var(--MainBG) !important; - border-color: var(--MainBorderColor) !important; + border-color: var(--TableBorderColor) !important; } diff --git a/frontend/src/views/dataset/add/AddCustom.vue b/frontend/src/views/dataset/add/AddCustom.vue index f3bcac3f3e..8906e24097 100644 --- a/frontend/src/views/dataset/add/AddCustom.vue +++ b/frontend/src/views/dataset/add/AddCustom.vue @@ -1,6 +1,6 @@