vue2-client 1.16.86 → 1.16.88

package/package.json

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

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

@@ -21,7 +21,11 @@ const wrapperClassObject = computed(() => {
 
   // 通用布尔样式开关（以存在/空字符串/'true' 为真）
   const booleanStyleKeys = [
-    'max-width200', 'width173', 'button_refresh'
+    'max-width200',
+    'width173',
+    'button_refresh',
+    'border', 'no-style',
+    'one-button-style' // 一个按钮样式，占满整个宽度
   ]
   for (const key of booleanStyleKeys) {
     const val = a[key]
@@ -377,5 +381,64 @@ defineExpose({
       width: 173px !important;
     }
   }
+  // 按钮无边框+无图标+无阴影
+  &.h-button-no-style{
+    :deep(.ant-btn) {
+        border: 0px;
+        .anticon{
+          display: none;
+        }
+    }
+    :deep(.ant-btn-primary){
+      text-shadow: none;
+      box-shadow: none;
+    }
+  }
+  // 按钮组边距
+  &.h-button-border{
+    border: 1px solid #E5E9F0;
+    border-radius: 6px;
+  }
+  // 按钮撑开整个容器
+  &.h-buttons-fill-container{
+    :deep(.x-buttons) {
+        width: 100%;
+        .ant-btn-group{
+          width: 100%;
+          .ant-btn{
+            width: 100%;
+            margin-right: 0px;
+          }
+        }
+    }
+  }
+  &.h-buttons-one-button-style {
+    margin: 0 !important;
+    padding: 0 !important;
+    :deep(.x-buttons) {
+      margin: 0 !important;
+      padding: 0 !important;
+      .ant-btn-group {
+        width: 100%;
+        height: 32px;
+        justify-content: space-between;
+        display: flex;
+        flex-wrap: nowrap;
+        .ant-btn {
+          width: 100%;
+          margin-right: 0px !important;
+          min-width: 100% !important;
+          border-radius: 6px; /* 边框圆角 */
+          font-size: 18px; /* 字体大小 */
+          line-height: 26px;
+          font-weight: bold;
+          letter-spacing: 0.5px; /* 增加字母间距 */
+          height: 32px; /* 高度 */
+          color: #FFFFFF; /* 字体颜色 */
+          background: #0057FE;/* 背景颜色 */
+        }
+      }
+    }
+  }
 }
 </style>

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

@@ -5,6 +5,18 @@ import { ref, computed, useAttrs } from 'vue'
 const xAddNativeFormRef = ref()
 
 const attrs = useAttrs()
+const props = defineProps({
+  // 是否启用 horizontal 模式的自定义配置
+  enableHorizontalCustom: {
+    type: Boolean,
+    default: false
+  }
+})
+ // 启动时间选择框弹出到body
+const enablePopupToBody = computed(() => {
+  const a = attrs
+  return a.enablePopupToBody === 'true' || a.enablePopupToBody === true
+})
 const wrapperClassObject = computed(() => {
   const a = attrs
   const classes = {}
@@ -15,9 +27,7 @@ const wrapperClassObject = computed(() => {
     'padding-50',
     'label-text-horizontal',
     'label-text-justify',
-    'left-form',
-    'charge-form',
-    'aligned-form'
+    'charge-form'
   ]
   for (const key of booleanStyleKeys) {
     const val = a[key]
@@ -47,6 +57,8 @@ defineExpose({
     <x-add-native-form
       ref="xAddNativeFormRef"
       v-bind="$attrs"
+      :enable-popup-to-body="enablePopupToBody"
+      :enable-horizontal-custom="props.enableHorizontalCustom"
       v-on="$listeners"
     >
       <template v-for="(_, name) in $slots" #[name]="slotData">
@@ -345,148 +357,5 @@ defineExpose({
       }
     }
   }
-
-  // aligned-form 样式 - 实现标签左对齐、输入框垂直对齐的整齐布局
-  &.h-form-aligned-form {
-    :deep(.ant-form-item) {
-      margin-bottom: 16px;
-      display: flex;
-      align-items: center;
-      width: 100%;
-
-      .ant-form-item-label {
-        text-align: left;
-        margin-right: 12px;
-        flex-shrink: 0;
-        min-width: 80px; // 确保标签有最小宽度，保持对齐
-        max-width: 120px; // 限制最大宽度，避免过宽
-
-        label {
-          margin: 0;
-          padding: 0;
-          white-space: nowrap;
-          display: block;
-          text-align: left;
-          line-height: 32px;
-          height: 32px;
-          color: rgba(0, 0, 0, 0.85);
-          font-size: 14px;
-
-          // 移除默认冒号
-          &::after {
-            content: '';
-          }
-        }
-      }
-
-      .ant-form-item-control-wrapper {
-        flex: 1;
-        min-width: 0;
-        display: flex;
-        align-items: center;
-
-        .ant-form-item-control {
-          width: 100%;
-          margin: 0;
-          padding: 0;
-
-          // 统一输入框样式
-          .ant-input,
-          .ant-input-affix-wrapper,
-          .ant-select,
-          .ant-input-number,
-          .ant-picker,
-          .ant-radio-group,
-          .ant-checkbox-group {
-            width: 100%;
-            height: 32px;
-            line-height: 32px;
-            vertical-align: top;
-            margin: 0;
-            text-align: left;
-          }
-
-          // 选择器样式
-          .ant-select {
-            .ant-select-selector {
-              height: 32px;
-              line-height: 32px;
-
-              .ant-select-selection-item,
-              .ant-select-selection-placeholder {
-                line-height: 32px;
-                height: 32px;
-              }
-            }
-          }
-
-          // 日期选择器样式
-          .ant-picker {
-            height: 32px;
-
-            .ant-picker-input {
-              height: 32px;
-              line-height: 32px;
-
-              input {
-                height: 32px;
-                line-height: 32px;
-              }
-            }
-          }
-
-          // 数字输入框样式
-          .ant-input-number {
-            height: 32px;
-
-            .ant-input-number-input {
-              height: 32px;
-              line-height: 32px;
-            }
-          }
-
-          // 单选框组和复选框组样式
-          .ant-radio-group,
-          .ant-checkbox-group {
-            height: 32px;
-            line-height: 32px;
-            display: flex;
-            align-items: center;
-
-            .ant-radio-wrapper,
-            .ant-checkbox-wrapper {
-              height: 32px;
-              line-height: 32px;
-              margin-right: 16px;
-            }
-          }
-        }
-      }
-    }
-
-    // 确保行容器样式
-    :deep(.ant-row) {
-      margin: 0;
-      padding: 0;
-
-      .ant-col {
-        margin: 0;
-        padding: 0 8px; // 列与列之间的间距
-        display: flex;
-        flex-direction: column;
-      }
-    }
-
-    // 重置可能的容器边距
-    :deep(.ant-form-item) {
-      margin: 0 0 16px 0 !important;
-
-      .ant-form-item-control-input,
-      .ant-form-item-control-input-content {
-        margin: 0 !important;
-        padding: 0 !important;
-      }
-    }
-  }
 }
 </style>

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

@@ -164,6 +164,10 @@ const isCustomPagination = computed(() => {
   const paginationAttr = (a && a.paginationStyle) || ''
   return props.tableStyle === 'custom-pagination' || paginationAttr === 'custom-pagination'
 })
+// 是否隐藏顶部功能区
+const isHiddenFunctionalArea = computed(() => {
+  return attrs.hiddenFunctionalArea === 'true' || attrs.hiddenFunctionalArea === true
+})
 </script>
 
 <template>
@@ -178,6 +182,7 @@ const isCustomPagination = computed(() => {
       ref="xFormTableRef"
       v-bind="$attrs"
       :customPagination="isCustomPagination"
+      :hiddenFunctionalArea="isHiddenFunctionalArea"
       @expand="onExpandLog"
       v-on="$listeners"
     >

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

@@ -51,6 +51,7 @@
               :rules="rules[`${item.formItem.name}${item.formItem.model}`]"
               :get-data-params="getDataParams"
               :env="env"
+              :enablePopupToBody="enablePopupToBody"
               @x-form-item-emit-func="emitFunc"
               @rowChoose="rowChoose"
               :setForm="setForm"
@@ -94,6 +95,7 @@
               :style="layout === 'inline' ? { marginTop:'5px' } : undefined"
               :form="form"
               :images="images"
+              :enablePopupToBody="enablePopupToBody"
               :service-name="serviceName"
               mode="新增/修改"
               :layout="layout"
@@ -147,6 +149,7 @@
             :disabled="itemDisabled(formItem)"
             :readonly="readonly(formItem)"
             :files="files"
+            :enablePopupToBody="enablePopupToBody"
             v-bind="formItemLayoutGen"
             :style="layout ==='inline'?{marginTop:'5px'}:undefined"
             :form="form[groupItem.model]"
@@ -223,6 +226,11 @@ export default {
     enableHorizontalCustom: {
       type: Boolean,
       default: false
+    },
+    // 是否启用时间弹出到最外层
+    enablePopupToBody: {
+      type: Boolean,
+      default: false
     }
   },
   data () {

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

@@ -56,7 +56,8 @@ export default {
       const classes = {}
       const booleanStyleKeys = [
         'medical-history',
-        'yizhu-input'
+        'yizhu-input',
+        'custom-placeholder'
       ]
       booleanStyleKeys.forEach(key => {
         const val = attrs[key]
@@ -161,7 +162,6 @@ export default {
       font-weight: normal;
       line-height: normal;
       letter-spacing: 0em;
-      font-variation-settings: "opsz" auto;
       font-feature-settings: "kern" on;
       color: #A7A7A7;
     }
@@ -172,7 +172,6 @@ export default {
     background: #FFFFFF;
     box-sizing: border-box;
     border: 1px solid #E5E9F0;
-
     margin: 2px 0px;
     :deep(.ant-input) {
       border-radius: 6px;
@@ -184,7 +183,19 @@ export default {
       font-size: 14px;
       padding: 5px 76px 3px 8px;
       font-weight: normal;
-      line-height: 24px;
+      line-height: normal;
+      letter-spacing: 0em;
+      color: #A7A7A7;
+    }
+  }
+  &.xinput-custom-placeholder {
+    :deep(.ant-input::placeholder) {
+      height: 23px;
+      opacity: 1;
+      font-family: Source Han Sans;
+      font-size: 16px;
+      font-weight: normal;
+      line-height: normal;
       letter-spacing: 0em;
       color: #A7A7A7;
     }