vue2-client 1.20.30 → 1.20.32

package/package.json

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

package/src/base-client/components/common/XMarkdownSectionExtractor/DemoXMarkdownSectionExtractor.vue

@@ -1,44 +1,54 @@
 <template>
   <div class="demo-x-markdown-section-extractor">
-    <h2>Demo: XMarkdownSectionExtractor + bingli.md</h2>
+    <h2>Demo: XMarkdownSectionExtractor</h2>
 
     <XMarkdownSectionExtractor
       ref="extractor"
-      :source="bingliMd"
       :showUploadButton="false"
-      @extracted="onExtracted"
+      @sections-rendered="onSectionsRendered"
       @selection-change="onSelectionChange"
     />
 
     <div class="demo-actions">
+      <button @click="loadAndExtract">加载内容并提取</button>
       <button @click="getSelected">获取选中数据</button>
+      <button @click="clearSections">清空</button>
     </div>
   </div>
 </template>
 
 <script>
 import XMarkdownSectionExtractor from './XMarkdownSectionExtractor.vue'
-import bingliMd from './bingli.md'
+
+// 示例 markdown 内容（实际使用时可以从接口获取）
+const sampleMarkdown = `### 还需提问
+1. 患者近期是否有发热症状？
+2. 是否有药物过敏史？
+3. 既往病史情况如何？
+
+### 下一步建议
+1. 建议进行血常规检查
+2. 建议完善胸部影像学检查
+3. 根据检查结果调整治疗方案
+`
 
 export default {
   name: 'DemoXMarkdownSectionExtractor',
   components: { XMarkdownSectionExtractor },
   data () {
     return {
-      bingliMd,
       selectedItems: []
     }
   },
-  mounted () {
-    const keywords = ['还需提问']
-    this.$refs.extractor.extractAs(keywords, 'title-content', true)
-    const keywords2 = ['下一步建议']
-    this.$refs.extractor.extractAs(keywords2, 'title-content', true)
-  },
   methods: {
-    onExtracted (sections) {
+    async loadAndExtract () {
+      // 方式1：先设置 source，再调用 extractAs
+      this.$refs.extractor.setSource(sampleMarkdown)
+      await this.$refs.extractor.extractAs(['还需提问', '下一步建议'])
+    },
+    onSectionsRendered (sections) {
       // eslint-disable-next-line no-console
-      console.log('extracted sections:', sections)
+      console.log('sections rendered:', sections)
     },
     onSelectionChange (selected) {
       this.selectedItems = selected
@@ -48,6 +58,9 @@ export default {
       // eslint-disable-next-line no-console
       console.log('selected items:', selected)
       alert(`已选中 ${selected.length} 条数据，已输出到控制台`)
+    },
+    clearSections () {
+      this.$refs.extractor.clearRenderedSections()
     }
   }
 }
@@ -65,6 +78,7 @@ export default {
     border-radius: 4px;
     cursor: pointer;
     font-size: 14px;
+    margin-right: 8px;
 
     &:hover {
       background: #40a9ff;

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

@@ -153,6 +153,18 @@ export default {
 
       event.target.value = ''
     },
+    /**
+     * 设置 markdown 内容（传入字符串）
+     * @param {string} markdownText - markdown 格式的字符串
+     */
+    setSource (markdownText) {
+      if (typeof markdownText !== 'string') {
+        console.warn('[XMarkdownSectionExtractor] setSource requires a string')
+        return
+      }
+      this.currentSource = markdownText
+      this.$emit('source-changed', markdownText)
+    },
     async extract () {
       if (!this.currentSource) {
         return
@@ -191,35 +203,53 @@ export default {
         this.loading = false
       }
     },
-    async extractAs (keywords = [], parseType = 'title-content', asComponent = false) {
+    async extractAs (keywords = [], parseType = 'title-content') {
       if (!Array.isArray(keywords) || keywords.length === 0) {
         return []
       }
+      if (!this.currentSource) {
+        console.warn('[XMarkdownSectionExtractor] currentSource is not set, call setSource() first')
+        return []
+      }
       const config = keywords.map((label, idx) => ({
         key: `section_${idx}`,
         label,
         headingLevel: 3
       }))
-      const sections = extractSectionsFromMarkdown(
-        await readMarkdownAsText(this.currentSource),
-        config
-      )
-      if (parseType === 'flat') {
-        return flattenSectionsToItemsArray(sections)
-      }
-      const result = sections.map(sec => ({
-        sectionTitle: sec.label || '',
-        items: Array.isArray(sec.hierarchicalItems)
-          ? sec.hierarchicalItems.map(h => ({
-            title: h.title || '',
-            content: Array.isArray(h.items) ? h.items : []
-          }))
-          : []
-      }))
-      if (asComponent) {
-        this.renderedSections = [...this.renderedSections, ...result]
+      try {
+        // 读取 markdown 内容（支持字符串、文件、URL 等）
+        const text = await readMarkdownAsText(this.currentSource)
+        if (!text) {
+          console.warn('[XMarkdownSectionExtractor] No text content from source')
+          return []
+        }
+        const sections = extractSectionsFromMarkdown(text, config)
+        if (parseType === 'flat') {
+          return flattenSectionsToItemsArray(sections)
+        }
+        const result = sections.map(sec => ({
+          sectionTitle: sec.label || '',
+          items: Array.isArray(sec.hierarchicalItems)
+            ? sec.hierarchicalItems.map(h => ({
+              title: h.title || '',
+              content: Array.isArray(h.items) ? h.items : []
+            }))
+            : []
+        }))
+        // 创建新数组引用以确保 Vue 响应式更新
+        const newSections = [...this.renderedSections, ...result]
+        this.renderedSections = newSections
+        // 强制更新视图
+        this.$forceUpdate()
+        // 等待 DOM 更新后发送事件
+        this.$nextTick(() => {
+          this.$emit('sections-rendered', this.renderedSections)
+        })
+        return result
+      } catch (e) {
+        console.error('[XMarkdownSectionExtractor] extractAs error:', e)
+        return []
       }
-      return result
     },
     toggleItem (sectionIdx, itemIdx, contentIdx) {
       const key = `${sectionIdx}-${itemIdx}-${contentIdx}`
@@ -263,6 +293,17 @@ export default {
     clearSelection () {
       this.selectedItems = []
       this.$emit('selection-change', [])
+    },
+    clearRenderedSections () {
+      this.renderedSections = []
+      this.selectedItems = []
+      this.$emit('sections-cleared')
+    },
+    forceRender () {
+      this.$forceUpdate()
+      this.$nextTick(() => {
+        this.$emit('sections-rendered', this.renderedSections)
+      })
     }
   }
 }
@@ -271,6 +312,10 @@ export default {
 <style lang="less" scoped>
 .x-markdown-section-extractor {
   display: block;
+  width: 100%;
+  max-height: 599px;
+  overflow-y: auto;
+  overflow-x: hidden;
 }
 
 .extractor-header {

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

@@ -214,7 +214,7 @@ export default {
 <style lang="less" scoped>
 .x-markdown-viewer {
   width: 100%;
-  max-height: 500px;
+  max-height: 499px;
   overflow-y: auto;
   overflow-x: hidden;
 }

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

@@ -1,9 +1,9 @@
 <template>
-    <div
-      ref="drawerRoot"
-      class="drawer"
-      :class="[{ 'drawer-collapsed': !isOpen }, wrapperClassObject()]"
-      :style="drawerStyle">
+  <div
+    ref="drawerRoot"
+    class="drawer"
+    :class="[{ 'drawer-collapsed': !isOpen }, wrapperClassObject()]"
+    :style="drawerStyle">
     <div
       v-show="!isFrameConfig || showToggleInFrame"
       class="drawer-toggle"
@@ -106,11 +106,11 @@ export default {
       mainWithData: [{ max: 80, min: 50 }],
       rowResizeObserver: null,
       drawerResizeObserver: null,
-      _syncDrawerMinHeightRafId: null,
+      syncDrawerMinHeightRafId: null,
       // 记录所在 a-row 有史以来出现过的最大高度，只增不减，展开/收起基准统一
-      _maxRowHeight: null,
+      maxRowHeight: null,
       // 记录抽屉自身高度，用于按钮居中
-      _drawerHeight: null
+      drawerHeight: null
     }
   },
   mounted () {
@@ -128,9 +128,9 @@ export default {
     })
   },
   beforeDestroy () {
-    if (this._syncDrawerMinHeightRafId) {
-      cancelAnimationFrame(this._syncDrawerMinHeightRafId)
-      this._syncDrawerMinHeightRafId = null
+    if (this.syncDrawerMinHeightRafId) {
+      cancelAnimationFrame(this.syncDrawerMinHeightRafId)
+      this.syncDrawerMinHeightRafId = null
     }
     this.unbindRowResizeObserver()
     this.unbindDrawerResizeObserver()
@@ -144,7 +144,7 @@ export default {
         (!currentCol.className ||
           !currentCol.className.includes ||
           !currentCol.className.includes('ant-col'))
-      ) {
+        ) {
         currentCol = currentCol.parentNode
       }
       if (!currentCol || !currentCol.parentNode) return null
@@ -155,13 +155,13 @@ export default {
     // 展开/收起共用同一套参照：用 CSS 变量记录行高，箭头始终相对于该值居中，
     // 不走 CSS transition，彻底避免 min-height 动画化导致的"缓慢下移"问题
     scheduleSyncDrawerMinHeight () {
-      if (this._syncDrawerMinHeightRafId) return
-      this._syncDrawerMinHeightRafId = requestAnimationFrame(() => {
-        this._syncDrawerMinHeightRafId = null
+      if (this.syncDrawerMinHeightRafId) return
+      this.syncDrawerMinHeightRafId = requestAnimationFrame(() => {
+        this.syncDrawerMinHeightRafId = null
         this.syncDrawerMinHeightToParentRow()
       })
     },
-    // 同步读取行高并更新 _maxRowHeight，供 mounted 在渲染前调用
+    // 同步读取行高并更新 maxRowHeight，供 mounted 在渲染前调用
     computeMaxRowHeight () {
       const root = this.$refs.drawerRoot
       if (!root) return
@@ -169,8 +169,8 @@ export default {
       if (!row) return
       const raw = row.offsetHeight || row.getBoundingClientRect().height
       const h = Math.round(raw)
-      if (h > 0 && (this._maxRowHeight === null || h > this._maxRowHeight)) {
-        this._maxRowHeight = h
+      if (h > 0 && (this.maxRowHeight === null || h > this.maxRowHeight)) {
+        this.maxRowHeight = h
       }
     },
     syncDrawerMinHeightToParentRow () {
@@ -183,8 +183,8 @@ export default {
         const h = Math.round(raw)
         if (h <= 0) return
         // 只增不减：记录有史以来出现过的最大行高，作为收起后的定位基准
-        if (this._maxRowHeight === null || h > this._maxRowHeight) {
-          this._maxRowHeight = h
+        if (this.maxRowHeight === null || h > this.maxRowHeight) {
+          this.maxRowHeight = h
         }
         if (!this.rowResizeObserver && typeof ResizeObserver !== 'undefined') {
           this.rowResizeObserver = new ResizeObserver(() => {
@@ -231,7 +231,7 @@ export default {
       if (!root) return
       const h = root.offsetHeight || root.getBoundingClientRect().height
       if (h > 0) {
-        this._drawerHeight = Math.round(h)
+        this.drawerHeight = Math.round(h)
       }
     },
     // 通用的样式保护方法
@@ -281,8 +281,8 @@ export default {
         if (row) {
           const h = Math.round(row.offsetHeight || row.getBoundingClientRect().height)
           if (h > 0) {
-            if (this._maxRowHeight === null || h > this._maxRowHeight) {
-              this._maxRowHeight = h
+            if (this.maxRowHeight === null || h > this.maxRowHeight) {
+              this.maxRowHeight = h
             }
           }
         }
@@ -568,7 +568,7 @@ export default {
       const isPx = this.widthMode === 'px'
       const width = isPx ? `${this.collapsedWidth}px` : `${this.collapsedWidthPercent}%`
       // 优先用外部传入的 rowHeight，否则用内部计算的行高
-      const rowH = this.rowHeight || this._maxRowHeight
+      const rowH = this.rowHeight || this.maxRowHeight
       const top = rowH ? `${rowH / 2 - 24}px` : '50%'
       return { width, top }
     }
@@ -586,7 +586,7 @@ export default {
   border-left: solid rgba(240, 242, 245) 2px;
   /* 明确列出需要过渡的属性，min-height 和 height 永远不走过渡，避免箭头"慢慢下移" */
   transition: width 0.3s ease, background-color 0.3s ease, border-color 0.3s ease,
-    box-shadow 0.3s ease, border-radius 0.3s ease;
+  box-shadow 0.3s ease, border-radius 0.3s ease;
   border-radius: 10px;
 }
 /* 折叠时保持高度 */