vue2-client 1.16.59 → 1.16.61

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

@@ -127,6 +127,7 @@ export default {
     },
     // 更新card-body的padding
     updateCardBodyPadding () {
+      if (this.widthMode) { return }
       this.$nextTick(() => {
         const cardBody = this.$el.querySelector('.ant-card-body')
         if (cardBody) {
@@ -176,7 +177,6 @@ export default {
     updateLayout (isOpen) {
       this.$nextTick(() => {
         try {
-          // 获取所有同级a-col（仅筛选出 .ant-col-12）
           const otherCols = this.getSiblingCols()
           if (otherCols.length > 0) {
             let currentCol = this.$el.parentNode
@@ -184,7 +184,6 @@ export default {
               currentCol = currentCol.parentNode
             }
             if (currentCol) {
-              // 触发XTab组件重新计算宽度
               const triggerResize = () => {
                 this.$nextTick(() => {
                   const tabComponent = this.$el.querySelector('.ant-tabs')
@@ -196,40 +195,34 @@ export default {
               }
 
               if (isOpen) {
-                // 展开：仅当显式允许时才改变布局；否则恢复默认宽度
                 if (this.affectLayout) {
                   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;`
+                    // 使用 style 对象逐个设置属性，保留其他样式
+                    currentCol.style.flex = `0 0 ${drawerWidth}px`
+                    currentCol.style.maxWidth = `${drawerWidth}px`
+                    currentCol.style.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;`
+                      mainCol.style.flex = '1 1 auto'
+                      mainCol.style.maxWidth = `calc(${this.totalWidth} - ${drawerWidth}px)`
+                      mainCol.style.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;`
+                    currentCol.style.flex = `0 0 ${drawerWidth}%`
+                    currentCol.style.maxWidth = `${drawerWidth}%`
+                    currentCol.style.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;`
+                      mainCol.style.flex = `0 0 ${mainWidth}%`
+                      mainCol.style.maxWidth = `${mainWidth}%`
+                      mainCol.style.transition = 'all 0.3s'
                     }
                   }
                 } else {
-                  // 恢复默认（移除我们加的内联样式）
+                  // 恢复默认：只移除我们设置的属性
                   currentCol.style.removeProperty('flex')
                   currentCol.style.removeProperty('max-width')
                   if (otherCols.length === 1) {
@@ -240,17 +233,15 @@ export default {
                 }
                 triggerResize()
               } else {
-                // 收缩：为了消除空白，始终把侧栏压到 26px，并让相邻主列占满剩余
-                currentCol.style.cssText = `
-                flex: 0 0 26px !important;
-                max-width: 26px !important;
-                transition: all 0.3s;`
+                // 收缩状态
+                currentCol.style.flex = '0 0 26px'
+                currentCol.style.maxWidth = '26px'
+                currentCol.style.transition = 'all 0.3s'
                 if (otherCols.length === 1) {
                   const mainCol = otherCols[0]
-                  mainCol.style.cssText = `
-                  flex: 1 1 auto !important;
-                  max-width: calc(100% - 26px) !important;
-                  transition: all 0.3s;`
+                  mainCol.style.flex = '1 1 auto'
+                  mainCol.style.maxWidth = 'calc(100% - 26px)'
+                  mainCol.style.transition = 'all 0.3s'
                 }
                 triggerResize()
               }

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>