vue2-client 1.18.14 → 1.18.15

package/package.json

@@ -1,112 +1,112 @@
-{
-  "name": "vue2-client",
-  "version": "1.18.14",
-  "private": false,
-  "scripts": {
-    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
-    "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
-    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
-    "serve:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
-    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
-    "serve:iot": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode iot",
-    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
-    "serve:runtime": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode runtime",
-    "serve:message": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode message",
-    "serve:apply": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode apply",
-    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
-    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint",
-    "build:preview": "vue-cli-service build --mode preview",
-    "lint:nofix": "vue-cli-service lint --no-fix",
-    "test": "jest"
-  },
-  "dependencies": {
-    "@afwenming123/vue-easy-tree": "^1.0.1",
-    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/data-set": "^0.11.8",
-    "@antv/g2plot": "^2.4.31",
-    "@hufe921/canvas-editor": "^0.9.49",
-    "@microsoft/fetch-event-source": "^2.0.1",
-    "@vue/babel-preset-jsx": "^1.4.0",
-    "animate.css": "^4.1.1",
-    "ant-design-vue": "^1.7.8",
-    "axios": "^0.27.2",
-    "clipboard": "^2.0.11",
-    "core-js": "^3.33.0",
-    "crypto-js": "^4.1.1",
-    "date-fns": "^2.29.3",
-    "default-passive-events": "^2.0.0",
-    "dotenv": "^16.3.1",
-    "echarts": "^5.5.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^11.7.0",
-    "html2canvas": "^1.4.1",
-    "js-base64": "^3.7.5",
-    "js-cookie": "^2.2.1",
-    "jsencrypt": "^3.3.2",
-    "jspdf": "^2.5.1",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.debounce": "^4",
-    "lodash.get": "^4.4.2",
-    "marked": "^4",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "qs": "^6.11.2",
-    "regenerator-runtime": "^0.14.0",
-    "splitpanes": "^2.4.1",
-    "videojs-contrib-hls": "^5.15.0",
-    "viser-vue": "^2.4.8",
-    "vue": "^2.7.14",
-    "vue-codemirror": "4.0.6",
-    "vue-color": "2.7.0",
-    "vue-draggable-resizable": "^2.3.0",
-    "vue-i18n": "^8.28.2",
-    "vue-json-viewer": "^2.2.22",
-    "vue-router": "^3.6.5",
-    "vue-video-player": "^5.0.2",
-    "vue-virtual-scroller": "^1.1.2",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2",
-    "xlsx": "0.18.5"
-  },
-  "devDependencies": {
-    "@ant-design/colors": "^7.0.0",
-    "@babel/core": "^7.22.20",
-    "@babel/eslint-parser": "^7.22.15",
-    "@babel/preset-env": "^7.22.20",
-    "@vue/cli-plugin-babel": "^5.0.8",
-    "@vue/cli-plugin-eslint": "^5.0.8",
-    "@vue/cli-service": "^5.0.8",
-    "@vue/eslint-config-standard": "^8.0.1",
-    "@vue/test-utils": "^1.3.6",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "compression-webpack-plugin": "^10.0.0",
-    "css-minimizer-webpack-plugin": "^5.0.1",
-    "deepmerge": "^4.3.1",
-    "eslint": "^8.51.0",
-    "eslint-plugin-vue": "^9.17.0",
-    "fast-deep-equal": "^3.1.3",
-    "ignore-loader": "^0.1.2",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "jest-transform-stub": "^2.0.0",
-    "less-loader": "^6.2.0",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.5.0",
-    "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-jest": "^4.0.1",
-    "vue-template-compiler": "^2.7.14",
-    "webpack": "^5.88.2",
-    "webpack-theme-color-replacer": "^1.4.7",
-    "whatwg-fetch": "^3.6.19"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead",
-    "not ie 11"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.18.15",
+  "private": false,
+  "scripts": {
+    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
+    "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
+    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
+    "serve:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
+    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
+    "serve:iot": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode iot",
+    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
+    "serve:runtime": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode runtime",
+    "serve:message": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode message",
+    "serve:apply": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode apply",
+    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
+    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "test:unit": "vue-cli-service test:unit",
+    "lint": "vue-cli-service lint",
+    "build:preview": "vue-cli-service build --mode preview",
+    "lint:nofix": "vue-cli-service lint --no-fix",
+    "test": "jest"
+  },
+  "dependencies": {
+    "@afwenming123/vue-easy-tree": "^1.0.1",
+    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@antv/data-set": "^0.11.8",
+    "@antv/g2plot": "^2.4.31",
+    "@hufe921/canvas-editor": "^0.9.49",
+    "@microsoft/fetch-event-source": "^2.0.1",
+    "@vue/babel-preset-jsx": "^1.4.0",
+    "animate.css": "^4.1.1",
+    "ant-design-vue": "^1.7.8",
+    "axios": "^0.27.2",
+    "clipboard": "^2.0.11",
+    "core-js": "^3.33.0",
+    "crypto-js": "^4.1.1",
+    "date-fns": "^2.29.3",
+    "default-passive-events": "^2.0.0",
+    "dotenv": "^16.3.1",
+    "echarts": "^5.5.0",
+    "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^11.7.0",
+    "html2canvas": "^1.4.1",
+    "js-base64": "^3.7.5",
+    "js-cookie": "^2.2.1",
+    "jsencrypt": "^3.3.2",
+    "jspdf": "^2.5.1",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.debounce": "^4",
+    "lodash.get": "^4.4.2",
+    "marked": "^4",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "qs": "^6.11.2",
+    "regenerator-runtime": "^0.14.0",
+    "splitpanes": "^2.4.1",
+    "videojs-contrib-hls": "^5.15.0",
+    "viser-vue": "^2.4.8",
+    "vue": "^2.7.14",
+    "vue-codemirror": "4.0.6",
+    "vue-color": "2.7.0",
+    "vue-draggable-resizable": "^2.3.0",
+    "vue-i18n": "^8.28.2",
+    "vue-json-viewer": "^2.2.22",
+    "vue-router": "^3.6.5",
+    "vue-video-player": "^5.0.2",
+    "vue-virtual-scroller": "^1.1.2",
+    "vuedraggable": "^2.24.3",
+    "vuex": "^3.6.2",
+    "xlsx": "0.18.5"
+  },
+  "devDependencies": {
+    "@ant-design/colors": "^7.0.0",
+    "@babel/core": "^7.22.20",
+    "@babel/eslint-parser": "^7.22.15",
+    "@babel/preset-env": "^7.22.20",
+    "@vue/cli-plugin-babel": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-service": "^5.0.8",
+    "@vue/eslint-config-standard": "^8.0.1",
+    "@vue/test-utils": "^1.3.6",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "compression-webpack-plugin": "^10.0.0",
+    "css-minimizer-webpack-plugin": "^5.0.1",
+    "deepmerge": "^4.3.1",
+    "eslint": "^8.51.0",
+    "eslint-plugin-vue": "^9.17.0",
+    "fast-deep-equal": "^3.1.3",
+    "ignore-loader": "^0.1.2",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "jest-transform-stub": "^2.0.0",
+    "less-loader": "^6.2.0",
+    "script-loader": "^0.7.2",
+    "style-resources-loader": "^1.5.0",
+    "vue-cli-plugin-style-resources-loader": "^0.1.5",
+    "vue-jest": "^4.0.1",
+    "vue-template-compiler": "^2.7.14",
+    "webpack": "^5.88.2",
+    "webpack-theme-color-replacer": "^1.4.7",
+    "whatwg-fetch": "^3.6.19"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead",
+    "not ie 11"
+  ]
+}

package/src/base-client/components/his/HChart/HChart.vue

@@ -87,6 +87,7 @@ const chartData = ref([])
 const loading = ref(false)
 let resizeObserver = null
 const activePointIndex = ref(-1)
+const activeBarIndex = ref(-1)
 const selectedFilterValue = ref('')
 const selectedSideListValue = ref('')
 
@@ -259,36 +260,111 @@ const handleListChange = (value) => {
 
 // 常用图表预设，统一处理 dataset → ECharts option 的映射
 const presetResolvers = {
-  bar: ({ dataset }) => ({
-    animationDuration: 420,
-    animationEasing: 'cubicOut',
-    animationDelay: (_, idx) => idx * 60,
-    tooltip: {
-      trigger: 'axis',
-      axisPointer: {
-        type: 'shadow'
+  bar: ({ dataset = [], config = {}, state = {} }) => {
+    const activeIndex = typeof state.activeBarIndex === 'number' ? state.activeBarIndex : -1
+    if (!dataset.length) {
+      return {
+        xAxis: { type: 'category', data: [] },
+        yAxis: { type: 'value' },
+        series: [{ type: 'bar', data: [] }]
       }
-    },
-    xAxis: { type: 'category', data: dataset.map(item => item.label) },
-    yAxis: { type: 'value' },
-    series: [
-      {
-        type: 'bar',
-        data: dataset.map(item => item.value),
-        itemStyle: {
-          color: '#3362DA',
-          borderRadius: [4, 4, 0, 0]
+    }
+
+    const barColor = config.barColor || '#3362DA'
+    const barHighlightColor = config.barHighlightColor || '#4C7CFF'
+    const valueSuffix = config.valueSuffix || ''
+
+    const tooltipFormatter = (params = []) => {
+      if (!params.length) return ''
+      const point = params.find(item => item.seriesIndex === 0) || params[0]
+      const value = typeof point.data === 'object' ? point.data?.value : point.data
+      return `${point.axisValue}<br/>${value}${valueSuffix}`
+    }
+
+    return {
+      animationDuration: 420,
+      animationEasing: 'cubicOut',
+      animationDelay: (_, idx) => idx * 40,
+      tooltip: {
+        trigger: 'axis',
+        backgroundColor: '#1F5BFF',
+        borderWidth: 0,
+        textStyle: { color: '#fff' },
+        axisPointer: {
+          type: 'shadow',
+          shadowStyle: {
+            color: 'rgba(51, 98, 218, 0.08)'
+          }
         },
-        emphasis: {
+        formatter: tooltipFormatter
+      },
+      grid: {
+        top: 40,
+        left: 60,
+        right: 40,
+        bottom: 40,
+        containLabel: true
+      },
+      xAxis: {
+        type: 'category',
+        data: dataset.map(item => item.label),
+        axisLine: { lineStyle: { color: '#C8D2E8' } },
+        axisLabel: { color: '#5C6C8C', fontWeight: 500 },
+        axisTick: { show: false },
+        splitLine: { show: false }
+      },
+      yAxis: {
+        type: 'value',
+        min: 0,
+        max: config.yMax ?? 100,
+        minInterval: 1,
+        axisLine: { show: false },
+        axisTick: { show: false },
+        axisLabel: {
+          color: '#5C6C8C',
+          fontWeight: 500,
+          formatter: value => `${value}${valueSuffix}`
+        },
+        splitLine: {
+          show: true,
+          lineStyle: { type: 'dashed', color: '#E0E6F1' }
+        }
+      },
+      series: [
+        {
+          type: 'bar',
+          data: dataset.map((item, idx) => ({
+            value: item.value,
+            barWidth: idx === activeIndex ? 10 : 5
+          })),
           itemStyle: {
-            color: '#4C7CFF',
-            shadowBlur: 18,
-            shadowColor: 'rgba(76, 124, 255, 0.45)'
+            color: barColor,
+            borderRadius: [6, 6, 0, 0]
+          },
+          label: {
+            show: true,
+            position: 'top',
+            color: barColor,
+            fontWeight: 600,
+            formatter: params => {
+              const value = typeof params.data === 'object' ? params.data?.value : params.data
+              return `${value}${valueSuffix}`
+            }
+          },
+          emphasis: {
+            itemStyle: {
+              color: barHighlightColor,
+              shadowBlur: 18,
+              shadowColor: 'rgba(76, 124, 255, 0.45)'
+            },
+            label: {
+              color: barHighlightColor
+            }
           }
         }
-      }
-    ]
-  }),
+      ]
+    }
+  },
   line: ({ dataset = [], config = {}, state = {} }) => {
     if (!dataset.length) {
       return {
@@ -598,6 +674,7 @@ const loadChartData = async (config) => {
     if (staticDataset) {
       chartData.value = staticDataset
       activePointIndex.value = -1
+      activeBarIndex.value = -1
       renderChart()
       emit('dataLoaded', chartData.value)
       return
@@ -615,12 +692,14 @@ const loadChartData = async (config) => {
       }
       chartData.value = transformedData
       activePointIndex.value = -1
+      activeBarIndex.value = -1
       renderChart()
       emit('dataLoaded', transformedData)
     } else {
       // 没有数据源，使用空数据
       chartData.value = []
       activePointIndex.value = -1
+      activeBarIndex.value = -1
       renderChart()
     }
   } catch (error) {
@@ -632,13 +711,21 @@ const loadChartData = async (config) => {
 // 渲染图表
 const handleChartClick = (params) => {
   const config = chartConfig.value || props.config
-  if (config?.type !== 'line') return
-  if (params?.componentType !== 'series') return
-  if (params.seriesType !== 'line') return
-  if (typeof params.dataIndex !== 'number') return
-  if (activePointIndex.value === params.dataIndex) return
-  activePointIndex.value = params.dataIndex
-  renderChart()
+  if (!config || params?.componentType !== 'series') return
+  if (config.type === 'line' && params.seriesType === 'line') {
+    if (typeof params.dataIndex !== 'number') return
+    if (activePointIndex.value === params.dataIndex) return
+    activePointIndex.value = params.dataIndex
+    renderChart()
+    return
+  }
+  if (config.type === 'bar' && params.seriesType === 'bar') {
+    if (typeof params.dataIndex !== 'number') return
+    const nextIndex = activeBarIndex.value === params.dataIndex ? -1 : params.dataIndex
+    if (activeBarIndex.value === nextIndex) return
+    activeBarIndex.value = nextIndex
+    renderChart()
+  }
 }
 
 const renderChart = () => {
@@ -666,7 +753,10 @@ const renderChart = () => {
     const preset = resolver({
       dataset: chartData.value,
       config,
-      state: { activePointIndex: activePointIndex.value }
+      state: {
+        activePointIndex: activePointIndex.value,
+        activeBarIndex: activeBarIndex.value
+      }
     })
 
     // 处理颜色配置：如果只有一个颜色，生成渐变数组
@@ -689,6 +779,7 @@ const renderChart = () => {
     if (config.options?.series && preset.series) {
       // 分离需要特殊处理的配置项
       const { xAxis: customXAxis, yAxis: customYAxis, series: customSeries, color: _, ...restOptions } = config.options
+      const normalizedCustomSeries = Array.isArray(customSeries) ? customSeries : [customSeries]
 
       finalOptions = {
         ...finalOptions,
@@ -713,14 +804,11 @@ const renderChart = () => {
             ...customYAxis
           }
         }),
-        series: [
-          {
-            ...preset.series[0],
-            ...customSeries[0],
-            // 确保 data 来自预设（从 logic 获取的数据）
-            data: preset.series[0].data
-          }
-        ]
+        series: preset.series.map((seriesItem, idx) => ({
+          ...seriesItem,
+          ...(normalizedCustomSeries[idx] || {}),
+          data: seriesItem.data
+        }))
       }
     } else {
       // 没有自定义 series 的情况