From 7d927866bcb39a5a5aab1b1725b69187b689146f Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Wed, 9 Nov 2022 16:04:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A1=E7=AE=97=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=8B=BE=E9=80=89=E6=A1=86=20=E7=82=B9=E5=87=BB=E6=88=91?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E5=89=8D=E7=AB=AF=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/elVisualSelect/index.vue | 2 +- frontend/src/styles/index.scss | 31 + .../views/chart/view/CalcChartFieldEdit.vue | 565 ++++++++---------- .../src/views/chart/view/ChartFieldEdit.vue | 8 +- .../src/views/dataset/data/CalcFieldEdit.vue | 27 +- frontend/src/views/dataset/data/FieldEdit.vue | 15 +- 6 files changed, 287 insertions(+), 361 deletions(-) diff --git a/frontend/src/components/elVisualSelect/index.vue b/frontend/src/components/elVisualSelect/index.vue index 682115ecca..299c20ad56 100644 --- a/frontend/src/components/elVisualSelect/index.vue +++ b/frontend/src/components/elVisualSelect/index.vue @@ -171,7 +171,7 @@ export default { this.options = this.newList.slice(0, this.maxLength) }, customInputStyle() { - if (!this.$parent.$parent.handlerInputStyle) return + if (!this.$parent.$parent.handlerInputStyle || !this.$refs.visualSelect) return handlerInputStyle(this.$refs.visualSelect.$el.querySelector('.el-input__inner'), this.$parent.element.style) handlerInputStyle(this.$refs.visualSelect.$el.querySelector('.el-select__input'), { wordColor: this.$parent.element.style.wordColor }) }, diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index 3b1b8cfb1d..22bf035642 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -1657,4 +1657,35 @@ div:focus { right: 12px; top: 9px; } +} + +.de-center-dialog { + .el-dialog { + margin: 0 !important; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + } +} +.calcu-field { + .calcu-cont { + display: flex; + justify-content: space-between; + } + .codemirror { + height: 250px; + overflow-y: auto; + width: 100%; + border: 1px solid #bbbfc4; + border-radius: 4px; + } + .codemirror .CodeMirror-scroll { + height: 250px; + overflow-y: auto; + } + + .mb8 { + margin-bottom: 8px; + display: inline-block; + } } \ No newline at end of file diff --git a/frontend/src/views/chart/view/CalcChartFieldEdit.vue b/frontend/src/views/chart/view/CalcChartFieldEdit.vue index 6f8af6562a..b4fd101f40 100644 --- a/frontend/src/views/chart/view/CalcChartFieldEdit.vue +++ b/frontend/src/views/chart/view/CalcChartFieldEdit.vue @@ -1,29 +1,29 @@