vue2-client 1.12.100 → 1.12.102

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.12.100",
+  "version": "1.12.102",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

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

@@ -2,20 +2,17 @@
   <div>
     <a-collapse
       :activeKey="activeKey"
-      @change="handleChange"
-    >
+      @change="handleChange">
       <a-collapse-panel
         v-for="(panel, panelIndex) in config.showData"
         :key="panelIndex.toString()"
         :show-arrow="false"
-        :disabled="config.collapsible"
-      >
+        :disabled="config.collapsible">
         <template #header>
           <div class="header-content">
             <span
               class="header-text"
-              :style="config.titleStyle"
-            >
+              :style="config.titleStyle">
               {{ panel.title }}
             </span>
             <!-- 当有 title2 数据时显示信息项 -->
@@ -24,8 +21,7 @@
                 v-for="(item, headerIndex) in panel.title2"
                 :key="headerIndex"
                 class="info-item"
-                :style="config.title2Style"
-              >
+                :style="config.title2Style">
                 <!-- 根据showTitle是否显示键名 -->
                 <span v-if="item.showTitle">{{ item.key }}:</span>
                 <span>{{ item.value }}</span>
@@ -35,8 +31,7 @@
             <span
               v-if="panel.title3"
               class="time-item"
-              :style="config.title3Style"
-            >
+              :style="config.title3Style">
               {{ panel.title3 }}
             </span>
             <!-- 修改搜索框的显示条件 -->
@@ -46,8 +41,7 @@
               :placeholder="panel.searchPlace"
               class="search-input"
               @search="(value) => onSearch(value, panelIndex)"
-              @click.stop
-            />
+              @click.stop/>
           </div>
         </template>
         <!-- 根据类型显示不同内容 -->
@@ -60,11 +54,11 @@
             :ref="`dynamicComponent_${ panel.type }`"
             serverName="af-his"
             :queryParamsName="panel.configName"
+            :parameter="panel.parameter"
             :countVisible="false"
             :env="env"
             @listClick="listClick"
-            @click="click"
-          />
+            @click="click"/>
         </template>
       </a-collapse-panel>
     </a-collapse>

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

@@ -0,0 +1,15 @@
+<template>
+  <x-collapse :query-params-name="openPrescriptionConfig" />
+</template>
+
+<script>
+import XCollapse from '@vue2-client/base-client/components/common/XCollapse/XCollapse.vue'
+export default {
+  name: 'Demo',
+  components: { XCollapse }
+}
+</script>
+
+<style scoped>
+
+</style>

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

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

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

@@ -1,44 +1,44 @@
-<template>
-  <div id="test">
-    <a-card :bordered="false">
-      <XReport
-        ref="main"
-        :use-oss-for-img="false"
-        config-name="openPrescriptionCover"
-        server-name="af-his"
-        :show-img-in-cell="true"
-        :display-only="true"
-        :edit-mode="false"
-        :dont-format="true"/>
-    </a-card>
-  </div>
-</template>
-
-<script>
-import XReport from './XReport'
-import XAddReport from '../XAddReport/XAddReport.vue'
-// eslint-disable-next-line no-unused-vars
-
-export default {
-  name: 'XReportDemo',
-  components: {
-    XReport, XAddReport
-  },
-  mounted () {
-    // this.$refs.xAddReport.init({
-    //   configName: 'skinTestExecuActionCover',
-    //   selectedId: '11111',
-    //   mixinData: {}
-    // })
-  },
-  data () {
-    return {
-    }
-  },
-  methods: {
-  }
-}
-</script>
-<style scoped>
-
-</style>
+<template>
+  <div id="test">
+    <a-card :bordered="false">
+      <XReport
+        ref="main"
+        :use-oss-for-img="false"
+        config-name="openPrescriptionCover"
+        server-name="af-his"
+        :show-img-in-cell="true"
+        :display-only="true"
+        :edit-mode="false"
+        :dont-format="true"/>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import XReport from './XReport'
+import XAddReport from '../XAddReport/XAddReport.vue'
+// eslint-disable-next-line no-unused-vars
+
+export default {
+  name: 'XReportDemo',
+  components: {
+    XReport, XAddReport
+  },
+  mounted () {
+    // this.$refs.xAddReport.init({
+    //   configName: 'skinTestExecuActionCover',
+    //   selectedId: '11111',
+    //   mixinData: {}
+    // })
+  },
+  data () {
+    return {
+    }
+  },
+  methods: {
+  }
+}
+</script>
+<style scoped>
+
+</style>

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

