vue2-client 1.16.54 → 1.16.57

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

@@ -1,17 +1,19 @@
 <template>
   <div
     class="drawer"
-    :class="{ 'drawer-collapsed': !isOpen }">
+    :class="[{ 'drawer-collapsed': !isOpen }, wrapperClassObject()]"
+    :style="drawerStyle">
     <div
       v-show="!isFrameConfig"
       class="drawer-toggle"
       :class="{ 'toggle-collapsed': !isOpen }"
+      :style="toggleStyle"
       @click="toggleDrawer">
       <div class="arrow">
         {{ isOpen ? '›' : '‹' }}
       </div>
     </div>
-    <div class="drawer-content" v-show="isOpen">
+    <div class="drawer-content" v-show="isOpen" :style="contentStyle">
       <x-report
         ref="x_report"
         :configName="queryParamsName"
@@ -51,15 +53,39 @@ export default {
       type: Boolean,
       default: false
     },
-    // 展开时所占宽度百分比（影响父级 ant-col 的 flex 与 max-width）
+    // 展开时所占宽度百分比（percent模式使用，影响父级 ant-col 的 flex 与 max-width）
     expandedWidthPercent: {
       type: Number,
       default: 33.3
     },
-    // 收缩时所占宽度百分比
+    // 收缩时所占宽度百分比（percent模式使用）
     collapsedWidthPercent: {
       type: Number,
       default: 2
+    },
+    // 展开时所占宽度像素值（px模式使用）
+    expandedWidth: {
+      type: Number,
+      default: 602
+    },
+    // 收缩时所占宽度像素值（px模式使用）
+    collapsedWidth: {
+      type: Number,
+      default: 26
+    },
+    // 总宽度像素值（px模式使用）
+    totalWidth: {
+      type: Number,
+      default: 1638
+    },
+    // 宽度计算模式：'percent' 百分比模式，'px' 像素模式
+    // 使用示例：
+    // percent模式: <x-sidebar :width-mode="'percent'" :expanded-width-percent="40" :collapsed-width-percent="3" />
+    // px模式: <x-sidebar :width-mode="'px'" :expanded-width="500" :collapsed-width="30" />
+    widthMode: {
+      type: String,
+      default: 'percent',
+      validator: value => ['percent', 'px'].includes(value)
     }
   },
   data () {
@@ -88,18 +114,29 @@ export default {
         })
       }
     },
