Merge pull request #152 from frappe/develop

chore: merge 'develop' into 'main'
frappe · Aug 9, 2023 · ef6f36b · ef6f36b
2 parents 18cbe4e + 78af97a
commit ef6f36b
Show file tree

Hide file tree

Showing 109 changed files with 2,120 additions and 1,451 deletions.
diff --git a/frappe-ui b/frappe-ui
diff --git a/frontend/index.html b/frontend/index.html
@@ -5,6 +5,7 @@
 		<link rel="icon" href="/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<title>Frappe Insights</title>
+		<script type="text/javascript" src="https://unpkg.com/default-passive-events"></script>
 	</head>
 	<body class="h-full">
 		<div id="app" class="h-full"></div>

diff --git a/frontend/package.json b/frontend/package.json
@@ -10,6 +10,7 @@
 	},
 	"dependencies": {
 		"@codemirror/lang-javascript": "^6.0.2",
+		"@codemirror/lang-python": "^6.1.3",
 		"@codemirror/lang-sql": "^6.4.0",
 		"@playwright/test": "^1.32.1",
 		"@vitejs/plugin-vue": "^4.2.3",
@@ -19,7 +20,7 @@
 		"dayjs": "^1.11.6",
 		"echarts": "^5.4.0",
 		"feather-icons": "^4.28.0",
-		"frappe-ui": "0.1.0-alpha.5",
+		"frappe-ui": "0.1.0-alpha.11",
 		"lucide-vue-next": "^0.259.0",
 		"pinia": "^2.0.30",
 		"tailwindcss": "3.2.7",

diff --git a/frontend/src/components/AppShell.vue b/frontend/src/components/AppShell.vue
@@ -17,12 +17,12 @@
 </template>
 
 <script setup>
-import { computed, onMounted } from 'vue'
-import auth from '@/utils/auth'
 import Sidebar from '@/components/Sidebar.vue'
-import { useRoute } from 'vue-router'
+import auth from '@/utils/auth'
 import settings from '@/utils/settings'
 import systemSettings from '@/utils/systemSettings'
+import { computed, onMounted } from 'vue'
+import { useRoute } from 'vue-router'
 
 const route = useRoute()
 const hideSidebar = computed(() => {

diff --git a/frontend/src/components/Charts/BaseChart.vue b/frontend/src/components/Charts/BaseChart.vue
@@ -0,0 +1,60 @@
+<script setup>
+import * as echarts from 'echarts'
+import { onBeforeUnmount, onMounted, ref, watch } from 'vue'
+
+const props = defineProps({
+	title: { type: String, required: false },
+	subtitle: { type: String, required: false },
+	options: { type: Object, required: true },
+})
+
+let eChart = null
+const chartRef = ref(null)
+onMounted(() => {
+	eChart = echarts.init(chartRef.value, 'light', { renderer: 'svg' })
+	props.options && eChart.setOption(props.options)
+
+	const resizeObserver = new ResizeObserver(() => eChart.resize())
+	setTimeout(() => chartRef.value && resizeObserver.observe(chartRef.value), 1000)
+	onBeforeUnmount(() => chartRef.value && resizeObserver.unobserve(chartRef.value))
+})
+
+watch(
+	() => props.options,
+	() => eChart && eChart.setOption(props.options),
+	{ deep: true }
+)
+
+defineExpose({ downloadChart })
+function downloadChart() {
+	const image = new Image()
+	const type = 'png'
+	image.src = eChart.getDataURL({
+		type,
+		pixelRatio: 2,
+		backgroundColor: '#fff',
+	})
+	const link = document.createElement('a')
+	link.href = image.src
+	link.download = `${props.title}.${type}`
+	link.click()
+}
+</script>
+
+<template>
+	<div class="h-full w-full rounded p-2">
+		<div class="flex h-full w-full flex-col">
+			<div v-if="title" class="flex-shrink-0" :class="['mx-3', subtitle ? 'h-11' : 'h-6']">
+				<div class="text-lg font-normal leading-6 text-gray-800">
+					{{ title }}
+				</div>
+				<div v-if="subtitle" class="text-base font-light">
+					{{ subtitle }}
+				</div>
+			</div>
+			<div ref="chartRef" class="w-full flex-1 overflow-hidden">
+				<slot></slot>
+			</div>
+		</div>
+	</div>
+</template>
diff --git a/frontend/src/components/Charts/Chart.vue b/frontend/src/components/Charts/Chart.vue
diff --git a/frontend/src/components/Charts/ChartAxis.vue b/frontend/src/components/Charts/ChartAxis.vue
diff --git a/frontend/src/components/Charts/ChartGrid.vue b/frontend/src/components/Charts/ChartGrid.vue
diff --git a/frontend/src/components/Charts/ChartLegend.vue b/frontend/src/components/Charts/ChartLegend.vue
diff --git a/frontend/src/components/Charts/ChartSeries.vue b/frontend/src/components/Charts/ChartSeries.vue
diff --git a/frontend/src/components/Charts/ChartTooltip.vue b/frontend/src/components/Charts/ChartTooltip.vue