import { computed, watch, inject, reactive } from 'vue'
import { iconPlus } from '@opentiny/vue-icon'
-import { Progress, Popover } from '@opentiny/vue'
+import { Progress, Tooltip } from '@opentiny/vue'
import SearchEmpty from './SearchEmpty.vue'
import SvgButton from './SvgButton.vue'
@@ -167,7 +130,7 @@ export default {
components: {
TinyProgress: Progress,
IconPlus: iconPlus(),
- TinyPopover: Popover,
+ TinyTooltip: Tooltip,
SvgButton,
SearchEmpty
},
@@ -421,7 +384,7 @@ export default {
flex-direction: column;
align-items: center;
position: relative;
- height: 108px;
+ height: 106px;
text-align: center;
user-select: none;
margin-right: 6px;
@@ -560,8 +523,9 @@ export default {
object-fit: cover;
}
.item-default-img {
- width: 50px;
+ width: 84px;
height: 50px;
+ color: var(--te-common-bg-defaut);
}
.item-text {
@@ -585,8 +549,8 @@ export default {
.block-setting {
visibility: hidden;
position: absolute;
- top: 4px;
- right: 8px;
+ top: 1px;
+ right: 6px;
z-index: 9;
&.is-current-visible-icon {
visibility: visible;
@@ -742,28 +706,21 @@ export default {
font-size: 12px;
color: var(--ti-lowcode-component-block-setting-item-text-color);
.list {
- margin-top: 6px;
+ display: flex;
}
.list-item {
box-sizing: border-box;
- padding: 16px 18px;
- height: 30px;
- line-height: 30px;
cursor: pointer;
- span {
- margin-left: 8px;
- }
- display: flex;
- align-items: center;
&:hover {
background-color: var(--ti-lowcode-component-block-setting-item-hover-bg);
color: var(--ti-lowcode-common-primary-text-color);
}
.list-item-icon {
font-size: 14px;
+ color: var(--te-common-icon-secondary);
}
- .list-item-svg:hover {
- background-color: var(--ti-lowcode-component-block-setting-item-hover-bg);
+ .list-item-svg {
+ color: var(--te-common-icon-secondary);
}
}
}
diff --git a/packages/design-core/assets/block-default.svg b/packages/design-core/assets/block-default.svg
new file mode 100644
index 000000000..48aa902c5
--- /dev/null
+++ b/packages/design-core/assets/block-default.svg
@@ -0,0 +1,19 @@
+
diff --git a/packages/design-core/assets/remove.svg b/packages/design-core/assets/remove.svg
new file mode 100644
index 000000000..1f9b01ce1
--- /dev/null
+++ b/packages/design-core/assets/remove.svg
@@ -0,0 +1,13 @@
+
diff --git a/packages/design-core/assets/versions.svg b/packages/design-core/assets/versions.svg
new file mode 100644
index 000000000..2331b3f59
--- /dev/null
+++ b/packages/design-core/assets/versions.svg
@@ -0,0 +1,12 @@
+
diff --git a/packages/theme/light/variable.less b/packages/theme/light/variable.less
index 10badad8b..999259496 100644
--- a/packages/theme/light/variable.less
+++ b/packages/theme/light/variable.less
@@ -431,4 +431,6 @@
--ti-lowcode-toolbar-hover-popper: var(--ti-lowcode-toolbar-more-color);
--te-common-border-hover: #c2c2c2;
+ --te-common-bg-defaut: #fff;
+ --te-common-icon-secondary: #808080;
}
From f094cc81df8a9b18d153b2c34985cf812685fe9c Mon Sep 17 00:00:00 2001
From: lichunn <269031597@qq.com>
Date: Thu, 26 Sep 2024 19:19:24 -0700
Subject: [PATCH 28/61] =?UTF-8?q?fix:=20=E5=85=A8=E5=B1=8F=E5=90=8E?=
=?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=B8=B8=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/common/component/MonacoEditor.vue | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/packages/common/component/MonacoEditor.vue b/packages/common/component/MonacoEditor.vue
index 057c97dbd..702ec540e 100644
--- a/packages/common/component/MonacoEditor.vue
+++ b/packages/common/component/MonacoEditor.vue
@@ -108,6 +108,23 @@ export default {
const switchFullScreen = (value) => {
fullscreen.value = value
+ if (value) {
+ setTimeout(() => {
+ Array.from(document.getElementsByClassName('buttons'))?.forEach((item) => {
+ if (!item.classList.toString().includes('fullscreen')) {
+ item.style.display = 'none'
+ } else {
+ item.style.display = 'flex'
+ }
+ })
+ }, 0)
+ } else {
+ setTimeout(() => {
+ Array.from(document.getElementsByClassName('buttons'))?.forEach((item) => {
+ item.style.display = 'flex'
+ })
+ }, 0)
+ }
}
return {
@@ -159,6 +176,7 @@ export default {
}
}
.fullscreen {
+ display: flex;
margin-right: 20px;
}
}
From e400de3dea02659e219280fd28c9e30a2adbdcef Mon Sep 17 00:00:00 2001
From: lichunn <269031597@qq.com>
Date: Thu, 26 Sep 2024 19:29:33 -0700
Subject: [PATCH 29/61] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=8C=BA?=
=?UTF-8?q?=E5=9D=97=E5=88=97=E8=A1=A8=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/common/component/PluginBlockList.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/packages/common/component/PluginBlockList.vue b/packages/common/component/PluginBlockList.vue
index 8e156d125..977f66633 100644
--- a/packages/common/component/PluginBlockList.vue
+++ b/packages/common/component/PluginBlockList.vue
@@ -384,15 +384,15 @@ export default {
flex-direction: column;
align-items: center;
position: relative;
- height: 106px;
+ height: 110px;
text-align: center;
user-select: none;
margin-right: 6px;
margin-bottom: 12px;
.block-item-img {
- line-height: 82px;
+ line-height: 86px;
width: 100%;
- height: 82px;
+ height: 86px;
border-radius: 4px;
background-color: var(--ti-lowcode-component-block-list-item-active-bg);
}
@@ -498,7 +498,7 @@ export default {
justify-content: center;
align-items: center;
width: 100%;
- height: 82px;
+ height: 86px;
border: 1px dashed var(--te-common-border-hover);
border-radius: 4px;
}
From ca7074a2d6173f60412710c1c7ce270f5d0ffe6e Mon Sep 17 00:00:00 2001
From: lichunn <269031597@qq.com>
Date: Fri, 27 Sep 2024 00:20:26 -0700
Subject: [PATCH 30/61] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4AI=E8=BE=93?=
=?UTF-8?q?=E5=85=A5=E6=A1=86=E8=BE=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/plugins/robot/src/Main.vue | 16 ++++++++--------
packages/theme/light/gpt-dialog.less | 2 ++
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/packages/plugins/robot/src/Main.vue b/packages/plugins/robot/src/Main.vue
index b3db167f0..77a9f107c 100644
--- a/packages/plugins/robot/src/Main.vue
+++ b/packages/plugins/robot/src/Main.vue
@@ -550,14 +550,14 @@ export default {
padding-left: 12px;
color: var(--ti-lowcode-chat-model-helper-text);
height: 40px;
- border: 2px solid;
- border-image: linear-gradient(
- to bottom right,
- var(--ti-lowcode-chat-model-button-bg-1),
- var(--ti-lowcode-chat-model-button-bg-2),
- var(--ti-lowcode-chat-model-button-bg-3)
- )
- 1;
+ border: 2px solid var(--ti-lowcode-chat-model-input-border);
+ border-radius: 8px;
+ }
+ .tiny-input__inner:hover {
+ border-color: var(--ti-lowcode-chat-model-input-border);
+ }
+ .tiny-input__inner:focus {
+ border-color: var(--ti-lowcode-chat-model-input-border);
}
clip-path: inset(0 0 round 2px);
svg {
diff --git a/packages/theme/light/gpt-dialog.less b/packages/theme/light/gpt-dialog.less
index d05ee3774..14abccd65 100644
--- a/packages/theme/light/gpt-dialog.less
+++ b/packages/theme/light/gpt-dialog.less
@@ -31,6 +31,8 @@
--ti-lowcode-chat-model-common-icon: #8a887b;
// chatGPT聊天窗输入框背景
--ti-lowcode-chat-model-input-bg: #eeeeee;
+ // chatGPT聊天窗输入框背景
+ --ti-lowcode-chat-model-input-border: rgb(129, 168, 255);
// chatGPT聊天窗发送按钮背景渐变色
--ti-lowcode-chat-model-button-bg-1: rgba(96, 140, 255, 0.8);
--ti-lowcode-chat-model-button-bg-2: rgba(169, 117, 255, 0.8);
From 8b746ec6a67fbb16d37547fa9aedae31f5836aaf Mon Sep 17 00:00:00 2001
From: lichunn <269031597@qq.com>
Date: Fri, 27 Sep 2024 20:16:18 -0700
Subject: [PATCH 31/61] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E5=8C=BA=E5=9D=97=E6=90=9C=E7=B4=A2=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/meta/block/src/BlockGroupPanel.vue | 15 +++++++++------
.../src/meta/block/src/BlockGroupTransfer.vue | 1 +
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue b/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue
index 946b28936..fcc54ac85 100644
--- a/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue
+++ b/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue
@@ -8,13 +8,16 @@
>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/packages/plugins/materials/src/meta/block/src/BlockGroupTransfer.vue b/packages/plugins/materials/src/meta/block/src/BlockGroupTransfer.vue
index 43e98d1c1..f89be61a5 100644
--- a/packages/plugins/materials/src/meta/block/src/BlockGroupTransfer.vue
+++ b/packages/plugins/materials/src/meta/block/src/BlockGroupTransfer.vue
@@ -1,6 +1,7 @@