Merge branch 'develop' into contact-page

frappe · Oct 19, 2023 · cc99d78 · cc99d78
2 parents c8b13d1 + 412565f
commit cc99d78
Show file tree

Hide file tree

Showing 8 changed files with 262 additions and 354 deletions.
diff --git a/frappe-ui b/frappe-ui
diff --git a/frontend/package.json b/frontend/package.json
@@ -16,7 +16,7 @@
     "@vueuse/integrations": "^10.3.0",
     "autoprefixer": "^10.4.14",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.6",
+    "frappe-ui": "^0.1.12",
     "pinia": "^2.0.33",
     "postcss": "^8.4.5",
     "socket.io-client": "^4.7.2",

diff --git a/frontend/src/components/ListRowItem.vue b/frontend/src/components/ListRowItem.vue
diff --git a/frontend/src/components/ListView.vue b/frontend/src/components/ListView.vue
+1 −1		package.json
+1 −1		src/components/Dialog.vue
+31 −0		src/components/ListFilter/FilterIcon.vue
+292 −0		src/components/ListFilter/ListFilter.vue
+60 −0		src/components/ListFilter/NestedPopover.vue
+85 −0		src/components/ListFilter/SearchComplete.vue
+123 −0		src/components/ListView.story.md
+200 −0		src/components/ListView.story.vue
+34 −0		src/components/ListView/ListHeader.vue
+22 −0		src/components/ListView/ListHeaderItem.vue
+68 −23		src/components/ListView/ListRow.vue
+42 −7		src/components/ListView/ListRowItem.vue
+18 −0		src/components/ListView/ListRows.vue
+86 −0		src/components/ListView/ListSelectBanner.vue
+80 −100		src/components/ListView/ListView.vue
+22 −0		src/components/ListView/utils.js
+6 −1		src/index.js
+10 −3		src/resources/documentResource.js
+10 −4		src/resources/listResource.js