Skip to content

fix(data-source): on configuring static data panel, the batch delete button should horizontally aligned. #413

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
chilingling merged 4 commits into from
Apr 23, 2024
Merged

fix(data-source): on configuring static data panel, the batch delete button should horizontally aligned. #413

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cff1856
【设计器】静态数据配置面板，批量删除未对齐 BUG202403140918
betterdancing Apr 13, 2024
cbf417c
fix(data-source): on configuring static data panel, the batch delete …
betterdancing Apr 16, 2024
31ce400
fix(data-source): use tinyLink property 'type' instead of color style;
betterdancing Apr 19, 2024
59b5f1d
fix(data-source): use tinyLink property 'type' instead of color style;
betterdancing Apr 19, 2024
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
33 changes: 22 additions & 11 deletions packages/plugins/datasource/src/DataSourceRecordList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,31 @@
>
<template #content>
<div class="actions">
<tiny-link class="addButton" :underline="false" :disabled="!allowCreate" @click.stop="insertNewData"
<tiny-link
type="primary"
class="addButton"
:underline="false"
:disabled="!allowCreate"
@click.stop="insertNewData"
><icon-plusCircle class="tiny-svg-size icon-plusCircle"></icon-plusCircle>新增静态数据</tiny-link
>
<tiny-link class="importButton" :underline="false" :disabled="!allowCreate" @click.stop="showImportModal(true)"
<tiny-link
type="primary"
class="importButton"
:underline="false"
:disabled="!allowCreate"
@click.stop="showImportModal(true)"
><icon-import class="tiny-svg-size icon-import"></icon-import>批量导入</tiny-link
>
<tiny-button class="box-all-delete" type="text" :disabled="state.isBatchDeleteDisable" @click.stop="batchDelete"
><span class="all-delete">批量删除</span></tiny-button
<tiny-link
type="primary"
class="box-all-delete"
:underline="false"
:disabled="state.isBatchDeleteDisable"
@click.stop="batchDelete"
><span class="all-delete">批量删除</span></tiny-link
>
<tiny-link class="download" :underline="false" @click="download"
<tiny-link type="primary" class="download" :underline="false" @click="download"
><icon-download class="tiny-svg-size icon-download"></icon-download>下载导入模板</tiny-link
>
</div>
Expand Down Expand Up @@ -80,7 +95,7 @@
<script lang="jsx">
import { reactive, ref, watchEffect, watch, computed } from 'vue'
import { camelize, capitalize } from '@vue/shared'
import { Grid, Pager, Button, Input, Numeric, DatePicker, Switch, Slider, Link } from '@opentiny/vue'
import { Grid, Pager, Input, Numeric, DatePicker, Switch, Slider, Link } from '@opentiny/vue'
import { IconPlusCircle, IconImport } from '@opentiny/vue-icon'
import { PluginSetting } from '@opentiny/tiny-engine-common'
import { utils } from '@opentiny/tiny-engine-utils'
Expand All @@ -104,7 +119,6 @@ export const close = () => {
export default {
components: {
TinyGrid: Grid,
TinyButton: Button,
PluginSetting,
TinyPager: Pager,
DataSourceRecordUpload,
Expand Down Expand Up @@ -595,14 +609,13 @@ export default {
align-items: center;
margin: 16px 0 30px 0;
.box-all-delete {
margin: -3px 5px 0 5px;
margin: 1px 5px 0 5px;
.all-delete {
font-size: 14px;
}
}
.download {
margin: 0 12px;
color: var(--ti-lowcode-datasource-common-text-main-color);
font-size: 14px;
.icon-download {
margin: 0 1px 4px 0;
Expand All @@ -611,7 +624,6 @@ export default {
}
.addButton {
margin: 0 12px;
color: var(--ti-lowcode-datasource-common-text-main-color);
font-size: 14px;
.icon-plusCircle {
margin: 0 1px 4px 0;
Expand All @@ -620,7 +632,6 @@ export default {
}
.importButton {
margin: 0 12px;
color: var(--ti-lowcode-datasource-common-text-main-color);
font-size: 14px;
.icon-import {
margin: 0 1px 4px 0;
Expand Down