vue2-client 1.15.122 → 1.15.125

package/src/base-client/components/common/HIS/HButtons/index.js

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

package/src/base-client/components/common/HIS/HFormTable/HFormTable.vue

@@ -0,0 +1,155 @@
+<script setup lang="ts">
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
+
+// 只定义HFormTable特有的属性
+defineProps({
+  // HFormTable特有的属性
+  tableStyle: {
+    type: String,
+    default: 'formtable-col1'
+  }
+})
+</script>
+
+<template>
+  <div
+    class="h-form-table-wrapper"
+    :class="[
+      `h-form-table-${tableStyle}`
+    ]"
+  >
+    <x-form-table
+      v-bind="$attrs"
+      v-on="$listeners"
+    >
+      <template v-for="(_, name) in $slots" #[name]="slotData">
+        <slot :name="name" v-bind="slotData" />
+      </template>
+    </x-form-table>
+  </div>
+</template>
+
+<style scoped lang="less">
+.h-form-table-wrapper {
+  // 基础样式
+  :deep(.table-wrapper) {
+    .ant-table {
+      .ant-table-row {
+        margin: 0px;
+
+        .ant-form-item {
+          margin: 0px;
+
+          .ant-form-item-control-wrapper {
+            .ant-form-item-control {
+              line-height: 0px;
+
+              .ant-select-selection--multiple {
+                padding-bottom: 2px;
+              }
+            }
+            width: 100%;
+          }
+        }
+      }
+      font-size: 16px;
+    }
+
+    .ant-alert-info {
+      display: none;
+    }
+  }
+
+  :deep(.ant-card) {
+    margin: -10px 0px 29px 0px;
+  }
+
+  :deep(.ant-btn) {
+    border: 0px;
+    box-shadow: none;
+    padding: 0px;
+    color: #5D5C5C;
+    font-weight: bold;
+    letter-spacing: 0em;
+    font-size: 18px;
+    line-height: normal;
+    font-family: "Source Han Sans";
+  }
+
+  :deep(.ant-card-body) {
+    padding: 0 6px;
+  }
+
+  :deep(.ant-table-small) {
+    border-width: 0;
+
+    .ant-table-fixed {
+      border-radius: 0;
+      border-bottom: 1px solid #f0f0f0;
+    }
+  }
+
+  // 表格高度样式
+  &.h-form-table-height {
+    :deep(.table-wrapper) {
+      .ant-select-open ~ .ant-table-content {
+        height: 500px !important;
+      }
+    }
+  }
+
+  // 表格样式
+  &.h-form-table-table {
+    :deep(.ant-table-small .ant-table-fixed-header) {
+      .ant-table-content {
+        .ant-table-content {
+          .ant-table-body {
+            border-radius: 0 0 4px 4px;
+            overflow: visible !important;
+          }
+        }
+      }
+    }
+  }
+
+  // 隐藏按钮区域
+  &.h-form-table-button-area-hide {
+    :deep(.ant-btn) {
+      display: none;
+    }
+
+    :deep(.table-wrapper) {
+      margin-top: -39px;
+    }
+  }
+
+  // 列样式1
+  &.h-form-table-formtable-col1 {
+    :deep(.table-wrapper) {
+      .ant-row {
+        .ant-col span {
+          border: none;
+          width: auto;
+          margin-bottom: auto;
+        }
+      }
+
+      .ant-table {
+        .ant-table-body {
+          .ant-table-fixed colgroup col:nth-child(2) {
+            width: 50px;
+            min-width: 50px;
+          }
+        }
+
+        .ant-table-header {
+          .ant-table-fixed colgroup col:nth-child(2) {
+            width: 50px;
+            min-width: 50px;
+          }
+        }
+      }
+    }
+  }
+}
+</style>

package/src/base-client/components/common/HIS/HFormTable/index.js

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

package/src/base-client/components/common/HIS/HTab/HTab.vue

