centaline-data-driven-v3 0.1.38 → 0.1.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.1.38",
+  "version": "0.1.40",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",
@@ -25,6 +25,7 @@
     "vue-cropper": "^1.1.1",
     "vue-router": "^4.2.5",
     "vue-ueditor-wrap": "^3.0.8",
+    "vue3-cron-plus-picker": "^1.0.2",
     "vue3-json-viewer": "^2.4.1",
     "vue3-pdf-app": "^1.0.3",
     "vuedraggable": "^4.1.0"

package/src/assets/commonWeb.css

@@ -780,7 +780,10 @@ body {
   user-select: none;
   /* 禁止文本选择 */
 }
-
+.ct-form .btnPadBom .el-checkbox{
+  height: 100% !important;
+  padding: 0 !important;
+}
 
 
 /*elementPlus样式重置开始*/

package/src/components/web/ComboBox.vue

@@ -21,7 +21,7 @@
                 <template #tag>
                     <template v-for="(v, i) in model.labelValue" :key="i">
                         <el-tag class="ml-2" type="info" disable-transitions :closable="!v.locked && !model.locked"
-                        :style="{ marginRight: i+1==model.labelValue.length ? '20px' : '' }"
+                            :style="{ marginRight: i + 1 == model.labelValue.length ? '20px' : '' }"
                             @close="closeTag(v.code)">
                             {{ v.name }}</el-tag>
                     </template>
@@ -62,6 +62,7 @@ const refselect = ref()
 const open = ref(false)
 const isComposing = ref(false);
 const nodatatext = ref('    ')
+const popperWidth = ref(null)
 model.value.itemKey = Math.random();
 let cancelTokenSource = null; // 用于存储取消令牌
 
