resolver-egretimp-plus 0.0.37 → 0.0.39

package/package.json

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

package/src/components/confirmInstance-H5/index.js

@@ -0,0 +1,53 @@
+import confirmInstance from './src/index.vue'
+import { createVNode, render } from 'vue'
+
+let instance = null
+
+export function confirmDialog(content, title, opts = {}, appContext) {
+  const options = {
+    ...opts,
+    content,
+    title
+  }
+  let resolver = null
+  let inject = null
+  const cancelFn = () => {
+    inject && inject()
+  }
+  const confirmFn = () => {
+    resolver && resolver()
+  }
+  const retPromise = new Promise((reso, inj) => {
+    resolver = reso
+    inject = inj
+  })
+  if (instance) {
+    Object.keys(options).forEach(key => {
+      instance.props[key] = options[key]
+    })
+    instance.props.cancel = cancelFn
+    instance.props.confirm = confirmFn
+    instance.vm.exposed.dialogVisible.value = true
+    return retPromise
+  }
+  const container = document.createElement('div')
+  const vnode = createVNode(confirmInstance, {
+    ...options,
+    cancel: cancelFn,
+    confirm: confirmFn
+  })
+  appContext && (vnode.appContext = appContext)
+  render(vnode, container)
+  document.body.appendChild(container.firstElementChild)
+
+  instance = {
+    vnode,
+    vm: vnode.component,
+    props: vnode.component?.props,
+    close: () => {
+      vnode.component.exposed.dialogVisible.value = false
+    }
+  }
+  vnode.component.exposed.dialogVisible.value = true
+  return retPromise
+}

package/src/components/confirmInstance-H5/src/index.vue

@@ -0,0 +1,54 @@
+<script setup>
+import { computed, ref } from 'vue';
+
+const props = defineProps({
+  title: String,
+  content: String,
+  confirm: {
+    type: Function,
+    default: () => {}
+  },
+  cancel: {
+    type: Function,
+    default: () => {}
+  },
+  showCancelButton: {
+    type: Boolean,
+    default: true
+  },
+  type: String
+})
+const dialogType = computed(() => {
+  return props.showCancelButton === false ? 'confirm' : 'modal'
+})
+const dialogVisible = ref(true)
+
+const confirm = () => {
+  props.confirm()
+  dialogVisible.value = false
+}
+
+const cancel = () => {
+  props.cancel()
+  dialogVisible.value = false
+}
+
+
+defineExpose({
+  dialogVisible
+})
+</script>
+<template>
+  <cmi-dialog
+    :type="dialogType"
+    :zIndex="10000"
+    :open="dialogVisible"
+    :title="props.title"
+    :content="props.content"
+    @confirm="confirm"
+    @cancel="cancel"
+  />
+</template>
+
+<style lang="scss">
+</style>

package/src/components/helper/{button.js → eventOrchestration.js}

@@ -1,16 +1,15 @@
 import { getRelateConfigKeys } from "../../rules/ruleUtils"
-import { resultToast } from "../../utils/respone"
-import { openChildDialog } from "../childDialog"
+import { RESULT_CODE, resultToast } from "../../utils/respone"
 