@@ -0,0 +1,100 @@
+<script setup lang="ts">
+import XTab from '@vue2-client/base-client/components/common/XTab/XTab.vue'
+
+defineProps({
+  // HTab特有的属性
+  hasTopMargin: {
+    type: Boolean,
+    default: true
+  }
+})
+</script>
+
+<template>
+  <div class="h-tab-wrapper" :class="{ 'h-tab-has-top-margin': hasTopMargin }">
+    <x-tab
+      v-bind="$attrs"
+      v-on="$listeners"
+    >
+      <template v-for="(_, name) in $slots" #[name]="slotData">
+        <slot :name="name" v-bind="slotData" />
+      </template>
+    </x-tab>
+  </div>
+</template>
+
+<style scoped lang="less">
+.h-tab-wrapper {
+  // 基础样式
+  :deep(.ant-tabs-tab-next) {
+    display: none;
+  }
+
+  :deep(.ant-tabs-nav) {
+    .ant-tabs-tab-next-icon {
+      display: none;
+    }
+
+    .ant-tabs-tab {
+      background-color: transparent;
+      border-radius: 6px 6px 0 0;
+      color: #5D5C5C;
+      font-weight: bold;
+      width: 134px;
+      font-size: 18px;
+      line-height: 10px;
+      font-family: "Source Han Sans";
+      transition: all 0.3s;
+      height: 32px;
+      text-align: center;
+    }
+
+    .ant-tabs-tab-active {
+      background-color: #0057FE;
+      color: #ffffff;
+      width: 134px;
+      line-height: 10px;
+      height: 32px;
+      text-align: center;
+    }
+  }
+
+  :deep(.ant-tabs-bar) {
+    border-bottom: 2px solid #0057FE;
+  }
+
+  :deep(.ant-tabs-tab-arrow-show) {
+    display: none;
+  }
+
+  :deep(.ant-tabs-ink-bar) {
+    background-color: transparent;
+    bottom: -1px;
+    display: none;
+    height: 0;
+  }
+
+  :deep(.ant-tabs-tab-prev-icon-target) {
+    display: none;
+  }
+
+  // 带顶部边距的样式
+  &.h-tab-has-top-margin {
+    :deep(.ant-tabs-nav) {
+      margin-top: 6px;
+    }
+
+    :deep(.ant-tabs-bar) {
+      margin: 0 6px;
+    }
+
+    :deep(.ant-card-body) {
+      padding: 6px 0;
+
+      .ant-card-body {
+        padding: 6px;
+      }
+    }
+  }
+}
+</style>

package/src/base-client/components/common/HIS/HTab/index.js

@@ -0,0 +1,3 @@
+import tab from './HTab.vue'
+
+export default tab

package/src/base-client/components/common/HIS/demo.vue

@@ -0,0 +1,46 @@
+<template>
+  <div class="h-tab-demo">
+    <!-- XTab -->
+    <a-card title="XTab">
+      <h-tab
+        configName="openPrescriptionTab"
+        serverName="af-his"
+      />
+    </a-card>
+
+    <!-- HFormTable -->
+    <a-card title="HFormTable" style="margin-top: 20px;">
+      <h-form-table
+        queryParamsName="outpatientAdviceAllCRUD"
+        serviceName="af-his"
+      />
+    </a-card>
+
+    <!-- HButtons -->
+    <a-card title="HButtons" style="margin-top: 20px;">
+      <h-buttons
+        queryParamsName="outpatientAdviceGroup"
+        serviceName="af-his"
+      />
+    </a-card>
+  </div>
+</template>
+
+<script setup>
+import HTab from './HTab/HTab.vue'
+import HFormTable from './HFormTable/HFormTable.vue'
+import HButtons from './HButtons/HButtons.vue'
+
+</script>
+
+<style scoped lang="less">
+.h-tab-demo {
+  padding: 20px;
+
+  h4 {
+    color: #333;
+    margin-bottom: 10px;
+    font-size: 14px;
+  }
+}
+</style>

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

