bfg-common 1.5.200 → 1.5.202

package/components/common/monitor/advanced/graphView/GraphView.vue

@@ -1,178 +1,145 @@
-<template>
-  <div ref="chartsView">
-    <common-monitor-advanced-graph-view-new
-      v-if="isNewView"
-      :loading="props.loading"
-      :is-loading="isLoading"
-      :chart-data="chartData"
-      :chart="chart"
-      :chart-helper="chartHelper"
-      :export-type="props.export"
-      :selected-row="props.selectedRow"
-    />
-    <common-monitor-advanced-graph-view-old
-      v-else
-      :loading="props.loading"
-      :is-loading="isLoading"
-      :chart-data="chartData"
-      :chart="chart"
-      :chart-helper="chartHelper"
-      :export-type="props.export"
-      :selected-row="props.selectedRow"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import type {
-  I_LineGraph,
-  I_SeriesLine,
-} from 'bfg-nuxt-3-graph/graph/lib/models/interfaces'
-import { useDebounceFn, useElementSize } from '@vueuse/core'
-import { graphDataFunc } from 'bfg-nuxt-3-graph/graph/lib/utils/renderGraph'
-import { format } from 'date-fns'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const props = defineProps<{
-  loading: boolean
-  data: I_SeriesLine | null
-  export: string
-  selectedRow: number[]
-  darkMode: boolean
-  language: string
-  selectedChartType: string
-}>()
-const emits = defineEmits<{
-  (event: 'open-advanced-page'): void
-}>()
-
-const { $store, $formattedDatetime, $getDateFormat }: any = useNuxtApp()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const isLoading = ref<boolean>(true)
-
-const chartData = ref<I_LineGraph | null>(null)
-
-const isFullScreen = ref<boolean>(false)
-const chart = ref<any>(null)
-const chartHelper = ref<number>(0)
-
-const fullScreenCallBack = (newValue: boolean): void => {
-  isFullScreen.value = newValue
-}
-
-const chartCallback = (newValue: any): void => {
-  newValue && (chart.value = newValue)
-}
-
-const newTabCallback = (newValue: boolean): void => {
-  newValue && emits('open-advanced-page')
-}
-
-watch(
-  chart,
-  (newValue) => {
-    isLoading.value = !newValue?.hasLoaded
-  },
-  { immediate: true, deep: true }
-)
-
-let dateFormat = ''
-
-const chartsView = ref(null)
-const { width } = useElementSize(chartsView)
-
-const startChart = useDebounceFn(() => {
-  if (!props.data || !width.value) return
-
-  chartData.value = graphDataFunc({
-    fullScreenCallBack,
-    format,
-    graphData: props.data,
-    isDarkMode: props.darkMode,
-    localization: localization.value,
-    disabledTitle: isNewView.value,
-    disabledExportButton: !isNewView.value,
-    disabledLegends: false,
-    graphType: props.selectedChartType,
-    width: Math.floor(width.value),
-    chartCallBack: chartCallback,
-    formattedDatetime: $formattedDatetime,
-    formatDate: dateFormat,
-    isNewView: isNewView.value,
-    isShowLinkNewWindow: true,
-    newTabCallBack: newTabCallback,
-  })
-
-  chartHelper.value++
-}, 1000)
-
-watch(
-  () => props.data,
-  (newValue) => {
-    if (!newValue) {
-      isLoading.value = true
-      return
-    }
-
-    startChart()
-  },
-  { immediate: true }
-)
-
-watch(
-  () => props.darkMode,
-  () => {
-    startChart()
-  }
-)
-
-watch(
-  () => props.language,
-  () => {
-    dateFormat = $getDateFormat(props.language)
-    startChart()
-  }
-)
-
-watch(
-  () => props.selectedChartType,
-  () => {
-    startChart()
-  },
-  { immediate: true }
-)
-
-watch(width, (newValue) => {
-  if (newValue) startChart()
-
-  if (!chart.value?.isResizing) return
-
-  chart.value.setSize(1, chart.chartHeight)
-
-  if (isFullScreen.value) {
-    chart.value.setSize(window.innerWidth, chart.chartHeight)
-    return
-  }
-
-  setTimeout(() => {
-    chart.value.setSize(newValue, chart.chartHeight)
-  }, 1000)
-})
-
-const exportType = ref<string>('')
-watch(
-  () => props.export,
-  (newValue) => {
-    if (!newValue) return
-
-    exportType.value = newValue
-  },
-  { immediate: true }
-)
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <div ref="chartsView">
+    <common-monitor-advanced-graph-view-new
+      v-if="isNewView"
+      :loading="props.loading"
+      :is-loading="isLoading"
+      :chart-data="chartData"
+      :chart="chart"
+      :chart-helper="chartHelper"
+      :export-type="props.export"
+      :selected-row="props.selectedRow"
+    />
+    <common-monitor-advanced-graph-view-old
+      v-else
+      :loading="props.loading"
+      :is-loading="isLoading"
+      :chart-data="chartData"
+      :chart="chart"
+      :chart-helper="chartHelper"
+      :export-type="props.export"
+      :selected-row="props.selectedRow"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import type {
+  I_LineGraph,
+  I_SeriesLine,
+} from 'bfg-nuxt-3-graph/graph/lib/models/interfaces'
+import { useDebounceFn, useElementSize } from '@vueuse/core'
+import { graphDataFunc } from 'bfg-nuxt-3-graph/graph/lib/utils/renderGraph'
+import { format } from 'date-fns'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  loading: boolean
+  data: I_SeriesLine | null
+  export: string
+  selectedRow: number[]
+  darkMode: boolean
+  language: string
+  selectedChartType: string
+}>()
+const emits = defineEmits<{
+  (event: 'open-advanced-page'): void
+}>()
+
+const { $store, $formattedDatetime, $getDateFormat }: any = useNuxtApp()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const isLoading = ref<boolean>(true)
+
+const chartData = ref<I_LineGraph | null>(null)
+
+const chart = ref<any>(null)
+const chartHelper = ref<number>(0)
+
+const chartCallback = (newValue: any): void => {
+  newValue && (chart.value = newValue)
+}
+
+const newTabCallback = (newValue: boolean): void => {
+  newValue && emits('open-advanced-page')
+}
+
+watch(
+  chart,
+  (newValue) => {
+    newValue?.hasLoaded && (isLoading.value = false)
+  },
+  { immediate: true, deep: true }
+)
+
+let dateFormat = ''
+
+const chartsView = ref(null)
+const { width } = useElementSize(chartsView)
+
+const startChart = useDebounceFn(() => {
+  if (!props.data || !width.value) return
+
+  chartData.value = graphDataFunc({
+    fullScreenCallBack: () => ({}),
+    format,
+    graphData: props.data,
+    isDarkMode: props.darkMode,
+    localization: localization.value,
+    disabledTitle: isNewView.value,
+    disabledExportButton: !isNewView.value,
+    disabledLegends: false,
+    graphType: props.selectedChartType,
+    width: Math.floor(width.value),
+    chartCallBack: chartCallback,
+    formattedDatetime: $formattedDatetime,
+    formatDate: dateFormat,
+    isNewView: isNewView.value,
+    isShowLinkNewWindow: true,
+    newTabCallBack: newTabCallback,
+  })
+
+  chartHelper.value++
+}, 1000)
+
+watch(
+  () => props.data,
+  (newValue) => {
+    if (!newValue) {
+      isLoading.value = true
+      return
+    }
+
+    startChart()
+  },
+  { immediate: true }
+)
+
+watch(
+  () => props.darkMode,
+  () => {
+    startChart()
+  }
+)
+
+watch(
+  () => props.language,
+  () => {
+    dateFormat = $getDateFormat(props.language)
+    startChart()
+  }
+)
+
+watch(
+  () => props.selectedChartType,
+  () => {
+    startChart()
+  },
+  { immediate: true }
+)
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/monitor/advanced/graphView/GraphViewOld.vue

