resolver-egretimp-plus 0.0.78 → 0.0.79

package/package.json

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

package/src/index.jsx

@@ -1,4 +1,4 @@
-import { provide, toRef, watch, computed, ref, defineExpose, reactive, getCurrentInstance } from "vue"
+import { provide, toRef, watch, computed, ref, defineExpose, reactive, getCurrentInstance, toRaw } from "vue"
 import Renderer from './renderer.jsx'
 // import './style/index.scss'
 import { usePageConfig } from './hooks/pageConfig'
@@ -169,7 +169,8 @@ export default {
         reqData: props.loadEvnetsReq,
         respCb: (result) => {
           nativeDataLoad.value = true
-          emit('update:modelValue', result)
+          const val = deepMerge(props.modelValue, result, 'replace')
+          emit('update:modelValue', val)
           emit('loadEvnetsCompleted', result)
         }
       }
@@ -198,7 +199,8 @@ export default {
           reqData: props.loadEvnetsReq,
           respCb: (result) => {
             nativeDataLoad.value = true
-            emit('update:modelValue', deepMerge(props.modelValue, result, 'replace') )
+            const val = deepMerge(props.modelValue, result, 'replace')
+            emit('update:modelValue', val)
             emit('loadEvnetsCompleted', result)
           }
         }

package/src/utils/common.js

@@ -168,7 +168,13 @@ export function deepMerge(
   if (!source) {
     return target;
   }
-  let ret = mergeWith({}, source, target, (sourceValue, targetValue) => {
+  let ret = mergeWith(source, target, (sourceValue, targetValue) => {
+    if (!targetValue) {
+      return sourceValue
+    }
+    if (!sourceValue) {
+      return targetValue
+    }
     if (isArray(targetValue) && isArray(sourceValue)) {
       switch (mergeArrays) {
         case 'union':
@@ -186,7 +192,7 @@ export function deepMerge(
     if (isPlainObject(targetValue) && isPlainObject(sourceValue)) {
       return deepMerge(sourceValue, targetValue, mergeArrays);
     }
-    return undefined;
+    return targetValue;
   });
   if (Array.isArray(source)) {
     if (ret && !Array.isArray(ret)) {

package/src/utils/valid.js

@@ -1,13 +1,11 @@
 export function toValidate(formRef, cb, dynamicMapComp) {
   if (!cb) {
     return formRef.value && formRef.value.validate().catch(err => {
-      debugger
       validFailAction(err, dynamicMapComp)
       return Promise.reject(err)
     })
   }
   return formRef.value && formRef.value.validate((valid, errInfo) => {
-    debugger
     errInfo && validFailAction(errInfo, dynamicMapComp)
     cb && cb(valid, errInfo)
   })