@@ -43,6 +43,12 @@ export default {
     queryParamsName: {
       type: String,
       default: 'DescriptionsExampleConfig'
+    },
+    parameter: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     }
   },
   created () {
@@ -54,7 +60,8 @@ export default {
       getConfigByName(data, 'af-his', res => {
         this.configurationParameters = res
         console.log(this.configurationParameters)
-        runLogic(res.logicName, res.parameter, 'af-his').then(result => {
+        const parameter = { ...res.parameter, ...this.parameter }
+        runLogic(res.logicName, parameter, 'af-his').then(result => {
           this.data = result
         })
       })

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

@@ -1,131 +1,131 @@
-<template>
-  <div class="list-wrapper">
-    <a-list size="large" :data-source="data" itemLayout="horizontal" class="list-container" ref="listRef">
-      <a-list-item slot="renderItem" slot-scope="item, index" class="list-item" @click="handleClick(index)">
-        <i
-          v-if="icon"
-          class="icon-menu"
-          :style="getIconStyle(item)"
-        ></i>
-        <span
-          class="item-text">
-          {{ item.number }} {{ item.name }}
-        </span>
-        <a-button v-if="button" type="link" class="confirm-btn" @click.stop="click(index)">{{ buttonName }}</a-button>
-      </a-list-item>
-    </a-list>
-  </div>
-</template>
-
-<script>
-
-import { runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XList',
-  props: {
-    queryParamsName: {
-      type: Object,
-      default: null
-    }
-  },
-  inject: ['getComponentByName'],
-  data () {
-    return {
-      data: [],
-      button: false,
-      icon: false,
-      buttonName: ''
-    }
-  },
-  created () {
-    this.getData(this.queryParamsName)
-  },
-  methods: {
-    async getData (config) {
-        runLogic(config, {}, 'af-his').then(res => {
-          this.button = res.button
-          this.icon = res.icon
-          this.buttonName = res.buttonName
-          this.data = res.data
-        })
-    },
-    handleClick (index) {
-      this.$emit('listClick', this.data[index])
-    },
-    refreshList () {
-      this.getData(this.queryParamsName)
-    },
-    click (index) {
-      this.$emit('click', this.data[index])
-    },
-    getIconStyle (item) {
-      return item.picture
-        ? { backgroundImage: `url(${item.picture})` }
-        : {}
-    },
-    filterData (par) {
-      runLogic(this.queryParamsName, par, 'af-his').then(res => {
-        this.data = res.data
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.list-wrapper {
-  max-height: 240px;
-  overflow-y: auto;
-  padding-right: 2px;
-}
-
-.list-container {
-  width: 100%;
-}
-
-.list-item {
-  height: 35px;
-  border-radius: 6px;
-  background-color: #F4F4F4;
-  padding: 8px 15px;
-  font-size: 16px;
-  display: flex;
-  align-items: center;
-  width: 100%;
-  border: 1px solid #D9D9D9;
-  box-sizing: border-box;
-  margin-bottom: 8px !important;
-}
-
-.icon-menu {
-  display: inline-block;
-  width: 20px;
-  height: 20px;
-  background-color: #ccc;
-  margin-right: 8px;
-}
-
-.item-text {
-  flex: 1;
-}
-
-.confirm-btn {
-  margin-left: auto;
-  padding: 0 8px;
-}
-
-/* 自定义滚动条样式 */
-.list-wrapper::-webkit-scrollbar {
-  width: 6px;
-}
-
-.list-wrapper::-webkit-scrollbar-thumb {
-  background-color: #d9d9d9;
-  border-radius: 3px;
-}
-
-.list-wrapper::-webkit-scrollbar-track {
-  background-color: #f0f0f0;
-}
-</style>
+<template>
+  <div class="list-wrapper">
+    <a-list size="large" :data-source="data" itemLayout="horizontal" class="list-container" ref="listRef">
+      <a-list-item slot="renderItem" slot-scope="item, index" class="list-item" @click="handleClick(index)">
+        <i
+          v-if="icon"
+          class="icon-menu"
+          :style="getIconStyle(item)"
+        ></i>
+        <span
+          class="item-text">
+          {{ item.number }} {{ item.name }}
+        </span>
+        <a-button v-if="button" type="link" class="confirm-btn" @click.stop="click(index)">{{ buttonName }}</a-button>
+      </a-list-item>
+    </a-list>
+  </div>
+</template>
+
+<script>
+
+import { runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XList',
+  props: {
+    queryParamsName: {
+      type: Object,
+      default: null
+    }
+  },
+  inject: ['getComponentByName'],
+  data () {
+    return {
+      data: [],
+      button: false,
+      icon: false,
+      buttonName: ''
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  methods: {
+    async getData (config) {
+        runLogic(config, {}, 'af-his').then(res => {
+          this.button = res.button
+          this.icon = res.icon
+          this.buttonName = res.buttonName
+          this.data = res.data
+        })
+    },
+    handleClick (index) {
+      this.$emit('listClick', this.data[index])
+    },
+    refreshList () {
+      this.getData(this.queryParamsName)
+    },
+    click (index) {
+      this.$emit('click', this.data[index])
+    },
+    getIconStyle (item) {
+      return item.picture
+        ? { backgroundImage: `url(${item.picture})` }
+        : {}
+    },
+    filterData (par) {
+      runLogic(this.queryParamsName, par, 'af-his').then(res => {
+        this.data = res.data
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.list-wrapper {
+  max-height: 240px;
+  overflow-y: auto;
+  padding-right: 2px;
+}
+
+.list-container {
+  width: 100%;
+}
+
+.list-item {
+  height: 35px;
+  border-radius: 6px;
+  background-color: #F4F4F4;
+  padding: 8px 15px;
+  font-size: 16px;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  border: 1px solid #D9D9D9;
+  box-sizing: border-box;
+  margin-bottom: 8px !important;
+}
+
+.icon-menu {
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  background-color: #ccc;
+  margin-right: 8px;
+}
+
+.item-text {
+  flex: 1;
+}
+
+.confirm-btn {
+  margin-left: auto;
+  padding: 0 8px;
+}
+
+/* 自定义滚动条样式 */
+.list-wrapper::-webkit-scrollbar {
+  width: 6px;
+}
+
+.list-wrapper::-webkit-scrollbar-thumb {
+  background-color: #d9d9d9;
+  border-radius: 3px;
+}
+
+.list-wrapper::-webkit-scrollbar-track {
+  background-color: #f0f0f0;
+}
+</style>

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

@@ -10,7 +10,7 @@
         {{ isOpen ? '›' : '‹' }}
       </div>
     </div>
-    <div class="drawer-content" v-if="isOpen">
+    <div class="drawer-content" v-show="isOpen">
       <x-report
         ref="x_report"
         :configName="queryParamsName"
@@ -56,12 +56,38 @@ export default {
   mounted () {
     // 在挂载后调整父元素宽度
     this.updateLayout(this.isOpen)
+    // 如果抽屉初始状态为打开，设置padding
+    if (this.isOpen) {
+      this.updateCardBodyPadding()
+    }
   },
   methods: {
     toggleDrawer () {
       this.isOpen = !this.isOpen
       this.$emit('on-drawer-change', this.isOpen)
       this.updateLayout(this.isOpen)
+      if (this.isOpen) {
+        this.$nextTick(() => {
+          this.updateCardBodyPadding()
+        })
+      }
+    },
+    // 更新card-body的padding
+    updateCardBodyPadding () {
+      this.$nextTick(() => {
+        const cardBody = this.$el.querySelector('.ant-card-body')
+        if (cardBody) {
+          cardBody.style.padding = '3%'
+        } else {
+          // 如果找不到元素，可能需要等待XReport完全渲染
+          setTimeout(() => {
+            const cardBody = this.$el.querySelector('.ant-card-body')
+            if (cardBody) {
+              cardBody.style.padding = '3%'
+            }
+          }, 500)
+        }
+      })
     },
     // 获取同级的其他所有a-col元素
     getSiblingCols () {