@@ -67,7 +67,7 @@
         <template v-if="panel.type === 'picture'">
           <img :src="panel.configName" alt="图片" style="width: 100%; max-width: 500px;"/>
         </template>
-        <template v-else-if="['x-form-table','x-simple-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio', 'x-text-card','x-tree-rows'].includes(panel.type)">
+        <template v-else-if="['x-image-report','x-form-table','x-simple-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio', 'x-text-card','x-tree-rows'].includes(panel.type)">
           <component
             :is="getComponentName(panel.type)"
             :ref="`dynamicComponent_${ panel.type }_${ panelIndex }`"
@@ -110,6 +110,7 @@ export default {
     XCardSet: () => import('@vue2-client/base-client/components/common/XCardSet/XCardSet.vue'),
     XCollapse: () => import('@vue2-client/base-client/components/common/XCollapse/XCollapse.vue'),
     XHDescriptions: () => import('@vue2-client/base-client/components/his/XHDescriptions/XHDescriptions.vue'),
+    XImageReport: () => import('@vue2-client/base-client/components/his/XImageReport/XImageReport.vue'),
     XSidebar: () => import('@vue2-client/base-client/components/his/XSidebar/XSidebar.vue'),
     XList: () => import('@vue2-client/base-client/components/his/XList/XList.vue'),
     XInput: () => import('@vue2-client/base-client/components/common/XInput/XInput.vue'),

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

@@ -348,12 +348,6 @@ export default {
         this.scrollToBottom()
       },
       deep: true
-    },
-    'messages.$[].text': {
-      handler () {
-        this.scrollToBottom()
-      },
-      deep: true
     }
   }
 }

package/src/base-client/components/common/XReportGrid/XReport.vue

@@ -317,9 +317,7 @@ export default {
     },
     // 把组件注册到refs中，方便调用
     registerComponent (componentName, component) {
-      console.log('内部注册', this.$options.name, componentName)
       this.$refs[componentName] = component
-      console.log('内部注册完成', this.$refs)
     },
 
     // 把设计的table布局转换成可显示的珊格布局
@@ -407,8 +405,6 @@ export default {
     },
     // 根据名字从注册到组件中获取组件
     getComponentByName (componentName) {
-      console.log('内部取组件', this.$options.name, componentName)
-      console.log('内部组件内容', this.$refs)
       return this.$refs[componentName]
     },
     getGlobalData () {
@@ -425,7 +421,6 @@ export default {
      * @param attr 传递给Modal弹框用的信息
      */
     openDialog (configName, selectedId, mixinData, outEnv = {}, attr = {}, showButtons = true) {
-      console.log('openDialog', configName, selectedId)
       this.$refs.xAddReport.init({
         configName: configName,
         selectedId: selectedId,
@@ -436,7 +431,6 @@ export default {
       })
     },
     openDrawer (configName, selectedId, mixinData, outEnv = {}, attr = {}) {
-      console.log('openDialog', configName, selectedId)
       this.$refs.xReportDrawer.init({
         configName,
         selectedId,
@@ -509,7 +503,6 @@ export default {
     selectRow (selectedRowKeys, selectedRows) {
       this.table_selectedRowKeys = selectedRowKeys
       this.table_selectedRows = selectedRows
-      console.log('')
       this.$emit('selectRow', selectedRowKeys, selectedRows)
     },
     // 注册组件到$refs中
@@ -915,7 +908,6 @@ export default {
 
         // 使用定时器循环判断锁状态，用于多个插槽，要等待统一获取完成之后，再进行下一步初始化
         const timer = setInterval(() => {
-          console.log('插槽下载进度，当前：' + count + '/' + total)
           if (count >= total) {
             clearInterval(timer)
             this.scanConfigSlot(config)
@@ -940,7 +932,6 @@ export default {
     },
     // 获取配置之后的初始化
     configInit () {
-      console.log('拼接完成', this.config)
       // 将初始化好的配置拷贝一份留存
       this.originalConfig = Object.assign({}, this.config)
       if (!this.dontFormat) {
@@ -993,11 +984,9 @@ export default {
       })
 
       // 对配置进行转换
-      console.log('转换前配置', this.config)
       this.originalConfig.columns = this.transformArray(
         JSON.parse(JSON.stringify(this.config.columns))
       )
-      console.log('转换后的列描述', this.originalConfig.columns)
 
       this.$nextTick(() => {
         this.scanFinish = true

package/src/base-client/components/common/XReportGrid/XReportDesign.vue

@@ -135,7 +135,6 @@ export default {
     selectRow (selectedRowKeys, selectedRows) {
       this.table_selectedRowKeys = selectedRowKeys
       this.table_selectedRows = selectedRows
-      console.log('XReportDesign')
       this.$emit('selectRow', selectedRowKeys, selectedRows)
     },
     setColSpanByName (componentName, colSpan) {
@@ -243,8 +242,6 @@ export default {
         // 处理子节点样式
         this.parseNestedStyles(classConfig, childStyles)
       })
-
-      console.warn('样式配置', rootStyles, childStyles)
       return {
         rootStyles,
         childStyles
@@ -375,48 +372,49 @@ export default {
       if (!rootElement) return
 
       // 处理样式映射
-      for (const [selector, data] of styleMap.entries()) {
-        const currentSelector = parentSelector ? `${parentSelector} ${selector}` : selector
-
-        try {
-          // 查找匹配的元素
-          const elements = Array.from(rootElement.querySelectorAll(currentSelector))
-
-          if (!elements.length) continue
-
-          // 应用当前层级样式
-          if (data.styles) {
-            elements.forEach(element => {
-              if (!element) return
-
-              // 应用每个样式属性
-              Object.entries(data.styles).forEach(([property, value]) => {
-                try {
-                  element.style.setProperty(property, value, 'important')
-                } catch (err) {
-                  console.warn(`设置样式失败: ${property}=${value}`, err)
-                }
+      try {
+        for (const [selector, data] of styleMap.entries()) {
+          const currentSelector = parentSelector ? `${parentSelector} ${selector}` : selector
+
+          try {
+            // 查找匹配的元素
+            const elements = Array.from(rootElement.querySelectorAll(currentSelector))
+
+            if (!elements.length) continue
+
+            // 应用当前层级样式
+            if (data.styles) {
+              elements.forEach(element => {
+                if (!element) return
+
+                // 应用每个样式属性
+                Object.entries(data.styles).forEach(([property, value]) => {
+                  try {
+                    element.style.setProperty(property, value, 'important')
+                  } catch (err) {
+                    console.warn(`设置样式失败: ${property}=${value}`, err)
+                  }
+                })
               })
-            })
-          }
+            }
 
-          // 处理子层级
-          if (data.children && data.children.size > 0) {
-            elements.forEach(element => {
-              if (element) {
-                this.applyChildStylesOptimized(element, data.children, currentSelector)
-              }
-            })
+            // 处理子层级
+            if (data.children && data.children.size > 0) {
+              elements.forEach(element => {
+                if (element) {
+                  this.applyChildStylesOptimized(element, data.children, currentSelector)
+                }
+              })
+            }
+          } catch (err) {
+            console.warn(`处理选择器失败: ${currentSelector}`, err)
+            continue
           }
-        } catch (err) {
-          console.warn(`处理选择器失败: ${currentSelector}`, err)
-          continue
         }
-      }
+      } catch (err) {}
     },
   },
   created () {
-    console.log('>>>> xreportdesign 渲染', JSON.stringify(this.config, null, 2))
     if (this.slotConfigName) {
       getConfigByName(this.slotConfigName, undefined, res => {
         this.slotConfig = res
@@ -440,19 +438,6 @@ export default {
   },
   mounted () {
     this.applyAllStyles()
-  },
-  watch: {
-    config: {
-      deep: true,
-      handler (newVal) {
-      }
-    },
-    activatedConfig: {
-      deep: true,
-      handler (val) {
-        console.log('>>>> activatedConfig: ', val)
-      }
-    }
   }
 }
 </script>