vue2-client 1.19.49 → 1.19.51

package/package.json

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

package/src/base-client/components/common/HIS/HFormTable/HFormTable.vue

@@ -172,6 +172,16 @@ const isCustomPagination = computed(() => {
 const isHiddenFunctionalArea = computed(() => {
   return attrs.hiddenFunctionalArea === 'true' || attrs.hiddenFunctionalArea === true
 })
+
+// 从 attrs 中获取 pageMaxSize，如果存在则作为 defaultPageSize
+const computedDefaultPageSize = computed(() => {
+  const pageMaxSize = attrs.pageMaxSize
+  // 将字符串转换为数字，如果无效则使用默认值
+  const numericPageSize = pageMaxSize ? Number(pageMaxSize) : null
+  const defaultSize = (numericPageSize && numericPageSize > 0) ? numericPageSize : 10
+
+  return defaultSize
+})
 </script>
 
 <template>
@@ -185,6 +195,7 @@ const isHiddenFunctionalArea = computed(() => {
     <x-form-table
       ref="xFormTableRef"
       v-bind="$attrs"
+      :defaultPageSize="computedDefaultPageSize"
       :customPagination="isCustomPagination"
       :hiddenFunctionalArea="isHiddenFunctionalArea"
       @expand="onExpandLog"

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

@@ -156,10 +156,36 @@ const filterQueryParams = computed(() => {
 })
 const sideListConfig = computed(() => props.config?.sideList || chartConfig.value?.sideList || null)
 const isCascadeMode = computed(() => sideListConfig.value?.mode === 'cascade')
-const sideListOptions = computed(() => {
-  const options = sideListConfig.value?.options
-  return Array.isArray(options) ? options : []
-})
+const sideListOptions = ref([])
+
+// 异步获取sideList options
+const loadSideListOptions = async () => {
+  const config = sideListConfig.value
+  if (!config) {
+    sideListOptions.value = []
+    return
+  }
+
+  // 如果配置了sideListLogic，则通过runLogic获取options
+  if (config.sideListLogic) {
+    try {
+      const result = await runLogic(config.sideListLogic, {
+        config,
+        chartConfig: chartConfig.value,
+        props
+      })
+      sideListOptions.value = Array.isArray(result) ? result : []
+    } catch (error) {
+      console.error('获取sideList options失败:', error)
+      sideListOptions.value = []
+      emit('error', error)
+    }
+  } else {
+    // 使用静态options
+    const options = config.options
+    sideListOptions.value = Array.isArray(options) ? options : []
+  }
+}
 const sideListLabel = computed(() => sideListConfig.value?.label || sideListConfig.value?.title || '')
 const cascadeLevels = computed(() => {
   if (!isCascadeMode.value) return []
@@ -418,6 +444,11 @@ const ensureCascadeSelections = () => {
   }
 }
 
+// 监听sideList配置变化，重新加载options
+watch(sideListConfig, () => {
+  loadSideListOptions()
+}, { immediate: true, deep: true })
+
 watch([radioFilterOptions, () => radioFilterConfig.value?.defaultValue], () => {
   ensureFilterSelection()
 }, { immediate: true })
@@ -1381,6 +1412,9 @@ onBeforeUnmount(() => {
   display: flex;
   flex-direction: column;
   gap: 6px;
+  max-height: 280px;
+  overflow-y: auto;
+  padding-right: 4px;
 }
 
 .side-list-item {