lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-14 20:40:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.7' into php8

Browse Source
This commit is contained in:
xiaomlove
2022-03-31 16:43:51 +08:00
parent 8bee181c09 f91cd6f20a
commit 09350c06e2
140 changed files with 21731 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
admin/src/views/tag/form.vue
View File

@@ -7,10 +7,30 @@
<el-input v-model="formData.name" placeholder=""></el-input>
</el-form-item>
<el-form-item label="Color" prop="color">
<el-form-item label="Background color" prop="color">
<el-input v-model="formData.color" placeholder=""></el-input>
</el-form-item>
<el-form-item label="Font color" prop="font_color">
<el-input v-model="formData.font_color" placeholder=""></el-input>
</el-form-item>
<el-form-item label="Font size" prop="font_size">
<el-input v-model="formData.font_size" placeholder=""></el-input>
</el-form-item>
<el-form-item label="Padding" prop="padding">
<el-input v-model="formData.padding" placeholder=""></el-input>
</el-form-item>
<el-form-item label="Margin" prop="margin">
<el-input v-model="formData.margin" placeholder=""></el-input>
</el-form-item>
<el-form-item label="Border radius" prop="border_radius">
<el-input v-model="formData.border_radius" placeholder=""></el-input>
</el-form-item>
<el-form-item label="Priority" prop="priority">
<el-input v-model="formData.priority" placeholder="The higher the value, the higher the ranking"></el-input>
</el-form-item>
@@ -47,7 +67,12 @@ export default {
formData: {
color: '',
name: '',
priority: ''
priority: '',
font_color: '#ffffff',
font_size: '12px',
margin: 0,
padding: 0,
border_radius: 0,
},
rules: {
color: [
@@ -64,6 +89,11 @@ export default {
state.formData.name = res.data.name
state.formData.color = res.data.color
state.formData.priority = res.data.priority
state.formData.font_color = res.data.font_color
state.formData.font_size = res.data.font_size
state.formData.margin = res.data.margin
state.formData.padding = res.data.padding
state.formData.border_radius = res.data.border_radius
})
}

38
admin/src/views/tag/index.vue
View File

@@ -33,7 +33,37 @@
<el-table-column
prop="color"
label="Color"
label="Background color"
>
</el-table-column>
<el-table-column
prop="font_color"
label="Font color"
>
</el-table-column>
<el-table-column
prop="font_size"
label="Font size"
>
</el-table-column>
<el-table-column
prop="margin"
label="Margin"
>
</el-table-column>
<el-table-column
prop="padding"
label="Padding"
>
</el-table-column>
<el-table-column
prop="border_radius"
label="Border radius"
>
</el-table-column>
@@ -48,12 +78,6 @@
label="Updated at"
></el-table-column>
<el-table-column
prop="created_at"
label="Created at"
></el-table-column>
<el-table-column
label="Action"
width="120"