resolver-egretimp-plus 0.1.133 → 0.1.135

package/package.json

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

package/src/analysisComponent.jsx

@@ -1,4 +1,4 @@
-import { computed, defineAsyncComponent, getCurrentInstance, inject, onBeforeMount, provide, ref, watch } from 'vue'
+import { computed, defineAsyncComponent, getCurrentInstance, inject, onBeforeMount, provide, ref, Teleport, watch } from 'vue'
 import { COFNGI_KEY_EVENT_FLAG, commonPropsType, definePrivatelyProp, EXECTE_CLICK_EVENT_COMPONENTS, findComponent, getComponentPropsKeys, getComponentSolt, hasOwn, isFunction, isPlainObject } from './utils/index.js'
 import { useVmodels } from './hooks/index.js'
 import { getRenderComponentProps, generateFormItemPolyfill } from './utils/index.js'
@@ -81,6 +81,7 @@ export default {
     const lang = inject('lang')
     const OPEN_DATA_RULES = inject('OPEN_DATA_RULES')
 
+    const _dialogFooterTeleport = inject('_dialogFooterTeleport')
     const selects = inject('selects')
     const _parentRootValue = inject('_parentRootValue')
     const _parentDynamicMapComp = inject('_parentDynamicMapComp')
@@ -378,7 +379,7 @@ export default {
         messageInstance: messageInstance?.value,
         OPEN_DATA_RULES,
       }) // 生成formItem（）的辅助函数
-      return formItemPolyfill(
+      const retVnode = formItemPolyfill(
         <currentComponent.value
           key={props.config.metaCode}
           ref={refFn}
@@ -395,6 +396,14 @@ export default {
           }
         </currentComponent.value>
       )
+      if (props.config?.dialogFooterSlot == '1' && _dialogFooterTeleport.value) {
+        return <Teleport to={_dialogFooterTeleport.value}>
+          {
+            retVnode
+          }
+        </Teleport>
+      }
+      return retVnode
     }
   }
 }

package/src/components/childDialog/src/index.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed, defineAsyncComponent, ref } from 'vue';
+import { computed, defineAsyncComponent, onMounted, onUnmounted, provide, ref, watchEffect } from 'vue';
 import { ElDialog } from 'element-plus';
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
 import en from 'element-plus/es/locale/lang/en'
@@ -107,10 +107,60 @@ function rootStoreChange(rootStore) {
   props.rootStoreChange && props.rootStoreChange(rootStore)
 }
 
+const footerHeight = ref(0)
+const contentHeight = computed(() => {
+  let reduceNum = footerHeight.value
+  reduceNum += 100 // 这是弹框遮罩层的上下边距
+  reduceNum += 36 // 弹框内边距
+  if (!!dialogProps.value?.title) {
+    reduceNum += 40 // 
+  }
+  return `calc(100vh - ${reduceNum}px)`
+})
+
+// 监听 footer 的高度======start=====
+const _dialogFooterTeleport = ref(null)
+let unWatchFooter = null
+onMounted(() => {
+  watchEffect((cleanup) => {
+    cleanup(() => {
+      unWatchFooter?.()
+    })
+    if (!_dialogFooterTeleport.value) {
+      return
+    }
+    unWatchFooter = watchFooterHeight(_dialogFooterTeleport.value, (height) => {
+      footerHeight.value = height
+    })
+  })
+})
+onUnmounted(() => {
+  unWatchFooter?.()
+})
+// 监听 footer 的高度======end=====
+
+function watchFooterHeight(dom, cb) {
+  if (!dom) return
+  const config = { attributes: true, childList: true, subtree: true, characterData: true };
+  
+  const callback = function() {
+      // 检查高度变化
+      cb && cb(dom.offsetHeight)
+  };
+  
+  const observer = new MutationObserver(callback);
+  observer.observe(dom, config);
+  return () => {
+    observer.disconnect()
+  }
+}
+
 
 watch(formData, (val) => {
   props.rootDataChange && props.rootDataChange(val)
 })
