diff --git a/web/packages/dataGovernance/module/common/tabCard/index.vue b/web/packages/dataGovernance/module/common/tabCard/index.vue
index 64220e6c5a..86ad08b971 100644
--- a/web/packages/dataGovernance/module/common/tabCard/index.vue
+++ b/web/packages/dataGovernance/module/common/tabCard/index.vue
@@ -3,22 +3,32 @@
-
-
+
+
-
负责人:
+
+ 负责人:
+
创建时间:{{ model.createTime }}
-
-
数据库:
-
主题域:
-
分层:
+
+ 数据库:
+
+
+ 主题域:
+
+
+ 分层:
+
@@ -33,7 +43,12 @@
标签:
-
+
标签:-
@@ -46,57 +61,60 @@
+ v-html="idx + 1 < model.columns.length ? item + '/' : item"
+ class="content-html"
+ >
diff --git a/web/packages/dataGovernance/view/fieldInfo/index.vue b/web/packages/dataGovernance/view/fieldInfo/index.vue
index 01fb2dbc29..5ea0f1695c 100644
--- a/web/packages/dataGovernance/view/fieldInfo/index.vue
+++ b/web/packages/dataGovernance/view/fieldInfo/index.vue
@@ -30,7 +30,7 @@
@@ -48,7 +48,7 @@
id="copy-button"
data-clipboard-action="copy"
data-clipboard-target="#copy-button"
- @click="e => copy(e, DDLsql)"
+ @click="(e) => copy(e, DDLsql)"
>复制
@@ -76,193 +76,193 @@
-
diff --git a/web/packages/dolphinScheduler/assets/styles/workflow.scss b/web/packages/dolphinScheduler/assets/styles/workflow.scss
index a44e9eed7d..ad468bd2b9 100644
--- a/web/packages/dolphinScheduler/assets/styles/workflow.scss
+++ b/web/packages/dolphinScheduler/assets/styles/workflow.scss
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-@import "@dataspherestudio/shared/common/style/variables.scss";
+@import '@dataspherestudio/shared/common/style/variables.scss';
.workflow-wrap {
width: 100%;
height: 100%;
@@ -89,7 +89,7 @@
font-weight: 400;
cursor: pointer;
&:hover {
- background-color: #2E92F7;
+ background-color: #2e92f7;
color: #fff;
}
}
@@ -162,7 +162,7 @@
position: relative;
flex: 1;
.tabs-content {
- /deep/ .ivu-tabs-tab {
+ ::v-deep .ivu-tabs-tab {
font-size: $font-size-large;
}
}
@@ -220,47 +220,51 @@
@include border-color($border-color-base, $dark-border-color-base);
padding: 0 5px;
.workflow-tabs-item {
- margin: 0;
- height: 31px;
- padding: 5px 16px 4px;
- border-bottom: $border-width-base $border-style-base $border-color-base;
- @include border-color($border-color-base, $dark-border-color-base);
- border-radius: 4px 4px 0 0;
- // background: #f8f8f9;
- @include bg-color($workflow-body-bg-color, $dark-workflow-body-bg-color);
+ margin: 0;
+ height: 31px;
+ padding: 5px 16px 4px;
+ border-bottom: $border-width-base $border-style-base
+ $border-color-base;
+ @include border-color($border-color-base, $dark-border-color-base);
+ border-radius: 4px 4px 0 0;
+ // background: #f8f8f9;
+ @include bg-color(
+ $workflow-body-bg-color,
+ $dark-workflow-body-bg-color
+ );
+ display: inline-block;
+ cursor: pointer;
+ position: relative;
+ &.active {
+ height: 32px;
+ padding-bottom: 5px;
+ background: #fff;
+ transform: translateZ(0);
+ border: 1px solid #dcdee2;
+ border-bottom: 1px solid #fff;
+ // color: #2d8cf0;
+ @include font-color($primary-color, $dark-primary-color);
+ }
+ .workflow-tabs-name {
display: inline-block;
- cursor: pointer;
+ }
+ .workflow-tabs-close {
+ width: 22px;
+ margin-right: -6px;
+ height: 22px;
+ font-size: 22px;
+ color: #999;
+ text-align: right;
+ vertical-align: middle;
+ overflow: hidden;
position: relative;
- &.active {
- height: 32px;
- padding-bottom: 5px;
- background: #fff;
- transform: translateZ(0);
- border: 1px solid #dcdee2;
- border-bottom:1px solid #fff;
- // color: #2d8cf0;
- @include font-color($primary-color, $dark-primary-color);
- }
- .workflow-tabs-name {
- display: inline-block;
- }
- .workflow-tabs-close {
- width: 22px;
- margin-right: -6px;
- height: 22px;
- font-size: 22px;
- color: #999;
- text-align: right;
- vertical-align: middle;
- overflow: hidden;
- position: relative;
- top: -1px;
- transform-origin: 100% 50%;
- transition: all .3s ease-in-out;
- cursor: pointer;
- }
+ top: -1px;
+ transform-origin: 100% 50%;
+ transition: all 0.3s ease-in-out;
+ cursor: pointer;
+ }
}
+ }
}
}
- }
}
diff --git a/web/packages/dolphinScheduler/components/tabList/index.scss b/web/packages/dolphinScheduler/components/tabList/index.scss
index 390a5676e5..adede936bb 100644
--- a/web/packages/dolphinScheduler/components/tabList/index.scss
+++ b/web/packages/dolphinScheduler/components/tabList/index.scss
@@ -1,4 +1,4 @@
-@import "@dataspherestudio/shared/common/style/variables.scss";
+@import '@dataspherestudio/shared/common/style/variables.scss';
.workflowTabContainer {
margin-left: 250px;
transition: margin-left 0.3s;
@@ -36,7 +36,7 @@
min-width: 320px;
.ivu-breadcrumb {
font-size: 21px;
- /deep/.ivu-breadcrumb-item-separator {
+ ::v-deep.ivu-breadcrumb-item-separator {
// color: rgba(0,0,0,0.65);
@include font-color($light-text-color, $dark-text-color);
}
@@ -48,43 +48,53 @@
font-size: 14px;
}
.bottomTapList {
- padding: 0px $padding-25;
- border-bottom: $border-width-base $border-style-base $border-color-base;
- @include border-color($background-color-base, $dark-workspace-body-bg-color);
- @include font-color($workspace-title-color, $dark-workspace-title-color);
- margin-top: 12px;
+ padding: 0px $padding-25;
+ border-bottom: $border-width-base $border-style-base
+ $border-color-base;
+ @include border-color(
+ $background-color-base,
+ $dark-workspace-body-bg-color
+ );
+ @include font-color(
+ $workspace-title-color,
+ $dark-workspace-title-color
+ );
+ margin-top: 12px;
+ flex: none;
+ display: flex;
+ align-items: center;
+ font-size: $font-size-large;
+ .bottomLeftText {
+ cursor: pointer;
flex: none;
- display: flex;
- align-items: center;
font-size: $font-size-large;
- .bottomLeftText {
- cursor: pointer;
- flex: none;
- font-size: $font-size-large;
- padding: 0 15px;
- margin-bottom: -1px;
- line-height: 40px;
- position: relative;
- &::after {
- content: "";
- border-left: 1px solid #DEE4EC;
- @include border-color($border-color-base, $dark-border-color-base);
- width: 0;
- position: absolute;
- right: -15px;
- top: 12px;
- height: 16px;
- margin: 0 15px;
- }
- }
- .active {
- border-bottom: 2px solid $primary-color;
- @include border-color($primary-color, $dark-primary-color);
- }
- .bottomRightContainer {
- flex: 1;
- height: 40px;
+ padding: 0 15px;
+ margin-bottom: -1px;
+ line-height: 40px;
+ position: relative;
+ &::after {
+ content: '';
+ border-left: 1px solid #dee4ec;
+ @include border-color(
+ $border-color-base,
+ $dark-border-color-base
+ );
+ width: 0;
+ position: absolute;
+ right: -15px;
+ top: 12px;
+ height: 16px;
+ margin: 0 15px;
}
+ }
+ .active {
+ border-bottom: 2px solid $primary-color;
+ @include border-color($primary-color, $dark-primary-color);
+ }
+ .bottomRightContainer {
+ flex: 1;
+ height: 40px;
+ }
}
}
}
@@ -109,7 +119,7 @@
line-height: 40px;
position: relative;
&::after {
- content: "";
+ content: '';
border-left: 1px solid #dee4ec;
@include border-color($border-color-base, $dark-border-color-base);
width: 0;
@@ -149,13 +159,13 @@
padding: 0 10px;
overflow: hidden;
margin-right: 8px;
- @include bg-color( #E1E5EA, $dark-workspace-body-bg-color);
+ @include bg-color(#e1e5ea, $dark-workspace-body-bg-color);
border-radius: 12px;
&.active {
height: 24px;
@include font-color($primary-color, $dark-primary-color);
line-height: 24px;
- @include bg-color(#E8EEF4, $dark-workspace-body-bg-color);
+ @include bg-color(#e8eef4, $dark-workspace-body-bg-color);
border-radius: 12px;
}
&:hover {
@@ -163,7 +173,7 @@
@include font-color($primary-color, $dark-primary-color);
line-height: 24px;
border-radius: 12px;
- @include bg-color(#D1D7DD, $dark-workspace-body-bg-color);
+ @include bg-color(#d1d7dd, $dark-workspace-body-bg-color);
}
}