resolver-egretimp-plus 0.1.9 → 0.1.11

package/package.json

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

package/src/bpm/udc-sdk-esm/cjs/impl/iframe/udcSdkForIframe/index.js

@@ -190,7 +190,7 @@ export default class UdcSdkForIfame {
     };
     /** 获取客户定制API */
     getCustomApi = () => {
-        const _tenant = currentSDK.baseInfo.tenant;
+        const _tenant = currentSDK.baseInfo.tenant || 'CMI';
         const _tenantApi = this._customization[_tenant];
         if (!_tenantApi) {
             console.error(!_tenant ? "缺少tenant信息" : "该tenant未定制过API");

package/src/components/helper/calcTooltip.jsx

@@ -99,6 +99,7 @@ export function useToolTip({
   })
   function generateTooltipWrap(node, opt) {
     const {
+      wrapAttrs = {},
       maintain = false,
     } = opt || {}
     const nodeComp = defineComponent(node)
@@ -106,7 +107,7 @@ export function useToolTip({
       return <nodeComp></nodeComp>
     }
     return (
-      <div class="resolver-calc-contrainer custom-error-tip-block">
+      <div class="resolver-calc-contrainer" {...wrapAttrs}>
         <span ref={(e) => calcSpanRef.value = e} class="resolver-calc-span">{ displayValue.value }</span>
         {
           isOverflow.value ? 

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 { isPromise, parseExtendAttr, unionWith } from "../../utils/index"
+import { isPromise, modelValueDeepMerge, parseExtendAttr, unionWith } from "../../utils/index"
 import { buildInRequest } from "../../utils/request"
 
 function getPathVal(obj = {}, path) {
@@ -119,10 +119,8 @@ export async function dispatchClickEvent(service, {
     reqResult = {
     }
   }
-  reqResult = {
-    ...reqResult,
-    ...reqData
-  }
+  const mergeObj = modelValueDeepMerge(reqResult, reqData)
+  reqResult = mergeObj
 
   let beforeRequestServiceRet = true
   if (normalBeforeRequestService) {

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

@@ -173,12 +173,18 @@ export default {
       }
       return ret
     })
-
+    const inputWrapAttrs = computed(() => {
+      return {
+        class: attrs?.class,
+        style: attrs?.style
+      }
+    })
     const normalAttrs = computed(() => {
       const ret = {
         ...attrs
       }
       delete ret.class
+      delete ret.style
 
       if (isPagePopupAndSearch.value && isOnlyIconClickFlag.value) {
         delete ret.onClick
@@ -293,7 +299,10 @@ export default {
           {
             getInputSolts()
           }
-        </ElInput>
+        </ElInput>,
+        {
+          wrapAttrs: inputWrapAttrs.value
+        }
       )
     }
   }

package/src/components/styles/CustomComponenTable.scss

@@ -1,4 +1,4 @@
-.error-tip-block,.custom-error-tip-block {
+.error-tip-block {
   & + .el-form-item__error {
     position: relative;
   }

package/src/utils/render.jsx

@@ -1053,9 +1053,6 @@ export function getComponentSolt({
   slotKey = 'slots'
 }) {
   const slots = config?.[slotKey]
-  if (config.metaType === 'ElButton') {
-    // debugger
-  }
   if (slots) {
     let retSlots = null
     try {