sean/manja_ui_dev
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: fix Forms and Switches bugs

Browse Source
This commit is contained in:
woothu
2019-04-05 12:53:57 +02:00
parent d5a0511652
commit d938bd4b9b
2 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/base/Forms.vue
+27 -27
View File
@@ -187,7 +187,7 @@
:custom="key > 1" :custom="key > 1"
:name="`Option 1${key}`" :name="`Option 1${key}`"
:checked="Math.random() > 0.6" :checked="Math.random() > 0.6"
:class="key % 2 === 1 ? 'form-check-inline' : ''" :inline="key % 2 === 1"
/> />
</CCol> </CCol>
</div> </div>
@@ -207,7 +207,7 @@
:custom="key > 1" :custom="key > 1"
:name="`Option 1${key}`" :name="`Option 1${key}`"
checked="Option 1" checked="Option 1"
:class="key % 2 === 1 ? 'form-check-inline' : ''" :inline="key % 2 === 1"
/> />
</CCol> </CCol>
</div> </div>
@@ -474,18 +474,18 @@
<CCardBody> <CCardBody>
<CFormInput <CFormInput
placeholder="Username" placeholder="Username"
prepend="<i class='fa fa-user'></i>" prependHtml="<i class='fa fa-user'></i>"
/> />
<CFormInput <CFormInput
type="email" type="email"
placeholder="Email" placeholder="Email"
autocomplete="email" autocomplete="email"
append="<i class='fa fa-envelope-o'></i>" appendHtml="<i class='fa fa-envelope-o'></i>"
/> />
<CFormInput <CFormInput
prepend="<i class='fa fa-euro'></i>" prependHtml="<i class='fa fa-euro'></i>"
placeholder="ex. $1.000.000" placeholder="ex. $1.000.000"
append=".00" appendHtml=".00"
/> />
</CCardBody> </CCardBody>
<CCardFooter> <CCardFooter>
@@ -542,7 +542,7 @@
<CFormInput placeholder="Username"> <CFormInput placeholder="Username">
<template #prepend> <template #prepend>
<CDropdown <CDropdown
buttonContent="Action" buttonHtml="Action"
variant="primary" variant="primary"
> >
<CDropdownItem>Action</CDropdownItem> <CDropdownItem>Action</CDropdownItem>
@@ -559,7 +559,7 @@
> >
<template #append> <template #append>
<CDropdown <CDropdown
buttonContent="Action" buttonHtml="Action"
variant="primary" variant="primary"
right right
> >
@@ -574,7 +574,7 @@
<template #prepend> <template #prepend>
<CDropdown <CDropdown
buttonContent="Split" buttonHtml="Split"
variant="primary" variant="primary"
split split
> >
@@ -587,7 +587,7 @@
<template #append> <template #append>
<CDropdown <CDropdown
buttonContent="Action" buttonHtml="Action"
variant="primary" variant="primary"
right right
> >
@@ -674,20 +674,20 @@
<CCardBody> <CCardBody>
<CForm> <CForm>
<CFormInput <CFormInput
prepend="Username" prependHtml="Username"
append="<i class='fa fa-user'></i>" appendHtml="<i class='fa fa-user'></i>"
/> />
<CFormInput <CFormInput
prepend="Email" prependHtml="Email"
type="email" type="email"
autocomplete="email" autocomplete="email"
append="<i class='fa fa-envelope'></i>" appendHtml="<i class='fa fa-envelope'></i>"
/> />
<CFormInput <CFormInput
prepend="Password" prependHtml="Password"
type="password" type="password"
autocomplete="current-password" autocomplete="current-password"
append="<i class='fa fa-asterisk'></i>" appendHtml="<i class='fa fa-asterisk'></i>"
/> />
<div class="form-group form-actions"> <div class="form-group form-actions">
<CButton type="submit" size="sm" variant="primary">Submit</CButton> <CButton type="submit" size="sm" variant="primary">Submit</CButton>
@@ -705,19 +705,19 @@
<CForm> <CForm>
<CFormInput <CFormInput
placeholder="Username" placeholder="Username"
append="<i class='fa fa-user'></i>" appendHtml="<i class='fa fa-user'></i>"
/> />
<CFormInput <CFormInput
placeholder="Email" placeholder="Email"
type="email" type="email"
autocomplete="email" autocomplete="email"
append="<i class='fa fa-envelope'></i>" appendHtml="<i class='fa fa-envelope'></i>"
/> />
<CFormInput <CFormInput
placeholder="Password" placeholder="Password"
type="password" type="password"
autocomplete="current-password" autocomplete="current-password"
append="<i class='fa fa-asterisk'></i>" appendHtml="<i class='fa fa-asterisk'></i>"
/> />
<div class="form-group form-actions"> <div class="form-group form-actions">
<CButton type="submit" class="btn btn-sm btn-secondary">Submit</CButton> <CButton type="submit" class="btn btn-sm btn-secondary">Submit</CButton>
@@ -735,19 +735,19 @@
<CForm> <CForm>
<CFormInput <CFormInput
placeholder="Username" placeholder="Username"
prepend="<i class='fa fa-user'></i>" prependHtml="<i class='fa fa-user'></i>"
/> />
<CFormInput <CFormInput
placeholder="Email" placeholder="Email"
type="email" type="email"
autocomplete="email" autocomplete="email"
prepend="<i class='fa fa-envelope'></i>" prependHtml="<i class='fa fa-envelope'></i>"
/> />
<CFormInput <CFormInput
placeholder="Password" placeholder="Password"
type="password" type="password"
autocomplete="current-password" autocomplete="current-password"
prepend="<i class='fa fa-asterisk'></i>" prependHtml="<i class='fa fa-asterisk'></i>"
/> />
<div class="form-group form-actions"> <div class="form-group form-actions">
<CButton type="submit" size="sm" variant="success">Submit</CButton> <CButton type="submit" size="sm" variant="success">Submit</CButton>
@@ -782,20 +782,20 @@
<CCardBody> <CCardBody>
<CFormInput <CFormInput
label="Prepended text" label="Prepended text"
prepend="@" prependHtml="@"
description="Here's some help text" description="Here's some help text"
type="email" type="email"
autocomplete="email" autocomplete="email"
/> />
<CFormInput <CFormInput
label="Appended text" label="Appended text"
append=".00" appendHtml=".00"
description="Here's some help text" description="Here's some help text"
/> />
<CFormInput <CFormInput
label="Appended text" label="Appended and prepended text"
prepend="$" prependHtml="$"
append=".00" appendHtml=".00"
description="Here's some help text" description="Here's some help text"
/> />
<CFormInput <CFormInput
src/views/base/Switches.vue
+15 -7
View File
@@ -1,6 +1,5 @@
<template> <template>
<div class="animated fadeIn"> <div class="animated fadeIn">
<CRow> <CRow>
<CCol xs="12" md="6"> <CCol xs="12" md="6">
<CCard v-if="true"> <CCard v-if="true">
@@ -12,6 +11,14 @@
</h5> </h5>
</CCardHeader> </CCardHeader>
<CCardBody> <CCardBody>
<!-- <CSwitch
:checked.sync="test11"
trueValue="yes"
falseValue="no"
id="alt"
name="lg"
required
/> -->
<!-- <CSwitch class="mx-1" variant="primary" shape="3d" outline="alt" v-bind="labelIcon" type="radio" name="radio" checked.sync="radio" trueValue="primary"/> --> <!-- <CSwitch class="mx-1" variant="primary" shape="3d" outline="alt" v-bind="labelIcon" type="radio" name="radio" checked.sync="radio" trueValue="primary"/> -->
<CSwitch class="mx-1" <CSwitch class="mx-1"
:key="key" :key="key"
@@ -368,7 +375,7 @@
Switch <small><code>label</code></small> Switch <small><code>label</code></small>
</CCardHeader> </CCardHeader>
<CCardBody> <CCardBody>
<CSwitch class="mx-1" variant="primary" checked dataOn="" dataOff=""/> <CSwitch class="mx-1" variant="primary" checked v-bind="labelIcon"/>
<CSwitch class="mx-1" variant="secondary" checked v-bind="labelIcon" /> <CSwitch class="mx-1" variant="secondary" checked v-bind="labelIcon" />
<CSwitch class="mx-1" variant="success" checked v-bind="labelIcon" /> <CSwitch class="mx-1" variant="success" checked v-bind="labelIcon" />
<CSwitch class="mx-1" variant="warning" checked v-bind="labelIcon" /> <CSwitch class="mx-1" variant="warning" checked v-bind="labelIcon" />
@@ -526,13 +533,14 @@ export default {
checker: 'yes', checker: 'yes',
radio: 'primary', radio: 'primary',
labelIcon: { labelIcon: {
dataOn: '\u2713', labelOn: '\u2713',
dataOff: '\u2715' labelOff: '\u2715'
}, },
labelTxt: { labelTxt: {
dataOn: 'yes', labelOn: 'yes',
dataOff: 'no' labelOff: 'no'
} },
} }
} }
} }