Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Field Layout as different components #524

Merged
merged 3 commits into from
Jan 9, 2025
Merged

refactor: Field Layout as different components #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de06ed4
build(deps): bump frappeui to 0.1.103
shariquerik Jan 9, 2025
6d0d1d1
refactor: separated Section, Column & Field as different component
shariquerik Jan 9, 2025
2c71a98
fix: hide settings in mobile view
shariquerik Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frappe-ui
Open in desktop
Submodule frappe-ui updated 15 files
+2 −2 package.json
+5 −1 src/components/FormControl.vue
+19 −18 src/components/Tabs/TabList.vue
+2 −2 src/components/Tabs/TabPanel.vue
+9 −4 src/components/Tabs/Tabs.vue
+2 −0 src/components/TextInput.vue
+1 −1 src/data-fetching/useCall/useCall.test.ts
+12 −6 src/data-fetching/useCall/useCall.ts
+4 −3 src/data-fetching/useDoc/useDoc.ts
+7 −0 src/data-fetching/useDoctype/useDoctype.ts
+7 −8 src/data-fetching/useList/types.ts
+1 −1 src/data-fetching/useList/useList.test.ts
+40 −25 src/data-fetching/useList/useList.ts
+17 −1 src/data-fetching/useNewDoc/useNewDoc.ts
+1 −4 src/mocks/handlers.ts
2 changes: 1 addition & 1 deletion frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@vueuse/core": "^10.3.0",
"@vueuse/integrations": "^10.3.0",
"feather-icons": "^4.28.0",
"frappe-ui": "^0.1.99",
"frappe-ui": "^0.1.103",
"gemoji": "^8.1.0",
"lodash": "^4.17.21",
"mime": "^4.0.1",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Activities/DataFields.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<script setup>
import EditIcon from '@/components/Icons/EditIcon.vue'
import DataFieldsModal from '@/components/Modals/DataFieldsModal.vue'
import FieldLayout from '@/components/FieldLayout.vue'
import FieldLayout from '@/components/FieldLayout/FieldLayout.vue'
import { Badge, createResource, createDocumentResource } from 'frappe-ui'
import LoadingIndicator from '@/components/Icons/LoadingIndicator.vue'
import { createToast } from '@/utils'
Expand Down
10 changes: 8 additions & 2 deletions frontend/src/components/Controls/Grid.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,13 @@
</div>
<!-- Rows -->
<template v-if="rows?.length">
<Draggable class="w-full" v-model="rows" group="rows" item-key="name">
<Draggable
class="w-full"
v-model="rows"
:delay="isTouchScreenDevice() ? 200 : 0"
group="rows"
item-key="name"
>
<template #item="{ element: row, index }">
<div
class="grid-row flex cursor-pointer items-center border-b border-outline-gray-modals bg-surface-modals last:rounded-b last:border-b-0"
Expand Down Expand Up @@ -252,7 +258,7 @@ import GridRowModal from '@/components/Controls/GridRowModal.vue'
import EditIcon from '@/components/Icons/EditIcon.vue'
import Link from '@/components/Controls/Link.vue'
import UserAvatar from '@/components/UserAvatar.vue'
import { getRandom, getFormat } from '@/utils'
import { getRandom, getFormat, isTouchScreenDevice } from '@/utils'
import { usersStore } from '@/stores/users'
import { getMeta } from '@/stores/meta'
import {
Expand Down
3 changes: 1 addition & 2 deletions frontend/src/components/Controls/GridRowFieldsModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
v-else
:tabs="tabs.data"
:data="{}"
:modal="true"
:preview="true"
/>
</div>
Expand All @@ -49,7 +48,7 @@
</Dialog>
</template>
<script setup>
import FieldLayout from '@/components/FieldLayout.vue'
import FieldLayout from '@/components/FieldLayout/FieldLayout.vue'
import FieldLayoutEditor from '@/components/FieldLayoutEditor.vue'
import { useDebounceFn } from '@vueuse/core'
import { capture } from '@/telemetry'
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Controls/GridRowModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<script setup>
import EditIcon from '@/components/Icons/EditIcon.vue'
import FieldLayout from '@/components/FieldLayout.vue'
import FieldLayout from '@/components/FieldLayout/FieldLayout.vue'
import { usersStore } from '@/stores/users'
import { createResource } from 'frappe-ui'
import { nextTick } from 'vue'
Expand Down
Loading
Loading