resolver-egretimp-plus 0.0.77 → 0.0.79

package/package.json

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

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

@@ -122,5 +122,8 @@ defineExpose({
       width: 100%;
     }
   }
+  .el-dialog__header {
+    min-height: 40px;
+  }
 }
 </style>

package/src/components/helper/eventOrchestration.js

@@ -46,7 +46,7 @@ export async function dispatchClickEvent(service, { dynamicMapComp, requestTrace
     delete reqConfig.data
   }
   const ret = await (axiosInstance && axiosInstance(reqConfig))
-  if (!resultToast(ret?.data, messageInstance, {messageCb, service, compConfig})) {
+  if (!resultToast(ret?.data, messageInstance, {messageCb, service, compConfig, noSuccessIip: httpMethod.toLocaleLowerCase() === 'get'})) {
     await Promise.reject()
     return
   }

package/src/components/packages-H5/CustomComponentCollapseH5.vue

@@ -28,10 +28,10 @@ const pmPageMetaList = computed(() => {
   return props.config?.pmPageMetaList?.filter(item => !item.collapseSlot) || []
 })
 const showCollapseBtn = computed(() => {
-  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN)?.length > collapseLimt
+  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN && item.hidden != '1')?.length > collapseLimt
 })
 const showPageMeteList = computed(() => {
-  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN).slice(0, isCollapse.value ? collapseLimt : Number.MAX_VALUE)
+  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN && item.hidden != '1').slice(0, isCollapse.value ? collapseLimt : Number.MAX_VALUE)
 })
 const collapseLabel = computed(() => {
   const isCh = lang?.value?.indexOf('zh') > -1

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

@@ -129,7 +129,7 @@ export default {
     // 获取表格列的属性配置
     const getTableColumnProps = (config, idx) => {
       const nextList = tableColumnConfigs.value.slice(idx + 1)
-      const nextConfig = nextList.find(config => config.displayType === DISPLAY_SHOW)
+      const nextConfig = nextList.find(config => config.displayType != DISPLAY_HIDDEN)
       const props =  Object.keys(ElTableColumn.props).reduce((ret, key) => {
         if (hasOwn(config, key)) {
           ret[key] = config[key]
@@ -146,7 +146,7 @@ export default {
         props.className = 'hidden-column'
         props.width = '1px'
       }
-      if (nextConfig && (nextConfig.width == 0 || nextConfig.width == '0px')) {
+      if (nextConfig && (nextConfig.width == 0 || nextConfig.width == '0px' || nextConfig.hidden == '1')) {
         props.className = `${props.className || ''} next-hidden-column`
       }
       if (isPlainColumn({...config, isColumn: true}, calcDisable(config, props.mode))) {
@@ -216,6 +216,9 @@ export default {
     watch(() => {
       return tableData?.value?.length
     }, (length) => {
+      // if (props.config.metaCode == 'solutionSupports') {
+      //   debugger
+      // }
       let list = []
       if (length) {
         const newVal = tableData?.value

package/src/components/styles/CustomComponenTable.scss

@@ -114,12 +114,13 @@
     margin-top: 16px;
   }
   .hidden-column {
-    display: none;
+    border: none;
+    // display: none;
   }
   .hidden-column + .el-table__cell {
-    border: none;
+    // border: none;
   }
   .next-hidden-column {
-    border: none;
+    // border: none;
   }
 }

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'
@@ -6,6 +6,7 @@ import { toValidate } from './utils/valid.js'
 import { MODE } from "./utils/const.js"
 import { generateRequester } from "./utils/request.js"
 import { executeLoadServices } from "./components/helper/resolver.js"
+import { deepMerge } from "./utils/index.js"
 export default {
   name: 'Resolver',
   props: {
@@ -168,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)
         }
       }
@@ -197,7 +199,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)
           }
         }

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

@@ -40,7 +40,7 @@ function validFailAction(errInfo, dynamicMapComp) {
 // 标签组件，需要进行聚焦当前页面
 // component组件，需要打开折叠
 function validFail(config, nextConfig) {
-  const type = config.metaType
+  const type = config.renderby || config.metaType
   switch (type) {
     case 'CustomComponentTabPane':
     case 'CustomComponentCycleTabPane':