Skip to content

Commit 7196846

Browse files
committed
fix confirm delete
Signed-off-by: zhangtianli2006 <49156174+zhangtianli2006@users.noreply.github.com>
1 parent 04b1660 commit 7196846

File tree

2 files changed

+45
-8
lines changed

2 files changed

+45
-8
lines changed

src/components/lib/confirm.vue renamed to src/components/lib/confirmDelete.vue

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,38 @@
1515
<p>Please type <strong>{{this.confirmInput}}</strong> to confirm.</p>
1616
<el-input :placeholder="'Type ' + this.confirmInput" v-model="confirmAnswer"></el-input>
1717
<div style="text-align: right; margin: 10px;">
18-
<el-button size="mini" type="text" @click="this.visible = false">Cancel</el-button>
19-
<el-button type="primary" size="mini" @click="confirmed" :disabled="!confirmAnswerCorrect">Confirm</el-button>
18+
<el-button
19+
size="mini"
20+
type="text"
21+
@click="visible = false;"
22+
>
23+
Cancel
24+
</el-button>
25+
<el-button
26+
type="primary"
27+
size="mini"
28+
@click="confirmed"
29+
:disabled="!confirmAnswerCorrect"
30+
>
31+
Confirm
32+
</el-button>
2033
</div>
21-
<el-button :type="this.buttonType" slot="reference" style="margin-left: 10px;">{{buttonName}}</el-button>
34+
<el-button
35+
:icon="this.buttonIcon"
36+
:type="this.buttonType"
37+
slot="reference"
38+
style="margin-left: 10px;"
39+
:circle="this.buttonCircle"
40+
>
41+
{{buttonName}}
42+
</el-button>
2243
</el-popover>
2344
</span>
2445
</template>
2546

2647
<script>
2748
export default {
28-
name: 'Confirm',
49+
name: 'ConfirmDelete',
2950
data() {
3051
return {
3152
visible: false,
@@ -38,6 +59,14 @@ export default {
3859
type: String,
3960
required: true
4061
},
62+
buttonIcon: {
63+
type: String,
64+
default: ''
65+
},
66+
buttonCircle: {
67+
type: Boolean,
68+
default: false
69+
},
4170
buttonType: {
4271
type: String,
4372
default: 'primary'

src/components/problem/edit.vue

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<el-card class="item">
3434
<el-button type="primary" @click="submit" :loading="buttonLoading">Submit</el-button>
3535
<el-button @click="back();">Back</el-button>
36-
<Confirm
36+
<ConfirmDelete
3737
buttonName="Delete"
3838
buttonType="danger"
3939
:buttonFunction="this.delete"
@@ -55,7 +55,15 @@
5555
<el-card class="float">
5656
<el-button type="primary" @click="submit();" icon="el-icon-check" circle />
5757
<el-button @click="back();" icon="el-icon-back" circle />
58-
<el-button type="danger">Delete</el-button>
58+
<ConfirmDelete
59+
:buttonName="null"
60+
buttonType="danger"
61+
buttonIcon="el-icon-delete"
62+
buttonCircle="true"
63+
:buttonFunction="this.delete"
64+
name="problem"
65+
:confirmInput="'#' + this.$route.params.id + '/' + this.title"
66+
/>
5967
</el-card>
6068
<el-card>
6169
<div slot="header" class="clearfix"><i class="el-icon-edit-outline" /> Name</div>
@@ -94,7 +102,7 @@
94102
<script>
95103
import apiurl from './../../apiurl';
96104
import MarkdownEditor from './../lib/MarkdownEditor.vue';
97-
import Confirm from './../lib/confirm.vue';
105+
import ConfirmDelete from './../lib/confirmDelete.vue';
98106
99107
export default {
100108
name: 'ProblemEdit',
@@ -184,7 +192,7 @@ export default {
184192
},
185193
components: {
186194
MarkdownEditor,
187-
Confirm
195+
ConfirmDelete
188196
}
189197
};
190198
</script>

0 commit comments

Comments
 (0)