vue2-client 1.16.89 → 1.16.91

package/package.json

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

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

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

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

@@ -381,7 +381,7 @@
       <XFormDatePicker
         :attr="attr"
         :mode="mode"
-        :enablePopupToBody="enablePopupToBody"
+        :getCalendarContainer="getPopupContainer"
         :disabled="disabled"
         :readOnly="readOnly"
         :showLabel="showLabel"
@@ -1486,7 +1486,23 @@ export default {
       this.emitFunc('recordingData', data)
     },
     getPopupContainer (triggerNode) {
-      // return document.body
+      // 行编辑模式特殊处理
+      if (this.$vnode?.key.startsWith('editRow')) {
+        // 限制最多向上查找5层
+        let parent = triggerNode.parentNode
+        let depth = 0
+        const maxDepth = 10
+
+        while (parent && parent !== document.body && depth < maxDepth) {
+          if (parent.tagName === 'TBODY') {
+            return parent
+          }
+          parent = parent.parentNode
+          depth++
+        }
+        // 如果5层内没找到，回退到body
+        return document.body
+      }
       return triggerNode.parentNode
     },
     colorPickerComboboxSelect (val) {

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

@@ -8,7 +8,7 @@
       @action="action"
       @selectRow="selectRow"
       @columnClick="columnClick"
-      serviceName="af-safecheck"
+      serviceName="af-system"
       ref="xFormTable">
     </x-form-table>
   </a-card>
@@ -26,7 +26,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'checkPlanListCRUD',
+      queryParamsName: 'ceshiCRUD',
       // 查询配置左侧tree
       xTreeConfigName: 'addressType',
       // 新增表单固定值