vue2-client 1.18.29 → 1.18.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.18.29",
+  "version": "1.18.30",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

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

@@ -274,12 +274,24 @@ const resolveStaticDataset = (config) => {
       return scoped
     }
     let scopedDataset = dataset
+    // 先处理时间粒度筛选（radioFilter），因为 dataset 的第一层可能是时间粒度
+    const filterKeys = [
+      selectedFilterValue.value,
+      radioFilterConfig.value?.defaultValue
+    ].filter(Boolean)
+    if (filterKeys.length) {
+      const filterScoped = pickByKeys(dataset, filterKeys, true)
+      if (Array.isArray(filterScoped)) return filterScoped
+      if (filterScoped && typeof filterScoped === 'object') scopedDataset = filterScoped
+    }
+    if (Array.isArray(scopedDataset)) return scopedDataset
+    // 再处理级联筛选或侧边列表筛选
     if (isCascadeMode.value) {
       const cascadeKeys = cascadeColumns.value
         .map(column => column.field && selectedCascadeValues.value[column.field])
         .filter(value => value !== undefined && value !== null && value !== '')
       if (cascadeKeys.length) {
-        const cascadeScoped = pickNestedByKeys(dataset, cascadeKeys)
+        const cascadeScoped = pickNestedByKeys(scopedDataset, cascadeKeys)
         if (Array.isArray(cascadeScoped)) return cascadeScoped
         if (cascadeScoped && typeof cascadeScoped === 'object') scopedDataset = cascadeScoped
       }
@@ -289,18 +301,32 @@ const resolveStaticDataset = (config) => {
         sideListConfig.value?.defaultValue
       ].filter(Boolean)
       if (listKeys.length) {
-        const listScoped = pickByKeys(dataset, listKeys, true)
+        // 优先在已按时间粒度过滤后的 scopedDataset 中取
+        const listScoped = pickByKeys(scopedDataset, listKeys, true)
         if (Array.isArray(listScoped)) return listScoped
-        if (listScoped && typeof listScoped === 'object') scopedDataset = listScoped
+        if (listScoped && typeof listScoped === 'object') {
+          // 在侧边列表命中的作用域内，再次按时间粒度过滤（处理 { dept: { week: [...] } } 场景）
+          let scopedAfterList = listScoped
+          if (filterKeys.length) {
+            const filterScopedInner = pickByKeys(scopedAfterList, filterKeys, true)
+            if (Array.isArray(filterScopedInner)) return filterScopedInner
+            if (filterScopedInner && typeof filterScopedInner === 'object') scopedAfterList = filterScopedInner
+          }
+          scopedDataset = scopedAfterList
+        } else {
+          // 如果时间粒度在第二层（如 { dept: { week: [...] } }），尝试反向嵌套取值
+          const nestedOrder = pickNestedByKeys(dataset, [...listKeys, ...filterKeys])
+          if (Array.isArray(nestedOrder)) return nestedOrder
+          if (nestedOrder && typeof nestedOrder === 'object') scopedDataset = nestedOrder
+          else {
+            const reverseNested = pickNestedByKeys(dataset, [...filterKeys, ...listKeys])
+            if (Array.isArray(reverseNested)) return reverseNested
+            if (reverseNested && typeof reverseNested === 'object') scopedDataset = reverseNested
+          }
+        }
       }
     }
     if (Array.isArray(scopedDataset)) return scopedDataset
-    const filterKeys = [
-      selectedFilterValue.value,
-      radioFilterConfig.value?.defaultValue
-    ].filter(Boolean)
-    const filterScoped = pickByKeys(scopedDataset, filterKeys, false)
-    if (Array.isArray(filterScoped)) return filterScoped
     const firstArray = pickFirstArray(scopedDataset)
     if (Array.isArray(firstArray)) return firstArray
   }

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

