resolver-egretimp-plus 0.1.126 → 0.1.127

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.1.126",
+  "version": "0.1.127",
   "description": "交付体验渲染",
   "main": "./dist/web/index.js",
   "module": "./dist/web/index.js",

package/src/analysisComponent.jsx

@@ -2,7 +2,7 @@ import { computed, defineAsyncComponent, getCurrentInstance, inject, onBeforeMou
 import { COFNGI_KEY_EVENT_FLAG, commonPropsType, definePrivatelyProp, EXECTE_CLICK_EVENT_COMPONENTS, findComponent, getComponentPropsKeys, getComponentSolt, hasOwn, isPlainObject } from './utils/index.js'
 import { useVmodels } from './hooks/index.js'
 import { getRenderComponentProps, generateFormItemPolyfill } from './utils/index.js'
-import rulesDriver from './rules/rulesDriver'
+import rulesDriver, { recoverCb } from './rules/rulesDriver'
 import { penddingRules } from './rules/ruleUtils.js'
 import { useRoute } from 'vue-router'
 import { executeEventOrchestration } from './components/helper/eventOrchestration.js'
@@ -10,7 +10,6 @@ import { useRouter } from 'vue-router'
 import { onErrorCaptured } from 'vue'
 import LoadingComponent from './components/loadingComponent/LoadingComponent.vue'
 import { useConfigLoad } from './hooks/configLoad.js'
-import { OPEN_DATA_RULES } from './config.js'
 
 export default {
   name: 'AnalysisComponent',
@@ -76,6 +75,7 @@ export default {
     const rootValue = inject('rootValue')
     const validate = inject('_validate')
     const lang = inject('lang')
+    const OPEN_DATA_RULES = inject('OPEN_DATA_RULES')
 
     const selects = inject('selects')
     const _parentRootValue = inject('_parentRootValue')
@@ -137,7 +137,7 @@ export default {
           const rules = context.rules
           delete context.rules
           setTimeout(() => {
-            rulesDriver.call(context, rules)
+            rulesDriver.call(context, rules, false, OPEN_DATA_RULES)
           }, 0)
         })
         penddingRules[hireRelat] = null
@@ -177,9 +177,19 @@ export default {
           console.error('onVnodeUnmounted error,', error, props.config)
         }
       }
+      // 清除事件中不满足条件的触发逻辑
+      const dynamicHireRelat = props?.config?.dynamicHireRelat || ''
+      const delKeys = Object.keys(recoverCb).filter(key => {
+        return key.endsWith(dynamicHireRelat)
+      })
+      if (delKeys.length) {
+        delKeys.forEach(key => {
+          delete recoverCb[key]
+        })
+      }
     }
 
-    const { vModelObjs, initVmodels, modelValue } = useVmodels(props, emit) // 过个v-model绑定对象，实现可以组件过赋值
+    const { vModelObjs, initVmodels, modelValue } = useVmodels(props, emit, OPEN_DATA_RULES) // 过个v-model绑定对象，实现可以组件过赋值
     
     definePrivatelyProp(props.config, 'refValue', modelValue)
     // onBeforeMount(() => {