@@ -77,6 +78,7 @@ onBeforeUnmount(() => {
 
 //下拉框出现/隐藏时触发
 function visibleChange(visible) {
+
     //是否有更多选择路由
     if (model.value.moreActionRouter) {
         refselect.value.popperRef.hidden = true
@@ -84,6 +86,9 @@ function visibleChange(visible) {
     else {
         //出现获取数据
         if (visible) {
+            if (refselect.value && popperWidth.value) {
+                refselect.value.popperSize = popperWidth.value;
+            }
             open.value = true;
             nodatatext.value = common.LocalizedString('加载中', '加載中');
             if (!model.value.filterable) {
@@ -256,9 +261,11 @@ function setminWidth() {
 
     if ((span.getBoundingClientRect().width + 40) <= refselect.value.selectRef.offsetWidth) {
         refselect.value.popperSize = refselect.value.selectRef.offsetWidth;
+        popperWidth.value = refselect.value.selectRef.offsetWidth;
     }
     else {
         refselect.value.popperSize = span.getBoundingClientRect().width + 40;
+        popperWidth.value = span.getBoundingClientRect().width + 40;
     }
 
     document.body.removeChild(span);

package/src/components/web/ContainerControl.vue

@@ -12,10 +12,10 @@
                     <div style="display: flex; flex: 0 0 100%;" v-if="col.show !== false && col.lineFeed"></div>
                     <div v-if="col.show !== false"
                         :class="index > 0 && (col.controlLabel == '' || col.is == 'ct-button') ? 'complex-left-10' : ''"
-                        :style="{ 'width': (col.width && col.width>0 ? col.width + 'px' : ''), 'flex': (col.width && col.width>0? '0 0 ' + col.width + 'px' : '') }">
+                        :style="{ 'width': (col.width && col.width > 0 ? col.width + 'px' : ''), 'flex': (col.width && col.width > 0 ? '0 0 ' + col.width + 'px' : '') }">
                         <component ref="Fields" :is="col.is" :vmodel="col" :parameterAction="parameterAction"
-                            v-bind="col.bindPara" @fieldClick="fieldClickHandler(col)" @change="change(col)"
-                            @popupSearchList="popupSearchListHandler"></component>
+                            :key="col.fieldItemKey" v-bind="col.bindPara" @fieldClick="fieldClickHandler(col)"
+                            @change="change(col)" @popupSearchList="popupSearchListHandler"></component>
                     </div>
                 </template>
             </template>
@@ -28,10 +28,10 @@
                         <div style="display: flex; flex: 0 0 100%;" v-if="col.show !== false && col.lineFeed"></div>
                         <el-col v-if="col.show !== false"
                             :class="[index > 0 && (col.controlLabel == '' || col.is == 'ct-btn') ? 'complex-left-10' : '', 'containerCol']"
-                            :style="{ 'width': (col.width && col.width>0 ? col.width + 'px' : '100%'), 'flex': (col.width && col.width>0 ? '0 0 ' + col.width + 'px' : '100%') }">
+                            :style="{ 'width': (col.width && col.width > 0 ? col.width + 'px' : '100%'), 'flex': (col.width && col.width > 0 ? '0 0 ' + col.width + 'px' : '100%') }">
                             <component ref="Fields" :is="col.is" :vmodel="col" :parameterAction="parameterAction"
-                                v-bind="col.bindPara" @fieldClick="fieldClickHandler(col)" @change="change(col)"
-                                @popupSearchList="popupSearchListHandler">
+                                :key="col.fieldItemKey" v-bind="col.bindPara" @fieldClick="fieldClickHandler(col)"
+                                @change="change(col)" @popupSearchList="popupSearchListHandler">
                             </component>
                         </el-col>
                     </template>

package/src/components/web/Cron.vue

@@ -0,0 +1,194 @@
+<template>
+  <ct-field :vmodel="model"  v-if="model">
+    <template #Control>
+      <el-input v-model="model.code1" :placeholder="点击选择" @click="showCron = true" />
+      <el-dialog v-model="showCron" title="" width="700px" append-to-body>
+        <Vue3CronPlusPicker :expression="model.code1" class="cron-plus-picker" :teleported="true"
+          @fill="val => { model.code1 = val; showCron = false }" @hide="showCron = false" />
+      </el-dialog>
+    </template>
+  </ct-field>
+</template>
+
+<script setup>
+import { Vue3CronPlusPicker } from 'vue3-cron-plus-picker'
+import 'vue3-cron-plus-picker/style.css'
+import { nextTick, ref, onMounted } from "vue";
+const props = defineProps({
+  api: String,
+  vmodel: Object,
+  actionRouter: Array,
+  listHeight: Number,
+}) 
+const model = ref(null);
+
+const showCron = ref(false)
+
+init()
+//初始化数据
+function init() {
+  nextTick(function () {
+    if (props.vmodel) {
+      load(props.vmodel);
+    }
+  });
+}
+function load(data) {
+  model.value = data;
+}
+</script>
+<style scoped>
+.cron-plus-picker :deep(.el-input__wrapper) {
+  align-items: center;
+  background-color: var(--el-input-bg-color, var(--el-fill-color-blank));
+  background-image: none;
+  border-radius: var(--el-input-border-radius, var(--el-border-radius-base));
+  box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
+  cursor: text;
+  display: inline-flex;
+  flex-grow: 1;
+  justify-content: center;
+  padding: 1px 11px;
+  transform: translateZ(0);
+  transition: var(--el-transition-box-shadow);
+}
+
+.cron-plus-picker :deep(.el-input--small) {
+  --el-input-inner-height: calc(var(--el-input-height, 24px) - 2px);
+}
+
+.cron-plus-picker :deep(.el-input--small),
+.cron-plus-picker :deep(.el-input) {
+  --el-input-height: var(--el-component-size-small);
+  font-size: 12px;
+}
+
+/* 使用更精确的选择器，避免全局覆盖 */
+.cron-plus-picker :deep(.el-input .el-input__wrapper) {
+  align-items: center;
+  background-color: var(--el-input-bg-color, var(--el-fill-color-blank));
+  background-image: none;
+  border-radius: var(--el-input-border-radius, var(--el-border-radius-base));
+  box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
+  cursor: text;
+  display: inline-flex;
+  flex-grow: 1;
+  justify-content: center;
+  padding: 1px 11px;
+  transform: translateZ(0);
+  transition: var(--el-transition-box-shadow);
+}
+
+.cron-plus-picker :deep(.el-select__wrapper) {
+
+  min-height: 24px;
+  /* 使用 min-height 而不是 height */
+}
+
+.cron-plus-picker :deep(.el-radio.el-radio--small) {
+  height: 24px;
+}
+
+.cron-plus-picker :deep(.el-select) {
+  --el-select-border-color-hover: var(--el-border-color-hover);
+  --el-select-disabled-color: var(--el-disabled-text-color);
+  --el-select-disabled-border: var(--el-disabled-border-color);
+  --el-select-font-size: var(--el-font-size-base);
+  --el-select-close-hover-color: var(--el-text-color-secondary);
+  --el-select-input-color: var(--el-text-color-placeholder);
+  --el-select-multiple-input-color: var(--el-text-color-regular);
+  --el-select-input-focus-border-color: var(--el-color-primary);
+  --el-select-input-font-size: 14px;
+  --el-select-width: 100%;
+  display: inline-block;
+  position: relative;
+  vertical-align: middle;
+  width: var(--el-select-width);
+  z-index: 100;
+
+}
+
+/* 修改Cron组件的样式 - 区分焦点和非焦点状态 */
+.cron-plus-picker :deep(.el-form-item.is-error .el-input__wrapper),
+.cron-plus-picker :deep(.el-form-item.is-error .el-select__wrapper),
+.cron-plus-picker :deep(.el-form-item.is-error .el-textarea__inner) {
+  box-shadow: 0 0 0 1px var(--el-border-color) inset;
+  /* 非焦点状态 */
+}
+
+.cron-plus-picker :deep(.el-form-item.is-error .el-input__wrapper.is-focus),
+.cron-plus-picker :deep(.el-form-item.is-error .el-input__wrapper:focus),
+.cron-plus-picker :deep(.el-form-item.is-error .el-select__wrapper.is-focus),
+.cron-plus-picker :deep(.el-form-item.is-error .el-select__wrapper:focus),
+.cron-plus-picker :deep(.el-form-item.is-error .el-textarea__inner.is-focus),
+.cron-plus-picker :deep(.el-form-item.is-error .el-textarea__inner:focus) {
+  box-shadow: 0 0 0 1px var(--el-color-primary) inset !important;
+  /* 焦点状态 - 蓝色 */
+}
+
+/* hover状态保持原来的灰色 */
+.cron-plus-picker :deep(.el-form-item.is-error .el-input__wrapper:hover),
+.cron-plus-picker :deep(.el-form-item.is-error .el-select__wrapper:hover),
+.cron-plus-picker :deep(.el-form-item.is-error .el-textarea__inner:hover) {
+  box-shadow: 0 0 0 1px var(--el-text-color-secondary) inset;
+  /* hover时也保持灰色 */
+}
+
+.cron-plus-picker :deep(.el-radio) {
+  --el-radio-font-size: var(--el-font-size-base);
+  --el-radio-text-color: var(--el-text-color-regular);
+  --el-radio-font-weight: var(--el-font-weight-primary);
+  --el-radio-input-height: 12px;
+  --el-radio-input-width: 12px;
+  --el-radio-input-border-radius: var(--el-border-radius-circle);
+  --el-radio-input-bg-color: var(--el-fill-color-blank);
+  --el-radio-input-border: var(--el-border);
+  --el-radio-input-border-color: var(--el-border-color);
+  --el-radio-input-border-color-hover: var(--el-color-primary);
+  align-items: center;
+  color: var(--el-radio-text-color);
+  cursor: pointer;
+  display: inline-flex;
+  font-size: var(--el-font-size-base);
+  font-weight: var(--el-radio-font-weight);
+  height: 32px;
+  margin-right: 30px;
+  outline: none;
+  position: relative;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+  white-space: nowrap;
+}
+
+.cron-plus-picker :deep(.el-radio:last-child) {
+  margin-right: 0;
+}
+
+.cron-plus-picker :deep(.el-checkbox.el-checkbox--small .el-checkbox__inner),
+.cron-plus-picker :deep(.el-radio.el-radio--small .el-radio__inner) {
+  width: 12px;
+  height: 12px;
+}
+
+/* 1. 让内部 el-select 继续用 ElementPlus 的公共骨架，我们只覆盖 mini 尺寸变量 */
+.cron-plus-picker :deep(.el-radio--small) {
+  font-size: 12px;
+}
+
+.cron-plus-picker :deep(.el-radio--small .el-select__wrapper) {
+  height: 24px;
+  line-height: 24px;
+  padding: 0 7px 0 11px;
+  /* 左右各缩 4px，与官网 mini 保持一致 */
+}
+
+.cron-plus-picker :deep(.el-form-item--small) {
+  margin-bottom: 18px;
+}
+
+.cron-plus-picker :deep(.el-select__placeholder) {
+  pointer-events: none;
+}
+
+</style>

package/src/components/web/DatePicker.vue

@@ -22,11 +22,11 @@
                     </DateTimePicker>
                 </template>
                 <template v-else>
-                    <el-date-picker v-model="model.code1" :type="model.dateType" v-bind="model.attrs"
+                    <el-date-picker v-model="model.code1" :type="model.dateType" v-bind="model.attrs" :format="model.format"
                         :disabled="model.locked" :disabled-date="disabledDate" @change="changeHandler(model, emit)"
                         class="fieldControl" />
                     <span class="range-span" v-if="model.flagrange"> - </span>
-                    <el-date-picker v-if="model.flagrange" v-model="model.code2" :type="model.dateType"
+                    <el-date-picker v-if="model.flagrange" v-model="model.code2" :type="model.dateType" :format="model.format"
                         v-bind="model.attrs" :disabled="model.locked" :disabled-date="disabledDate"
                         @change="changeHandler(model, emit)" class="fieldControl" />
                 </template>

package/src/components/web/Form.vue

@@ -5,16 +5,16 @@
             <div style="flex: 1; min-width: 0;">
                 <div v-if="model !== null && !loading" class="ct-form">
                     <el-affix target=".ct-form" v-if="model.tip" :offset="62">
-                        <div class="ct-form-tip">
+                        <div class="ct-form-tip" ref="refTip">
                             <span v-html="model.tip"></span>
                         </div>
                     </el-affix>
 
                     <!--可根据场景判断显示el-card还是el-main-->
-                    <component :is="model.showTitle ? 'el-main' : 'el-card'">
-                        <div class="ct-from-title" v-if="typeof model.title !== 'undefined' && model.flagShowTitle">
+                    <component :is="model.showTitle ? 'el-main' : 'el-card'" :key="itemKey">
+                        <!-- <div class="ct-from-title" v-if="typeof model.title !== 'undefined' && model.flagShowTitle">
                             <span style="font-weight:bold">{{ model.title }}</span>
-                        </div>
+                        </div> -->
 
                         <!--relationParentFormFields-->
                         <el-row v-if="relationParentFormFields.length > 0">
@@ -23,9 +23,9 @@
                                 </div>
                                 <el-col v-if="col.show !== false" :span="col.colspan" style="padding:5px"
                                     :class="[col.is == 'ct-button' && col.labelPlacement == '1' ? 'el-col1' : '']">
-                                    <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey" :listHeight="listHeight"
-                                        :parameterAction="model.parameterAction" v-bind="col.bindPara"
-                                        :fileData="getFileData(col)" @change="changeHandler"
+                                    <component ref="Fields" :is="col.is" :vmodel="col" :key="col.fieldItemKey"
+                                        :listHeight="listHeight" :parameterAction="model.parameterAction"
+                                        v-bind="col.bindPara" :fileData="getFileData(col)" @change="changeHandler"
                                         @importComplete="importComplete" @popupLocation="popupLocationHandler"
                                         @fieldClick="fieldClickHandler" @popupSearchList="popupSearchListHandler"
                                         @tableButtonClick="clickHandler" @popupGroupList="popupGroupListHandler"
@@ -42,9 +42,9 @@
                                 </div>
                                 <el-col v-if="col.show !== false" :span="col.colspan" style="padding:5px"
                                     :class="[col.is == 'ct-button' && col.labelPlacement == '1' ? 'el-col1' : '']">
-                                    <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey" :listHeight="listHeight"
-                                        :parameterAction="model.parameterAction" v-bind="col.bindPara"
-                                        :fileData="getFileData(col)" @change="changeHandler"
+                                    <component ref="Fields" :is="col.is" :vmodel="col" :key="col.fieldItemKey"
+                                        :listHeight="listHeight" :parameterAction="model.parameterAction"
+                                        v-bind="col.bindPara" :fileData="getFileData(col)" @change="changeHandler"
                                         @importComplete="importComplete" @popupLocation="popupLocationHandler"
                                         @fieldClick="fieldClickHandler" @popupSearchList="popupSearchListHandler"
                                         @tableButtonClick="clickHandler" @popupGroupList="popupGroupListHandler"
@@ -54,37 +54,43 @@
                             </template>
                         </el-row>
                         <!--tabs-->
-                        <el-tabs v-if="model.isHorizontalLayout" v-model="activeName" @tab-click="tabClick">
+                        <template v-if="model.isHorizontalLayout">
+                            <component :is="model.flagFixedTabOnHorizontalLayout ? 'el-affix' : 'div'"
+                                v-bind="model.flagFixedTabOnHorizontalLayout ? { offset: tabTopHight, target: '.ct-form' } : {}">
+                                <el-tabs v-model="activeName" @tab-click="tabClick" style="background: #fff;">
+                                    <template v-for="(item, index) in model.collapse" :key="index">
+                                        <el-tab-pane :name="index.toString()" :lazy="item.lazyLoad"
+                                            v-if="item.show !== false" :key="index">
+                                            <template #label>
+                                                <span v-html="item.controlLabel"></span>
+                                            </template>
+                                        </el-tab-pane>
+                                    </template>
+                                </el-tabs>
+                            </component>
                             <template v-for="(item, index) in model.collapse" :key="index">
-                                <el-tab-pane :name="index.toString()" :lazy="item.lazyLoad" v-if="item.show !== false"
-                                    :key="index">
-                                    <template #label>
-                                        <span v-html="item.controlLabel"></span>
+                                <el-row v-show="activeName === index.toString()">
+                                    <template v-for="(col, i) in model.collapseFields[index + 1]" :key="i">
+                                        <div style="display: flex; flex: 0 0 100%;"
+                                            v-if="col.show !== false && col.lineFeed"></div>
+                                        <el-col :span="col.colspan" v-if="col.show !== false" style="padding:5px"
+                                            :class="[col.is == 'ct-button' && col.labelPlacement == '1' ? 'el-col1' : '']">
+                                            <component ref="Fields" :is="col.is" :vmodel="col" :key="col.fieldItemKey"
+                                                :listHeight="listHeight" :parameterAction="model.parameterAction"
+                                                v-bind="col.bindPara" :fileData="getFileData(col)"
+                                                @change="changeHandler" @fieldClick="fieldClickHandler"
+                                                @popupLocation="popupLocationHandler"
+                                                @popupSearchList="popupSearchListHandler"
+                                                @importComplete="importComplete" @popupGroupList="popupGroupListHandler"
+                                                @tableButtonClick="clickHandler"
+                                                @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
+                                            </component>
+                                        </el-col>
                                     </template>
-                                    <el-row>
-                                        <template v-for="(col, i) in model.collapseFields[index + 1]" :key="i">
-                                            <div style="display: flex; flex: 0 0 100%;"
-                                                v-if="col.show !== false && col.lineFeed"></div>
-                                            <el-col :span="col.colspan" v-if="col.show !== false" style="padding:5px"
-                                                :class="[col.is == 'ct-button' && col.labelPlacement == '1' ? 'el-col1' : '']">
-                                                <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey" :listHeight="listHeight"
-                                                    :parameterAction="model.parameterAction" v-bind="col.bindPara"
-                                                    :fileData="getFileData(col)" @change="changeHandler"
-                                                    @fieldClick="fieldClickHandler"
-                                                    @popupLocation="popupLocationHandler"
-                                                    @popupSearchList="popupSearchListHandler"
-                                                    @importComplete="importComplete"
-                                                    @popupGroupList="popupGroupListHandler"
-                                                    @tableButtonClick="clickHandler"
-                                                    @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
-                                                </component>
-                                            </el-col>
-                                        </template>
-                                    </el-row>
-                                </el-tab-pane>
+                                </el-row>
                             </template>
-                        </el-tabs>
-
+                            <div style="height: 34px;"> </div>
+                        </template>
                         <!--分组-->
                         <el-collapse v-else v-model="model.collapseActiveNames"
                             :class="model.flagHideSaveLine ? 'el-collapse-saveLine' : ''">
@@ -104,10 +110,10 @@
                                                 v-if="col.show !== false && col.lineFeed"></div>
                                             <el-col :span="col.colspan" v-if="col.show !== false" style="padding:5px"
                                                 :class="[col.is == 'ct-button' && col.labelPlacement == '1' ? 'el-col1' : '']">
-                                                <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey" :listHeight="listHeight"
-                                                    :parameterAction="model.parameterAction" v-bind="col.bindPara"
-                                                    :fileData="getFileData(col)" @change="changeHandler"
-                                                    @fieldClick="fieldClickHandler"
+                                                <component ref="Fields" :is="col.is" :vmodel="col" :key="col.fieldItemKey"
+                                                    :listHeight="listHeight" :parameterAction="model.parameterAction"
+                                                    v-bind="col.bindPara" :fileData="getFileData(col)"
+                                                    @change="changeHandler" @fieldClick="fieldClickHandler"
                                                     @popupLocation="popupLocationHandler"
                                                     @popupSearchList="popupSearchListHandler"
                                                     @importComplete="importComplete"
@@ -130,7 +136,7 @@
                                     :class="[col.is == 'ct-button' && col.labelPlacement == '1' ? 'el-col1' : '']">
                                     <component ref="Fields" :is="col.is" :vmodel="col" :listHeight="listHeight"
                                         :parameterAction="model.parameterAction" v-bind="col.bindPara"
-                                        @change="changeHandler" :key="itemKey" :fileData="getFileData(col)"
+                                        @change="changeHandler" :key="col.fieldItemKey" :fileData="getFileData(col)"
                                         @fieldClick="fieldClickHandler" @popupSearchList="popupSearchListHandler"
                                         @importComplete="importComplete" @tableButtonClick="clickHandler"
                                         @popupGroupList="popupGroupListHandler" @popupLocation="popupLocationHandler"
@@ -148,8 +154,7 @@
 
                             </el-col>
                         </el-row>
-                        <el-row v-if="model.buttons.findIndex((v) => { return v.show }) > -1"
-                            :class="isScroll ? 'button-absolute' : 'button-initial'"
+                        <el-row v-if="model.buttons.findIndex((v) => { return v.show }) > -1" class="button-absolute"
                             :style="['max-width:' + buttonsWidth(), isWebScroll ? 'position: fixed;' : '']">
                             <el-col :span="24"
                                 style="text-align:center;padding-bottom: 1px;padding-left: 5px;padding-right: 5px;"
@@ -164,6 +169,12 @@
                         <div v-if="isScroll && model.buttons.findIndex((v) => { return v.show }) > -1"
                             style="height: 34px;">
                         </div>
+                        <el-affix target=".ct-form" position="bottom" v-if="model.bottomTip"
+                            :offset="model.buttons.findIndex((v) => { return v.show }) > -1 ? 43 : 0">
+                            <div class="ct-form-tip">
+                                <span v-html="model.bottomTip"></span>
+                            </div>
+                        </el-affix>
                     </component>
                 </div>
 
@@ -276,6 +287,8 @@ const minHeight = ref('auto')
 const showAI = ref(false);
 const dialogHeight = ref(props.dialogHeight || (window.innerHeight - 60));
 const tabActiveNameKey = ref('')
+const refTip = ref()
+const tabTopHight = ref(52)
 
 const qrtimer1 = ref(null)
 const qrtimer2 = ref(null)
@@ -366,7 +379,11 @@ function load(data) {
 
         }
     }
-
+    nextTick(() => {
+        if (refTip.value) {
+            tabTopHight.value = tabTopHight.value + refTip.value.clientHeight + 10
+        }
+    })
     //通知父组件加载完成
     emit('loaded', model.value);
 }
@@ -686,6 +703,12 @@ function setCss() {
     if (props.topHeight > -1) {
         minHeight.value = (document.documentElement.clientHeight - props.topHeight - 20) + 'px';
     }
+    else if(props.dialogHeight){
+        minHeight.value = (props.dialogHeight) + 'px';
+    }
+    else{
+        minHeight.value = document.documentElement.clientHeight + 'px';
+    }
 }
 
 

package/src/components/web/JsonViewer.vue

@@ -1,36 +1,56 @@
-<template> 
-
-    <div class="josnViewerBox" :style="{ height: model.height || 'auto','max-height':(listHeight?listHeight-130+'px':'calc(100vh - 130px)') }" v-if="isRefresh">
-      <JsonViewer :value="model.json" copyable show-array-index show-double-quotes theme="light" :expanded="true"
-        :expand-depth="2" @onKeyClick="keyClick">
-        <template #copy="{ copied }">
-          <div class="btn-iocn"><el-icon title="复原到初始状态" @click.stop="resetJSON">
-              <Refresh />
-            </el-icon>
-
-            <!-- 复制按钮 -->
-            <el-icon :class="{ 'copied': copied }" title="复制JSON内容">
-              <CopyDocument />
-            </el-icon>
-          </div>
-        </template>
-      </JsonViewer>
-    </div>
+<template>
+  <div class="josnViewerBox" ref="jsonContent" tabindex="-1"
+    :style="{ height: model.height || 'auto', 'max-height': ('calc(100vh - '+topDistance+'px)') }"
+    v-if="isRefresh">
+    <JsonViewer :value="model.json" copyable show-array-index show-double-quotes theme="light" :expanded="true"
+      :expand-depth="2" @onKeyClick="keyClick">
+      <template #copy="{ copied }">
+        <div class="btn-iocn"><el-icon title="复原到初始状态" @click.stop="resetJSON">
+            <Refresh />
+          </el-icon>
+
+          <!-- 复制按钮 -->
+          <el-icon :class="{ 'copied': copied }" title="复制JSON内容">
+            <CopyDocument />
+          </el-icon>
+        </div>
+      </template>
+    </JsonViewer>
+  </div>
 </template>
 
 <script setup>
 import { JsonViewer } from "vue3-json-viewer"
 import "vue3-json-viewer/dist/vue3-json-viewer.css";
-import { nextTick, ref } from "vue";
+import { useDistanceCalculator } from '../../utils/distance-utils.js';
+
+import { nextTick, ref, onMounted} from "vue";
 const props = defineProps({
   api: String,
   vmodel: Object,
   actionRouter: Array,
-   listHeight: Number,
+  listHeight: Number,
 })
+
+const jsonContent = ref(null); 
+
 const model = ref({});
 const isRefresh = ref(true);
+const topDistance = ref(0);
+const { getAllDistances } = useDistanceCalculator(jsonContent);
+
+
+ 
+
+// 在组件挂载后或需要时调用
+onMounted(() => {
+  nextTick(() => { 
+      setTimeout(() => {
+       topDistance.value = getAllDistances()?.elementInfo?.top+40;
+      }, 100);
+  });
 
+});
 
 init()
 //初始化数据
@@ -47,12 +67,12 @@ function load(data) {
 }
 const resetJSON = () => {
   isRefresh.value = false;
-  nextTick(() => { 
+  nextTick(() => {
     isRefresh.value = true;
   });
 };
 
- 
+
 
 const keyClick = (keyName) => {
   console.log(keyName, "it was click")
@@ -72,14 +92,14 @@ const keyClick = (keyName) => {
   z-index: 10;
   margin-left: auto;
   /* 辅助：确保靠右 */
- float: right;
+  float: right;
 
 }
 
- 
+
 
 .josnViewerBox {
-  overflow: auto; 
+  overflow: auto;
   width: 100%;
   border: 1px solid #eee;
   border-radius: 4px;
@@ -89,14 +109,15 @@ const keyClick = (keyName) => {
   box-sizing: border-box;
   background-color: #ffffff;
 }
+
 .josnViewerBox:focus {
   border: 1px solid #3D5ECC;
 }
 
 
 .btn-iocn {
-    display: flex;
+  display: flex;
   gap: 10px;
- 
+
 }
 </style>

package/src/components/web/SearchScreen.vue

@@ -180,8 +180,10 @@ function searchHandler(field) {
                 SearchScreen.hiddenHandle(v, model.value);
                 SearchScreen.displayHandle(v, model.value);
             })
-            if (validExcute()) {
-                emit('resetSearch', model.value);
+            if (field.autoSearch) {
+                if (validExcute()) {
+                    emit('resetSearch', model.value);
+                }
             }
             break;
         default: