vue2-client 1.16.63 → 1.16.64

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

@@ -104,6 +104,43 @@ export default {
     }
   },
   methods: {
+    // 通用的样式保护方法
+    protectElementStyles (element, stylesToProtect = ['padding', 'padding-left', 'padding-right', 'padding-top', 'padding-bottom', 'margin', 'background-color', 'color', 'font-size', 'border']) {
+      const protectedStyles = {}
+
+      // 保存需要保护的样式
+      stylesToProtect.forEach(style => {
+        const value = element.style.getPropertyValue(style)
+        if (value) {
+          protectedStyles[style] = value
+        }
+      })
+
+      return protectedStyles
+    },
+
+    // 恢复保护的样式
+    restoreElementStyles (element, protectedStyles) {
+      Object.entries(protectedStyles).forEach(([property, value]) => {
+        if (value) {
+          element.style.setProperty(property, value, 'important')
+        }
+      })
+    },
+
+    // 安全地设置布局样式，保护其他样式
+    safeSetLayoutStyles (element, layoutStyles) {
+      // 保护所有可能的样式配置
+      const protectedStyles = this.protectElementStyles(element)
+
+      // 设置布局样式
+      Object.entries(layoutStyles).forEach(([property, value]) => {
+        element.style.setProperty(property, value)
+      })
+
+      // 恢复保护的样式
+      this.restoreElementStyles(element, protectedStyles)
+    },
     toggleDrawer () {
       this.isOpen = !this.isOpen
       this.$emit('on-drawer-change', this.isOpen)
@@ -144,7 +181,7 @@ export default {
       })
     },
     // 获取同级的其他所有a-col元素
