vue2-client 1.16.62 → 1.16.64

package/.claude/settings.local.json

@@ -7,10 +7,15 @@
       "mcp__context7__resolve-library-id",
       "mcp__context7__get-library-docs",
       "WebFetch(domain:github.com)",
-      "Bash(npm run serve:*)"
+      "Bash(npm run serve:*)",
+      "mcp__serena__get_current_config",
+      "mcp__serena__activate_project",
+      "mcp__serena__get_symbols_overview",
+      "mcp__serena__list_dir",
+      "mcp__serena__find_file"
     ],
     "deny": [],
     "ask": [],
     "defaultMode": "acceptEdits"
   }
-}
+}

package/.serena/project.yml

@@ -0,0 +1,67 @@
+# language of the project (csharp, python, rust, java, typescript, go, cpp, or ruby)
+#  * For C, use cpp
+#  * For JavaScript, use typescript
+# Special requirements:
+#  * csharp: Requires the presence of a .sln file in the project folder.
+language: typescript
+
+# whether to use the project's gitignore file to ignore files
+# Added on 2025-04-07
+ignore_all_files_in_gitignore: true
+# list of additional paths to ignore
+# same syntax as gitignore, so you can use * and **
+# Was previously called `ignored_dirs`, please update your config if you are using that.
+# Added (renamed) on 2025-04-07
+ignored_paths: []
+
+# whether the project is in read-only mode
+# If set to true, all editing tools will be disabled and attempts to use them will result in an error
+# Added on 2025-04-18
+read_only: false
+
+# list of tool names to exclude. We recommend not excluding any tools, see the readme for more details.
+# Below is the complete list of tools for convenience.
+# To make sure you have the latest list of tools, and to view their descriptions, 
+# execute `uv run scripts/print_tool_overview.py`.
+#
+#  * `activate_project`: Activates a project by name.
+#  * `check_onboarding_performed`: Checks whether project onboarding was already performed.
+#  * `create_text_file`: Creates/overwrites a file in the project directory.
+#  * `delete_lines`: Deletes a range of lines within a file.
+#  * `delete_memory`: Deletes a memory from Serena's project-specific memory store.
+#  * `execute_shell_command`: Executes a shell command.
+#  * `find_referencing_code_snippets`: Finds code snippets in which the symbol at the given location is referenced.
+#  * `find_referencing_symbols`: Finds symbols that reference the symbol at the given location (optionally filtered by type).
+#  * `find_symbol`: Performs a global (or local) search for symbols with/containing a given name/substring (optionally filtered by type).
+#  * `get_current_config`: Prints the current configuration of the agent, including the active and available projects, tools, contexts, and modes.
+#  * `get_symbols_overview`: Gets an overview of the top-level symbols defined in a given file.
+#  * `initial_instructions`: Gets the initial instructions for the current project.
+#     Should only be used in settings where the system prompt cannot be set,
+#     e.g. in clients you have no control over, like Claude Desktop.
+#  * `insert_after_symbol`: Inserts content after the end of the definition of a given symbol.
+#  * `insert_at_line`: Inserts content at a given line in a file.
+#  * `insert_before_symbol`: Inserts content before the beginning of the definition of a given symbol.
+#  * `list_dir`: Lists files and directories in the given directory (optionally with recursion).
+#  * `list_memories`: Lists memories in Serena's project-specific memory store.
+#  * `onboarding`: Performs onboarding (identifying the project structure and essential tasks, e.g. for testing or building).
+#  * `prepare_for_new_conversation`: Provides instructions for preparing for a new conversation (in order to continue with the necessary context).
+#  * `read_file`: Reads a file within the project directory.
+#  * `read_memory`: Reads the memory with the given name from Serena's project-specific memory store.
+#  * `remove_project`: Removes a project from the Serena configuration.
+#  * `replace_lines`: Replaces a range of lines within a file with new content.
+#  * `replace_symbol_body`: Replaces the full definition of a symbol.
+#  * `restart_language_server`: Restarts the language server, may be necessary when edits not through Serena happen.
+#  * `search_for_pattern`: Performs a search for a pattern in the project.
+#  * `summarize_changes`: Provides instructions for summarizing the changes made to the codebase.
+#  * `switch_modes`: Activates modes by providing a list of their names
+#  * `think_about_collected_information`: Thinking tool for pondering the completeness of collected information.
+#  * `think_about_task_adherence`: Thinking tool for determining whether the agent is still on track with the current task.
+#  * `think_about_whether_you_are_done`: Thinking tool for determining whether the task is truly completed.
+#  * `write_memory`: Writes a named memory (for future reference) to Serena's project-specific memory store.
+excluded_tools: []
+
+# initial prompt for the project. It will always be given to the LLM upon activating the project
+# (contrary to the memories, which are loaded on demand).
+initial_prompt: ""
+
+project_name: "vue2-client"