-export async function dispatchClickEvents  ({serviceList = [], axiosInstance, dynamicMapComp, rootValue, dynamicHireRelat, messageInstance}) {
+export async function dispatchClickEvents  ({serviceList = [], axiosInstance, dynamicMapComp, rootValue, dynamicHireRelat, messageCb, compConfig, messageInstance}) {
   const dynamicMapCompKeys = Object.keys(dynamicMapComp)
   for (let i = 0; i < serviceList.length; i++) {
     const service = serviceList[i]
-    dispatchClickEvent(service, {dynamicMapComp, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageInstance})
+    dispatchClickEvent(service, {dynamicMapComp, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageCb, compConfig, messageInstance})
   }
 }
 
-export async function dispatchClickEvent(service, { dynamicMapComp, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageInstance }) {
+export async function dispatchClickEvent(service, { dynamicMapComp, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageCb, compConfig, messageInstance }) {
   let reqData = rootValue
   let tableConfig = null
   if (service.transactionType == '1') {
@@ -22,12 +21,12 @@ export async function dispatchClickEvent(service, { dynamicMapComp, rootValue, d
     }
   }
   const url = service.serviceCode
-  const ret = await (axiosInstance.value && axiosInstance.value({
+  const ret = await (axiosInstance && axiosInstance({
     url,
     method: "post",
     data: reqData
   }))
-  if (!resultToast(ret?.data, messageInstance)) {
+  if (!resultToast(ret?.data, messageInstance, {messageCb, service, compConfig})) {
     await Promise.reject()
     return
   }
@@ -111,6 +110,7 @@ export function openDailg({
   dynamicMapComp,
   dynamicHireRelat,
   lang,
+  openChildDialog,
   appContext,
 }) {
   const busiIdentityId = pagePopupMap.popupBusiIdentityId
@@ -148,7 +148,7 @@ export function openDailg({
   }
   dialogClose = openChildDialog({
     busiIdentityId,
-    axiosInstance: axiosInstance?.value,
+    axiosInstance: axiosInstance,
     lang,
     loadEvnetsReq: reqData,
     polyfillConfigs,
@@ -157,3 +157,97 @@ export function openDailg({
     }
   }, appContext)
 }
+
+// 数据校验服务
+export async function executeDataValid(validConfig, { dynamicMapComp, rootValue, axiosInstance, lang}) {
+  let reqData = rootValue
+  const url = service.serviceCode
+  const ret = await (axiosInstance && axiosInstance({
+    url,
+    method: "post",
+    data: reqData
+  }))
+  const result = ret.data || {}
+  const resultCode = result.resultCode
+  const resultMessage = result?.resultMessage || ''
+  let type = ''
+  if (RESULT_CODE.SUCCESS !== resultCode) {
+    switch (resultCode) {
+      case RESULT_CODE.INFO:
+        type = 'info'
+        break;
+      case RESULT_CODE.WARNING:
+        type = 'warning'
+        break;
+      case RESULT_CODE.ERROR:
+        type = 'error'
+        break;
+      case RESULT_CODE.OTHER:
+        type = 'error'
+        break;
+      default:
+        type = 'error'
+        break;
+    }
+  }
+  let weakFlag = false
+  if (validConfig?.validationType === '2') {
+    weakFlag = true
+  }
+  return new Promise((resolver, inject) => {
+    confirmInstance(resultMessage, lang?.indexOf('zh') > -1 ? '提示' : 'Hint', {
+      type,
+      showCancelButton: weakFlag
+    }).then(() => {
+      if (!weakFlag) {
+        resolver(false)
+      } else {
+        resolver(true)
+      }
+    }).catch(() => {
+      inject(false)
+    })
+  })
+}
+
+export async function executeEventOrchestration({props, axiosInstance, rootValue, confirmInstance, dynamicMapComp, messageInstance, openChildDialog, messageCb, lang, appContext } = {}) {
+  // 数据校验服务
+  const valid = await executeDataValid(null, {
+    dynamicMapComp,
+    rootValue,
+    axiosInstance,
+    lang
+  })
+  if (!valid) {
+    return
+  }
+
+  const PageServiceMapVOList = props.config.lcpPageServiceMapVOList
+  if (PageServiceMapVOList?.length) {
+    const dynamicHireRelat = props.config?.dynamicHireRelat
+    dispatchClickEvents({
+      serviceList: PageServiceMapVOList,
+      axiosInstance,
+      rootValue,
+      dynamicMapComp,
+      dynamicHireRelat,
+      messageInstance,
+      messageCb,
+      compConfig: props.config
+    })
+  }
+  const lcpPagePopupMapVO = props.config.lcpPagePopupMapVO
+  if (lcpPagePopupMapVO) {
+    const dynamicHireRelat = props.config?.dynamicHireRelat
+    openDailg({
+      pagePopupMap: lcpPagePopupMapVO,
+      axiosInstance,
+      dynamicMapComp,
+      dynamicHireRelat,
+      appContext,
+      lang,
+      messageCb,
+      openChildDialog
+    })
+  }
+}

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

@@ -2,7 +2,7 @@
 import { defineProps, inject, getCurrentInstance, computed, useAttrs } from 'vue'
 import { commonPropsType } from '../../utils/index.js'
 import { useRoute } from 'vue-router'
-import { dispatchClickEvents } from '../helper/button.js';
+import { dispatchClickEvents } from '../helper/eventOrchestration.js';
 
 const appContext = getCurrentInstance()?.appContext
 

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

@@ -8,7 +8,7 @@ import { ElButton } from 'element-plus'
 import { defineProps, inject, getCurrentInstance, computed, useAttrs } from 'vue'
 import { commonPropsType } from '../../utils/index.js'
 import { useRoute } from 'vue-router'
-import { dispatchClickEvents, openDailg } from '../helper/button.js';
+import { executeEventOrchestration } from '../helper/eventOrchestration.js';
 import { getRelateConfigKeys } from '../../rules/ruleUtils.js';
 
 defineOptions({
@@ -63,6 +63,7 @@ const label = computed(() => {
 })
 const route = useRoute()
 const buttonActions = inject('buttonActions', {})
+const messageCb = inject('_messageCb')
 
 const messageInstance = inject('_messageInstance')
 const dynamicMapComp = inject('dynamicMapComp')
@@ -73,9 +74,12 @@ const rootValue = inject('rootValue')
 const dataLoad = inject('dataLoad')
 const rootForm = inject('rootForm')
 const _axiosInstance = inject('_axiosInstance')
+const confirmInstance = inject('_confirmInstance')
+const openChildDialogInstance = inject('_openChildDialogInstance')
+
 const routeQuery= route?.query
 
-const buttonAction = (...arg) => {
+const buttonAction = async (...arg) => {
   attrs?.onClick?.(...arg) // 如果配置中有点击事件
   const actionKey = props.config?.clickActionKey || props.config?.buttonActionKey || props.config?.hireRelat
   const actionFn = buttonActions[actionKey]
@@ -84,34 +88,19 @@ const buttonAction = (...arg) => {
     hireRelatMapRules,
     components,
     selects,
-    rootValue,
+    rootValue: rootValue?.value,
     dataLoad,
     rootForm,
     routeQuery
   }, appContext)
-  const PageServiceMapVOList = props.config.lcpPageServiceMapVOList
-  if (PageServiceMapVOList?.length) {
-    const dynamicHireRelat = props.config?.dynamicHireRelat
-    dispatchClickEvents({
-      serviceList: PageServiceMapVOList,
-      axiosInstance: _axiosInstance,
-      rootValue: rootValue?.value,
-      dynamicMapComp,
-      dynamicHireRelat,
-      messageInstance: messageInstance?.value
-    })
-  }
-  const lcpPagePopupMapVO = props.config.lcpPagePopupMapVO
-  if (lcpPagePopupMapVO) {
-    const dynamicHireRelat = props.config?.dynamicHireRelat
-    openDailg({
-      pagePopupMap: lcpPagePopupMapVO,
-      axiosInstance: _axiosInstance,
-      dynamicMapComp,
-      dynamicHireRelat,
-      appContext,
-      lang: lang?.value
-    })
-  }
+
+  executeEventOrchestration({
+    props, axiosInstance: _axiosInstance?.value, rootValue, confirmInstance: confirmInstance?.value,
+    dynamicMapComp,
+    openChildDialog: openChildDialogInstance?.value,
+    messageInstance: messageInstance?.value,
+    messageCb, lang: lang?.value,
+    appContext
+  })
 }
 </script>

package/src/hooks/pageConfig.js

@@ -18,13 +18,15 @@ export function usePageConfig() {
     isH5,
     rootValue,
     axiosInstance,
-    messageInstance
+    messageInstance,
+    messageCb
   }) {
     const { pageConfig, mapComp, hireRelatMapRules } = parsePageConfig({
       config, lang, polyfillConfigs, instance, isH5,
       rootValue,
       axiosInstance,
-      messageInstance
+      messageInstance,
+      messageCb
     })
     pageConfigRef.value = pageConfig
     hireRelatMapRulesRef.value = hireRelatMapRules
@@ -67,7 +69,7 @@ export function useBuildInData(messageTipInstance, loadingInstance) {
     buildInRequest(GET_SYS_PARAM_CACHE, {
       tenantId
     }).then(ret => {
-      if (resultToast(ret.data, messageTipInstance)) {
+      if (resultToast(ret.data, messageTipInstance, { noSuccessIip: true })) {
         selects.value = JSON.parse(ret.data.result || '{}')
         return
       }

package/src/index.jsx

@@ -82,10 +82,24 @@ export default {
       type: [Object, Function],
       default: () => null
     },
+    openChildDialogInstance: {
+      type: [Function],
+      default: () => {
+        return () => {}
+      }
+    },
+    confirmInstance: {
+      type: [Object, Function],
+      default: () => {
+        return () => {}
+      }
+    },
     loadEvnetsReq: {
       type: Object,
       default: () => ({})
-    }
+    },
+    // 提示语的回调
+    messageCb: Function,
   },
   setup(props, { emit, attrs, expose }) {
     const rootStore = reactive({})
@@ -120,7 +134,8 @@ export default {
       isH5: props.isH5,
       rootValue: props.modelValue,
       axiosInstance,
-      messageInstance: props.messageInstance
+      messageInstance: props.messageInstance,
+      messageCb: props.messageCb
     })
     // 触发加载事件执行
     executeLoadServices(
@@ -146,7 +161,8 @@ export default {
         isH5: props.isH5,
         rootValue: props.modelValue,
         axiosInstance,
-        messageInstance: props.messageInstance
+        messageInstance: props.messageInstance,
+        messageCb: props.messageCb
       })
       executeLoadServices(
         props.config?.pmPageServiceMapVOList || [],
@@ -163,7 +179,10 @@ export default {
       )
     })
     
+    provide('_messageCb', props.messageCb)
     provide('_rootStore', rootStore)
+    provide('_openChildDialogInstance', toRef(props, 'openChildDialogInstance'))
+    provide('_confirmInstance', toRef(props, 'confirmInstance'))
     provide('_messageInstance', toRef(props, 'messageInstance'))
     provide('_loadingInstance', toRef(props, 'loadingInstance'))
     provide('_getNativeComps', props.getNativeComps)

package/src/resolver-H5.vue

@@ -4,6 +4,7 @@ import { useAttrs } from 'vue';
 import Resolver from './resolver-common.vue'
 import CmiToast from "cmid/lib/toast"
 import CmiFullLoading from "cmid/lib/fullloading"
+import { confirmDialog } from './components/confirmInstance-H5/index.js';
 
 const props = defineProps({
   loadingInstance: {
@@ -16,6 +17,18 @@ const props = defineProps({
     default: () => CmiToast
     // default: () => null
   },
+  confirmInstance: {
+    type: [Object, Function],
+    default: () => {
+      return confirmDialog
+    }
+  },
+  openChildDialogInstance: {
+    type: [Function],
+    default: () => {
+      return () => {}
+    }
+  },
 })
 
 defineOptions({
@@ -25,5 +38,12 @@ const attrs = useAttrs()
 
 </script>
 <template>
-  <Resolver v-bind="attrs" :isH5="true" :getNativeComps="getNativeComps" :messageInstance="props.messageInstance" :loadingInstance="props.loadingInstance"></Resolver>
+  <Resolver
+    v-bind="attrs"
+    :isH5="true" :getNativeComps="getNativeComps"
+    :messageInstance="props.messageInstance"
+    :confirmInstance="props.confirmInstance"
+    :openChildDialogInstance="props.openChildDialogInstance"
+    :loadingInstance="props.loadingInstance"
+  ></Resolver>
 </template>

package/src/resolver-common.vue

@@ -35,7 +35,7 @@ getPageConfig({
   queryPageService: '1',
 }, (pageConfig) => {
   // 数据加载完成事件 'loadedConfigCompeted'
-  attrs.onLoadedConfigCompeted(pageConfig)
+  attrs?.onLoadedConfigCompeted?.(pageConfig)
 })
 const allSelects = computed(() => {
   return {

package/src/resolver-web.vue

@@ -1,9 +1,10 @@
 <script setup>
 import getNativeComps from './components/patchComponents-web'
-import { ElMessage } from "element-plus"
+import { ElMessage, ElMessageBox } from "element-plus"
 import { loadingInstance } from './components/loading'
 import { useAttrs } from 'vue';
 import Resolver from './resolver-common.vue'
+import { openChildDialog } from './components/childDialog';
 
 const props = defineProps({
   loadingInstance: {
@@ -15,6 +16,18 @@ const props = defineProps({
     type: [Object, Function],
     default: () => ElMessage
   },
+  confirmInstance: {
+    type: [Object, Function],
+    default: () => {
+      return ElMessageBox.confirm.bind(ElMessageBox)
+    }
+  },
+  openChildDialogInstance: {
+    type: [Function],
+    default: () => {
+      return openChildDialog
+    }
+  },
 })
 
 defineOptions({
@@ -24,5 +37,12 @@ const attrs = useAttrs()
 
 </script>
 <template>
-  <Resolver v-bind="attrs" :getNativeComps="getNativeComps" :messageInstance="props.messageInstance" :loadingInstance="props.loadingInstance"></Resolver>
+  <Resolver
+    v-bind="attrs"
+    :getNativeComps="getNativeComps"
+    :messageInstance="props.messageInstance"
+    :confirmInstance="props.confirmInstance"
+    :openChildDialogInstance="props.openChildDialogInstance"
+    :loadingInstance="props.loadingInstance"
+  ></Resolver>
 </template>

package/src/utils/render.jsx

@@ -25,7 +25,7 @@ import { preserveCheck } from './preserveFunc.js'
 import { isArray, isFunction, isString } from './is.js'
 import CustomComponentPlain from '../components/packages-web/CustomComponentPlain.vue'
 import QuestionFilled from '../components/icons/question-filled.vue'
-import { dispatchClickEvent, dispatchClickEvents, getTableConfig } from '../components/helper/button.js'
+import { dispatchClickEvent, dispatchClickEvents, getTableConfig } from '../components/helper/eventOrchestration.js'
 
 // 解析配置中的defStyle属性
 export function parseDefStyle(defStyle) {
@@ -105,7 +105,8 @@ export function parsePageConfig({
   config, lang, polyfillConfigs, instance, isH5,
   rootValue,
   axiosInstance,
-  messageInstance
+  messageInstance,
+  messageCb
 }) {
   if (!config) return {}
   const formConfig = generateFormConfig(lang, isH5)
@@ -118,7 +119,8 @@ export function parsePageConfig({
     cbs,
     rootValue,
     axiosInstance,
-    messageInstance
+    messageInstance,
+    messageCb
   }, formConfig)
   cbs.forEach((cb) => {
     cb()
@@ -142,7 +144,8 @@ export function normalConfig({
   cbs = [],
   rootValue,
   axiosInstance,
-  messageInstance
+  messageInstance,
+  messageCb
 }, config, hireRelat = '', mapComp = {}, needformItem = false) {
   const metaCode = config.metaCode || ''
   hireRelat += hireRelat ? `->${metaCode}` : metaCode
@@ -183,7 +186,8 @@ export function normalConfig({
         instance,
         rootValue,
         axiosInstance,
-        messageInstance 
+        messageInstance ,
+        messageCb
       }, metaItem, hireRelat, mapComp, needformItem || [FORM_META_TYPE].includes(metaType))
       return pageConfig
     })?.sort((a, b) => a.seqNo - b.seqNo)
@@ -217,7 +221,7 @@ export function normalConfig({
             const dynamicMapComp = props.config.dynamicMapComp
             const dynamicMapCompKeys = Object.keys(dynamicMapComp)
             const dynamicHireRelat = props.config.dynamicHireRelat
-            dispatchClickEvent(service, { dynamicMapComp,  dynamicMapCompKeys, dynamicHireRelat, rootValue, axiosInstance, messageInstance })
+            dispatchClickEvent(service, { dynamicMapComp,  dynamicMapCompKeys, dynamicHireRelat, rootValue, messageCb, compConfig: pageConfig, axiosInstance, messageInstance })
           // }, 0);
         }
         tableConfig.sizeChange = (val, props, page) => {
@@ -225,7 +229,7 @@ export function normalConfig({
             const dynamicMapComp = props.config.dynamicMapComp
             const dynamicMapCompKeys = Object.keys(dynamicMapComp)
             const dynamicHireRelat = props.config.dynamicHireRelat
-            dispatchClickEvent(service, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, rootValue, axiosInstance, messageInstance })
+            dispatchClickEvent(service, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, rootValue, messageCb, compConfig: pageConfig, axiosInstance, messageInstance })
           // }, 0);
         }
       }))

package/src/utils/respone.js

@@ -1,3 +1,5 @@
+import { isPromise } from "./common"
+
 export const RESULT_CODE = {
   SUCCESS: '000000',
   INFO: '000088',
@@ -5,37 +7,54 @@ export const RESULT_CODE = {
   ERROR: '000000',
   OTHER: '020002'
 }
-export function resultToast(result = {}, messageInstance, {noSuccessIip = false} = {}) {
+export function resultToast(result = {}, messageInstance, {messageCb, service, compConfig, noSuccessIip = false} = {}) {
   let ret = false
+  let cbKey = ''
   const resultMessage = result?.resultMessage || ''
   const resultCode = result.resultCode
   switch (resultCode) {
     case RESULT_CODE.SUCCESS:
       if (!noSuccessIip) {
-        messageInstance?.success(resultMessage)
+        cbKey = 'success'
       }
       ret = true
       break;
     case RESULT_CODE.INFO:
       if (messageInstance.info && typeof messageInstance.info === 'function') {
-        messageInstance.info(resultMessage)
+        cbKey = 'info'
       } else if (messageInstance.text && typeof messageInstance.text === 'function') {
         // 移动端兼容写法
-        messageInstance.text(resultMessage)
+        cbKey = 'text'
       }
       break;
     case RESULT_CODE.WARNING:
-      messageInstance?.warning(resultMessage)
+      cbKey = 'warning'
       break;
     case RESULT_CODE.ERROR:
-      messageInstance?.error(resultMessage)
+      cbKey = 'error'
       break;
     case RESULT_CODE.OTHER:
-      messageInstance?.error(resultMessage)
+      cbKey = 'error'
       break;
     default:
-      messageInstance?.error(resultMessage)
+      cbKey = 'error'
       break;
   }
+  
+  if (messageCb) {
+    if (isPromise(messageCb)) {
+      messageCb({resultMessage, result, resultCode, service, compConfig}).then(res => {
+        if (res === true) {
+          messageInstance?.[cbKey]?.(resultMessage)
+        }
+      })
+    } else {
+      if (messageCb({resultMessage, result, resultCode, service, compConfig}) === true) {
+        messageInstance?.[cbKey]?.(resultMessage)
+      }
+    }
+  } else {
+    messageInstance?.[cbKey]?.(resultMessage)
+  }
   return ret
 }