@@ -1,88 +1,88 @@
-<template>
-  <div class="h-chart-test-container">
-    <h2>HChart 组件测试案例</h2>
-
-    <section class="test-section">
-      <h3>测试1: 通过 queryParamsName 查询配置（从后端获取配置和数据）</h3>
-      <div class="chart-wrapper">
-        <HChart
-          ref="chart1"
-          query-params-name="accountsReceivableChart"
-          :fixed-query-form="{ condition: '1=1', dateRange: '2024-01' }"
-          service-name="af-his"
-          @init="handleChartInit"
-          @dataLoaded="handleDataLoaded"
-          @error="handleError"
-        />
-      </div>
-      <div class="test-actions">
-        <a-button @click="refreshChart1">刷新图表</a-button>
-        <a-button @click="reloadChart1">重新加载（更新查询条件）</a-button>
-      </div>
-    </section>
-
-    <section class="test-section">
-      <h3>测试日志</h3>
-      <div class="log-container">
-        <div v-for="(log, index) in logs" :key="index" class="log-item">
-          <span class="log-time">{{ log.time }}</span>
-          <span class="log-type" :class="log.type">{{ log.type }}</span>
-          <span class="log-message">{{ log.message }}</span>
-        </div>
-      </div>
-      <a-button @click="clearLogs">清空日志</a-button>
-    </section>
-  </div>
-</template>
-
-<script setup>
-import { ref } from 'vue'
-import { message } from 'ant-design-vue'
-import HChart from './HChart.vue'
-
-const chart1 = ref(null)
-
-const logs = ref([])
-
-const addLog = (type, messageText) => {
-  logs.value.unshift({
-    time: new Date().toLocaleTimeString(),
-    type,
-    message: typeof messageText === 'object' ? JSON.stringify(messageText, null, 2) : messageText
-  })
-  if (logs.value.length > 50) logs.value.pop()
-}
-
-const clearLogs = () => {
-  logs.value = []
-}
-
-const handleChartInit = (config) => {
-  addLog('init', `图表初始化: ${config?.title || '未知'}`)
-  message.success(`图表初始化成功: ${config?.title || '未知'}`)
-}
-
-const handleDataLoaded = (data) => {
-  addLog('dataLoaded', `数据加载完成，共 ${data?.length || 0} 条`)
-  console.log('数据加载完成:', data)
-}
-
-const handleError = (error) => {
-  addLog('error', `错误: ${error?.message || String(error)}`)
-  message.error(`图表加载错误: ${error?.message || String(error)}`)
-}
-
-const refreshChart1 = () => {
-  if (!chart1.value) return
-  chart1.value.refresh()
-  addLog('action', '刷新图表')
-  message.info('正在刷新图表...')
-}
-
-const reloadChart1 = () => {
-  if (!chart1.value) return
-  chart1.value.reload({ condition: '1=1', dateRange: '2024-02' })
-  addLog('action', '重新加载图表，更新查询条件')
-  message.info('正在重新加载图表...')
-}
-</script>
+<template>
+  <div class="h-chart-test-container">
+    <h2>HChart 组件测试案例</h2>
+
+    <section class="test-section">
+      <h3>测试1: 通过 queryParamsName 查询配置（从后端获取配置和数据）</h3>
+      <div class="chart-wrapper">
+        <HChart
+          ref="chart1"
+          query-params-name="accountsReceivableChart"
+          :fixed-query-form="{ condition: '1=1', dateRange: '2024-01' }"
+          service-name="af-his"
+          @init="handleChartInit"
+          @dataLoaded="handleDataLoaded"
+          @error="handleError"
+        />
+      </div>
+      <div class="test-actions">
+        <a-button @click="refreshChart1">刷新图表</a-button>
+        <a-button @click="reloadChart1">重新加载（更新查询条件）</a-button>
+      </div>
+    </section>
+
+    <section class="test-section">
+      <h3>测试日志</h3>
+      <div class="log-container">
+        <div v-for="(log, index) in logs" :key="index" class="log-item">
+          <span class="log-time">{{ log.time }}</span>
+          <span class="log-type" :class="log.type">{{ log.type }}</span>
+          <span class="log-message">{{ log.message }}</span>
+        </div>
+      </div>
+      <a-button @click="clearLogs">清空日志</a-button>
+    </section>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { message } from 'ant-design-vue'
+import HChart from './HChart.vue'
+
+const chart1 = ref(null)
+
+const logs = ref([])
+
+const addLog = (type, messageText) => {
+  logs.value.unshift({
+    time: new Date().toLocaleTimeString(),
+    type,
+    message: typeof messageText === 'object' ? JSON.stringify(messageText, null, 2) : messageText
+  })
+  if (logs.value.length > 50) logs.value.pop()
+}
+
+const clearLogs = () => {
+  logs.value = []
+}
+
+const handleChartInit = (config) => {
+  addLog('init', `图表初始化: ${config?.title || '未知'}`)
+  message.success(`图表初始化成功: ${config?.title || '未知'}`)
+}
+
+const handleDataLoaded = (data) => {
+  addLog('dataLoaded', `数据加载完成，共 ${data?.length || 0} 条`)
+  console.log('数据加载完成:', data)
+}
+
+const handleError = (error) => {
+  addLog('error', `错误: ${error?.message || String(error)}`)
+  message.error(`图表加载错误: ${error?.message || String(error)}`)
+}
+
+const refreshChart1 = () => {
+  if (!chart1.value) return
+  chart1.value.refresh()
+  addLog('action', '刷新图表')
+  message.info('正在刷新图表...')
+}
+
+const reloadChart1 = () => {
+  if (!chart1.value) return
+  chart1.value.reload({ condition: '1=1', dateRange: '2024-02' })
+  addLog('action', '重新加载图表，更新查询条件')
+  message.info('正在重新加载图表...')
+}
+</script>