resolver-egretimp-plus 0.0.106 → 0.0.108

package/package.json

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

package/src/analysisComponent.jsx

@@ -86,9 +86,17 @@ export default {
       if (props.config.onMounted) {
         let onMounted = props.config.onMounted
         if (typeof onMounted === 'string') {
-          onMounted = eval(`(function({props, e, selects}) {
-            ${props.config.onMounted}
-          })`)
+          try {
+            onMounted = eval(`(function({props, e, selects}) {
+              try {
+                ${props.config.onMounted}
+              } catch (error) {
+                console.error('error===:', props, error)
+              }
+            })`)
+          } catch (error) {
+            console.error('error===:',props, error)
+          }
         }
         typeof onMounted === 'function' && onMounted({props, e, selects})
       }

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

@@ -3,6 +3,7 @@ import { computed, defineAsyncComponent, ref } from 'vue';
 import { ElDialog } from 'element-plus';
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
 import en from 'element-plus/es/locale/lang/en'
+import { hasOwn } from '../../../utils';
 const Resolver = defineAsyncComponent(() => import('../../../resolver-web.vue'))
 
 const props = defineProps({
@@ -76,7 +77,9 @@ const dialogStyle = computed(() => {
 
 const dialogProps = computed(() => {
   const ret = Object.keys(ElDialog.props).reduce((ret, key) => {
-    ret[key] = props.dialogProps[key]
+    if (hasOwn(props.dialogProps, key)) {
+      ret[key] = props.dialogProps[key]
+    }
     return ret
   }, {})
   return ret
@@ -104,6 +107,7 @@ defineExpose({
   <ElConfigProvider :locale="locale">
     <ElDialog class="open-child-frame"
       :close-on-click-modal="false"
+      :show-close="false"
       v-bind="dialogProps"
       :width="dialogWidth"
       v-model="dialogVisible"

package/src/components/helper/eventOrchestration.js

@@ -284,17 +284,7 @@ export function openDailg({
             initOutParamData(outParamMappingList, {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, outResult: outData})
             dialogClose?.()
 
-            // 定义的请求后钩子
-            const afterOpenDialog = compConfig?.afterOpenDialog
-            afterOpenDialog && afterOpenDialog({
-              dynamicMapComp,
-              rootValue, 
-              dynamicHireRelat, 
-              compConfig,
-              pagePopupMap,
-              inputParams: reqData,
-              outputParams: outData
-            })
+            toAfterOpenDialog(outData)
           }
         }
       }
@@ -305,6 +295,7 @@ export function openDailg({
       return {
         onClick() {
           dialogClose?.()
+          toAfterOpenDialog()
         }
       }
     }
@@ -344,10 +335,30 @@ export function openDailg({
     toOpenDialog()
   }
 
+  function toAfterOpenDialog(outputParams) {
+    // 定义的请求后钩子
+    const afterOpenDialog = compConfig?.afterOpenDialog
+    afterOpenDialog && afterOpenDialog({
+      dynamicMapComp,
+      rootValue, 
+      dynamicHireRelat, 
+      compConfig,
+      pagePopupMap,
+      inputParams: reqData,
+      outputParams,
+    })
+  }
+
   function toOpenDialog() {
     dialogClose = openChildDialog({
+      
       buttonActions,
-      dialogProps,
+      dialogProps: {
+        ...(dialogProps || {}),
+        beforeClose: () => {
+          toAfterOpenDialog()
+        },
+      },
       parentRootValue: rootValue,
       selectionsObj,
       busiIdentityId,

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

@@ -47,7 +47,7 @@ function toCollapse() {
 </script>
 <template>
   <cmi-card v-bind="{...cmiProps, ...attrs}">
-    <div slot="content" :style="{'background-color': cmiProps.cardbgcolor}">
+    <div slot="content">
       <Renderer :config="showPageMeteList" v-model="modelValue"></Renderer>
       <div v-if="showCollapseBtn" class="collapse-wrap">
         <cmi-button type="text" size="small" @click="toCollapse">
@@ -62,9 +62,4 @@ function toCollapse() {
   display: flex;
   justify-content: end;
 }
-cmi-card {
-  cmi-form-item {
-    background-color: transparent;
-  }
-}
 </style>

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

@@ -53,7 +53,7 @@ const normalPageTotal = computed(() => {
 const paginationProps = computed(() => {
   return {
     pagesizes: props.config?.pagesizes || [3, 10, 20, 50],
-    showHomeEnd: hasOwn(props.config, 'showHomeEnd') ? props.config.showHomeEnd === '1' : hasOwn(props.config, 'show-home-end') ? props.config['show-home-end'] === '1' : false,
+    showHomeEnd: hasOwn(props.config, 'showHomeEnd') ? props.config.showHomeEnd === '1' : hasOwn(props.config, 'show-home-end') ? props.config['show-home-end'] === '1' : true,
   }
 })
 const pagenationEvents = computed(() => {
@@ -213,10 +213,9 @@ function normalTableRowValue(row) {
     >
     </cmi-table-column>
   </cmi-table>
-  <div v-if="pageable && normalPageTotal > 3" :style="{'display': 'flex', 'justify-content': pageAlignEnmu[pageAlign || PAGE_CENTER]}" style="margin-bottom: 12px;">
+  <div v-if="pageable && normalPageTotal > 3" :style="{'justify-content': pageAlignEnmu[pageAlign || PAGE_RIGHT]}" style="margin-bottom: 12px;">
     <cmi-pagination
       :key="normalPageTotal"
-      style="border-radius: 8px;border: 1px solid rgba(219,219,219,1);"
       v-bind="{...paginationProps, ...pagenationEvents}"
       @sizeChange="pagenationEvents.onSizeChange"
       @currentChange="pagenationEvents.onCurrentChange"

package/src/components/packages-web/CustomComponentDialog.vue

@@ -66,22 +66,25 @@ let promiseReject = null
 // 初始化handlePromise为一个计算属性，为了获取引用次数
 let referenceCount = 0
 let handleProValue = null
-props.config.handlePromise = computed({
-  get() {
-    referenceCount ++
-    return handleProValue
-  },
-  set(val) {
-    referenceCount = 0
-    handleProValue = val
-  }
-})
+function initHandlePromise() {
+  props.config.handlePromise = computed({
+    get() {
+      referenceCount ++
+      return handleProValue
+    },
+    set(val) {
+      referenceCount = 0
+      handleProValue = val
+    }
+  })
+}
 
 const dialogValue = computed({
   get() {
     const val = props?.config?.dialogVisible
     if (showCloseButton.value || showConfirmButton.value) {
       if (val) {
+        initHandlePromise()
         props.config.handlePromise = new Promise((res, rej) => {
           promiseResolve = res
           promiseReject = rej
@@ -142,6 +145,9 @@ const toConfirm = async () => {
   if (res) {
     dialogValue.value = false
   }
+  if (!res) {
+    initHandlePromise()
+  }
   props.config.handlePromise = new Promise((res, rej) => {
     promiseResolve = res
     promiseReject = rej
@@ -161,6 +167,9 @@ const toClose = async () => {
   if (res) {
     dialogValue.value = false
   }
+  if (!res) {
+    initHandlePromise()
+  }
   props.config.handlePromise = new Promise((res, rej) => {
     promiseResolve = res
     promiseReject = rej