This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit f9a3f532679e530862a647ac7273117866f3c350
Author: Qian Xia <lauraxiaq...@gmail.com>
AuthorDate: Fri Jul 21 10:46:09 2023 +0800
KYLIN-5663 refine css issue
---
kystudio/src/assets/styles/variables.less | 1 +
.../studio/StudioModel/ModelList/ModelAggregate/index.vue | 14 ++++++++++----
.../studio/StudioModel/ModelList/ModelSaveConfig/index.vue | 14 +++++++++-----
.../StudioModel/ModelList/ModelSaveConfig/locales.js | 2 +-
4 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/kystudio/src/assets/styles/variables.less
b/kystudio/src/assets/styles/variables.less
index 4d7dacea6f..3c9610b9cf 100644
--- a/kystudio/src/assets/styles/variables.less
+++ b/kystudio/src/assets/styles/variables.less
@@ -10,6 +10,7 @@
@text-placeholder-color: @color-text-placeholder; //#A5B2C5
@text-darkbg-color: @fff;
@text-disabled-color: @color-text-disabled; //#8B99AE
+@text-disabled-color1: rgba(47, 55, 76, 0.3);
@text-description: #415461;
diff --git
a/kystudio/src/components/studio/StudioModel/ModelList/ModelAggregate/index.vue
b/kystudio/src/components/studio/StudioModel/ModelList/ModelAggregate/index.vue
index 98f3faa97c..c8389b2a8b 100644
---
a/kystudio/src/components/studio/StudioModel/ModelList/ModelAggregate/index.vue
+++
b/kystudio/src/components/studio/StudioModel/ModelList/ModelAggregate/index.vue
@@ -1208,18 +1208,24 @@ export default class ModelAggregate extends Vue {
}
.el-dropdown-menu__item {
&.action-disabled {
- color: @text-disabled-color;
+ color: @text-disabled-color1;
cursor: not-allowed;
- &:focus {
- color: @text-disabled-color;
+ &:focus,
+ &:not(.is-disabled):active {
+ color: @text-disabled-color1;
cursor: not-allowed;
}
}
&.dropdown-group-title {
font-size: 12px;
- color: @text-disabled-color;
+ color: @text-disabled-color1;
line-height: 30px;
cursor: default;
+ &:focus,
+ &:not(.is-disabled):active {
+ color: @text-disabled-color1;
+ cursor: default;
+ }
&:hover {
background-color: @fff !important;
}
diff --git
a/kystudio/src/components/studio/StudioModel/ModelList/ModelSaveConfig/index.vue
b/kystudio/src/components/studio/StudioModel/ModelList/ModelSaveConfig/index.vue
index 6578697518..632208af2c 100644
---
a/kystudio/src/components/studio/StudioModel/ModelList/ModelSaveConfig/index.vue
+++
b/kystudio/src/components/studio/StudioModel/ModelList/ModelSaveConfig/index.vue
@@ -30,7 +30,7 @@
<el-tab-pane name="incremental"
:disabled="!datasourceActions.includes('changeBuildType')">
<span slot="label">
<el-tooltip :content="$t('incrementalTips')" placement="top">
- <span>{{$t('incremental')}}<el-tag class="ksd-ml-5" size="mini"
type="success">{{$t('recommend')}}</el-tag></span>
+ <span>{{$t('incremental')}}<el-tag class="ksd-ml-5" is-light
size="mini" type="success">{{$t('recommend')}}</el-tag></span>
</el-tooltip>
</span>
</el-tab-pane>
@@ -885,13 +885,17 @@ export default class ModelPartitionModal extends Vue {
.buildType-switch {
.el-tabs__header {
width: 100%;
+ height: 32px;
.el-tabs__nav {
width: 97.8%;
.el-tabs__item {
width: 50%;
+ height: 26px;
+ line-height: 26px;
.el-tag {
position: relative;
bottom: 1px;
+ padding: 0 7px;
}
}
}
@@ -913,8 +917,8 @@ export default class ModelPartitionModal extends Vue {
line-height: 16px;
}
.pre-format {
- color: @text-normal-color;
- font-size: 14px;
+ color: @text-disabled-color;
+ font-size: 12px;
margin-top: 4px;
background-color: @ke-background-color-secondary;
border: 1px solid @ke-border-divider-color;
@@ -945,8 +949,8 @@ export default class ModelPartitionModal extends Vue {
padding: 8px 16px;
box-sizing: border-box;
font-size: 12px;
- color: @text-normal-color;
- line-height: 16px;
+ color: @text-disabled-color;
+ line-height: 20px;
margin-top: 4px;
p {
display: flex;
diff --git
a/kystudio/src/components/studio/StudioModel/ModelList/ModelSaveConfig/locales.js
b/kystudio/src/components/studio/StudioModel/ModelList/ModelSaveConfig/locales.js
index 9b735733f8..f2d3d62099 100644
---
a/kystudio/src/components/studio/StudioModel/ModelList/ModelSaveConfig/locales.js
+++
b/kystudio/src/components/studio/StudioModel/ModelList/ModelSaveConfig/locales.js
@@ -36,7 +36,7 @@ export default {
recommend: 'Recommend',
isNotBatchModel: 'Can’t load the stream model in full.',
incrementalTips: 'It will load data incrementally based on the selected
partition column, which is more resource-efficient.',
- fullLoadTips: 'The system will load all data.',
+ fullLoadTips: 'The system will load all data',
changeBuildTypeTips: 'With partition setting changed, all segments and
data would be deleted. The model couldn\'t serve queries. Meanwhile, the
related ongoing jobs for building index would be discarded.',
editCCBuildTip: 'The modified expression of computed column would be
effective until all the related indexes have been built. Do you want to save
and build index now? ',
saveAndBuild: 'Save and Build',