@@ -1,56 +1,56 @@
-<template>
-  <div class="advanced-graph-container">
-    <div v-if="props.isLoading" class="graphic-loader-block">
-      <div class="spinner"></div>
-      <p>{{ localization.inventoryMonitor.retrievingData }}...</p>
-    </div>
-    <template v-if="!props.loading && props.chartData">
-      <common-graph
-        :chart="props.chart"
-        :data="props.chartData"
-        :update="props.chartHelper"
-        :export-type="props.exportType"
-        :selected-row="props.selectedRow"
-      />
-    </template>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { I_LineGraph } from '~/node_modules/bfg-nuxt-3-graph/graph/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const props = defineProps<{
-  loading: boolean
-  isLoading: boolean
-  chartData: I_LineGraph | null
-  chart: any
-  chartHelper: number
-  exportType: string
-  selectedRow: number[]
-}>()
-</script>
-
-<style scoped lang="scss">
-.advanced-graph-container {
-  position: relative;
-  min-height: 400px;
-
-  .graphic-loader-block {
-    background-color: var(--loader-bg-color);
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: var(--z-fixed);
-  }
-}
-</style>
+<template>
+  <div class="advanced-graph-container">
+    <div v-if="props.isLoading" class="graphic-loader-block">
+      <div class="spinner"></div>
+      <p>{{ localization.inventoryMonitor.retrievingData }}...</p>
+    </div>
+    <template v-if="!props.loading && props.chartData">
+      <common-graph
+        :chart="props.chart"
+        :data="props.chartData"
+        :update="props.chartHelper"
+        :export-type="props.exportType"
+        :selected-row="props.selectedRow"
+      />
+    </template>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { I_LineGraph } from '~/node_modules/bfg-nuxt-3-graph/graph/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const props = defineProps<{
+  loading: boolean
+  isLoading: boolean
+  chartData: I_LineGraph | null
+  chart: any
+  chartHelper: number
+  exportType: string
+  selectedRow: number[]
+}>()
+</script>
+
+<style scoped lang="scss">
+.advanced-graph-container {
+  position: relative;
+  min-height: 400px;
+
+  .graphic-loader-block {
+    background-color: var(--loader-bg-color);
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: var(--z-fixed);
+  }
+}
+</style>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.200",
+  "version": "1.5.202",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -16,6 +16,7 @@
     "@vueuse/core": "10.1.2",
     "@vueuse/nuxt": "10.1.2",
     "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-myrules": "file:./eslint",
     "nuxt": "3.11.2",
     "prettier": "2.7.1",
     "sass": "^1.54.9",
@@ -27,15 +28,15 @@
     "xterm-addon-fit": "^0.7.0",
     "xterm-addon-serialize": "^0.9.0",
     "xterm-addon-unicode11": "^0.5.0",
-    "xterm-addon-web-links": "^0.8.0",
-    "eslint-plugin-myrules": "file:./eslint"
+    "xterm-addon-web-links": "^0.8.0"
   },
   "dependencies": {
     "@nuxtjs/eslint-config-typescript": "^12.0.0",
     "@vueuse/components": "^10.1.2",
-    "date-fns": "^2.29.3",
     "bfg-nuxt-3-graph": "1.0.26",
     "bfg-uikit": "1.0.430",
+    "date-fns": "^2.29.3",
+    "highcharts": "^12.2.0",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }