-
- %
-
+ />
+
@@ -160,16 +158,19 @@ onUnmounted(() => {
}
.scale-input-number {
- height: 28px;
- width: 80px !important;
+ height: 24px;
+ line-height: 24px;
+ width: 80px;
margin-right: 16px;
- input {
- -webkit-appearance: none;
- -moz-appearance: textfield;
- &::-webkit-inner-spin-button,
- &::-webkit-outer-spin-button {
- -webkit-appearance: none;
+ :deep(.ed-input__wrapper) {
+ position: relative;
+ padding: 0 38px 0 8px;
+ &::after {
+ position: absolute;
+ content: '%';
+ right: 35px;
+ top: 1px;
}
}
}
diff --git a/core/core-frontend/src/custom-component/v-query/Time.vue b/core/core-frontend/src/custom-component/v-query/Time.vue
index e15a1fa556..085df88b69 100644
--- a/core/core-frontend/src/custom-component/v-query/Time.vue
+++ b/core/core-frontend/src/custom-component/v-query/Time.vue
@@ -14,7 +14,6 @@ import 'vant/es/popup/style'
import 'vant/es/date-picker/style'
import 'vant/es/picker-group/style'
import 'vant/es/time-picker/style'
-import { Icon } from '@/components/icon-custom'
interface SelectConfig {
selectValue: any
diff --git a/core/core-frontend/src/layout/components/AiTips.vue b/core/core-frontend/src/layout/components/AiTips.vue
index b419cb3723..2131f2f83f 100644
--- a/core/core-frontend/src/layout/components/AiTips.vue
+++ b/core/core-frontend/src/layout/components/AiTips.vue
@@ -42,6 +42,7 @@ onMounted(() => {
.ai-popper-tips {
z-index: 10001 !important;
padding: 24px !important;
+ box-shadow: none;
background: var(--ed-color-primary) !important;
.ed-popper__arrow::before {
border: 1px solid var(--ed-color-primary) !important;
@@ -67,6 +68,7 @@ onMounted(() => {
line-height: 22px;
text-align: right;
button {
+ border-color: #ffffff !important;
font-weight: 500;
color: rgba(51, 112, 255, 1) !important;
}
diff --git a/core/core-frontend/src/layout/components/CollapseBar.vue b/core/core-frontend/src/layout/components/CollapseBar.vue
new file mode 100644
index 0000000000..51f51598ff
--- /dev/null
+++ b/core/core-frontend/src/layout/components/CollapseBar.vue
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+ {{ !isCollapse ? '收起导航' : '' }}
+
+
+
+
diff --git a/core/core-frontend/src/layout/components/Menu.vue b/core/core-frontend/src/layout/components/Menu.vue
index 31f9faa6e0..0847ad7969 100644
--- a/core/core-frontend/src/layout/components/Menu.vue
+++ b/core/core-frontend/src/layout/components/Menu.vue
@@ -1,5 +1,5 @@
@@ -22,10 +27,22 @@ const toolboxMenu = computed(() => route.path.includes('toolbox'))
/>
-
+
+
+
+
+
+
route.path.includes('toolbox'))
.layout-container {
.layout-sidebar {
height: calc(100vh - 56px);
+ position: relative;
+ &::after {
+ content: '';
+ width: 100%;
+ height: 1px;
+ background: #1f232926;
+ position: absolute;
+ bottom: 48px;
+ left: 0;
+ }
+ }
+
+ .layout-sidebar-collapse {
+ width: 64px;
}
.org-config-center {
diff --git a/core/core-frontend/src/models/chart/chart-attr.d.ts b/core/core-frontend/src/models/chart/chart-attr.d.ts
index 77065335b0..cd2f745c11 100644
--- a/core/core-frontend/src/models/chart/chart-attr.d.ts
+++ b/core/core-frontend/src/models/chart/chart-attr.d.ts
@@ -710,6 +710,8 @@ declare interface MapCfg {
* 象限属性
*/
declare interface QuadrantAttr {
+ xBaseline?: number
+ yBaseline?: number
lineStyle: QuadrantLineStyle
regionStyle: QuadrantCommonStyle[]
labels: QuadrantLabelConf[]
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
index 9e2d5548e5..4e985b3d23 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
@@ -804,7 +804,7 @@ onMounted(() => {
v-model="state.basicStyleForm.topNLabel"
size="small"
:maxlength="50"
- @blur="changeBasicStyle('topNLabel')"
+ @change="changeBasicStyle('topNLabel')"
/>
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/QuadrantSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/QuadrantSelector.vue
index 0ca30cc76b..aa1e548edc 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/QuadrantSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/QuadrantSelector.vue
@@ -1,8 +1,13 @@