package/CLAUDE.md

@@ -83,8 +83,16 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 - 环境变量控制API端点和功能标志
 
 ### 代码风格指南（来自.cursorrules）
-- 尽可能使用Vue 2.7组合API和setup语法糖
-- 组件名使用PascalCase
-- 可组合函数和工具使用camelCase
+- 使用Vue 2.7组合API和setup语法糖，避免选项API（除非修改现有代码）
+- 目录名使用kebab-case（如components/auth-wizard）
+- 组件名使用PascalCase（如AuthWizard.vue）
+- 可组合函数使用camelCase（如useAuthState.js）
 - 方法和计算属性使用箭头函数
-- 模块化和迭代式代码，避免重复
+- 避免条件语句中不必要的花括号，使用简洁语法
+- 模块化和迭代式代码，避免重复
+
+### 重要配置说明
+- **NODE_OPTIONS**: Windows环境需要设置`--openssl-legacy-provider`解决OpenSSL兼容性问题
+- **Webpack别名**: 引入项目需添加别名配置：`@vue2-client` → `node_modules/vue2-client/src`
+- **端口**: 开发服务器默认运行在8020端口
+- **ESLint**: 开发模式默认禁用ESLint（--no-eslint），使用`npm run lint`单独执行检查

package/package.json

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

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

@@ -1,12 +1,12 @@
 <template>
   <div class="h-tab-demo">
-<!--    &lt;!&ndash; XTab &ndash;&gt;-->
-<!--    <a-card title="XTab">-->
-<!--      <h-tab-->
-<!--        configName="openPrescriptionTab"-->
-<!--        serverName="af-his"-->
-<!--      />-->
-<!--    </a-card>-->
+    <!--    &lt;!&ndash; XTab &ndash;&gt;-->
+    <!--    <a-card title="XTab">-->
+    <!--      <h-tab-->
+    <!--        configName="openPrescriptionTab"-->
+    <!--        serverName="af-his"-->
+    <!--      />-->
+    <!--    </a-card>-->
 
     <!-- HFormTable -->
     <a-card title="HFormTable" style="margin-top: 20px;">
@@ -30,13 +30,13 @@
 <!--        :left-hide="true"-->
 <!--      />-->
 <!--    </a-card>-->
-<!--    &lt;!&ndash; HButtons &ndash;&gt;-->
-<!--    <a-card title="HButtons" style="margin-top: 20px;">-->
-<!--      <h-buttons-->
-<!--        queryParamsName="outpatientAdviceGroup"-->
-<!--        serviceName="af-his"-->
-<!--      />-->
-<!--    </a-card>-->
+    <!--    &lt;!&ndash; HButtons &ndash;&gt;-->
+    <!--    <a-card title="HButtons" style="margin-top: 20px;">-->
+    <!--      <h-buttons-->
+    <!--        queryParamsName="outpatientAdviceGroup"-->
+    <!--        serviceName="af-his"-->
+    <!--      />-->
+    <!--    </a-card>-->
   </div>
 </template>
 

package/src/base-client/components/common/Upload/Upload.vue

@@ -48,10 +48,10 @@
       :file-list="uploadedFileList"
       :remove="deleteFileItem"
       :show-upload-list="{
-          showRemoveIcon: !readOnly,
-          showPreviewIcon: true,
-          showDownloadIcon: false
-       }"
+        showRemoveIcon: !readOnly,
+        showPreviewIcon: true,
+        showDownloadIcon: false
+      }"
       list-type="picture-card">
       <a-icon v-if="!readOnly" type="plus"/>
       <div v-if="!readOnly" class="ant-upload-text">