+
+provide('_dialogFooterTeleport', _dialogFooterTeleport)
 defineExpose({
   dialogVisible,
   clearData: () => {
@@ -136,23 +186,26 @@ defineExpose({
     >
       <div>
       </div>
-      <Resolver v-if="dialogVisible" ref="resolverRef"
-        @loadedConfigCompeted="loadedConfigCompeted"
-        @rootStoreChange="rootStoreChange"
-        v-model="formData"
-        :parentRootValue="props.parentRootValue"
-        :parentDynamicMapComp="props.parentDynamicMapComp"
-        :selectionsObj="props.selectionsObj"
-        :busiIdentityId="busiIdentityId"
-        :lang="props.lang"
-        :selects="parentSelects"
-        :buttonActions="props.buttonActions"
-        :dialogReq="props.loadEvnetsReq"
-        :polyfillConfigs="props.polyfillConfigs"
-        :axiosInstance="props.axiosInstance"
-        :axiosConfig="props.axiosConfig"
-        :components="props.components"
-      ></Resolver>
+      <el-scrollbar class="content" :max-height="contentHeight">
+        <Resolver v-if="dialogVisible" ref="resolverRef"
+          @loadedConfigCompeted="loadedConfigCompeted"
+          @rootStoreChange="rootStoreChange"
+          v-model="formData"
+          :parentRootValue="props.parentRootValue"
+          :parentDynamicMapComp="props.parentDynamicMapComp"
+          :selectionsObj="props.selectionsObj"
+          :busiIdentityId="busiIdentityId"
+          :lang="props.lang"
+          :selects="parentSelects"
+          :buttonActions="props.buttonActions"
+          :dialogReq="props.loadEvnetsReq"
+          :polyfillConfigs="props.polyfillConfigs"
+          :axiosInstance="props.axiosInstance"
+          :axiosConfig="props.axiosConfig"
+          :components="props.components"
+        ></Resolver>
+      </el-scrollbar>
+      <div ref="_dialogFooterTeleport" id="open-dialog-footer"></div>
     </ElDialog>
   </ElConfigProvider>
 </template>
@@ -160,14 +213,11 @@ defineExpose({
 <style lang="scss">
 .open-child-frame {
   padding: 16px 20px 20px 20px;
-  overflow-y: auto;
-  overflow-x: hidden;
+  overflow-y: hidden;
 
-  max-height: calc(100vh - 200px);
-  
   &.el-dialog {
-    margin-top: 100px !important;
-    margin-bottom: 100px;
+    margin-top: 50px !important;
+    margin-bottom: 50px;
   }
   .el-dialog__header {
     --el-dialog-title-font-size: 16px;
@@ -175,11 +225,16 @@ defineExpose({
     font-weight: 600;
   }
   .el-dialog__body {
+    // max-height: calc(100% - 40px);
   }
   &.hidden-head {
     & > .el-dialog__header {
       display: none;
     }
+
+    .el-dialog__body {
+      // max-height: 100%;
+    }
   }
 }
 </style>

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

@@ -22,12 +22,12 @@ const emit = defineEmits(['change'])
 const props = defineProps({
   ...commonPropsType,
   multiple: {
-    type: [String, Boolean],
+    type: [String, Boolean, Number],
     default: false
   },
   // ====start==== 按部门查找人员，type为user时有效，结构为{deptIds:'xxx,yyy', cascade: true, excludeDeptIds:'xxx,yyy'}, deptIds为部门ID（如有多个用英文逗号分隔），cascade为是否包含下级部门人员, excludeDeptIds为除外部门ID（如有多个用英文逗号分隔）
   cascade: {
-    type: [Boolean, String],
+    type: [Boolean, String, Number],
     default: true
   },
   deptIds: {

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

@@ -189,7 +189,7 @@ export default {
     })
     const lang = inject('lang')
     const clear = () => {
-      modelValue.value = ''
+      // modelValue.value = ''
     }
     const getRenderSlots = function () {
       const optionsSlotKeys = {

package/src/rules/ruleUtils.js

@@ -95,8 +95,8 @@ function getRelateConfigs(codesStr, config, type) {
   })
   // 组装成此数据结果，用于后续的获取对应字段=====end====
 
-  let diffIdx = -1 // 次标识表示，是从那个所以开始，code不一样了
   const codes = codesStr.split('->')
+  let diffIdx = codes.length - 1 // 次标识表示，是从那个所以开始，code不一样了
 
   for (let i = 0; i < codes.length; i ++) {
     const code = codes[i]