resolver-egretimp-plus 0.0.38 → 0.0.41

package/package.json

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

package/src/analysisComponent.jsx

@@ -1,9 +1,11 @@
 import { computed, defineAsyncComponent, getCurrentInstance, inject, onBeforeMount, provide, ref } from 'vue'
-import { getComponentPropsKeys, hasOwn } from './utils/index.js'
+import { commonPropsType, getComponentPropsKeys, hasOwn } from './utils/index.js'
 import { useVmodels } from './hooks/index.js'
 import { getRenderComponentProps, generateFormItemPolyfill } from './utils/index.js'
 import rulesDriver from './rules/rulesDriver'
 import { penddingRules } from './rules/ruleUtils.js'
+import { useRoute } from 'vue-router'
+import { executeEventOrchestration } from './components/helper/eventOrchestration.js'
 
 export default {
   name: 'AnalysisComponent',
@@ -39,9 +41,29 @@ export default {
   },
   emits: ['update:modelValue'],
   setup(props, { emit, attrs }) {
+    const currentAttrs = computed(() => {
+      const ret = {
+        ...attrs
+      }
+      delete ret.onClick
+      return ret
+    })
+    const route = useRoute()
+    const routeQuery= route?.query
+    const hireRelatMapRules = inject('hireRelatMapRules')
+    const components = inject('components')
+    const dataLoad = inject('dataLoad')
+    const rootForm = inject('rootForm')
+    const _axiosInstance = inject('_axiosInstance')
+    const confirmInstance = inject('_confirmInstance')
+    const openChildDialogInstance = inject('_openChildDialogInstance')
+    const messageCb = inject('_messageCb')
+    const messageInstance = inject('_messageInstance')
+
     const selects = inject('selects')
     // 当前组件的实例
     const instance = getCurrentInstance()
+    const appContext = instance?.appContext
     props.config.wrapVm = instance
     const refFn = e => {
       // 具体渲染的组件
@@ -142,8 +164,39 @@ export default {
     const _isH5 = inject('_isH5')
     const lang = inject('lang')
     const rootValue = inject('rootValue')
+    const onClick = (e) => {
+      e.stopPropagation()
+      const context = {
+        props,
+        dynamicMapComp,
+        hireRelatMapRules,
+        components,
+        selects,
+        rootValue: rootValue?.value,
+        dataLoad,
+        rootForm,
+        routeQuery,
+        appContext
+      }
+      attrs?.onClick?.call(context, e) // 如果配置中有点击事件
+
+      executeEventOrchestration({
+        props,
+        axiosInstance: _axiosInstance?.value,
+        rootValue: rootValue?.value,
+        confirmInstance: confirmInstance?.value,
+        dynamicMapComp,
+        openChildDialog: openChildDialogInstance?.value,
+        messageInstance: messageInstance?.value,
+        messageCb,
+        lang: lang?.value,
+        appContext
+      })
+    }
     return () => {
       const compProps = getRenderComponentProps({config: props.config, props, component: props.component, modelValue, selects})
+      const compPropsOnClick = compProps?.onClick
+      delete compProps.onClick
       const formItemPolyfill = generateFormItemPolyfill(props.config, lang.value, compProps, _isH5?.value, {
         lang,
         rootValue,
@@ -152,14 +205,15 @@ export default {
       }) // 生成formItem（）的辅助函数
       return formItemPolyfill(
         <currentComponent.value
-          ref={refFn}
-          onVnodeMounted={onVnodeMounted}
-          onVnodeUnmounted={onVnodeUnmounted}
-          {...attrs}
-          {...componentProps.value}
-          {...compProps}
-          {...vModelObjs}
-        ></currentComponent.value>
+        ref={refFn}
+        onVnodeMounted={onVnodeMounted}
+        onVnodeUnmounted={onVnodeUnmounted}
+        {...currentAttrs.value}
+        onClick={(e) => {onClick(e);compPropsOnClick?.(e)}}
+        {...componentProps.value}
+        {...compProps}
+        {...vModelObjs}
+      ></currentComponent.value>
       )
     }
   }

package/src/api/builtIn.js

@@ -2,3 +2,4 @@ export const QUERY_PAGE_CONFIG_DATA = '/sa-lcp/api/v1/pageConfig/queryPageConfig
 export const LCP_LOGIN = '/sa-lcp/login'
 export const GET_SYS_PARAM_CACHE = '/sa-lcp/api/v1/sysparam/getSysParamCache'
 export const REFRESH_TOKEN = '/sa-lcp/changePwd/refreshToken'
+export const DATA_VALID_RULE_EXECUTE = '/sa-lcp/api/v1/validate/dataValidRuleExecute'

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,16 @@
+import { DATA_VALID_RULE_EXECUTE } from "../../api/builtIn"
 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 +22,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 +111,7 @@ export function openDailg({
   dynamicMapComp,
   dynamicHireRelat,
   lang,
+  openChildDialog,
   appContext,
 }) {
   const busiIdentityId = pagePopupMap.popupBusiIdentityId
@@ -148,7 +149,7 @@ export function openDailg({
   }
   dialogClose = openChildDialog({
     busiIdentityId,
-    axiosInstance: axiosInstance?.value,
+    axiosInstance: axiosInstance,
     lang,
     loadEvnetsReq: reqData,
     polyfillConfigs,
@@ -157,3 +158,115 @@ export function openDailg({
     }
   }, appContext)
 }
+
+// 数据校验服务
+export async function executeDataValid(validConfig, { dynamicMapComp, mixinServiceConfig, rootValue, axiosInstance, lang}) {
+  let reqData = rootValue || {}
+  const url = DATA_VALID_RULE_EXECUTE
+  const ret = await (axiosInstance && axiosInstance({
+    url,
+    method: "post",
+    data: {
+      pmHandleBusinessIdentity: {
+        busiIdentityId: validConfig.busiIdentityId,
+        pageMetaId: validConfig.pageMetaId,
+        tenantId: validConfig.tenantId,
+        mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
+      },
+      ...reqData
+    }
+  }))
+  const result = ret.data || {}
+  const resultCode = result.resultCode
+  const resultMessage = result?.resultMessage || ''
+  let type = ''
+  let weakFlag = false
+
+  if (RESULT_CODE.SUCCESS !== resultCode) {
+    switch (resultCode) {
+      case RESULT_CODE.WARNING:
+        type = 'warning'
+        weakFlag = true
+        break;
+      case RESULT_CODE.ERROR:
+        type = 'error'
+        weakFlag = false
+        break;
+      case RESULT_CODE.INFO:
+        type = 'info'
+        break;
+      case RESULT_CODE.OTHER:
+        type = 'error'
+        break;
+      default:
+        type = 'error'
+        break;
+    }
+  }
+  // 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 lcpPageRuleVOLis = props.config?.lcpPageRuleVOList || []
+  const PageServiceMapVOList = props.config.lcpPageServiceMapVOList || []
+  const mixinServiceConfig = PageServiceMapVOList.find(service => service.serviceType === '1')
+  if (lcpPageRuleVOLis?.length && mixinServiceConfig) {
+    // for(let i = 0; i < lcpPageRuleVOLis.length; i++) {
+      // 数据校验服务
+      const validConfig = lcpPageRuleVOLis[0]
+      const valid = await executeDataValid(validConfig, {
+        dynamicMapComp,
+        rootValue,
+        axiosInstance,
+        mixinServiceConfig,
+        lang
+      })
+      if (!valid) {
+        return
+      }
+    // }
+  }
+  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-H5/CmiCheckbox.vue

@@ -20,6 +20,7 @@ const checkboxGroupProps = computed(() => {
 
 const checkboxProps = computed(() => {
   return {
+    label: lang?.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,
     size: props?.config?.size,
     disabled: props.disabled,
     block: props?.config?.block === '1',
@@ -50,6 +51,7 @@ const onSigleChange = ({ detail }) => {
 <template>
   <cmi-checkbox-group :value="modeValue" @change="onChange" v-if="props.options && props.options.length" v-bind="{...checkboxGroupProps, ...attrs}">
     <cmi-checkbox 
+      class="mr-20"
       v-for="option in props.options" :key="option.columnValue"
       :disabled="option.columnStatus == '0' || option.columnStatus == '2'"
       :name="option.columnValue" :label="lang.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc"
@@ -57,7 +59,12 @@ const onSigleChange = ({ detail }) => {
       {{lang.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc}}
     </cmi-checkbox>
   </cmi-checkbox-group>
-  <cmi-checkbox v-else v-bind="{...checkboxProps, ...attrs}" :checked="modeValue === '1'" :value="modeValue" @change="onSigleChange">
+  <cmi-checkbox v-else v-bind="{...attrs, ...checkboxProps}" :checked="modeValue === '1'" :value="modeValue" @change="onSigleChange">
     {{ label }}
   </cmi-checkbox>
-</template>
+</template>
+<style lang="scss" scoped>
+.mr-20 {
+  margin-right: 20px;
+}
+</style>

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

@@ -0,0 +1,30 @@
+<script setup>
+import { computed, defineProps, inject } from 'vue'
+import { commonPropsType } from '../../utils/index.js'
+
+const lang = inject('lang')
+const props = defineProps({
+  ...commonPropsType,
+})
+const dividerProps = computed(() => {
+  return {
+    direction: props.config?.direction,
+    borderStyle: props.config?.borderStyle,
+    borderwidth: props.config?.borderwidth,
+    position: props.config?.position,
+  }
+})
+const modelValue = defineModel()
+
+const label = computed(() => {
+  return modelValue.value || (lang?.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn)
+})
+</script>
+
+<template>
+  <cmi-divider
+    v-bind="{...dividerProps}"
+  >
+    {{ label }}
+  </cmi-divider>
+</template>

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

@@ -5,7 +5,7 @@ import { commonPropsType } from '../../utils/index.js'
 const modelValue = defineModel()
 const props = defineProps({
   ...commonPropsType,
-  isMutiple: [String, Boolean]
+  multiple: [String, Boolean]
 })
 const attrs = useAttrs()
 const lang = inject('lang')
@@ -47,7 +47,7 @@ const value = computed({
 
 const selectProps = computed(() => {
   return {
-    label: lang?.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,
+    // label: lang?.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,
     value: value.value,
     disabled: props.disabled,
     clearable: props.clearable,

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

@@ -8,8 +8,6 @@ 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 { getRelateConfigKeys } from '../../rules/ruleUtils.js';
 
 defineOptions({
   inheritAttrs: false
@@ -64,7 +62,6 @@ const label = computed(() => {
 const route = useRoute()
 const buttonActions = inject('buttonActions', {})
 
-const messageInstance = inject('_messageInstance')
 const dynamicMapComp = inject('dynamicMapComp')
 const hireRelatMapRules = inject('hireRelatMapRules')
 const components = inject('components')
@@ -72,11 +69,12 @@ const selects = inject('selects')
 const rootValue = inject('rootValue')
 const dataLoad = inject('dataLoad')
 const rootForm = inject('rootForm')
-const _axiosInstance = inject('_axiosInstance')
+
 const routeQuery= route?.query
 
-const buttonAction = (...arg) => {
-  attrs?.onClick?.(...arg) // 如果配置中有点击事件
+const buttonAction = async (...arg) => {
+  attrs?.onClick?.(...arg)
+
   const actionKey = props.config?.clickActionKey || props.config?.buttonActionKey || props.config?.hireRelat
   const actionFn = buttonActions[actionKey]
   actionFn && actionFn(props, {
@@ -84,34 +82,10 @@ 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
-    })
-  }
 }
 </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
@@ -53,6 +55,12 @@ export function useBuildInData(messageTipInstance, loadingInstance) {
         cb(pageConfig.value)
         getSelects(ret.data.result?.pmBusinessIdentityVO?.tenantId)
         return
+      } else {
+        if (loadingInstance.finish && typeof loadingInstance.finish === 'function') {
+          loadingInstance.finish()
+        } else if (loadingInstance.hide && typeof loadingInstance.hide === 'function') {
+          loadingInstance.hide()
+        }
       }
     }).catch(() => {
       if (loadingInstance.finish && typeof loadingInstance.finish === 'function') {
@@ -70,6 +78,12 @@ export function useBuildInData(messageTipInstance, loadingInstance) {
       if (resultToast(ret.data, messageTipInstance, { noSuccessIip: true })) {
         selects.value = JSON.parse(ret.data.result || '{}')
         return
+      } else {
+        if (loadingInstance.finish && typeof loadingInstance.finish === 'function') {
+          loadingInstance.finish()
+        } else if (loadingInstance.hide && typeof loadingInstance.hide === 'function') {
+          loadingInstance.hide()
+        }
       }
     }).finally(() => {
       if (loadingInstance.finish && typeof loadingInstance.finish === 'function') {

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)