mirror of
https://github.com/frappe/books.git
synced 2024-12-23 03:19:01 +00:00
fix: Minor fixes
- Placeholder in Setup Wizard - Import frappe-chart styles - Destroy popper if it exists - Placeholder for Date
This commit is contained in:
parent
e8370aa8ab
commit
3a72dc6d0d
@ -55,6 +55,7 @@ module.exports = {
|
|||||||
{
|
{
|
||||||
fieldname: 'fiscalYearStart',
|
fieldname: 'fiscalYearStart',
|
||||||
label: 'Fiscal Year Start Date',
|
label: 'Fiscal Year Start Date',
|
||||||
|
placeholder: 'Fiscal Year Start Date',
|
||||||
fieldtype: 'Date',
|
fieldtype: 'Date',
|
||||||
formula: doc => {
|
formula: doc => {
|
||||||
if (!doc.country) return;
|
if (!doc.country) return;
|
||||||
@ -72,6 +73,7 @@ module.exports = {
|
|||||||
{
|
{
|
||||||
fieldname: 'fiscalYearEnd',
|
fieldname: 'fiscalYearEnd',
|
||||||
label: 'Fiscal Year End Date',
|
label: 'Fiscal Year End Date',
|
||||||
|
placeholder: 'Fiscal Year End Date',
|
||||||
fieldtype: 'Date',
|
fieldtype: 'Date',
|
||||||
formula: doc => {
|
formula: doc => {
|
||||||
if (!doc.country) return;
|
if (!doc.country) return;
|
||||||
@ -111,7 +113,7 @@ module.exports = {
|
|||||||
'country',
|
'country',
|
||||||
'currency',
|
'currency',
|
||||||
'fiscalYearStart',
|
'fiscalYearStart',
|
||||||
'fiscalYearEnd',
|
'fiscalYearEnd'
|
||||||
],
|
],
|
||||||
|
|
||||||
layout: {
|
layout: {
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import './styles/index.css';
|
import './styles/index.css';
|
||||||
|
import 'frappe-charts/dist/frappe-charts.min.css';
|
||||||
import frappe from 'frappejs';
|
import frappe from 'frappejs';
|
||||||
import Desk from './pages/Desk';
|
import Desk from './pages/Desk';
|
||||||
import SetupWizard from './pages/SetupWizard/SetupWizard';
|
import SetupWizard from './pages/SetupWizard/SetupWizard';
|
||||||
|
@ -6,7 +6,10 @@
|
|||||||
{{ formatValue ? formatValue(value) : value }}
|
{{ formatValue ? formatValue(value) : value }}
|
||||||
</span>
|
</span>
|
||||||
<span class="text-gray-600" v-else>
|
<span class="text-gray-600" v-else>
|
||||||
{{ placeholder }}
|
<template v-if="placeholder">
|
||||||
|
{{ placeholder }}
|
||||||
|
</template>
|
||||||
|
<span v-else v-html="' '"></span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@ -42,6 +45,7 @@
|
|||||||
<div
|
<div
|
||||||
class="w-6 h-6 mr-1 last:mr-0 flex-center text-center"
|
class="w-6 h-6 mr-1 last:mr-0 flex-center text-center"
|
||||||
v-for="d in ['S', 'M', 'T', 'W', 'T', 'F', 'S']"
|
v-for="d in ['S', 'M', 'T', 'W', 'T', 'F', 'S']"
|
||||||
|
:key="d"
|
||||||
>
|
>
|
||||||
{{ d }}
|
{{ d }}
|
||||||
</div>
|
</div>
|
||||||
@ -74,14 +78,12 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import Popover from '../Popover';
|
import Popover from '../Popover';
|
||||||
import Row from '../Row';
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'DatePicker',
|
name: 'DatePicker',
|
||||||
props: ['value', 'placeholder', 'readonly', 'formatValue'],
|
props: ['value', 'placeholder', 'readonly', 'formatValue'],
|
||||||
components: {
|
components: {
|
||||||
Popover,
|
Popover
|
||||||
Row
|
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
@ -47,7 +47,7 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
beforeDestroy() {
|
beforeDestroy() {
|
||||||
this.popper.destroy();
|
this.popper && this.popper.destroy();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
setupPopper() {
|
setupPopper() {
|
||||||
|
@ -2,13 +2,17 @@
|
|||||||
<div class="py-10 flex-1 bg-white window-drag">
|
<div class="py-10 flex-1 bg-white window-drag">
|
||||||
<div class="px-12">
|
<div class="px-12">
|
||||||
<h1 class="text-2xl font-semibold">{{ _('Setup your organization') }}</h1>
|
<h1 class="text-2xl font-semibold">{{ _('Setup your organization') }}</h1>
|
||||||
<p class="text-gray-600">{{ _('These settings can be changed later') }}</p>
|
<p class="text-gray-600">
|
||||||
|
{{ _('These settings can be changed later') }}
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="px-8 mt-5">
|
<div class="px-8 mt-5">
|
||||||
<TwoColumnForm :fields="fields" :doc="doc" />
|
<TwoColumnForm :fields="fields" :doc="doc" />
|
||||||
</div>
|
</div>
|
||||||
<div class="px-8 flex justify-end mt-5">
|
<div class="px-8 flex justify-end mt-5">
|
||||||
<Button @click="submit" type="primary" class="text-white text-sm">{{ _('Next') }}</Button>
|
<Button @click="submit" type="primary" class="text-white text-sm">
|
||||||
|
{{ _('Next') }}
|
||||||
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
Loading…
Reference in New Issue
Block a user