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 cfe5c38033f8d5df0dce8f68f6660a3e0a6803a8
Author: Qian Xia <lauraxiaq...@gmail.com>
AuthorDate: Fri Jul 28 15:03:03 2023 +0800
KYLIN-5673 ui fix
---
kystudio/src/assets/styles/main.less | 5 ++++
kystudio/src/components/admin/User/index.vue | 2 +-
kystudio/src/components/common/editor.vue | 33 +++++++++-------------
kystudio/src/components/studio/DDL/ddl.vue | 2 ++
.../studio/StudioModel/ModelEdit/index.vue | 2 +-
.../StudioModel/ModelList/AggregateModal/index.vue | 2 +-
.../StudioModel/ModelList/GuideModal/locales.js | 2 +-
.../ModelList/ModelBuildModal/build.vue | 4 +--
.../ModelList/ModelLayout/modelLayout.vue | 2 +-
.../StudioModel/ModelList/ModelSegment/index.vue | 8 +++---
.../studio/StudioModel/ModelList/index.vue | 2 +-
.../StudioModel/TableIndexEdit/tableindex_edit.vue | 2 +-
.../snapshot/SnapshotModel/SnapshotModel.vue | 2 +-
.../src/components/studio/snapshot/snapshot.vue | 2 +-
14 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/kystudio/src/assets/styles/main.less
b/kystudio/src/assets/styles/main.less
index b51db4f0ef..18829aa96c 100644
--- a/kystudio/src/assets/styles/main.less
+++ b/kystudio/src/assets/styles/main.less
@@ -536,6 +536,11 @@ i[class^=el-icon-]{
line-height: 21px;
}
}
+.el-message{
+ .el-message__icon{
+ font-size: 16px;
+ }
+}
.ksd-dialog-sub-title{
color:@text-title-color;
font-size: 14px;
diff --git a/kystudio/src/components/admin/User/index.vue
b/kystudio/src/components/admin/User/index.vue
index b8f7a27d2b..eb323de881 100644
--- a/kystudio/src/components/admin/User/index.vue
+++ b/kystudio/src/components/admin/User/index.vue
@@ -55,7 +55,7 @@
</template>
</el-table-column>
<!-- 表：是否有数据权限 -->
- <el-table-column :label="$t('dataPermission')" align="center"
:width="120">
+ <el-table-column :label="$t('dataPermission')" align="center"
:width="140">
<template slot-scope="scope">
<i class="el-icon-ksd-good_health admin-svg"
v-if="scope.row.hasQueryPermission"></i>
</template>
diff --git a/kystudio/src/components/common/editor.vue
b/kystudio/src/components/common/editor.vue
index 046cc6325d..d41c0510aa 100644
--- a/kystudio/src/components/common/editor.vue
+++ b/kystudio/src/components/common/editor.vue
@@ -8,26 +8,22 @@
<div class="limit-sql-tip" v-if="showLimitTip">{{needFormater ?
$t('kylinLang.common.sqlPartLimitTip') :
$t('kylinLang.common.sqlLimitTip')}}</div>
</template>
<div class="smyles_dragbar" v-if="dragable"
v-drag:change.height="editorDragData"></div>
- <el-popover
- placement="top"
- title=""
- trigger="click"
- v-model="showCopyStatus">
- <i class="el-icon-circle-check"></i>
<span>{{$t('kylinLang.common.copySuccess')}}</span>
- </el-popover>
<el-tooltip placement="top" :disabled="isFormat==='origin'">
<div slot="content">{{$t('kylinLang.common.notice')}}<br/>
<span class="tooltips-cont"><i class="el-ksd-n-icon-warning-filled
ksd-mb-2"></i>
<span>{{$t('kylinLang.common.formatTips')}}</span></span>
</div>
- <i class="el-ksd-icon-dup_16 edit-copy-btn ksd-fs-16"
+ <el-button
+ size="mini"
@click.stop
v-if="readOnly"
+ icon-button
+ icon="el-ksd-icon-dup_16"
+ class="edit-copy-btn"
:class="{'is-show': editorData, 'alwaysShow': alwaysShowCopyBtn}"
v-clipboard:copy="fullFormatData || editorData"
v-clipboard:success="onCopy"
- v-clipboard:error="onError">
- </i>
+ v-clipboard:error="onError"></el-button>
</el-tooltip>
<el-tabs v-model="isFormat" v-if="isFormatSwitch" class="format-switch"
type="button" :class="{'en-model': $lang==='en'}" @tab-click="changeFormatType">
<el-tab-pane :label="$t('kylinLang.common.origin')"
name="origin"></el-tab-pane>
@@ -134,18 +130,18 @@ import { Component } from 'vue-property-decorator'
if (navigator.userAgent.indexOf('Windows NT') >= 0 &&
window.clipboardData) {
let text = window.clipboardData.getData('text')
if (text && text === this.editorData) {
- this.showCopyStatus = true
- setTimeout(() => {
- this.showCopyStatus = false
- }, 1000)
+ this.$message({
+ type: 'success',
+ message: this.$t('kylinLang.common.copySuccess')
+ })
} else {
this.$message(this.$t('kylinLang.common.copyfail'))
}
} else {
- this.showCopyStatus = true
- setTimeout(() => {
- this.showCopyStatus = false
- }, 1000)
+ this.$message({
+ type: 'success',
+ message: this.$t('kylinLang.common.copySuccess')
+ })
}
},
onError () {
@@ -232,7 +228,6 @@ export default class KapEditor extends Vue {
formatData: '',
fullFormatData: '',
dragging: false,
- showCopyStatus: false,
editorDragData: {
height: +this.height || 0,
width: this.width
diff --git a/kystudio/src/components/studio/DDL/ddl.vue
b/kystudio/src/components/studio/DDL/ddl.vue
index ac0da6b127..3d0c67044e 100644
--- a/kystudio/src/components/studio/DDL/ddl.vue
+++ b/kystudio/src/components/studio/DDL/ddl.vue
@@ -251,6 +251,8 @@
.feedback-suggestions {
padding: 16px 8px;
box-sizing: border-box;
+ height: calc(~'100vh - 48px - 60px');
+ overflow-y: auto;
.suggestion-list {
.label {
font-size: 14px;
diff --git a/kystudio/src/components/studio/StudioModel/ModelEdit/index.vue
b/kystudio/src/components/studio/StudioModel/ModelEdit/index.vue
index c2556ea17a..26fdd87402 100644
--- a/kystudio/src/components/studio/StudioModel/ModelEdit/index.vue
+++ b/kystudio/src/components/studio/StudioModel/ModelEdit/index.vue
@@ -2376,7 +2376,7 @@ export default class ModelEdit extends Vue {
duration: 10000,
showClose: true,
message: (
- <div>
+ <div class="el-message__content">
<span>{this.$t('kylinLang.common.buildSuccess')}</span>
<a href="javascript:void(0)" onClick={() =>
this.jumpToJobs()}>{this.$t('kylinLang.common.toJoblist')}</a>
</div>
diff --git
a/kystudio/src/components/studio/StudioModel/ModelList/AggregateModal/index.vue
b/kystudio/src/components/studio/StudioModel/ModelList/AggregateModal/index.vue
index e41fd3c783..129b426541 100644
---
a/kystudio/src/components/studio/StudioModel/ModelList/AggregateModal/index.vue
+++
b/kystudio/src/components/studio/StudioModel/ModelList/AggregateModal/index.vue
@@ -1232,7 +1232,7 @@ export default class AggregateModal extends Vue {
duration: 10000,
showClose: true,
message: (
- <div>
+ <div class="el-message__content">
<span>{tipMsg}</span>
<a href="javascript:void(0)" onClick={() =>
this.jumpToJobs()}>{this.$t('kylinLang.common.toJoblist')}</a>
</div>
diff --git
a/kystudio/src/components/studio/StudioModel/ModelList/GuideModal/locales.js
b/kystudio/src/components/studio/StudioModel/ModelList/GuideModal/locales.js
index 15a3a922d5..832bda1f54 100644
--- a/kystudio/src/components/studio/StudioModel/ModelList/GuideModal/locales.js
+++ b/kystudio/src/components/studio/StudioModel/ModelList/GuideModal/locales.js
@@ -7,7 +7,7 @@ export default {
segmentSubTitle: 'Add segments to define the model\'s data range for
serving queries.',
ignore: 'Ignore',
next: 'Next',
- pre: 'Previous',
+ pre: 'Prev',
indexOverview: 'Index Overview',
aggregateGroup: 'Aggregate Group',
tableIndex: 'Table Index',
diff --git
a/kystudio/src/components/studio/StudioModel/ModelList/ModelBuildModal/build.vue
b/kystudio/src/components/studio/StudioModel/ModelList/ModelBuildModal/build.vue
index d5e5d6dab2..48b5e40d58 100644
---
a/kystudio/src/components/studio/StudioModel/ModelList/ModelBuildModal/build.vue
+++
b/kystudio/src/components/studio/StudioModel/ModelList/ModelBuildModal/build.vue
@@ -867,7 +867,7 @@
duration: 10000,
showClose: true,
message: (
- <div>
+ <div class="el-message__content">
<span>{this.$t('kylinLang.common.buildSuccess')}</span>
<a href="javascript:void(0)" onClick={() =>
this.jumpToJobs()}>{this.$t('kylinLang.common.toJoblist')}</a>
</div>
@@ -1045,7 +1045,7 @@
duration: 10000,
showClose: true,
message: (
- <div>
+ <div class="el-message__content">
<span>{this.$t('kylinLang.common.buildSuccess')}</span>
<a href="javascript:void(0)" onClick={() =>
this.jumpToJobs()}>{this.$t('kylinLang.common.toJoblist')}</a>
</div>
diff --git
a/kystudio/src/components/studio/StudioModel/ModelList/ModelLayout/modelLayout.vue
b/kystudio/src/components/studio/StudioModel/ModelList/ModelLayout/modelLayout.vue
index 928eeca6a3..cc8186aae3 100644
---
a/kystudio/src/components/studio/StudioModel/ModelList/ModelLayout/modelLayout.vue
+++
b/kystudio/src/components/studio/StudioModel/ModelList/ModelLayout/modelLayout.vue
@@ -368,7 +368,7 @@ export default class ModelLayout extends Vue {
duration: 10000,
showClose: true,
message: (
- <div>
+ <div class="el-message__content">
<span>{this.$t('kylinLang.common.submitSuccess')}</span>
<a href="javascript:void(0)" onClick={() =>
jumpToJobs()}>{this.$t('kylinLang.common.toJoblist')}</a>
</div>
diff --git
a/kystudio/src/components/studio/StudioModel/ModelList/ModelSegment/index.vue
b/kystudio/src/components/studio/StudioModel/ModelList/ModelSegment/index.vue
index 9cf3baf29f..baef85d310 100644
---
a/kystudio/src/components/studio/StudioModel/ModelList/ModelSegment/index.vue
+++
b/kystudio/src/components/studio/StudioModel/ModelList/ModelSegment/index.vue
@@ -573,7 +573,7 @@ export default class ModelSegment extends Vue {
duration: 10000,
showClose: true,
message: (
- <div>
+ <div class="el-message__content">
<span>{this.$t('kylinLang.common.buildSuccess')}</span>
<a href="javascript:void(0)" onClick={() =>
this.jumpToJobs()}>{this.$t('kylinLang.common.toJoblist')}</a>
</div>
@@ -704,7 +704,7 @@ export default class ModelSegment extends Vue {
duration: 10000,
showClose: true,
message: (
- <div>
+ <div class="el-message__content">
<span>{this.$t('kylinLang.common.buildSuccess')}</span>
<a href="javascript:void(0)" onClick={() =>
this.jumpToJobs()}>{this.$t('kylinLang.common.toJoblist')}</a>
</div>
@@ -917,7 +917,7 @@ export default class ModelSegment extends Vue {
duration: 10000,
showClose: true,
message: (
- <div>
+ <div class="el-message__content">
<span>{this.$t('kylinLang.common.buildSuccess')}</span>
<a href="javascript:void(0)" onClick={() =>
this.jumpToJobs()}>{this.$t('kylinLang.common.toJoblist')}</a>
</div>
@@ -1017,7 +1017,7 @@ export default class ModelSegment extends Vue {
duration: 10000,
showClose: true,
message: (
- <div>
+ <div class="el-message__content">
<span>{this.$t('kylinLang.common.buildSuccess')}</span>
<a href="javascript:void(0)" onClick={() =>
this.jumpToJobs()}>{this.$t('kylinLang.common.toJoblist')}</a>
</div>
diff --git a/kystudio/src/components/studio/StudioModel/ModelList/index.vue
b/kystudio/src/components/studio/StudioModel/ModelList/index.vue
index 9c2f311885..7c34681e68 100644
--- a/kystudio/src/components/studio/StudioModel/ModelList/index.vue
+++ b/kystudio/src/components/studio/StudioModel/ModelList/index.vue
@@ -448,7 +448,7 @@ export default class ModelList extends Vue {
duration: 10000,
showClose: true,
message: (
- <div>
+ <div class="el-message__content">
<span>{this.$t('kylinLang.common.submitSuccess')}</span>
<a href="javascript:void(0)" onClick={() =>
jumpToJobs()}>{this.$t('kylinLang.common.toJoblist')}</a>
</div>
diff --git
a/kystudio/src/components/studio/StudioModel/TableIndexEdit/tableindex_edit.vue
b/kystudio/src/components/studio/StudioModel/TableIndexEdit/tableindex_edit.vue
index fa222db8f1..ce19a38b36 100644
---
a/kystudio/src/components/studio/StudioModel/TableIndexEdit/tableindex_edit.vue
+++
b/kystudio/src/components/studio/StudioModel/TableIndexEdit/tableindex_edit.vue
@@ -335,7 +335,7 @@
duration: 10000,
showClose: true,
message: (
- <div>
+ <div class="el-message__content">
<span>{tipMsg}</span>
<a href="javascript:void(0)" onClick={() =>
this.jumpToJobs()}>{this.$t('kylinLang.common.toJoblist')}</a>
</div>
diff --git
a/kystudio/src/components/studio/snapshot/SnapshotModel/SnapshotModel.vue
b/kystudio/src/components/studio/snapshot/SnapshotModel/SnapshotModel.vue
index f7e891e3eb..31863104ef 100644
--- a/kystudio/src/components/studio/snapshot/SnapshotModel/SnapshotModel.vue
+++ b/kystudio/src/components/studio/snapshot/SnapshotModel/SnapshotModel.vue
@@ -728,7 +728,7 @@ export default class SnapshotModel extends Vue {
duration: 10000,
showClose: true,
message: (
- <div>
+ <div class="el-message__content">
<span>{this.$t('kylinLang.common.buildSuccess')}</span>
<a href="javascript:void(0)" onClick={() =>
this.gotoJob()}>{this.$t('kylinLang.common.toJoblist')}</a>
</div>
diff --git a/kystudio/src/components/studio/snapshot/snapshot.vue
b/kystudio/src/components/studio/snapshot/snapshot.vue
index 3590dc06fa..6ae264ecc3 100644
--- a/kystudio/src/components/studio/snapshot/snapshot.vue
+++ b/kystudio/src/components/studio/snapshot/snapshot.vue
@@ -493,7 +493,7 @@ export default class Snapshot extends Vue {
duration: 10000,
showClose: true,
message: (
- <div>
+ <div class="el-message__content">
<span>{this.$t('kylinLang.common.buildSuccess')}</span>
<a href="javascript:void(0)" onClick={() =>
this.gotoJob()}>{this.$t('kylinLang.common.toJoblist')}</a>
</div>
