vue2-client 1.16.15 → 1.16.19

package/src/base-client/components/his/XHisEditor/index.js

@@ -1,3 +1,3 @@
-import XHisEditor from './XHisEditor.vue'
-
-export default XHisEditor
+import XHisEditor from './XHisEditor.vue'
+
+export default XHisEditor

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

@@ -45,6 +45,21 @@ export default {
     serverName: {
       type: String,
       default: 'af-his'
+    },
+    // 是否允许该组件主动调整同级布局（默认不影响其它页面）
+    affectLayout: {
+      type: Boolean,
+      default: false
+    },
+    // 展开时所占宽度百分比（影响父级 ant-col 的 flex 与 max-width）
+    expandedWidthPercent: {
+      type: Number,
+      default: 33.3
+    },
+    // 收缩时所占宽度百分比
+    collapsedWidthPercent: {
+      type: Number,
+      default: 2
     }
   },
   data () {
@@ -55,7 +70,7 @@ export default {
     }
   },
   mounted () {
-    // 在挂载后调整父元素宽度
+    // 在挂载后调整父元素宽度（方法内部已区分是否影响布局）
     this.updateLayout(this.isOpen)
     // 如果抽屉初始状态为打开，设置padding
     if (this.isOpen) {
@@ -124,7 +139,7 @@ export default {
     updateLayout (isOpen) {
       this.$nextTick(() => {
         try {
-          // 获取所有同级a-col
+          // 获取所有同级a-col（仅筛选出 .ant-col-12）
           const otherCols = this.getSiblingCols()
           if (otherCols.length > 0) {
             let currentCol = this.$el.parentNode
@@ -132,31 +147,59 @@ export default {
               currentCol = currentCol.parentNode
             }
             if (currentCol) {
-              // 更新当前列的宽度
-              const drawerWidth = isOpen ? 33.3 : 2
-              // 强制更新样式
-              currentCol.style.cssText = `
-            flex: 0 0 ${drawerWidth}% !important;
-            max-width: ${drawerWidth}% !important;
-            transition: all 0.3s;`
               // 触发XTab组件重新计算宽度
-              this.$nextTick(() => {
-                const tabComponent = this.$el.querySelector('.ant-tabs')
-                if (tabComponent) {
-                  tabComponent.style.width = '100%'
-                  window.dispatchEvent(new Event('resize'))
-                }
-              })
-              // 更新其他列宽度
-              otherCols.forEach((col, index) => {
-                if (index < this.mainWithData.length) {
-                  const widthValue = isOpen ? this.mainWithData[index].min : this.mainWithData[index].max
-                  col.style.cssText = `
-                flex: 0 0 ${widthValue}% !important;
-                max-width: ${widthValue}% !important;
+              const triggerResize = () => {
+                this.$nextTick(() => {
+                  const tabComponent = this.$el.querySelector('.ant-tabs')
+                  if (tabComponent) {
+                    tabComponent.style.width = '100%'
+                    window.dispatchEvent(new Event('resize'))
+                  }
+                })
+              }
+
+              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;
+                    transition: all 0.3s;`
+                  }
+                } else {
+                  // 恢复默认（移除我们加的内联样式）
+                  currentCol.style.removeProperty('flex')
+                  currentCol.style.removeProperty('max-width')
+                  if (otherCols.length === 1) {
+                    const mainCol = otherCols[0]
+                    mainCol.style.removeProperty('flex')
+                    mainCol.style.removeProperty('max-width')
+                  }
+                }
+                triggerResize()
+              } else {
+                // 收缩：为了消除空白，始终把侧栏压到 24px，并让相邻主列占满剩余
+                currentCol.style.cssText = `
+              flex: 0 0 24px !important;
+              max-width: 24px !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;
+                  transition: all 0.3s;`
                 }
-              })
+                triggerResize()
+              }
             }
           }
         } catch (error) {
@@ -214,7 +257,7 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  z-index: 1;
+  z-index: 1000;
   transition: all 0.3s;
 }
 /* 打开状态：箭头在抽屉内 */

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

@@ -397,7 +397,11 @@ function mergeAndTransformData (records, patientInfo, id, date, operateDate) {
   }
   return mergedData
 }
-
+// 设置病历号的方法
+function setMedicalRecordId (id) {
+  vitalSignsId.value = id
+  console.log('病历号已设置为:', vitalSignsId.value)
+}
 // 生命周期钩子
 onMounted(() => {
   window.addEventListener('message', (event) => {
@@ -433,6 +437,8 @@ defineExpose({
   },
   // 创建体温单 参数：(Object) data
   handleSubmit,
+  // 设置病历号
+  setMedicalRecordId,
   // 获取表单数据
   mergeAndTransformData
 })

package/src/base-client/components/index.js

@@ -1,51 +1,51 @@
-import XForm from './common/XForm'
-import XAddForm from './common/XAddForm'
-import XAddNativeForm from './common/XAddNativeForm'
-import XFormCol from './common/XFormCol'
-import XTable from './common/XTable'
-import XTreeOne from './common/XTreeOne'
-import XImportExcel from './common/XImportExcel'
-import XDataDrawer from './common/XDataDrawer'
-import XCard from './common/XCard'
-import XBadge from './common/XBadge'
-import Upload from './common/Upload'
-import JSONToTree from './common/JSONToTree'
-import FormGroupEdit from './common/FormGroupEdit'
-import FormGroupQuery from './common/FormGroupQuery'
-import AddressSearchCombobox from './common/AddressSearchCombobox'
-import AmapMarker from './common/AmapMarker'
-import PersonSetting from './common/PersonSetting'
-import XFormTable from './common/XFormTable'
-import XStepView from './common/XStepView'
-import Tree from './common/Tree'
-import CreateQuery from './common/CreateQuery'
-import CreateSimpleFormQuery from './common/CreateSimpleFormQuery'
-import XFormGroup from './common/XFormGroup'
-import XDescriptionsGroup from './common/XDescriptions/XDescriptionsGroup.vue'
-
-export default {
-  AddressSearchCombobox,
-  AmapMarker,
-  CreateQuery,
-  CreateSimpleFormQuery,
-  FormGroupEdit,
-  FormGroupQuery,
-  JSONToTree,
-  PersonSetting,
-  Tree,
-  Upload,
-  XAddForm,
-  XAddNativeForm,
-  XBadge,
-  XCard,
-  XDataDrawer,
-  XDescriptionsGroup,
-  XForm,
-  XFormCol,
-  XFormGroup,
-  XFormTable,
-  XImportExcel,
-  XStepView,
-  XTable,
-  XTreeOne
-}
+import XForm from './common/XForm'
+import XAddForm from './common/XAddForm'
+import XAddNativeForm from './common/XAddNativeForm'
+import XFormCol from './common/XFormCol'
+import XTable from './common/XTable'
+import XTreeOne from './common/XTreeOne'
+import XImportExcel from './common/XImportExcel'
+import XDataDrawer from './common/XDataDrawer'
+import XCard from './common/XCard'
+import XBadge from './common/XBadge'
+import Upload from './common/Upload'
+import JSONToTree from './common/JSONToTree'
+import FormGroupEdit from './common/FormGroupEdit'
+import FormGroupQuery from './common/FormGroupQuery'
+import AddressSearchCombobox from './common/AddressSearchCombobox'
+import AmapMarker from './common/AmapMarker'
+import PersonSetting from './common/PersonSetting'
+import XFormTable from './common/XFormTable'
+import XStepView from './common/XStepView'
+import Tree from './common/Tree'
+import CreateQuery from './common/CreateQuery'
+import CreateSimpleFormQuery from './common/CreateSimpleFormQuery'
+import XFormGroup from './common/XFormGroup'
+import XDescriptionsGroup from './common/XDescriptions/XDescriptionsGroup.vue'
+
+export default {
+  AddressSearchCombobox,
+  AmapMarker,
+  CreateQuery,
+  CreateSimpleFormQuery,
+  FormGroupEdit,
+  FormGroupQuery,
+  JSONToTree,
+  PersonSetting,
+  Tree,
+  Upload,
+  XAddForm,
+  XAddNativeForm,
+  XBadge,
+  XCard,
+  XDataDrawer,
+  XDescriptionsGroup,
+  XForm,
+  XFormCol,
+  XFormGroup,
+  XFormTable,
+  XImportExcel,
+  XStepView,
+  XTable,
+  XTreeOne
+}

package/src/base-client/components/layout/XTreeView/XTreeView.vue

@@ -1,130 +1,130 @@
-<template>
-  <component-layout-one v-if="loaded" :siderProps="{width: leftWidth, collapsible: collapsible, collapsedWidth: collapsedWidth, theme: 'light'}">
-    <template slot="left">
-      <div class="bg-white pd-20" :style="{height: treeHeight}">
-        <x-tree-pro
-          :config-name="configName"
-          :serviceName="serviceName"
-          :env="env"
-          :countVisible="countVisible"
-          @action="action"
-          @treeOnChecked="treeOnChecked"
-          @itemChecked="itemChecked"
-          ref="xtree"
-        ></x-tree-pro>
-      </div>
-    </template>
-    <div style="margin-left: 12px">
-      <slot></slot>
-    </div>
-  </component-layout-one>
-</template>
-
-<script>
-  import ComponentLayoutOne from '@vue2-client/layouts/ComponentLayoutOne'
-  import XTreePro from '@vue2-client/base-client/components/common/XTree/XTreePro'
-  export default {
-    name: 'XTreeView',
-    components: { ComponentLayoutOne, XTreePro },
-    data () {
-      return {
-        // 加载状态
-        loaded: false,
-        // xTree 配置名称
-        configName: undefined,
-        // 环境
-        env: undefined,
-        // 命名空间
-        serviceName: undefined,
-        // 左侧宽度
-        leftWidth: undefined,
-        // 是否允许收起
-        collapsible: undefined,
-        // 左侧收起后宽度
-        collapsedWidth: undefined,
-        // 是否显示数量
-        countVisible: undefined,
-        // 树高度
-        treeHeight: undefined,
-        // 用于展示筛选出的数据
-        searchData: [],
-        // 查询值
-        searchValue: ''
-      }
-    },
-    methods: {
-      init (params) {
-        const {
-          // xTree 配置名称
-          configName,
-          // 环境
-          env = 'prod',
-          // 命名空间
-          serviceName,
-          // 左侧宽度
-          leftWidth = 300,
-          // 是否允许收起
-          collapsible = true,
-          // 左侧收起后宽度
-          collapsedWidth = 0,
-          // 是否显示数量
-          countVisible = false,
-          // 树高度
-          treeHeight = '85vh'
-        } = params
-        this.loaded = false
-        this.configName = configName
-        this.env = env
-        this.serviceName = serviceName
-        this.leftWidth = leftWidth
-        this.collapsible = collapsible
-        this.collapsedWidth = collapsedWidth
-        this.countVisible = countVisible
-        this.treeHeight = treeHeight
-        this.loaded = true
-      },
-      /**
-       * 详情按钮事件
-       * @param record 本条数据
-       * @param id 数据标识
-       * @param actionType 操作类型
-       * @param fun 向上级传递的事件
-       */
-      action (record, id, actionType, fun = 'action') {
-        this.$emit(fun, record, id, actionType)
-      },
-      refresh () {
-        this.$refs.xtree.refresh()
-      },
-      treeOnChecked (checkedKeys, deepNodes, deepKeys) {
-        this.$emit('treeOnChecked', checkedKeys, deepNodes, deepKeys)
-      },
-      itemChecked (node) {
-        this.$emit('itemChecked', node)
-      },
-      onChange (e) {
-        const name = e.target.value
-        this.searchValue = name
-        this.searchData = []
-        for (const row of this.treeData) {
-          if (row.title.indexOf(name) > -1) {
-            this.searchData.push(row)
-          }
-        }
-      },
-      close () {
-        this.loaded = false
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-  .pd-20 {
-    padding: 20px;
-  }
-  /deep/ .ant-tree-switcher-icon svg{
-    width: 1.5em;
-    height: 1.5em;
-  }
-</style>
+<template>
+  <component-layout-one v-if="loaded" :siderProps="{width: leftWidth, collapsible: collapsible, collapsedWidth: collapsedWidth, theme: 'light'}">
+    <template slot="left">
+      <div class="bg-white pd-20" :style="{height: treeHeight}">
+        <x-tree-pro
+          :config-name="configName"
+          :serviceName="serviceName"
+          :env="env"
+          :countVisible="countVisible"
+          @action="action"
+          @treeOnChecked="treeOnChecked"
+          @itemChecked="itemChecked"
+          ref="xtree"
+        ></x-tree-pro>
+      </div>
+    </template>
+    <div style="margin-left: 12px">
+      <slot></slot>
+    </div>
+  </component-layout-one>
+</template>
+
+<script>
+  import ComponentLayoutOne from '@vue2-client/layouts/ComponentLayoutOne'
+  import XTreePro from '@vue2-client/base-client/components/common/XTree/XTreePro'
+  export default {
+    name: 'XTreeView',
+    components: { ComponentLayoutOne, XTreePro },
+    data () {
+      return {
+        // 加载状态
+        loaded: false,
+        // xTree 配置名称
+        configName: undefined,
+        // 环境
+        env: undefined,
+        // 命名空间
+        serviceName: undefined,
+        // 左侧宽度
+        leftWidth: undefined,
+        // 是否允许收起
+        collapsible: undefined,
+        // 左侧收起后宽度
+        collapsedWidth: undefined,
+        // 是否显示数量
+        countVisible: undefined,
+        // 树高度
+        treeHeight: undefined,
+        // 用于展示筛选出的数据
+        searchData: [],
+        // 查询值
+        searchValue: ''
+      }
+    },
+    methods: {
+      init (params) {
+        const {
+          // xTree 配置名称
+          configName,
+          // 环境
+          env = 'prod',
+          // 命名空间
+          serviceName,
+          // 左侧宽度
+          leftWidth = 300,
+          // 是否允许收起
+          collapsible = true,
+          // 左侧收起后宽度
+          collapsedWidth = 0,
+          // 是否显示数量
+          countVisible = false,
+          // 树高度
+          treeHeight = '85vh'
+        } = params
+        this.loaded = false
+        this.configName = configName
+        this.env = env
+        this.serviceName = serviceName
+        this.leftWidth = leftWidth
+        this.collapsible = collapsible
+        this.collapsedWidth = collapsedWidth
+        this.countVisible = countVisible
+        this.treeHeight = treeHeight
+        this.loaded = true
+      },
+      /**
+       * 详情按钮事件
+       * @param record 本条数据
+       * @param id 数据标识
+       * @param actionType 操作类型
+       * @param fun 向上级传递的事件
+       */
+      action (record, id, actionType, fun = 'action') {
+        this.$emit(fun, record, id, actionType)
+      },
+      refresh () {
+        this.$refs.xtree.refresh()
+      },
+      treeOnChecked (checkedKeys, deepNodes, deepKeys) {
+        this.$emit('treeOnChecked', checkedKeys, deepNodes, deepKeys)
+      },
+      itemChecked (node) {
+        this.$emit('itemChecked', node)
+      },
+      onChange (e) {
+        const name = e.target.value
+        this.searchValue = name
+        this.searchData = []
+        for (const row of this.treeData) {
+          if (row.title.indexOf(name) > -1) {
+            this.searchData.push(row)
+          }
+        }
+      },
+      close () {
+        this.loaded = false
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  .pd-20 {
+    padding: 20px;
+  }
+  /deep/ .ant-tree-switcher-icon svg{
+    width: 1.5em;
+    height: 1.5em;
+  }
+</style>

package/src/base-client/components/layout/XTreeView/index.js

@@ -1,3 +1,3 @@
-import XTreeView from './XTreeView'
-
-export default XTreeView
+import XTreeView from './XTreeView'
+
+export default XTreeView

package/src/base-client/components/layout/XTreeView/index.md

@@ -1,46 +1,46 @@
-# XTreeView
-
-左侧为树结构，右侧为自定义面板的单向数据流布局组件
-
-引用方式：
-
-```vue
-<template>
-  <x-tree-view ref="xTreeView" @itemChecked="itemChecked">
-    <!-- 右侧面板 -->
-  </x-tree-view>
-</template>
-<script>
-import XTreeView from '@vue2-client/base-client/components/layout/XTreeView'
-
-export default {
-  components: {
-    XTreeView
-  },
-  mounted () {
-    this.initView()
-  },
-  methods: {
-    // 初始化组件
-    initView() {
-      this.$refs.xTreeView.init({
-        configName: 'templateTreeConfig',
-        serviceName: 'af-his',
-        env: 'dev',
-      })
-    },
-    itemChecked(node) {
-
-    }
-  }
-}
-</script>
-```
-
-## API
-
-| 参数           | 说明      | 类型       | 默认值 |
-|--------------|---------|----------|-----|
-| init(params) | 初始化组件   | function | -   |
-| close()      | 关闭组件    | function | -   |
-| @itemChecked | 树节点选中事件 | event    | -   |
+# XTreeView
+
+左侧为树结构，右侧为自定义面板的单向数据流布局组件
+
+引用方式：
+
+```vue
+<template>
+  <x-tree-view ref="xTreeView" @itemChecked="itemChecked">
+    <!-- 右侧面板 -->
+  </x-tree-view>
+</template>
+<script>
+import XTreeView from '@vue2-client/base-client/components/layout/XTreeView'
+
+export default {
+  components: {
+    XTreeView
+  },
+  mounted () {
+    this.initView()
+  },
+  methods: {
+    // 初始化组件
+    initView() {
+      this.$refs.xTreeView.init({
+        configName: 'templateTreeConfig',
+        serviceName: 'af-his',
+        env: 'dev',
+      })
+    },
+    itemChecked(node) {
+
+    }
+  }
+}
+</script>
+```
+
+## API
+
+| 参数           | 说明      | 类型       | 默认值 |
+|--------------|---------|----------|-----|
+| init(params) | 初始化组件   | function | -   |
+| close()      | 关闭组件    | function | -   |
+| @itemChecked | 树节点选中事件 | event    | -   |