+    wrapperClassObject () {
+      const attrs = this.$attrs || {}
+      const classes = {}
+      const booleanStyleKeys = ['']
+      booleanStyleKeys.forEach(key => {
+        const val = attrs[key]
+        const truthy = val === true || val === '' || val === 'true'
+        if (truthy) classes[`x-sidebar-${key}`] = true
+      })
+      return classes
+    },
     // 更新card-body的padding
     updateCardBodyPadding () {
       this.$nextTick(() => {
         const cardBody = this.$el.querySelector('.ant-card-body')
         if (cardBody) {
-          cardBody.style.padding = '3%'
+          cardBody.style.padding = '0px'
         } else {
           // 如果找不到元素，可能需要等待XReport完全渲染
           setTimeout(() => {
             const cardBody = this.$el.querySelector('.ant-card-body')
             if (cardBody) {
-              cardBody.style.padding = '3%'
+              cardBody.style.padding = '0px'
             }
           }, 500)
         }
@@ -159,20 +196,37 @@ export default {
               }
 
               if (isOpen) {
-                // 展开：仅当显式允许时才改变布局百分比；否则恢复默认宽度
+                // 展开：仅当显式允许时才改变布局；否则恢复默认宽度
                 if (this.affectLayout) {
-                  const drawerWidth = (this.expandedWidthPercent || 33.3)
-                  currentCol.style.cssText = `
-                flex: 0 0 ${drawerWidth}% !important;
-                max-width: ${drawerWidth}% !important;
-                transition: all 0.3s;`
-                  if (otherCols.length === 1) {
-                    const mainCol = otherCols[0]
-                    const mainWidth = Math.max(0, 100 - drawerWidth)
-                    mainCol.style.cssText = `
-                    flex: 0 0 ${mainWidth}% !important;
-                    max-width: ${mainWidth}% !important;
+                  if (this.widthMode === 'px') {
+                    // px模式：使用固定像素宽度
+                    const drawerWidth = this.expandedWidth || 584
+                    currentCol.style.cssText = `
+                    flex: 0 0 ${drawerWidth}px !important;
+                    max-width: ${drawerWidth}px !important;
+                    transition: all 0.3s;`
+                    if (otherCols.length === 1) {
+                      const mainCol = otherCols[0]
+                      mainCol.style.cssText = `
+                      flex: 1 1 auto !important;
+                      max-width: calc(${this.totalWidth} - ${drawerWidth}px) !important;
+                      transition: all 0.3s;`
+                    }
+                  } else {
+                    // percent模式：使用百分比宽度（原有逻辑）
+                    const drawerWidth = (this.expandedWidthPercent || 33.3)
+                    currentCol.style.cssText = `
+                    flex: 0 0 ${drawerWidth}% !important;
+                    max-width: ${drawerWidth}% !important;
                     transition: all 0.3s;`
+                    if (otherCols.length === 1) {
+                      const mainCol = otherCols[0]
+                      const mainWidth = Math.max(0, Math.min(this.totalWidth, 100) - drawerWidth)
+                      mainCol.style.cssText = `
+                      flex: 0 0 ${mainWidth}% !important;
+                      max-width: ${mainWidth}% !important;
+                      transition: all 0.3s;`
+                    }
                   }
                 } else {
                   // 恢复默认（移除我们加的内联样式）
@@ -186,16 +240,16 @@ export default {
                 }
                 triggerResize()
               } else {
-                // 收缩：为了消除空白，始终把侧栏压到 24px，并让相邻主列占满剩余
+                // 收缩：为了消除空白，始终把侧栏压到 26px，并让相邻主列占满剩余
                 currentCol.style.cssText = `
-              flex: 0 0 24px !important;
-              max-width: 24px !important;
-              transition: all 0.3s;`
+                flex: 0 0 26px !important;
+                max-width: 26px !important;
+                transition: all 0.3s;`
                 if (otherCols.length === 1) {
                   const mainCol = otherCols[0]
                   mainCol.style.cssText = `
                   flex: 1 1 auto !important;
-                  max-width: calc(100% - 24px) !important;
+                  max-width: calc(100% - 26px) !important;
                   transition: all 0.3s;`
                 }
                 triggerResize()
@@ -226,6 +280,39 @@ export default {
   computed: {
     isFrameConfig () {
       return this.queryParamsName?.endsWith('Frame') || false
+    },
+    drawerStyle () {
+      const isPx = this.widthMode === 'px'
+      if (!this.isOpen) {
+        // collapsed width
+        return isPx
+          ? { width: `${this.collapsedWidth}px` }
+          : { width: `${this.collapsedWidthPercent}%` }
+      }
+      // expanded width for the whole drawer wrapper
+      return isPx
+        ? { width: `${this.expandedWidth}px`, display: 'flex', flexDirection: 'row', alignItems: 'stretch' }
+        : { width: `${this.expandedWidthPercent}%`, display: 'flex', flexDirection: 'row', alignItems: 'stretch' }
+    },
+    contentStyle () {
+      const isPx = this.widthMode === 'px'
+      if (!this.isOpen) return { display: 'none' }
+      if (isPx) {
+        const contentWidth = Math.max(0, (this.expandedWidth || 0) - (this.collapsedWidth || 0))
+        return { width: `${contentWidth}px`, flex: '1 1 auto', overflow: 'hidden' }
+      }
+      const contentPercent = Math.max(0, (this.expandedWidthPercent || 0) - (this.collapsedWidthPercent || 0))
+      return { width: `${contentPercent}%`, flex: '1 1 auto', overflow: 'hidden' }
+    },
+    toggleStyle () {
+      // 在展开时让切换按钮参与flex布局，避免与内容重叠；收起时保持绝对定位
+      const isPx = this.widthMode === 'px'
+      if (this.isOpen) {
+        return isPx
+          ? { position: 'relative', left: '0', zIndex: 1, flex: `0 0 ${this.collapsedWidth}px`, width: `${this.collapsedWidth}px` }
+          : { position: 'relative', left: '0', zIndex: 1, flex: `0 0 ${this.collapsedWidthPercent}%`, width: `${this.collapsedWidthPercent}%` }
+      }
+      return { left: '0' }
     }
   }
 }
@@ -243,14 +330,14 @@ export default {
 }
 
 .drawer-collapsed {
-  width: 24px;
+  width: 26px;
   box-shadow: none;
 }
 .drawer-toggle {
   position: absolute;
   top: 50%;
   transform: translateY(-50%);
-  width: 24px;
+  width: 26px;
   height: 48px;
   cursor: pointer;
   background-color: rgba(255, 255, 255, 0) !important;
@@ -279,5 +366,6 @@ export default {
 }
 .drawer-content {
   height: 100%;
+  padding-right: 12px;
 }
 </style>

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

@@ -27,6 +27,11 @@ const props = defineProps({
   queryParamsName: {
     type: String,
     default: ''
+  },
+  // 新增：直接设置标题文本，优先级高于queryParamsName
+  title: {
+    type: String,
+    default: ''
   }
 })
 
@@ -75,6 +80,17 @@ const handleClick = () => {
 }
 
 const parseConfig = (data) => {
+  // 如果设置了title属性，直接使用title作为标签
+  if (props.title) {
+    config.value.label = props.title
+    config.value.type = 'title'
+    config.value.line = ''
+    config.value.color = ''
+    config.value.lineLength = ''
+    config.value.clickName = ''
+    return
+  }
+
   if (!data) return
 
   const parts = data.includes('-') ? data.split('-') : data === 'line' ? ['', 'title', 'line'] : [data]

package/src/base-client/components/his/threeTestOrders/editor.vue

@@ -1,113 +1,113 @@
-<template>
-  <!-- 根据实际部署环境修改 editor.html 的路径 -->
-  <iframe
-    src="/his/editor/editor.html"
-    width="100%"
-    height="800"
-    frameborder="0"
-    @load="onIframeLoad"
-    ref="editorIframe">
-  </iframe>
-</template>
-
-<script setup>
-
-import { ref, onBeforeUnmount } from 'vue'
-
-const editorIframe = ref(null)
-const checkEditorTimer = ref(null)
-const checkCount = ref(0)
-const editor = ref(null)
-const iframeWindow = ref(null)
-// 对外暴露的获取editor方法
-const getEditor = () => {
-  if (editor.value) {
-    return editor.value
-  }
-  if (iframeWindow.value && iframeWindow.value.editor) {
-    editor.value = iframeWindow.value.editor
-    return editor.value
-  }
-  if (editorIframe.value && editorIframe.value.contentWindow && editorIframe.value.contentWindow.editor) {
-    editor.value = editorIframe.value.contentWindow.editor
-    return editor.value
-  }
-  return null
-}
-// 创建体温单方法
-const createVitalSigns = (data) => {
-  const editorObj = getEditor()
-  if (!editorObj) {
-    throw new Error('editor对象未初始化，无法创建体温单')
-  }
-  if (typeof editorObj.createVitalSigns === 'function') {
-    return editorObj.createVitalSigns(data)
-  } else {
-    throw new Error('editor对象未包含createVitalSigns方法')
-  }
-}
-
-// 检查editor对象是否已初始化
-const startEditorCheck = (frameWindow, iframe) => {
-  if (checkEditorTimer.value) {
-    clearInterval(checkEditorTimer.value)
-  }
-  checkCount.value = 0
-  checkEditorTimer.value = setInterval(() => {
-    checkCount.value++
-    try {
-      const editorObj = frameWindow.editor
-      if (editorObj && typeof editorObj.createVitalSigns === 'function') {
-        clearInterval(checkEditorTimer.value)
-        editor.value = editorObj
-        // 将editor对象暴露到全局
-        window.iframeEditor = editorObj
-        window.iframeWindow = frameWindow
-        // 触发事件
-        emit('editor-ready', editorObj)
-        emit('load', { target: iframe, editor: editorObj })
-        // 发送消息通知
-        window.parent.postMessage({ type: 'editorReady' }, '*')
-      }
-    } catch (err) {
-      console.error('检查editor对象时出错:', err)
-    }
-    if (checkCount.value >= 20) {
-      clearInterval(checkEditorTimer.value)
-      console.error('Editor 对象加载失败')
-    }
-  }, 500)
-}
-// iframe加载完成的处理
-const onIframeLoad = (e) => {
-  const iframe = e.target
-  const frameWindow = iframe.contentWindow
-  iframeWindow.value = frameWindow
-  if (!frameWindow) {
-    console.error('无法访问 iframe 内容')
-    return
-  }
-  // 关闭文书工具栏
-  iframe.contentWindow.editor.option.toolbar = false
-  startEditorCheck(frameWindow, iframe)
-}
-// 组件销毁前清理
-onBeforeUnmount(() => {
-  if (checkEditorTimer.value) {
-    clearInterval(checkEditorTimer.value)
-  }
-})
-// 暴露方法给父组件
-defineExpose({ getEditor, createVitalSigns })
-
-// 定义事件
-const emit = defineEmits(['editor-ready', 'load'])
-</script>
-
-<style scoped>
-iframe {
-  border: none;
-  width: 100%;
-  min-height: 800px;
-}
-</style>
+<template>
+  <!-- 根据实际部署环境修改 editor.html 的路径 -->
+  <iframe
+    src="/his/editor/editor.html"
+    width="100%"
+    height="800"
+    frameborder="0"
+    @load="onIframeLoad"
+    ref="editorIframe">
+  </iframe>
+</template>
+
+<script setup>
+
+import { ref, onBeforeUnmount } from 'vue'
+
+const editorIframe = ref(null)
+const checkEditorTimer = ref(null)
+const checkCount = ref(0)
+const editor = ref(null)
+const iframeWindow = ref(null)
+// 对外暴露的获取editor方法
+const getEditor = () => {
+  if (editor.value) {
+    return editor.value
+  }
+  if (iframeWindow.value && iframeWindow.value.editor) {
+    editor.value = iframeWindow.value.editor
+    return editor.value
+  }
+  if (editorIframe.value && editorIframe.value.contentWindow && editorIframe.value.contentWindow.editor) {
+    editor.value = editorIframe.value.contentWindow.editor
+    return editor.value
+  }
+  return null
+}
+// 创建体温单方法
+const createVitalSigns = (data) => {
+  const editorObj = getEditor()
+  if (!editorObj) {
+    throw new Error('editor对象未初始化，无法创建体温单')
+  }
+  if (typeof editorObj.createVitalSigns === 'function') {
+    return editorObj.createVitalSigns(data)
+  } else {
+    throw new Error('editor对象未包含createVitalSigns方法')
+  }
+}
+
+// 检查editor对象是否已初始化
+const startEditorCheck = (frameWindow, iframe) => {
+  if (checkEditorTimer.value) {
+    clearInterval(checkEditorTimer.value)
+  }
+  checkCount.value = 0
+  checkEditorTimer.value = setInterval(() => {
+    checkCount.value++
+    try {
+      const editorObj = frameWindow.editor
+      if (editorObj && typeof editorObj.createVitalSigns === 'function') {
+        clearInterval(checkEditorTimer.value)
+        editor.value = editorObj
+        // 将editor对象暴露到全局
+        window.iframeEditor = editorObj
+        window.iframeWindow = frameWindow
+        // 触发事件
+        emit('editor-ready', editorObj)
+        emit('load', { target: iframe, editor: editorObj })
+        // 发送消息通知
+        window.parent.postMessage({ type: 'editorReady' }, '*')
+      }
+    } catch (err) {
+      console.error('检查editor对象时出错:', err)
+    }
+    if (checkCount.value >= 20) {
+      clearInterval(checkEditorTimer.value)
+      console.error('Editor 对象加载失败')
+    }
+  }, 500)
+}
+// iframe加载完成的处理
+const onIframeLoad = (e) => {
+  const iframe = e.target
+  const frameWindow = iframe.contentWindow
+  iframeWindow.value = frameWindow
+  if (!frameWindow) {
+    console.error('无法访问 iframe 内容')
+    return
+  }
+  // 关闭文书工具栏
+  iframe.contentWindow.editor.option.toolbar = false
+  startEditorCheck(frameWindow, iframe)
+}
+// 组件销毁前清理
+onBeforeUnmount(() => {
+  if (checkEditorTimer.value) {
+    clearInterval(checkEditorTimer.value)
+  }
+})
+// 暴露方法给父组件
+defineExpose({ getEditor, createVitalSigns })
+
+// 定义事件
+const emit = defineEmits(['editor-ready', 'load'])
+</script>
+
+<style scoped>
+iframe {
+  border: none;
+  width: 100%;
+  min-height: 800px;
+}
+</style>

package/src/pages/userInfoDetailManage/ExceptionRecordQuery/index.vue

@@ -1,45 +1,45 @@
-<script>
-export default {
-  name: 'ExceptionQuery',
-  components: {
-    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
-  },
-  props: {
-    currUserInfo: {
-      type: Object,
-      default: () => undefined
-    }
-  },
-  mounted () {
-    this.$refs.xFormTable.refresh(true)
-  },
-  data () {
-    return {
-      // 查询配置名称
-      queryParamsName: 'ExceptionRecordQueryCRUD',
-      fixedQueryForm: { ex_f_userfiles_id: this.currUserInfo.f_userfiles_id },
-      // 新增表单固定值
-      fixedAddForm: {},
-      // 是否显示详情抽屉
-      detailVisible: false,
-      // 当前记录
-      record: {}
-    }
-  }
-}
-</script>
-
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="异常查询"
-      :queryParamsName="queryParamsName"
-      :fixedQueryForm="fixedQueryForm"
-      ref="xFormTable">
-    </x-form-table>
-  </a-card>
-</template>
-
-<style scoped>
-
-</style>
+<script>
+export default {
+  name: 'ExceptionQuery',
+  components: {
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
+  },
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  mounted () {
+    this.$refs.xFormTable.refresh(true)
+  },
+  data () {
+    return {
+      // 查询配置名称
+      queryParamsName: 'ExceptionRecordQueryCRUD',
+      fixedQueryForm: { ex_f_userfiles_id: this.currUserInfo.f_userfiles_id },
+      // 新增表单固定值
+      fixedAddForm: {},
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {}
+    }
+  }
+}
+</script>
+
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="异常查询"
+      :queryParamsName="queryParamsName"
+      :fixedQueryForm="fixedQueryForm"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<style scoped>
+
+</style>