@@ -321,10 +331,12 @@ export default {
         rootValue,
         dynamicMapComp,
         props,
-        messageInstance: messageInstance?.value
+        messageInstance: messageInstance?.value,
+        OPEN_DATA_RULES,
       }) // 生成formItem（）的辅助函数
       return formItemPolyfill(
         <currentComponent.value
+          key={props.config.metaCode}
           ref={refFn}
           onVnodeMounted={onVnodeMounted}
           onVnodeUnmounted={onVnodeUnmounted}

package/src/components/lazyLoadComponent/index.js

@@ -1 +1,3 @@
 export {default as default} from './src/LazyLoadComponent'
+
+export { default as LazyLoadSkeleton } from './src/LazyLoadSkeleton.vue'

package/src/components/lazyLoadComponent/src/LazyLoadComponent.jsx

@@ -1,15 +1,25 @@
-import { onMounted, onUnmounted, reactive, ref, TransitionGroup } from "vue"
+import { onMounted, onBeforeUnmount, reactive, ref, TransitionGroup, withDirectives } from "vue"
 import './LazyLoadComponent.scss'
 
 export default {
+  inheritAttrs: false,
   name: 'LazyLoadComponent',
+  emits: [
+    'beforeInit',
+    'init',
+    'before-enter',
+    'before-leave',
+    'after-enter',
+    'after-leave',
+  ],
   props: {
+    config: Object,
     timeout: {
       type: Number
     },
     tagName: {
       type: String,
-      default: 'div'
+      default: ''
     },
     viewport: {
       type: typeof window !== 'undefined' ? window.HTMLElement : Object,
@@ -28,7 +38,8 @@ export default {
       default: 50
     }
   },
-  setup(props, { slots, emit }) {
+  setup(props, { slots, emit, attrs }) {
+    const randomKey = Math.random()
     const el = ref(null)
     let timer = null
     let io = null
@@ -46,15 +57,17 @@ export default {
     }
 
     function intersectionHandler (entries) {
-      if (
-        // 正在交叉
-        entries[0].isIntersecting ||
-        // 交叉率大于0
-        entries[0].intersectionRatio
-      ) {
-        toInit()
-        io?.unobserve(el.value)
-      }
+      entries?.forEach(item => {
+        if (
+          // 正在交叉
+          item.isIntersecting ||
+          // 交叉率大于0
+          item.intersectionRatio
+        ) {
+          toInit()
+          io?.unobserve(el.value)
+        }
+      })
     }
 
     function requestAnimationFrame (callback) {
@@ -70,7 +83,6 @@ export default {
     }
     // 处理组件和骨架组件的切换
     function toInit () {
-      debugger
       // 此时说明骨架组件即将被切换
       emit('beforeInit')
 
@@ -85,7 +97,27 @@ export default {
       })
     }
 
-    onMounted(() => {
+    function bindElement(e) {
+      if (e) {
+        io && el.value && io.unobserve(el.value)
+        // 这边是兼容元素已经在视图区域了，但是IntersectionObserver回调没有触发的情况（不知道为什么）======start======
+        // const rect =  e?.getBoundingClientRect()
+        // if (rect.top || rect.bottom) {
+        //   requestAnimationFrame(() => {
+        //     data.isInit = true
+        //     emit('init')
+        //   })
+        //   return
+        // }
+        // 这边是兼容元素已经在视图区域了，但是IntersectionObserver回调没有触发的情况（不知道为什么）======end======
+        el.value = e
+        if (!data.isInit) {
+          mountedHandler()
+        }
+      }
+    }
+
+    function mountedHandler() {
       if (!props.timeout) {
         // 根据滚动方向来构造视口外边距，用于提前加载
         let rootMargin
@@ -103,35 +135,45 @@ export default {
           io = new window.IntersectionObserver(intersectionHandler, {
               rootMargin,
               root: props.viewport,
-              threshold: [0, Number.MIN_VALUE, 0.01]
+              threshold: [0, Number.MIN_VALUE, 0.01, 0.25, 0.5, 0.75, 1]
           });
           io.observe(el.value);
         } catch (e) {
           toInit()
         }
       }
-    })
-    onUnmounted(() => {
+    }
+
+    // onMounted(mountedHandler)
+
+    onBeforeUnmount(() => {
       if (io) {
-        io.unobserve(el.value)
+        console.log('props.config=:', props.config)
+        io?.disconnect()
       }
     })
 
-    return () => (
-      <TransitionGroup ref={(e) => {el.value= e.$el}} tag={props.tagName} name="lazy-component" className="lazy-load-component"
+    return () => (<>
+      {/* <TransitionGroup tag={props.tagName}
         onBeforeEnter={(el) => emit('before-enter', el)}
-        onBbeforeLeave={(el) => emit('before-leave', el)}
+        onBeforeLeave={(el) => emit('before-leave', el)}
         onAfterEnter={(el) => emit('after-enter', el)}
         onAfterLeave={(el) => emit('after-leave', el)}
-      >
+      > */}
+        
         {
-          data.isInit ?
-            slots?.default(data.loading) :
-            slots?.skeleton ?
-              slots?.skeleton() :
-              null
+          !data.isInit ?
+            (<div style="width: 100%" key={randomKey} ref={bindElement}>
+              {
+                slots?.skeleton ?
+                  slots?.skeleton() :
+                  null
+              }
+            </div>) :
+            slots?.default(data.loading)
+            
         }
-      </TransitionGroup>
-    )
+      {/* </TransitionGroup> */}
+    </>)
   }
 }

package/src/components/lazyLoadComponent/src/LazyLoadSkeleton.vue

@@ -0,0 +1,112 @@
+<template>
+  <div 
+    :class="[
+      'skeleton-item',
+      `skeleton-${type}`,
+      animated && 'skeleton-animated'
+    ]"
+    :style="computedStyle"
+  >
+    <slot></slot>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue';
+
+defineOptions({
+  name: 'LazyLoadSkeleton'
+})
+
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'text',
+    validator: (value) => ['text', 'avatar', 'image', 'button'].includes(value)
+  },
+  width: {
+    type: [String, Number],
+    default: '100%'
+  },
+  height: {
+    type: [String, Number],
+    default: null
+  },
+  animated: {
+    type: Boolean,
+    default: true
+  },
+  round: {
+    type: Boolean,
+    default: false
+  }
+});
+
+const computedStyle = computed(() => {
+  const style = {};
+  
+  if (props.width) {
+    style.width = isNaN(props.width) ? props.width : `${props.width}px`;
+  }
+  
+  if (props.height) {
+    style.height = isNaN(props.height) ? props.height : `${props.height}px`;
+  }
+  
+  if (props.round) {
+    style.borderRadius = '50%';
+  }
+  
+  return style;
+});
+</script>
+
+<style scoped>
+/* 基础样式和动画实现 */
+.skeleton-item {
+  background: #f0f0f0;
+  overflow: hidden;
+  position: relative;
+}
+
+.skeleton-text {
+  height: 16px;
+  border-radius: 4px;
+}
+
+.skeleton-avatar {
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+}
+
+.skeleton-button {
+  height: 36px;
+  border-radius: 4px;
+}
+
+.skeleton-animated::after {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: linear-gradient(
+    90deg,
+    rgba(255, 255, 255, 0) 0%,
+    rgba(255, 255, 255, 0.6) 50%,
+    rgba(255, 255, 255, 0) 100%
+  );
+  animation: shimmer 1.5s infinite;
+}
+
+@keyframes shimmer {
+  0% {
+    transform: translateX(-100%);
+  }
+  100% {
+    transform: translateX(100%);
+  }
+}
+</style>

package/src/components/packages-web/CustomComponentCycle.vue

@@ -11,12 +11,13 @@
   </div>
 </template>
 <script setup>
-import { computed, defineModel, watch, reactive } from 'vue'
+import { computed, defineModel, watch, reactive, inject } from 'vue'
 import { commonPropsType, cloneDeep, definePrivatelyProp } from '../../utils/index.js'
 import { ElRow, ElCard } from 'element-plus'
 import Renderer from '../../renderer.jsx'
-import { OPEN_DATA_RULES } from '../../config.js'
+import { normalRecoverCb } from '../../rules/rulesDriver.js'
 
+const OPEN_DATA_RULES = inject('OPEN_DATA_RULES')
 // const lang = inject('lang')
 const modelValue = defineModel()
 // setTimeout(() => {
@@ -59,6 +60,7 @@ if (!OPEN_DATA_RULES) {
         if (rowCgs) {
           rowCgs.forEach(config => {
             config.rowIndex = idx
+            normalRecoverCb(config, idx)
           })
           return rowCgs
         } else {

package/src/components/packages-web/CustomComponentCycleTabPane.vue

@@ -40,11 +40,11 @@ import { commonPropsType, cloneDeep, definePrivatelyProp } from '../../utils/ind
 import { TabPane } from '../tabs'
 import { h } from 'vue'
 import { useAttrs } from 'vue'
-import { OPEN_DATA_RULES } from '../../config.js'
 
 defineOptions({
   inheritAttrs: false
 })
+const OPEN_DATA_RULES = inject('OPEN_DATA_RULES')
 const attrs = useAttrs()
 const props = defineProps({
   ...commonPropsType,

package/src/components/packages-web/CustomComponentNativeTabPane.vue

@@ -28,8 +28,8 @@ import { computed, inject, useAttrs, useSlots } from 'vue'
 import { commonPropsType } from '../../utils/index.js'
 import { TabPane } from '../tabs'
 import { h } from 'vue'
-import { OPEN_DATA_RULES } from '../../config.js'
 
+const OPEN_DATA_RULES = inject('OPEN_DATA_RULES')
 const slots = useSlots()
 const props = defineProps({
   ...commonPropsType,

package/src/components/packages-web/CustomComponentSelectEmployees.vue

@@ -27,7 +27,7 @@ const props = defineProps({
   },
   // ====start==== 按部门查找人员，type为user时有效，结构为{deptIds:'xxx,yyy', cascade: true, excludeDeptIds:'xxx,yyy'}, deptIds为部门ID（如有多个用英文逗号分隔），cascade为是否包含下级部门人员, excludeDeptIds为除外部门ID（如有多个用英文逗号分隔）
   cascade: {
-    type: Boolean,
+    type: [Boolean, String],
     default: true
   },
   deptIds: {
@@ -107,7 +107,7 @@ const initSelEmployee = async () => {
     if (props.deptIds || props.excludeDeptIds) {
       deptForUser.deptIds = isString(props.deptIds) ? props.deptIds : ''
       deptForUser.excludeDeptIds = isString(props.excludeDeptIds) ? props.excludeDeptIds : ''
-      deptForUser.cascade = isBoolean(props.cascade) ? props.cascade : !!(props.cascade)
+      deptForUser.cascade = isBoolean(props.cascade) ? props.cascade : props.cascade == '1'
     }
     const initParams = {
       el: `#${metaCode.value}`,

package/src/components/packages-web/CustomComponentTable.jsx

@@ -5,7 +5,7 @@ import Renderer from '../../renderer.jsx'
 import { computed, inject, watch, h, ref, reactive, onMounted, unref } from 'vue'
 import { commonPropsType, TABLE_COLUMN_NOT_RENDER_META_TYPE, DISPLAY_SHOW, compareComponet, isPlainObject, hasOwn, cloneDeep, isPromise, isPlainColumn, generateUniqueId, calcDisable, camelize, capitalize, DISPLAY_HIDDEN, definePrivatelyProp, isArray, eleIsOverflow } from '../../utils/index.js'
 import { getCustomerTableProps, tableValidate } from '../helper/table'
-import { OPEN_TABLE_DEFAULT_PAGINATION, OPEN_DATA_RULES } from '../../config'
+import { OPEN_TABLE_DEFAULT_PAGINATION } from '../../config'
 // import '../styles/CustomComponenTable.scss'
 
 export default {
@@ -92,6 +92,8 @@ export default {
     const selectable = computed(() => {
       return props.config?.selectable == '1' || props.config?.canSelect
     })
+
+    const OPEN_DATA_RULES = inject('OPEN_DATA_RULES')
     const formContext = inject(formContextKey, undefined)
     const messageInstance = inject('_messageInstance')
     const indectModeRef = inject('indectModeRef', ref(''))

package/src/components/packages-web/CustomComponentTabs.vue

@@ -10,12 +10,12 @@
 import { ElTabs } from 'element-plus'
 import Tabs from '../tabs'
 import Renderer from '../../renderer.jsx'
-import { computed, useAttrs, useSlots } from 'vue'
+import { computed, inject, useAttrs, useSlots } from 'vue'
 import { assertMetaType, commonPropsType, hasOwn } from '../../utils/index.js'
 import { watch } from 'vue'
-import { OPEN_DATA_RULES } from '../../config.js'
 // import * as lib from 'element-plus/es/utils/index.mjs'
 
+const OPEN_DATA_RULES = inject('OPEN_DATA_RULES')
 const slots = useSlots()
 const props = defineProps({
   ...ElTabs.props,

package/src/hooks/index.js

@@ -4,7 +4,7 @@ import defaultVal from '../utils/defaultVal.js'
 import {definePrivatelyProp, isNonRefType, modelValueDeepMerge } from "../utils"
 
 export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
-  const { hireRelatMapRules, messageInstance, rootValue, ruleExecuter, dataLoad, dynamicMapComp, lang, _mapComp } = this
+  const { OPEN_DATA_RULES, hireRelatMapRules, messageInstance, rootValue, ruleExecuter, dataLoad, dynamicMapComp, lang, _mapComp } = this
   const currentRules = hireRelatMapRules.value[config.hireRelat]
   let metaCodeKey = config.metaCode
   if (modelKey !== 'update:modelValue') {
@@ -50,7 +50,7 @@ export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
               lang,
               _mapComp,
               messageInstance
-            }, currentRules, true)
+            }, currentRules, true, OPEN_DATA_RULES)
             definePrivatelyProp(config, 'eventInit', true)
           }, 0)
         }
@@ -126,7 +126,7 @@ export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
             lang,
             _mapComp,
             messageInstance
-          }, currentRules)
+          }, currentRules, false, OPEN_DATA_RULES)
         }, 0)
       }
     }
@@ -134,7 +134,7 @@ export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
   return retModelVale
 }
 
