From 15aa4d0d38cfacd107610b845eaba7274a4e02ea Mon Sep 17 00:00:00 2001 From: Mercutio Date: Fri, 7 Apr 2023 16:05:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ .../form-designer/form-widget/index.vue | 1 - src/components/form-designer/index.vue | 18 ++++++++----- .../setting-panel/form-setting.vue | 14 ++++++++-- .../form-designer/setting-panel/index.vue | 16 +++++++++--- .../form-designer/widget-panel/index.vue | 24 ++++++++++++------ src/main.js | 3 ++- src/styles/global.scss | 21 ++++++++------- src/styles/index.scss | 3 ++- src/styles/theme/fonts/element-icons.ttf | Bin 0 -> 55956 bytes src/styles/theme/fonts/element-icons.woff | Bin 0 -> 28200 bytes src/styles/theme/index.scss | 1 + 12 files changed, 71 insertions(+), 32 deletions(-) create mode 100644 src/styles/theme/fonts/element-icons.ttf create mode 100644 src/styles/theme/fonts/element-icons.woff create mode 100644 src/styles/theme/index.scss diff --git a/.gitignore b/.gitignore index 8dcab82..de77db7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.lh + .DS_Store node_modules /dist diff --git a/src/components/form-designer/form-widget/index.vue b/src/components/form-designer/form-widget/index.vue index 90ecafb..6a130b7 100644 --- a/src/components/form-designer/form-widget/index.vue +++ b/src/components/form-designer/form-widget/index.vue @@ -259,7 +259,6 @@ .grid-cell { min-height: 30px; border-right: 1px dotted #cccccc; - } .fade-enter-active, .fade-leave-active { diff --git a/src/components/form-designer/index.vue b/src/components/form-designer/index.vue index 8ee68d3..4b41649 100644 --- a/src/components/form-designer/index.vue +++ b/src/components/form-designer/index.vue @@ -31,7 +31,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -416,12 +416,12 @@ .el-container.center-layout-container { min-width: 680px; - border-left: 2px dotted #EBEEF5; - border-right: 2px dotted #EBEEF5; + border-left: 1px solid #EBEEF5; + border-right: 1px solid #EBEEF5; } .el-header.main-header { - border-bottom: 2px dotted #EBEEF5; + border-bottom: 1px solid #EBEEF5; height: 48px !important; line-height: 48px !important; min-width: 800px; @@ -475,15 +475,19 @@ .el-header.toolbar-header { font-size: 14px; - border-bottom: 1px dotted #CCCCCC; + border-bottom: 1px solid #dddddd; height: 42px !important; //line-height: 42px !important; } - .el-aside.side-panel { + .el-aside.left-panel { width: 260px !important; overflow-y: hidden; } + .el-aside.right-panel { + // width: 320px !important; + overflow-y: hidden; + } .el-main.form-widget-main { padding: 0; diff --git a/src/components/form-designer/setting-panel/form-setting.vue b/src/components/form-designer/setting-panel/form-setting.vue index 0bc6d93..8d0a092 100644 --- a/src/components/form-designer/setting-panel/form-setting.vue +++ b/src/components/form-designer/setting-panel/form-setting.vue @@ -42,7 +42,7 @@ {{i18nt('designer.setting.addEventHandler')}} - {{i18nt('designer.setting.formSFCSetting')}} + {{i18nt('designer.setting.formSFCSetting')}} @@ -332,6 +332,10 @@ .custom-divider.el-divider--horizontal { margin: 10px 0; } + .custom-divider .el-divider__text.is-left{ + left: 5px; + padding: 0 5px 0 5px; + } } .setting-collapse { @@ -340,9 +344,15 @@ } ::v-deep .el-collapse-item__header { - font-style: italic; + background: #f2f2f4; + height: 28px; + padding: 0 10px; + // font-style: italic; font-weight: bold; } + ::v-deep .el-collapse-item__wrap { + padding: 10px; + } } .small-padding-dialog { diff --git a/src/components/form-designer/setting-panel/index.vue b/src/components/form-designer/setting-panel/index.vue index d065f3b..af98a50 100644 --- a/src/components/form-designer/setting-panel/index.vue +++ b/src/components/form-designer/setting-panel/index.vue @@ -1,6 +1,6 @@