package/src/base-client/components/common/XCollapse/XCollapse.vue

@@ -330,14 +330,14 @@ export default {
             })
             this.$forceUpdate()
           }
-          // 默认展开当前页的所有面板
-          this.activeKey = (this.config.showData || []).map((_, i) => i.toString())
-          // 初始化关闭所有折叠面板
+          // 根据配置决定是否展开面板
           const shouldCollapseAll = this.config.collapseAllByDefault || false
           if (shouldCollapseAll) {
-            setTimeout(() => {
-              this.activeKey = [] // 关闭所有面板
-            }, 0.00001)
+            // 如果配置为默认关闭，直接设置为空数组，避免展开动画
+            this.activeKey = []
+          } else {
+            // 默认展开当前页的所有面板
+            this.activeKey = (this.config.showData || []).map((_, i) => i.toString())
           }
         })
       })
@@ -429,11 +429,10 @@ export default {
 :deep(.ant-collapse-header) {
   display: flex;
   position: relative;
-  border-bottom: v-bind('config.showLine ? "1px solid #000000" : "none"');
+  // border-bottom: v-bind('config.showLine ? "1px solid #000000" : "none"');
   align-items: center !important;
   background-color: #ffffff;
   padding: 12px 16px !important; /* 确保头部有足够的内边距 */
-  min-height: 50px; /* 设置头部最小高度 */
 }
 
 :deep(.ant-collapse-header-text) {
@@ -466,7 +465,9 @@ export default {
   height: 12px;
   border-radius: 6px;
   background: #3362DA;
-  margin: 6px;
+  margin-top: 15px;
+  margin-left: 11px;
+  margin-bottom: 12px;
   flex-shrink: 0;
 }
 
@@ -620,9 +621,14 @@ export default {
 
 /* 当前页码样式 */
 :deep(.ant-pagination .ant-pagination-item-active) {
-  background: #FFFFFF;
+  background: #0057FE !important;
   border: 1px solid #1890ff;
-  color: #1890ff;
+  color: #FFFFFF !important;
+}
+
+/* 确保选中页码文字颜色生效 */
+:deep(.ant-pagination .ant-pagination-item-active a) {
+  color: #FFFFFF !important;
 }
 
 /* 禁用状态样式 */
@@ -642,14 +648,15 @@ export default {
   &.xcollapse-style1 {
     height: auto; /* 允许根据内容自适应高度，避免滚动被限制 */
     min-height: 600px;
-    .blue-circle-icon { margin: 0 !important; }
     .header-text {
       font-family: "Source Han Sans";
       font-size: 16px;
       font-weight: 700;
-      line-height: normal;
+      line-height: 23px;
       letter-spacing: 0em;
       color: #313131;
+      margin-top: 8px;
+      margin-bottom: 8px;
       margin-right: 0 !important;
     }
 
@@ -657,9 +664,11 @@ export default {
       font-family: "Source Han Sans";
       font-size: 16px;
       font-weight: 700;
-      line-height: normal;
+      line-height: 23px;
       text-align: right;
       color: #313131;
+      margin-top: 9px;
+      margin-bottom: 7px;
       margin-left: 28.14px;
       letter-spacing: 0em
     }
@@ -668,8 +677,10 @@ export default {
       font-family: "Source Han Sans";
       font-size: 16px;
       font-weight: 400;
-      line-height: normal;
+      line-height: 23px;
       text-align: right;
+      margin-top: 9px;
+      margin-bottom: 7px;
       color: #313131;
       letter-spacing: 0em;
     }
@@ -684,7 +695,7 @@ export default {
       width: 564px;
       min-height: auto;
       height: auto;
-      margin: 3px 10px 26px 12px;  // 面板之间留白
+      margin-bottom:10px;
       background: #FFFFFF;         // 独立白底
       box-sizing: border-box;
       border: 1px solid #E5E9F0;   // 每个面板自身边框
@@ -693,15 +704,18 @@ export default {
     :deep(.ant-collapse > .ant-collapse-item:first-child) { margin-top: 0; }
     :deep(.ant-collapse > .ant-collapse-item:last-child) { margin-bottom: 0; }
 
-    :deep(.ant-collapse-content > .ant-collapse-content-box) { background: #FFFFFF; }
+    :deep(.ant-collapse-content > .ant-collapse-content-box) {
+      background: #FFFFFF;
+      padding: 0px !important; /* 自定义边距：上9px 右12px 下10px 左11px */
+    }
 
     // 表头：恢复合适的上下内边距，去掉顶部额外空白
     :deep(.ant-collapse-header) {
       background: #FFFFFF;
-      padding: 0px 0px;
-      align-items: center;
-      height: 39px;
+      padding: 0px 0px !important;
+      height: 41px !important;
       border-bottom: none !important; // 移除标题处下边线，避免与外边框连为一体
+      border: 1px solid #E5E9F0;   // 每个面板自身边框
     }
   }
 }

package/src/base-client/components/common/XReport/XReportHospitalizationDemo.vue

@@ -0,0 +1,45 @@
+<template>
+  <div id="xreport-hosp-demo">
+    <a-space style="margin-bottom: 12px;">
+      <a-button type="primary" @click="doInit">手动初始化</a-button>
+    </a-space>
+    <XReport
+      ref="reportRef"
+      :edit-mode="true"
+      :show-save-button="true"
+      :show-img-in-cell="false"
+      :use-oss-for-img="false"
+      server-name="af-his"
+      @updateImg="onUpdateImg"/>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import XReport from '@vue2-client/base-client/components/common/XReport'
+
+const reportRef = ref(null)
+
+const payload = {
+  arr: [
+    { BQ: '病房区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
+    { BQ: '感染科', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
+    { BQ: '骨科病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
+    { BQ: '呼吸科病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
+    { BQ: '急症科病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
+    { BQ: '内科二病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 }
+  ]
+}
+
+const doInit = async () => {
+  if (!reportRef.value || !reportRef.value.init) return
+  await reportRef.value.init({
+    configName: 'hospitalizationStatsReport',
+    configData: payload
+  })
+}
+
+const onUpdateImg = data => {
+  console.warn('updateImg:', data)
+}
+</script>

package/src/base-client/components/common/XReportGrid/XReportDemo.vue

@@ -4,7 +4,7 @@
       <XReport
         ref="main"
         :use-oss-for-img="false"
-        config-name="openPrescriptionCover"
+        config-name="ceshishange"
         server-name="af-his"
         :show-img-in-cell="true"
         :display-only="true"

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -7,7 +7,7 @@
         :key="cellIndex"
         :ref="`trGroup_${ cell.slotRef || cellIndex}`"
         @hook:mounted="(h)=>applyAllStyles(cell,cellIndex)"
-        :span="calculateColSpan(cell)">
+        :span="calculateColSpan(cell, columns)">
         <div id="report_widget" v-if="isWidget">
           <!-- 插槽渲染 -->
           <template v-if="Array.isArray(cell)">
@@ -337,10 +337,24 @@ export default {
     listClick (data) {
       this.$emit('listClick', data)
     },
-    calculateColSpan (cell) {
-      return Array.isArray(cell)
-        ? cell[0][0]?.colSpan * 2
-        : (cell?.colSpan ?? cell?.def?.colSpan ?? 1) * 2
+    calculateColSpan (cell, columns) {
+      // 1. 获取当前 cell 的原始 colSpan 值
+      const currentColSpan = Array.isArray(cell)
+        ? cell[0][0]?.colSpan || 1
+        : (cell?.colSpan ?? cell?.def?.colSpan ?? 1)
+
+      // 2. 计算整行所有 cell 的 colSpan 总和
+      const totalColSpan = columns.reduce((sum, c) => {
+        const span = Array.isArray(c)
+          ? c[0][0]?.colSpan || 1
+          : (c?.colSpan ?? c?.def?.colSpan ?? 1)
+        return sum + span
+      }, 0)
+
+      // 3. 智能判断：总和 > 12 为新配置（24份），≤ 12 为旧配置（12份需要×2）
+      const multiplier = totalColSpan > 12 ? 1 : 2
+
+      return currentColSpan * multiplier
     },
     applyAllStyles (cell, cellIndex) {
       // 应用组件样式

package/src/base-client/components/his/XCharge/XChargeDemo.vue

@@ -143,4 +143,3 @@ export default {
 .info { margin-top: 16px; color: #333; }
 .info p { margin: 6px 0; }
 </style>
-