-export function useVmodels(props, emit) {
+export function useVmodels(props, emit, OPEN_DATA_RULES) {
   const hireRelatMapRules = inject('hireRelatMapRules')
   const dataLoad = inject('dataLoad')
   const dynamicMapComp = inject('dynamicMapComp')
@@ -145,6 +145,7 @@ export function useVmodels(props, emit) {
   const messageInstance = inject('_messageInstance')
 
   const thisObj = {
+    OPEN_DATA_RULES,
     hireRelatMapRules,
     dataLoad,
     dynamicMapComp,

package/src/hooks/pageConfig.js

@@ -11,6 +11,7 @@ export function usePageConfig() {
   const hireRelatMapRulesRef = ref(null)
   const mapCompRef = ref(null)
   function initPageConfig({
+    OPEN_DATA_RULES,
     components,
     confirmInstance,
     openChildDialogInstance,
@@ -35,6 +36,7 @@ export function usePageConfig() {
     messageCb
   }) {
     const { pageConfig, mapComp, hireRelatMapRules } = parsePageConfig({
+      OPEN_DATA_RULES,
       components,
       confirmInstance,
       openChildDialogInstance,

package/src/index.jsx

@@ -16,6 +16,11 @@ import { OPEN_DATA_RULES } from "./config.js"
 export default {
   name: 'Resolver',
   props: {
+    // 是否开启根据数据加载组件逻辑
+    OPEN_DATA_RULES: {
+      type: Boolean,
+      default: OPEN_DATA_RULES
+    },
     // 传入的自定义组件
     components: {
       type: Object,
@@ -280,6 +285,7 @@ export default {
               resetConfigEventInit(dynamicMapComp)
               const emptyObj = createEmptyCopy(val)
               emit('update:modelValue', emptyObj)
+              
               setTimeout(() => {
                 nativeDataLoad.value = true
                 emit('update:modelValue', val)
@@ -300,6 +306,7 @@ export default {
       )
     }
     initPageConfig({
+      OPEN_DATA_RULES: props.OPEN_DATA_RULES,
       components: props.components,
       confirmInstance: props.confirmInstance,
       openChildDialogInstance: props.openChildDialogInstance,
@@ -327,6 +334,7 @@ export default {
 
     watch(toRef(props, 'config'), () => {
       initPageConfig({
+        OPEN_DATA_RULES: props.OPEN_DATA_RULES,
         components: props.components,
         confirmInstance: props.confirmInstance,
         openChildDialogInstance: props.openChildDialogInstance,
@@ -395,12 +403,13 @@ export default {
     provide('_polyfillConfigs', props.polyfillConfigs)
     const requestTraceIdRef = toRef(props, 'requestTraceId')
     provide('requestTraceId', requestTraceIdRef) // 所有渲染器调用的接口，都需要加次参数（生哥提）
+    provide('OPEN_DATA_RULES', props.OPEN_DATA_RULES) // 通过 provide 传递此配置给所有子组件
 
     const rootForm = ref(null)
     provide('rootForm', rootForm)
 
     const validate = (cb) => {
-      if (OPEN_DATA_RULES) {
+      if (props.OPEN_DATA_RULES) {
         validateByData({
           rootConfig: props.config,
           rootValue: props.modelValue,
@@ -438,7 +447,7 @@ export default {
         emit('update:modelValue', val)
       }
     })
-    if (OPEN_DATA_RULES) {
+    if (props.OPEN_DATA_RULES) {
       toWatchRules({
         rules: hireRelatMapRulesRef.value,
         rootValue: toRef(props, 'modelValue'),

package/src/renderer.jsx

@@ -45,6 +45,7 @@ export default {
     const loadModuleCache = inject('_loadModuleCache')
     const _isH5 = inject('_isH5')
     const injectMode = inject('injectMode', '')
+    const OPEN_DATA_RULES = inject('OPEN_DATA_RULES')
     const mode = props.mode || injectMode
     provide('injectMode', mode)
 
@@ -63,7 +64,7 @@ export default {
         if (config?.displayType == DISPLAY_HIDDEN) {
           return null
         }
-        if (canHiddenConfig(config)) {
+        if (canHiddenConfig(config, OPEN_DATA_RULES)) {
           return null
         }
         const disabled = calcDisable(config, modelRef.value)

package/src/rules/eventsSupplement.js

@@ -236,18 +236,16 @@ const allInitEvents = {
     const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
     const configs = getCurrentComp.call(this, targetObj, 'setHidden')
     // const oldDisplayTypes = []
-    // 隐藏的效果需要晚点触发，才能正常执行清空等一些列需要组件操作
-    setTimeout(() => {
-      configs.forEach(labelInfo => {
-        // const oldDisplayType = labelInfo && labelInfo.displayType
-        // oldDisplayTypes.push(oldDisplayType)
-        // 兼容开始使用displayType用于显示隐藏的配置
-        labelInfo && /^\d+$/.test(labelInfo.displayType) && (labelInfo.displayType = '0')
-        labelInfo && (labelInfo.hidden = '1')
-        labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '0')
-        labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '1')
-      })
-    }, 0)
+      
+    configs.forEach(labelInfo => {
+      // const oldDisplayType = labzelInfo && labelInfo.displayType
+      // oldDisplayTypes.push(oldDisplayType)
+      // 兼容开始使用displayType用于显示隐藏的配置
+      labelInfo && /^\d+$/.test(labelInfo.displayType) && (labelInfo.displayType = '0')
+      labelInfo && (labelInfo.hidden = '1')
+      labelInfo && labelInfo.refConfig && /^\d+$/.test(labelInfo.refConfig.displayType) && (labelInfo.refConfig.displayType = '0')
+      labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '1')
+    })
     
     // 有的事件在不满足条件的情况下，需要进行恢复
     return () => {
@@ -255,7 +253,7 @@ const allInitEvents = {
         // const oldDisplayType = oldDisplayTypes[idx]
         labelInfo && /^\d+$/.test(labelInfo.displayType) && (labelInfo.displayType = '1')
         labelInfo && (labelInfo.hidden = '0')
-        labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '1')
+        labelInfo && labelInfo.refConfig && /^\d+$/.test(labelInfo.refConfig.displayType) && (labelInfo.refConfig.displayType = '1')
         labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '0')
       })
     }
@@ -271,7 +269,7 @@ const allInitEvents = {
       // oldDisplayTypes.push(oldDisplayType)
       labelInfo && /^\d+$/.test(labelInfo.displayType) && (labelInfo.displayType = '1')
       labelInfo && (labelInfo.hidden = '0')
-      labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '1')
+      labelInfo && labelInfo.refConfig && /^\d+$/.test(labelInfo.refConfig.displayType) && (labelInfo.refConfig.displayType = '1')
       labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '0')
     })
     // 有的事件在不满足条件的情况下，需要进行恢复
@@ -282,7 +280,7 @@ const allInitEvents = {
           // const oldDisplayType = oldDisplayTypes[idx]
           labelInfo && /^\d+$/.test(labelInfo.displayType) && (labelInfo.displayType = '0')
           labelInfo && (labelInfo.hidden = '1')
-          labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '0')
+          labelInfo && labelInfo.refConfig && /^\d+$/.test(labelInfo.refConfig.displayType) && (labelInfo.refConfig.displayType = '0')
           labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '1')
         })
       }, 0)

package/src/rules/ruleUtils.js

@@ -159,7 +159,7 @@ function getRelateConfigs(codesStr, config, type) {
     })
     retConfigs = list
   }
-  if (_mapComp?.value?.[codesStr] && !retConfigs.length) {
+  if (_mapComp?.value?.[codesStr] && !(retConfigs.filter(item => item.vmIsBind)).length) {
     if (!penddingRules[codesStr]) {
       penddingRules[codesStr] = []
     }