resolver-egretimp-plus 0.1.144 → 0.1.145

package/package.json

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

package/src/analysisComponent.jsx

@@ -277,7 +277,7 @@ export default {
                 definePrivatelyProp(props.config, '_formFields', [])
               }
               const originValidate = field.validate
-              field.validate = function (...arg) {
+              field.validate = async function (...arg) {
                 if (!assertNeedToValid()) {
                   return
                 }
@@ -324,13 +324,12 @@ export default {
             addField(field) {
               if (field.validate && isFunction(field.validate)) {
                 const originValidate = field.validate
-                field.validate = function (...arg) {
+                field.validate = async function (...arg) {
                   if (!assertNeedToValid()) {
                     return
                   }
                   const ret = originValidate.apply(this, arg)
                   return ret?.then(ret => ret)?.catch(err => {
-                      debugger
                     if (isPlainObject(err)) {
                       Object.keys(err).forEach(key => {
                         // 在自定义组件中form-item 校验失败之后，err 中绑定的 prop 属性手动替换成config 的dynamicHireRelat

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;
 }