-    getSiblingCols () {
+    getSiblingCols (className) {
       try {
         // 找到当前组件所在的a-col
         let currentCol = this.$el.parentNode
@@ -162,10 +199,8 @@ export default {
           return []
         }
 
-        // 修改这里：只获取直接子元素中的.ant-col-12
-        const allCols = Array.from(row.children).filter(child =>
-          child.className.includes('ant-col-12')
-        )
+        // 修改这里 如果没有指定className 则获取全部
+        const allCols = Array.from(row.children).filter(child => !className || child.className.includes(className))
 
         // 过滤掉当前a-col，返回其他所有a-col
         return allCols.filter(col => col !== currentCol)
@@ -174,10 +209,48 @@ export default {
         return []
       }
     },
+
+    computeRemainingWidth (allElements, mainCol, currentCol) {
+      if (!allElements || allElements.length === 0) {
+        return '0px'
+      }
+
+      // 排除 mainCol 和 currentCol
+      const filteredElements = allElements.filter(element =>
+        element !== mainCol && element !== currentCol
+      )
+
+      if (filteredElements.length === 0) {
+        return '0px'
+      }
+
+      let totalWidth = 0
+
+      filteredElements.forEach(element => {
+        if (element && element.style) {
+          // 获取元素的计算样式
+          const computedStyle = window.getComputedStyle(element)
+
+          // 获取宽度（包括padding和border）
+          const width = parseFloat(computedStyle.width) || 0
+
+          // 获取左右margin
+          const marginLeft = parseFloat(computedStyle.marginLeft) || 0
+          const marginRight = parseFloat(computedStyle.marginRight) || 0
+
+          // 累加总宽度（宽度 + 左右margin）
+          totalWidth += width + marginLeft + marginRight
+        }
+      })
+
+      // 返回计算出的宽度，如果计算失败则返回默认值
+      return totalWidth > 0 ? `${totalWidth}px` : '0px'
+    },
+
     updateLayout (isOpen) {
       this.$nextTick(() => {
         try {
-          const otherCols = this.getSiblingCols()
+          const otherCols = this.getSiblingCols('ant-col-12')
           if (otherCols.length > 0) {
             let currentCol = this.$el.parentNode
             while (currentCol && !currentCol.className.includes('ant-col')) {
@@ -197,28 +270,42 @@ export default {
               if (isOpen) {
                 if (this.affectLayout) {
                   if (this.widthMode === 'px') {
-                    const drawerWidth = this.expandedWidth || 584
-                    // 使用 style 对象逐个设置属性，保留其他样式
-                    currentCol.style.flex = `0 0 ${drawerWidth}px`
-                    currentCol.style.maxWidth = `${drawerWidth}px`
-                    currentCol.style.transition = 'all 0.3s'
+                    const drawerWidth = this.expandedWidth || 602
+                    // 使用安全的方式设置布局样式
+                    this.safeSetLayoutStyles(currentCol, {
+                      flex: `0 0 ${drawerWidth}px`,
+                      maxWidth: `${drawerWidth}px`,
+                      transition: 'all 0.3s'
+                    })
                     if (otherCols.length === 1) {
                       const mainCol = otherCols[0]
-                      mainCol.style.flex = '1 1 auto'
-                      mainCol.style.maxWidth = `calc(${this.totalWidth} - ${drawerWidth}px)`
-                      mainCol.style.transition = 'all 0.3s'
+                      const remainingWidth = this.computeRemainingWidth(this.getSiblingCols(undefined), mainCol, currentCol)
+
+                      // 使用安全的方式设置布局样式
+                      this.safeSetLayoutStyles(mainCol, {
+                        flex: '1 1 auto',
+                        maxWidth: `calc(100% - ${remainingWidth} - ${drawerWidth}px)`,
+                        transition: 'all 0.3s'
+                      })
                     }
                   } else {
                     const drawerWidth = (this.expandedWidthPercent || 33.3)
-                    currentCol.style.flex = `0 0 ${drawerWidth}%`
-                    currentCol.style.maxWidth = `${drawerWidth}%`
-                    currentCol.style.transition = 'all 0.3s'
+                    // 使用安全的方式设置布局样式
+                    this.safeSetLayoutStyles(currentCol, {
+                      flex: `0 0 ${drawerWidth}%`,
+                      maxWidth: `${drawerWidth}%`,
+                      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.flex = `0 0 ${mainWidth}%`
-                      mainCol.style.maxWidth = `${mainWidth}%`
-                      mainCol.style.transition = 'all 0.3s'
+                      const remainingWidth = this.computeRemainingWidth(this.getSiblingCols(undefined), mainCol, currentCol)
+
+                      // 使用安全的方式设置布局样式
+                      this.safeSetLayoutStyles(mainCol, {
+                        flex: `0 0 calc(100% - ${remainingWidth} - ${drawerWidth}%)`,
+                        maxWidth: `calc(100% - ${remainingWidth} - ${drawerWidth}%)`,
+                        transition: 'all 0.3s'
+                      })
                     }
                   }
                 } else {
@@ -234,14 +321,23 @@ export default {
                 triggerResize()
               } else {
                 // 收缩状态
-                currentCol.style.flex = '0 0 26px'
-                currentCol.style.maxWidth = '26px'
-                currentCol.style.transition = 'all 0.3s'
+                const width = this.widthMode === 'px' ? this.collapsedWidth + 'px' : this.collapsedWidthPercent + '%'
+                // 使用安全的方式设置布局样式
+                this.safeSetLayoutStyles(currentCol, {
+                  flex: '0 0 ' + width,
+                  maxWidth: width,
+                  transition: 'all 0.3s'
+                })
                 if (otherCols.length === 1) {
                   const mainCol = otherCols[0]
-                  mainCol.style.flex = '1 1 auto'
-                  mainCol.style.maxWidth = 'calc(100% - 26px)'
-                  mainCol.style.transition = 'all 0.3s'
+                  const remainingWidth = this.computeRemainingWidth(this.getSiblingCols(undefined), mainCol, currentCol)
+
+                  // 使用安全的方式设置布局样式
+                  this.safeSetLayoutStyles(mainCol, {
+                    flex: '1 1 auto',
+                    maxWth: `calc(100% - ${remainingWidth} - ${width})`,
+                    transition: 'all 0.3s'
+                  })
                 }
                 triggerResize()
               }

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    | -   |