Skip to content

Commit

Permalink
fix: 修复表单设计器上方按钮css丢失bug
Browse files Browse the repository at this point in the history
  • Loading branch information
BoBoooooo committed Mar 12, 2021
1 parent 3ed8e4e commit 845defa
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@
"last 2 versions"
],
"dependencies": {
"@vue/composition-api": "^1.0.0-rc.1",
"echarts": "^4.8.0"
"@vue/composition-api": "^1.0.0-rc.1"
}
}
12 changes: 7 additions & 5 deletions src/component/form-designer/src/FormDesigner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
<el-button
type="primary"
size="small"
class="button"
icon="el-icon-picture-outline"
@click="changeMode('design')"
:class="{
Expand All @@ -62,6 +63,7 @@
<el-button
type="primary"
size="small"
class="button"
icon="el-icon-view"
@click="changeMode('preview')"
:class="{
Expand All @@ -70,16 +72,16 @@
>预览模式</el-button
>
<el-divider direction="vertical"></el-divider>
<el-button type="primary" size="small" icon="el-icon-upload2" @click="handleUpload">导入JSON</el-button>
<el-button type="primary" size="small" icon="el-icon-tickets" @click="handleGenerateJson">生成JSON</el-button>
<el-button type="primary" size="small" icon="el-icon-document" @click="handleGenerateCode">生成代码</el-button>
<el-button type="danger" size="small" icon="el-icon-delete" @click="handleClear">清空</el-button>
<el-button class="button" type="primary" size="small" icon="el-icon-upload2" @click="handleUpload">导入JSON</el-button>
<el-button class="button" type="primary" size="small" icon="el-icon-tickets" @click="handleGenerateJson">生成JSON</el-button>
<el-button class="button" type="primary" size="small" icon="el-icon-document" @click="handleGenerateCode">生成代码</el-button>
<el-button class="button" type="danger" size="small" icon="el-icon-delete" @click="handleClear">清空</el-button>
<el-tooltip placement="bottom" effect="dark">
<div slot="content">
需传入getFormKey方法,详见文档
</div>
<div style="display: inline-block">
<el-button type="normal" size="small" icon="el-icon-attract" :disabled="!(allTables && getFormKey)" @click="formVisible = true">自动绑定</el-button>
<el-button class="button" type="normal" size="small" icon="el-icon-attract" :disabled="!(allTables && getFormKey)" @click="formVisible = true">自动绑定</el-button>
</div>
</el-tooltip>
<slot name="custom-btn"></slot>
Expand Down
3 changes: 2 additions & 1 deletion src/component/form-designer/src/styles/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,8 @@ $primary-background-color: #ecf5ff;
// flex-direction: column;
align-items: center;
justify-content: center;
/deep/.el-button {
.button {
background: black;
margin-right: 5px;
background: none !important;
border: none !important;
Expand Down

0 comments on commit 845defa

Please sign in to comment.