vue2-client 1.12.2 → 1.12.3-9.alpha.1

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

@@ -423,6 +423,7 @@ export default {
       summaryDrawerWidth: 35,
       // 行选择模式
       selectRowMode: 'default',
+      tableSize: 'default',
       clearSelectRowAfterQuery: false,
       selectedRowModalVisible: false
     }
@@ -653,6 +654,7 @@ export default {
         chartsConfigArray = [],
         printTemplate = 'DEFAULT_CRUD_PRINT_TEMPLATE',
         selectRowMode = 'default',
+        tableSize = 'default',
         clearSelectRowAfterQuery = false
       } = params
       this.showSummary = Object.keys(tableSummaryMap).length > 0
@@ -703,6 +705,7 @@ export default {
       this.summaryDrawerWidth = summaryDrawerWidth
       this.chartsConfigArray = chartsConfigArray
       this.selectRowMode = selectRowMode
+      this.tableSize = tableSize
       this.clearSelectRowAfterQuery = clearSelectRowAfterQuery
       if (this.chartsConfigArray.length > 0) {
         // 循环chartsConfigArray，将每个配置的数据请求参数赋值给requestParameters

package/src/base-client/components/common/XTable/XTableWrapper.vue

@@ -15,7 +15,7 @@
     :pageSize="tableContext.simpleMode ? 1000 : undefined"
     :setScrollYHeight="tableContext.setScrollYHeight"
     :selectRowMode="tableContext.selectRowMode"
-    size="default"
+    :size="tableContext.tableSize"
   >
     <template
       v-for="(item, c_index) in tableContext.tableColumns"
@@ -36,6 +36,9 @@
           :key="'editRow-' + c_index"
         />
       </template>
+      <span v-else-if="item.slotType === 'rate'" :key="'rate-' + c_index">
+        <x-rate :value="text" :disabled="true" :allow-half="item.allowHalf" :max-count="item.maxCount" />
+      </span>
       <span v-else-if="item.slotType === 'index'" :key="'index-' + c_index">
         {{ index + 1 }}
       </span>
@@ -81,7 +84,7 @@
       </span>
       <span v-else-if="item.slotType === 'action'" :key="'action-' + c_index">
         <template v-if="item.actionArr && item.actionArr.length > 0">
-          <a-dropdown>
+          <a-dropdown :getPopupContainer=" triggerNode => { return triggerNode.parentNode } ">
             <a class="ant-dropdown-link" @click="e => e.preventDefault()">
               {{ item.scopedSlots?.customRender || item.slotValue }} <a-icon type="down"/>
             </a>
@@ -116,7 +119,7 @@ import XBadge from '@vue2-client/base-client/components/common/XBadge'
 import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
 import CustomFuncCel from '@vue2-client/base-client/components/common/XTable/CustomFuncCel.vue'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
-
+import XRate from '@vue2-client/base-client/components/common/XRate/index.vue'
 export default {
   name: 'XTableWrapper',
   components: {
@@ -124,6 +127,7 @@ export default {
     STable,
     XBadge,
     XFormItem,
+    XRate,
     CustomFuncCel
   },
   computed: {

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

@@ -0,0 +1,172 @@
+<template>
+  <div class="patient-info-descriptions">
+    <a-descriptions
+      :column="configurationParameters?.layout"
+      :size="configurationParameters?.style?.size"
+      :bordered="configurationParameters?.style?.bordered"
+      layout="horizontal">
+      <template v-if="data">
+        <a-descriptions-item
+          v-for="item in configurationParameters?.items"
+          :key="item.field">
+          <template #label>
+            <div :class="['label-wrapper', { 'with-avatar': item.showAvatar }]">
+              <a-avatar
+                v-if="item.showAvatar"
+                :size="item.avatar.size"
+                :icon="item.avatar.icon"
+                :style="{ background: item.avatar.background }"
+              />
+              <span class="label-text">{{ item.label }}</span>
+            </div>
+          </template>
+          <div class="content-wrapper">
+            {{ data[item.field] }}
+          </div>
+        </a-descriptions-item>
+      </template>
+    </a-descriptions>
+  </div>
+</template>
+<script>
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XHDescriptions',
+  data () {
+    return {
+      data: null,
+      configurationParameters: null
+    }
+  },
+  props: {
+    queryParamsName: {
+      type: String,
+      default: 'DescriptionsExampleConfig'
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  methods: {
+    async getData (data) {
+      this.data = null
+      getConfigByName(data, 'af-his', res => {
+        this.configurationParameters = res
+        console.log(this.configurationParameters)
+        runLogic(res.logicName, res.parameter, 'af-his').then(result => {
+          this.data = result
+        })
+      })
+    }
+  },
+  watch: {
+    queryParamsName: {
+      handler (newValue) {
+        console.log(newValue)
+        this.getData(newValue)
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.patient-info-descriptions {
+  background: #fff;
+  padding: 12px;
+  border-radius: 4px;
+}
+
+.label-wrapper {
+  display: flex;
+  align-items: center;
+  white-space: nowrap;
+  line-height: 24px;
+  position: relative;
+  padding: 0;
+  margin: 0;
+}
+
+.label-wrapper.with-avatar {
+  gap: 8px;
+}
+
+.label-text {
+  display: inline-flex;
+  align-items: center;
+}
+
+.content-wrapper {
+  line-height: 24px;
+  white-space: nowrap;
+}
+
+:deep(.ant-descriptions-row) {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+:deep(.ant-descriptions-item) {
+  padding: 0 !important;
+  display: flex !important;
+  align-items: center !important;
+  flex-direction: row !important;
+  margin-right: 24px;
+  width: fit-content !important;
+}
+
+:deep(.ant-descriptions-item-container) {
+  display: flex !important;
+  flex-direction: row !important;
+  align-items: center !important;
+  position: relative;
+  gap: 0 !important;
+  width: 100% !important;
+}
+
+:deep(.ant-descriptions-item-label) {
+  color: rgba(0, 0, 0, 0.65);
+  padding: 0 !important;
+  margin: 0 !important;
+  font-size: v-bind('configurationParameters?.style?.fontSize');
+  display: inline-flex !important;
+  align-items: center !important;
+  white-space: nowrap !important;
+}
+
+:deep(.ant-descriptions-item-content) {
+  font-size: v-bind('configurationParameters?.style?.fontSize');
+  display: inline-flex !important;
+  align-items: center !important;
+  padding: 0 !important;
+  margin: 0 !important;
+  margin-left: 2px !important;
+}
+
+:deep(.ant-descriptions-item-colon) {
+  position: static !important;
+  display: inline-flex !important;
+  align-items: center !important;
+  margin: 0 !important;
+  padding: 0 !important;
+}
+
+/* 移除 Ant Design 的默认样式 */
+:deep(.ant-descriptions-item-container),
+:deep(.ant-descriptions-item-label),
+:deep(.ant-descriptions-item-content),
+:deep(.ant-descriptions-item-colon) {
+  box-sizing: border-box !important;
+  border-spacing: 0 !important;
+  border-collapse: collapse !important;
+}
+
+/* 添加悬停效果 */
+:deep(.ant-descriptions-item-container:hover) {
+  background-color: rgba(0, 0, 0, 0.02);
+  border-radius: 4px;
+}
+</style>