Skip to content

Hotfix release v2.15 #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cn-xufei merged 2 commits into from
Apr 11, 2023
Merged

Hotfix release v2.15 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f82f39
refactor(@tap/dag): FieldRenameProcessor add batchRemove/batchShow
cn-xufei Apr 11, 2023
84c05de
refactor(@tap/dag): MetaPanel field list field name add show-overflo…
cn-xufei Apr 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/assets/styles/element-overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts';
th.el-table__cell {
padding: 0;
height: 40px;
font-weight: 500;
}

.cell {
Expand Down
5 changes: 3 additions & 2 deletions packages/dag/src/components/form/field-inference/List.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
>
<template slot="field_name" slot-scope="scope">
<span class="flex align-center"
>{{ scope.row.field_name }}
><span class="ellipsis">{{ scope.row.field_name }}</span>
<VIcon v-if="scope.row.primary_key_position > 0" size="12" class="text-warning ml-1">key</VIcon>
</span>
</template>
Expand Down Expand Up @@ -168,7 +168,8 @@ export default {
label: i18n.t('packages_form_field_add_del_index_ziduanmingcheng'),
prop: 'field_name',
slotName: 'field_name',
'min-width': '90px'
'min-width': '90px',
'show-overflow-tooltip': true
},
{
label: i18n.t('packages_form_dag_dialog_field_mapping_type'),
Expand Down
73 changes: 67 additions & 6 deletions packages/dag/src/components/form/field-processor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,31 @@ export const FieldRenameProcessor = defineComponent({
)
return props.disabled ? disabled : show
}

const showBatchRemove = computed(() => {
return config.checkedFields.some(field => !!field.isShow)
})

const batchRemove = () => {
console.log('config.checkedFields', config.checkedFields) // eslint-disable-line
config.checkedFields.forEach(field => {
field.isShow = false
doUpdateField(field, 'del', false)
})
updateDeletedNum(config.selectTableRow)
refs.table?.clearSelection()
}

const batchShow = () => {
console.log('config.checkedFields', config.checkedFields) // eslint-disable-line
config.checkedFields.forEach(field => {
field.isShow = true
doUpdateField(field, 'del', true)
})
updateDeletedNum(config.selectTableRow)
refs.table?.clearSelection()
}

watch(
() => root.$store.state.dataflow.transformLoading,
v => {
Expand All @@ -414,6 +439,7 @@ export const FieldRenameProcessor = defineComponent({
}
}
)

loadData()
return {
list,
Expand All @@ -433,7 +459,10 @@ export const FieldRenameProcessor = defineComponent({
updateView,
doOperationRest,
doSearchField,
doSearchTables
doSearchTables,
batchRemove,
batchShow,
showBatchRemove
}
},
render() {
Expand All @@ -453,7 +482,7 @@ export const FieldRenameProcessor = defineComponent({
></ElInput>
</div>
</div>
<div class="bg-main flex justify-content-between line-height processor-ml-10">
<div class="bg-main flex justify-content-between line-height processor-ml-10 table-checkbox-wrap">
<span>
<el-checkbox v-model={this.config.checkAll} onChange={this.doCheckAllChange}></el-checkbox>
<span class="table-name ml-2">{i18n.t('packages_form_field_mapping_list_biaoming')}</span>
Expand Down Expand Up @@ -525,7 +554,7 @@ export const FieldRenameProcessor = defineComponent({
</div>
<div class="main">
<div class="flex ml-2 text-start justify-content-between" style="margin-bottom: 8px">
<div class="flex">
<div class="flex field-search-input-wrap">
<ElInput
size="mini"
placeholder={i18n.t('packages_form_field_mapping_list_qingshuruziduan')}
Expand All @@ -546,13 +575,43 @@ export const FieldRenameProcessor = defineComponent({
>
{i18n.t('public_button_bulk_operation')}
</ElButton>

{this.config.checkedFields.length > 0 &&
(this.showBatchRemove ? (
<ElButton
key="batchRemove"
type="text"
class="btn-operation"
onClick={this.batchRemove}
disabled={
(this.config.checkedTables.length === 0 && this.config.checkedFields.length === 0) ||
this.disabled
}
>
{i18n.t('packages_form_field_processor_index_pingbi')}
</ElButton>
) : (
<ElButton
key="batchShow"
type="text"
class="btn-operation"
onClick={this.batchShow}
disabled={
(this.config.checkedTables.length === 0 && this.config.checkedFields.length === 0) ||
this.disabled
}
>
{i18n.t('packages_form_field_processor_index_huifu')}
</ElButton>
))}

<ElButton type="text" class="btn-rest mr-2" disabled={this.disabled} onClick={this.doOperationRest}>
{i18n.t('public_button_reset')}
</ElButton>
</div>
</div>
<ElTable
class="field-mapping-table"
class="field-mapping-table border-start-0 border-end-0 border-bottom-0"
border
height="100%"
ref={'table'}
Expand All @@ -561,8 +620,9 @@ export const FieldRenameProcessor = defineComponent({
row-class-name={this.tableRowClassName}
onSelection-change={this.doSelectionField}
>
<ElTableColumn type="selection" width="55"></ElTableColumn>
<ElTableColumn type="selection" width="32" class-name="ck-cell-wrap"></ElTableColumn>
<ElTableColumn
align="center"
type="index"
width="55"
label={i18n.t('packages_form_field_mapping_list_xuhao')}
Expand All @@ -576,6 +636,7 @@ export const FieldRenameProcessor = defineComponent({
}}
></ElTableColumn>
<ElTableColumn
class-name="p-0"
show-overflow-tooltip
label={i18n.t('packages_form_field_processor_index_xinziduanming')}
prop="targetFieldName"
Expand All @@ -584,7 +645,7 @@ export const FieldRenameProcessor = defineComponent({
}}
></ElTableColumn>
<ElTableColumn
show-overflow-tooltip
align="center"
label={i18n.t('public_operation')}
prop="isShow"
width={'60px'}
Expand Down
84 changes: 46 additions & 38 deletions packages/dag/src/components/form/field-processor/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
border-radius: 4px;
.task-form-left {
padding-top: 8px;
width: 200px;
border-right: 1px solid map-get($borderColor, light);
.table-name {
font-size: 12px;
Expand All @@ -73,28 +74,27 @@
}
.task-form-left__ul {
flex: 1;
max-width: 210px;
overflow-x: hidden;
overflow-y: auto;
li {
background: map-get($bgColor, white);
box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.02);
border-left: 2px solid transparent;
border-bottom: 1px solid map-get($borderColor, light);
display: flex;
padding: 10px 0 10px 10px;
padding: 10px;
&:hover {
background: map-get($bgColor, disactive);
cursor: pointer;
border-left: 2px solid map-get($color, primary);
border-left-color: map-get($color, primary);
}
&.active {
background: map-get($bgColor, disactive);
border-left: 2px solid map-get($color, primary);
border-left-color: map-get($color, primary);
cursor: pointer;
}
.task-form-text-box {
margin-left: 10px;
width: 120px;
flex: 1;
min-width: 0;
.target {
font-size: 12px;
font-weight: 400;
Expand Down Expand Up @@ -165,39 +165,47 @@
line-height: 15px;
}
}
.field-mapping-table {
::v-deep {
.el-table {
border: none;
}
.el-table__empty-block {
height: 100% !important;
}
.el-table__header {
.el-table__cell {
border-right: 0;
&.is-leaf {
border-bottom: 0;
}
&:hover {
border-right: 1px solid map-get($borderColor, light);
}
}
th {
color: map-get($fontColor, normal);
font-weight: 500;
white-space: nowrap;
background-color: map-get($bgColor, normal);
}
}
.el-table__body {
td {
color: map-get($fontColor, light);
}

.field-mapping-table.el-table {
.ck-cell-wrap .cell {
padding: 0 !important;
text-align: center;
}
}

.table-checkbox-wrap {
border-top: 1px solid #ebeef5;
}

.field-search-input-wrap {
width: 180px;
}
/*.el-table__empty-block {
height: 100% !important;
}
.el-table__header {
.el-table__cell {
border-right: 0;
&.is-leaf {
border-bottom: 0;
}
&:after {
width: 0;
&:hover {
border-right: 1px solid map-get($borderColor, light);
}
}
th {
color: map-get($fontColor, normal);
font-weight: 500;
white-space: nowrap;
background-color: map-get($bgColor, normal);
}
}
.el-table__body {
td {
color: map-get($fontColor, light);
}
}
&:after {
width: 0;
}*/
}