vue2-client 1.16.86 → 1.16.87

package/src/base-client/components/common/XDatePicker/index.vue

@@ -40,6 +40,11 @@ export default {
       type: Boolean,
       default: false,
     },
+    // 是否启用时间弹出到最外层
+    enablePopupToBody: {
+      type: Boolean,
+      default: false
+    },
   },
   model: {
     prop: 'value',
@@ -183,6 +188,9 @@ export default {
         moment(value[1]).format(this.formatType),
       ]
     },
+    getBodyContainer (triggerNode) {
+      return document.body
+    }
   },
 }
 </script>
@@ -195,7 +203,8 @@ export default {
         (attr?.queryType !== 'BETWEEN' || mode !== '查询')) ||
         (['rangePicker'].includes(attr.type) && mode !== '查询')
     "
-    :getCalendarContainer="(triggerNode) => triggerNode.parentNode"
+    :getCalendarContainer="enablePopupToBody? undefined :(triggerNode) => triggerNode.parentNode"
+    :getPopupContainer="enablePopupToBody? getBodyContainer : undefined"
     v-model="localValue"
     :disabled="disabled || readOnly"
     style="width: 100%"
@@ -211,7 +220,8 @@ export default {
       attr.type === 'monthPicker' ||
         (attr.type === 'monthRangePicker' && mode !== '查询')
     "
-    :getCalendarContainer="(triggerNode) => triggerNode.parentNode"
+    :getCalendarContainer="enablePopupToBody? undefined :(triggerNode) => triggerNode.parentNode"
+    :getPopupContainer="enablePopupToBody? getBodyContainer : undefined"
     v-model="localValue"
     :disabled="disabled || readOnly"
     :show-time="true"
@@ -225,7 +235,8 @@ export default {
       attr.type === 'yearPicker' ||
         (attr.type === 'yearRangePicker' && mode !== '查询')
     "
-    :getCalendarContainer="(triggerNode) => triggerNode.parentNode"
+    :getCalendarContainer="enablePopupToBody? undefined :(triggerNode) => triggerNode.parentNode"
+    :getPopupContainer="enablePopupToBody? getBodyContainer : undefined"
     v-model="localValue"
     :disabled="disabled || readOnly"
     format="YYYY"
@@ -250,7 +261,8 @@ export default {
         (attr.type === 'rangePicker' && mode === '查询') ||
         ['yearRangePicker', 'monthRangePicker'].includes(attr.type)
     "
-    :getCalendarContainer="(triggerNode) => triggerNode.parentNode"
+    :getCalendarContainer="enablePopupToBody? undefined :(triggerNode) => triggerNode.parentNode"
+    :getPopupContainer="enablePopupToBody? getBodyContainer : undefined"
     v-model="localValue"
     :disabled="disabled"
     :placeholder="placeholder"

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -381,6 +381,7 @@
       <XFormDatePicker
         :attr="attr"
         :mode="mode"
+        :enablePopupToBody="enablePopupToBody"
         :disabled="disabled"
         :readOnly="readOnly"
         :showLabel="showLabel"
@@ -815,6 +816,11 @@ export default {
           return []
         }
     },
+    // 是否启用时间弹出到最外层
+    enablePopupToBody: {
+      type: Boolean,
+      default: false
+    },
     serviceName: {
       type: String,
       default:

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

@@ -67,6 +67,7 @@
             :pageMaxSize="realQueryConfig.queryPagesSize"
             :externalSelectedRowKeys="externalSelectedRowKeys"
             :customPagination="customPagination"
+            :hiddenFunctionalArea="hiddenFunctionalArea"
             @add="add"
             @move="move"
             @edit="edit"
@@ -409,6 +410,11 @@ export default {
     customPagination: {
       type: Boolean,
       default: false
+    },
+    // 是否隐藏顶部功能区域
+    hiddenFunctionalArea: {
+      type: Boolean,
+      default: false
     }
   },
   watch: {

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

@@ -1,194 +1,194 @@
-<template>
-  <div class="x-input-wrapper" :class="wrapperClassObject">
-    <div class="input-container">
-      <span v-if="config?.label" class="input-label">{{ config.label }}</span>
-      <div class="input-wrapper">
-        <a-input
-          v-model="innerValue"
-          v-bind="$attrs"
-          :placeholder="config?.placeholder"
-          :size="config?.size"
-          :maxLength="config?.maxLength"
-          :disabled="config?.disabled"
-          :allowClear="config?.allowClear"
-          @change="handleInput"
-          @pressEnter="handleSearch"
-        >
-          <template v-if="config?.prefix" #prefix>
-            <a-icon :type="config.prefix" @click="handleSearch" class="clickable-icon" />
-          </template>
-          <template v-if="config?.suffix" #suffix>
-            <a-icon :type="config.suffix" @click="handleSearch" class="clickable-icon" />
-          </template>
-        </a-input>
-      </div>
-      <span v-if="config?.tail" class="input-tail">{{ config.tail }}</span>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XInput',
-  inheritAttrs: false,
-  props: {
-    value: {
-      type: [String, Number],
-      default: ''
-    },
-    queryParamsName: {
-      type: String,
-      default: ''
-    }
-  },
-  data () {
-    return {
-      innerValue: this.value || '',
-      config: null
-    }
-  },
-  computed: {
-    // 动态样式开关：布尔开关 + size 派生类
-    wrapperClassObject () {
-      const attrs = this.$attrs || {}
-      const classes = {}
-      const booleanStyleKeys = [
-        'medical-history',
-        'yizhu-input'
-      ]
-      booleanStyleKeys.forEach(key => {
-        const val = attrs[key]
-        const truthy = val === true || val === '' || val === 'true'
-        if (truthy) classes[`xinput-${key}`] = true
-      })
-      const size = attrs.size
-      if (size && typeof size === 'string') classes[`xinput-size-${size}`] = true
-      return classes
-    }
-  },
-  created () {
-    this.getData(this.queryParamsName)
-  },
-  emits: ['search'],
-  methods: {
-    runLogic,
-    async getData (data) {
-      getConfigByName(data, 'af-his', res => {
-        this.config = res
-        if (res.defaultValue !== undefined) {
-          this.innerValue = res.defaultValue
-        }
-      })
-    },
-    handleInput (e) {
-      const value = e.target.value
-      this.innerValue = value
-      this.$emit('search', value)
-    },
-    handleSearch () {
-      // 统一的搜索事件：将当前输入值发送给父组件
-      this.$emit('search', this.innerValue)
-    }
-  },
-  watch: {
-    value: {
-      handler (newValue) {
-        this.innerValue = newValue
-      },
-      immediate: true
-    },
-    queryParamsName: {
-      handler (newValue) {
-        this.getData(newValue)
-      },
-      deep: true
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-.x-input-wrapper {
-  position: relative;
-  display: inline-block;
-  width: 100%;
-}
-
-.input-container {
-  display: flex;
-  align-items: center;
-}
-
-.input-label {
-  white-space: nowrap;
-  color: rgba(0, 0, 0, 0.85);
-  padding-right: 8px; /* 标签右侧固定间距 */
-}
-
-.input-label {
-  white-space: nowrap;
-  color: rgba(0, 0, 0, 0.85);
-  padding-left: 4px; /* 标签左侧固定间距 */
-}
-
-.input-wrapper {
-  flex: 1; /* 输入框占据剩余空间 */
-}
-
-:deep(.clickable-icon) {
-  cursor: pointer;
-}
-
-:deep(.clickable-icon:hover) {
-  color: #1890ff;
-}
-
-.x-input-wrapper{
-  &.xinput-medical-history {
-    width: 192px;
-    height: 32px;
-    border-radius: 6px;
-    opacity: 1;
-    background: #FFFFFF;
-    box-sizing: border-box;
-    border: 1px solid #D8D8D8;
-
-    :deep(.ant-input::placeholder) {
-      font-family: Source Han Sans;
-      font-size: 16px;
-      font-weight: normal;
-      line-height: normal;
-      letter-spacing: 0em;
-      font-variation-settings: "opsz" auto;
-      font-feature-settings: "kern" on;
-      color: #A7A7A7;
-    }
-  }
-  &.xinput-yizhu-input {
-    border-radius: 6px;
-    opacity: 1;
-    background: #FFFFFF;
-    box-sizing: border-box;
-    border: 1px solid #E5E9F0;
-
-    margin: 2px 0px;
-    :deep(.ant-input) {
-      border-radius: 6px;
-      opacity: 1;
-      background: #FFFFFF;
-      box-sizing: border-box;
-      border: 1px solid #E5E9F0;
-      font-family: Source Han Sans;
-      font-size: 14px;
-      padding: 5px 76px 3px 8px;
-      font-weight: normal;
-      line-height: 24px;
-      letter-spacing: 0em;
-      color: #A7A7A7;
-    }
-  }
-}
-
-</style>
+<template>
+  <div class="x-input-wrapper" :class="wrapperClassObject">
+    <div class="input-container">
+      <span v-if="config?.label" class="input-label">{{ config.label }}</span>
+      <div class="input-wrapper">
+        <a-input
+          v-model="innerValue"
+          v-bind="$attrs"
+          :placeholder="config?.placeholder"
+          :size="config?.size"
+          :maxLength="config?.maxLength"
+          :disabled="config?.disabled"
+          :allowClear="config?.allowClear"
+          @change="handleInput"
+          @pressEnter="handleSearch"
+        >
+          <template v-if="config?.prefix" #prefix>
+            <a-icon :type="config.prefix" @click="handleSearch" class="clickable-icon" />
+          </template>
+          <template v-if="config?.suffix" #suffix>
+            <a-icon :type="config.suffix" @click="handleSearch" class="clickable-icon" />
+          </template>
+        </a-input>
+      </div>
+      <span v-if="config?.tail" class="input-tail">{{ config.tail }}</span>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XInput',
+  inheritAttrs: false,
+  props: {
+    value: {
+      type: [String, Number],
+      default: ''
+    },
+    queryParamsName: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      innerValue: this.value || '',
+      config: null
+    }
+  },
+  computed: {
+    // 动态样式开关：布尔开关 + size 派生类
+    wrapperClassObject () {
+      const attrs = this.$attrs || {}
+      const classes = {}
+      const booleanStyleKeys = [
+        'medical-history',
+        'yizhu-input'
+      ]
+      booleanStyleKeys.forEach(key => {
+        const val = attrs[key]
+        const truthy = val === true || val === '' || val === 'true'
+        if (truthy) classes[`xinput-${key}`] = true
+      })
+      const size = attrs.size
+      if (size && typeof size === 'string') classes[`xinput-size-${size}`] = true
+      return classes
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  emits: ['search'],
+  methods: {
+    runLogic,
+    async getData (data) {
+      getConfigByName(data, 'af-his', res => {
+        this.config = res
+        if (res.defaultValue !== undefined) {
+          this.innerValue = res.defaultValue
+        }
+      })
+    },
+    handleInput (e) {
+      const value = e.target.value
+      this.innerValue = value
+      this.$emit('search', value)
+    },
+    handleSearch () {
+      // 统一的搜索事件：将当前输入值发送给父组件
+      this.$emit('search', this.innerValue)
+    }
+  },
+  watch: {
+    value: {
+      handler (newValue) {
+        this.innerValue = newValue
+      },
+      immediate: true
+    },
+    queryParamsName: {
+      handler (newValue) {
+        this.getData(newValue)
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.x-input-wrapper {
+  position: relative;
+  display: inline-block;
+  width: 100%;
+}
+
+.input-container {
+  display: flex;
+  align-items: center;
+}
+
+.input-label {
+  white-space: nowrap;
+  color: rgba(0, 0, 0, 0.85);
+  padding-right: 8px; /* 标签右侧固定间距 */
+}
+
+.input-label {
+  white-space: nowrap;
+  color: rgba(0, 0, 0, 0.85);
+  padding-left: 4px; /* 标签左侧固定间距 */
+}
+
+.input-wrapper {
+  flex: 1; /* 输入框占据剩余空间 */
+}
+
+:deep(.clickable-icon) {
+  cursor: pointer;
+}
+
+:deep(.clickable-icon:hover) {
+  color: #1890ff;
+}
+
+.x-input-wrapper{
+  &.xinput-medical-history {
+    width: 192px;
+    height: 32px;
+    border-radius: 6px;
+    opacity: 1;
+    background: #FFFFFF;
+    box-sizing: border-box;
+    border: 1px solid #D8D8D8;
+
+    :deep(.ant-input::placeholder) {
+      font-family: Source Han Sans;
+      font-size: 16px;
+      font-weight: normal;
+      line-height: normal;
+      letter-spacing: 0em;
+      font-variation-settings: "opsz" auto;
+      font-feature-settings: "kern" on;
+      color: #A7A7A7;
+    }
+  }
+  &.xinput-yizhu-input {
+    border-radius: 6px;
+    opacity: 1;
+    background: #FFFFFF;
+    box-sizing: border-box;
+    border: 1px solid #E5E9F0;
+
+    margin: 2px 0px;
+    :deep(.ant-input) {
+      border-radius: 6px;
+      opacity: 1;
+      background: #FFFFFF;
+      box-sizing: border-box;
+      border: 1px solid #E5E9F0;
+      font-family: Source Han Sans;
+      font-size: 14px;
+      padding: 5px 76px 3px 8px;
+      font-weight: normal;
+      line-height: 24px;
+      letter-spacing: 0em;
+      color: #A7A7A7;
+    }
+  }
+}
+
+</style>

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

@@ -0,0 +1,45 @@
+<template>
+  <div id="xreport-hosp-demo">
+    <a-space style="margin-bottom: 12px;">
+      <a-button type="primary" @click="doInit">手动初始化</a-button>
+    </a-space>
+    <XReport
+      ref="reportRef"
+      :edit-mode="true"
+      :show-save-button="true"
+      :show-img-in-cell="false"
+      :use-oss-for-img="false"
+      server-name="af-his"
+      @updateImg="onUpdateImg"/>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import XReport from '@vue2-client/base-client/components/common/XReport'
+
+const reportRef = ref(null)
+
+const payload = {
+  arr: [
+    { BQ: '病房区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
+    { BQ: '感染科', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
+    { BQ: '骨科病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
+    { BQ: '呼吸科病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
+    { BQ: '急症科病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
+    { BQ: '内科二病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 }
+  ]
+}
+
+const doInit = async () => {
+  if (!reportRef.value || !reportRef.value.init) return
+  await reportRef.value.init({
+    configName: 'hospitalizationStatsReport',
+    configData: payload
+  })
+}
+
+const onUpdateImg = data => {
+  console.warn('updateImg:', data)
+}
+</script>