resolver-egretimp-plus 0.1.143 → 0.1.145

package/package.json

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

package/src/analysisComponent.jsx

@@ -1,5 +1,5 @@
 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 { calcDisable, COFNGI_KEY_EVENT_FLAG, commonPropsType, definePrivatelyProp, EXECTE_CLICK_EVENT_COMPONENTS, findComponent, getComponentPropsKeys, getComponentSolt, hasOwn, isChainHidden, isFunction, isPlainColumn, isPlainObject } from './utils/index.js'
 import { useVmodels } from './hooks/index.js'
 import { getRenderComponentProps, generateFormItemPolyfill } from './utils/index.js'
 import rulesDriver, { recoverCb } from './rules/rulesDriver'
@@ -264,57 +264,110 @@ export default {
     provide('parent', props.config)
 
     if (OPEN_DATA_RULES) {
-      if (!_isH5?.value && props.config.renderby) {
-        provide(formContextKey, reactive({
-          ...formContext,
-          addField(field) {
-            if (!props.config?._formFields) {
-              definePrivatelyProp(props.config, '_formFields', [])
-            }
-            props.config?._formFields?.push(field)
-            formContext.addField(field)
-          },
-          removeField(field) {
-            const fields = props.config?._formFields
-            if (field.prop && fields) {
-              const idx = fields.indexOf(field)
-              if (idx !== -1) {
-                fields.splice(idx, 1)
+      // 改了什么配置那就需要进行备份；这个只是自定义组件需要；如果自定义组件是容器，容器里面的组件开始还是使用原来的定义
+      const originAddField = formContext.originAddField || formContext.addField
+      const originRemoveField = formContext.originRemoveField || formContext.removeField
+      if (!_isH5?.value) {
+        if (props.config.renderby) {
+          provide(formContextKey, reactive({
+            ...formContext,
+            originAddField,
+            addField(field) {
+              if (!props.config?._formFields) {
+                definePrivatelyProp(props.config, '_formFields', [])
+              }
+              const originValidate = field.validate
+              field.validate = async function (...arg) {
+                if (!assertNeedToValid()) {
+                  return
+                }
+                return originValidate.apply(this, arg)
+              }
+              props.config?._formFields?.push(field)
+              formContext.addField(field)
+            },
+            originRemoveField,
+            removeField(field) {
+              const fields = props.config?._formFields
+              if (field.prop && fields) {
+                const idx = fields.indexOf(field)
+                if (idx !== -1) {
+                  fields.splice(idx, 1)
+                }
               }
+              formContext.removeField(field)
             }
-            formContext.removeField(field)
-          }
-        }))
+          }))
+        } else {
+          provide(formContextKey, reactive({
+            ...formContext,
+            originAddField,
+            addField(...arg) {
+              return originAddField?.apply(this, arg)
+            },
+            originRemoveField,
+            removeField(...arg) {
+              return originRemoveField?.apply(this, arg)
+            }
+          }))
+        }
       }
     } else {
+      // 改了什么配置那就需要进行备份；这个只是自定义组件需要；如果自定义组件是容器，容器里面的组件开始还是使用原来的定义
+      const originAddField = formContext.originAddField || formContext.addField
       // 在自定义组件中使用 form-item 进行声明的校验，这边进行兼容，可以在校验住的时候支持跳转
-      if (!_isH5?.value && props.config.renderby) {
-        provide(formContextKey, reactive({
-          ...formContext,
-          addField(field) {
-            if (field.validate && isFunction(field.validate)) {
-              const originValidate = field.validate
-              field.validate = function (...arg) {
-                const ret = originValidate.apply(this, arg)
-                return ret?.then(ret => ret)?.catch(err => {
-                  if (isPlainObject(err)) {
-                    Object.keys(err).forEach(key => {
-                      // 在自定义组件中form-item 校验失败之后，err 中绑定的 prop 属性手动替换成config 的dynamicHireRelat
-                      const copyVal = err[key]
-                      delete err[key]
-                      err[props.config.dynamicHireRelat] = copyVal
-                    })
+      if (!_isH5?.value) {
+        if (props.config.renderby) {
+          provide(formContextKey, reactive({
+            ...formContext,
+            originAddField,
+            addField(field) {
+              if (field.validate && isFunction(field.validate)) {
+                const originValidate = field.validate
+                field.validate = async function (...arg) {
+                  if (!assertNeedToValid()) {
+                    return
                   }
-                  return Promise.reject(err)
-                }) || true
+                  const ret = originValidate.apply(this, arg)
+                  return ret?.then(ret => ret)?.catch(err => {
+                    if (isPlainObject(err)) {
+                      Object.keys(err).forEach(key => {
+                        // 在自定义组件中form-item 校验失败之后，err 中绑定的 prop 属性手动替换成config 的dynamicHireRelat
+                        const copyVal = err[key]
+                        delete err[key]
+                        err[props.config.dynamicHireRelat] = copyVal
+                      })
+                    }
+                    return Promise.reject(err)
+                  }) || true
+                }
               }
+              formContext.addField(field)
             }
-            formContext.addField(field)
-          }
-        }))
+          }))
+        } else {
+          provide(formContextKey, reactive({
+            ...formContext,
+            originAddField,
+            addField(...arg) {
+              return originAddField?.apply(this, arg)
+            },
+          }))
+        }
       }
     }
 
+    function assertNeedToValid() {
+      const compProps = {
+        disabled: calcDisable(props.config, props.mode)
+      }
+      const needToValid = !(
+        (compProps?.disabled || isPlainColumn(props.config, compProps?.disabled)) && props.config.alongValidate != '1' ||
+        isChainHidden({ config: props.config })
+      )
+      return needToValid
+    }
+
     const onClick = (e, params) => {
       const context = {
         props,

package/src/components/helper/eventOrchestration.js

@@ -2,7 +2,7 @@ import { isArray, isHasVal, isNull, isUndefined } from "../../utils/is"
 import { DATA_VALID_RULE_EXECUTE } from "../../api/builtIn"
 import { getRelateConfigKeys } from "../../rules/ruleUtils"
 import { RESULT_CODE, resultToast } from "../../utils/respone"
-import { assignmentPathVal, definePrivatelyProp, getPathVal, isPromise, modelValueDeepMerge, parseExtendAttr, unionWith } from "../../utils/index"
+import { assignmentPathVal, cloneDeep, definePrivatelyProp, getPathVal, isPromise, modelValueDeepMerge, parseExtendAttr, unionWith } from "../../utils/index"
 import { buildInRequest } from "../../utils/request"
 import { bpmInstance } from "../../bpm/bpmInstance"
 
@@ -34,7 +34,7 @@ export async function dispatchClickEvent(service, {
   }
   // 把执行逻辑封装成一个方法
   async function toExecute(resetPageNum = true) {
-    let reqData = rootValue || {}
+    let reqData = cloneDeep(rootValue || {})
     let tableConfig = null
     const serviceCustomProps = parseExtendAttr({extendAttr: service.extendAttr})
 

package/src/theme/element/components/collapse.scss

@@ -121,24 +121,17 @@
   margin-bottom: 16px;
 }
 
-// 选择第一个
-// :not(.CustomComponentCollapse.is-card) + .CustomComponentCollapse.is-card {
-//   background: red;
-// }
-.CustomComponentCollapse.is-card:has(+ .CustomComponentCollapse.is-card) {
+// 当卡片组件、被包裹的折叠组件、页签组件相邻排列时，给前面的组件添加 16px 底部间距
+// 卡片组件后面紧跟被包裹的折叠组件、卡片组件或页签组件时
+.CustomComponentCard.is-card:has(+ .CustomComponentCollapse.is-card, + .CustomComponentCard.is-card, + .CustomComponentTabs) {
   margin-bottom: 16px;
 }
-
-.CustomComponentCollapse.is-card:has(+ .CustomComponentCard.is-card) {
-  margin-bottom: 16px;
-}
-
-.CustomComponentCard.is-card:has(+ .CustomComponentCollapse.is-card) {
+// 被包裹的折叠组件后面紧跟同类组件、卡片组件或页签组件时
+.CustomComponentCollapse.is-card:has(+ .CustomComponentCollapse.is-card, + .CustomComponentCard.is-card, + .CustomComponentTabs) {
   margin-bottom: 16px;
 }
-
-
-.CustomComponentCard.is-card:has(+ .CustomComponentCard.is-card) {
+// 页签组件后面紧跟被包裹的折叠组件、卡片组件或页签组件时
+.CustomComponentTabs:has(+ .CustomComponentCollapse.is-card, + .CustomComponentCard.is-card, + .CustomComponentTabs) {
   margin-bottom: 16px;
 }
 

package/src/utils/render.jsx

@@ -1435,7 +1435,7 @@ function isTransCellMobile(config, disabled) {
 }
 
 // 如果父级有一个是hidden了，那就表示hidden了
-function isChainHidden({config}) {
+export function isChainHidden({config}) {
   if (isHidden({config})) {
     return true
   }