From cff1856e28be0356b6b437de018a8e515f4e55be Mon Sep 17 00:00:00 2001
From: betterdancing <liulinclear@163.com>
Date: Fri, 12 Apr 2024 18:00:16 -0700
Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E3=80=91=E9=9D=99=E6=80=81=E6=95=B0=E6=8D=AE=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=EF=BC=8C=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=9C=AA=E5=AF=B9=E9=BD=90=20BUG202403140918?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/datasource/src/DataSourceRecordList.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/plugins/datasource/src/DataSourceRecordList.vue b/packages/plugins/datasource/src/DataSourceRecordList.vue
index 93ee922844..7139191261 100644
--- a/packages/plugins/datasource/src/DataSourceRecordList.vue
+++ b/packages/plugins/datasource/src/DataSourceRecordList.vue
@@ -17,8 +17,12 @@
         <tiny-link 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
+          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"
           ><icon-download class="tiny-svg-size icon-download"></icon-download>下载导入模板</tiny-link
@@ -80,7 +84,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'
@@ -104,7 +108,6 @@ export const close = () => {
 export default {
   components: {
     TinyGrid: Grid,
-    TinyButton: Button,
     PluginSetting,
     TinyPager: Pager,
     DataSourceRecordUpload,
@@ -595,7 +598,7 @@ 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;
     }

From cbf417cf779cd66d80f8a52fe683b7b552203476 Mon Sep 17 00:00:00 2001
From: betterdancing <liulinclear@163.com>
Date: Tue, 16 Apr 2024 16:10:52 -0700
Subject: [PATCH 2/4] fix(data-source): on configuring static data panel, the
 batch delete button should horizontally aligned.

---
 .../datasource/src/DataSourceRecordList.vue   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/packages/plugins/datasource/src/DataSourceRecordList.vue b/packages/plugins/datasource/src/DataSourceRecordList.vue
index 7139191261..ee6c33afd3 100644
--- a/packages/plugins/datasource/src/DataSourceRecordList.vue
+++ b/packages/plugins/datasource/src/DataSourceRecordList.vue
@@ -11,20 +11,28 @@
   >
     <template #content>
       <div class="actions">
-        <tiny-link class="addButton" :underline="false" :disabled="!allowCreate" @click.stop="insertNewData"
+        <tiny-link
+          :class="['addButton', allowCreate ? 'normal-text-color' : '']"
+          :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
+          :class="['importButton', allowCreate ? 'normal-text-color' : '']"
+          :underline="false"
+          :disabled="!allowCreate"
+          @click.stop="showImportModal(true)"
           ><icon-import class="tiny-svg-size icon-import"></icon-import>批量导入</tiny-link
         >
         <tiny-link
-          class="box-all-delete"
+          :class="['box-all-delete', state.isBatchDeleteDisable ? '' : 'normal-text-color']"
           :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 class="download normal-text-color" :underline="false" @click="download"
           ><icon-download class="tiny-svg-size icon-download"></icon-download>下载导入模板</tiny-link
         >
       </div>
@@ -597,6 +605,9 @@ export default {
   justify-content: left;
   align-items: center;
   margin: 16px 0 30px 0;
+  .normal-text-color {
+    color: var(--ti-lowcode-datasource-common-text-main-color);
+  }
   .box-all-delete {
     margin: 1px 5px 0 5px;
     .all-delete {
@@ -605,7 +616,6 @@ export default {
   }
   .download {
     margin: 0 12px;
-    color: var(--ti-lowcode-datasource-common-text-main-color);
     font-size: 14px;
     .icon-download {
       margin: 0 1px 4px 0;
@@ -614,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;
@@ -623,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;

From 31ce400fa1ec03875a252aaee1f467402bcd0489 Mon Sep 17 00:00:00 2001
From: betterdancing <liulinclear@163.com>
Date: Thu, 18 Apr 2024 17:54:50 -0700
Subject: [PATCH 3/4] fix(data-source): use tinyLink property 'type' instead of
 color style;

---
 .../datasource/src/DataSourceRecordList.vue        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/plugins/datasource/src/DataSourceRecordList.vue b/packages/plugins/datasource/src/DataSourceRecordList.vue
index ee6c33afd3..118ad6b829 100644
--- a/packages/plugins/datasource/src/DataSourceRecordList.vue
+++ b/packages/plugins/datasource/src/DataSourceRecordList.vue
@@ -12,27 +12,30 @@
     <template #content>
       <div class="actions">
         <tiny-link
-          :class="['addButton', allowCreate ? 'normal-text-color' : '']"
+          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', allowCreate ? 'normal-text-color' : '']"
+          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-link
-          :class="['box-all-delete', state.isBatchDeleteDisable ? '' : 'normal-text-color']"
+          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 normal-text-color" :underline="false" @click="download"
+        <tiny-link type="primary" class="download normal-text-color" :underline="false" @click="download"
           ><icon-download class="tiny-svg-size icon-download"></icon-download>下载导入模板</tiny-link
         >
       </div>
@@ -605,9 +608,6 @@ export default {
   justify-content: left;
   align-items: center;
   margin: 16px 0 30px 0;
-  .normal-text-color {
-    color: var(--ti-lowcode-datasource-common-text-main-color);
-  }
   .box-all-delete {
     margin: 1px 5px 0 5px;
     .all-delete {

From 59b5f1d52823efbaf32410e6da884b360da4bfbf Mon Sep 17 00:00:00 2001
From: betterdancing <liulinclear@163.com>
Date: Thu, 18 Apr 2024 20:28:35 -0700
Subject: [PATCH 4/4] fix(data-source): use tinyLink property 'type' instead of
 color style;

---
 packages/plugins/datasource/src/DataSourceRecordList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/plugins/datasource/src/DataSourceRecordList.vue b/packages/plugins/datasource/src/DataSourceRecordList.vue
index 118ad6b829..55174cd7d8 100644
--- a/packages/plugins/datasource/src/DataSourceRecordList.vue
+++ b/packages/plugins/datasource/src/DataSourceRecordList.vue
@@ -35,7 +35,7 @@
           @click.stop="batchDelete"
           ><span class="all-delete">批量删除</span></tiny-link
         >
-        <tiny-link type="primary" class="download normal-text-color" :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>