resolver-egretimp-plus 0.0.32 → 0.0.34

package/package.json

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

package/src/components/childDialog/index.js

@@ -0,0 +1,33 @@
+import ChildDialog from './src/index.vue'
+import { createVNode, render } from 'vue'
+
+let instance = null
+
+export function openChildDialog(options = {}, appContext) {
+  if (instance) {
+    Object.keys(options).forEach(key => {
+      instance.props[key] = options[key]
+
+      instance.vm.exposed.dialogVisible.value = true
+    })
+    return instance.close
+  }
+  const container = document.createElement('div')
+  const vnode = createVNode(ChildDialog, {
+    ...options,
+  })
+  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 instance.close
+}

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

@@ -0,0 +1,94 @@
+<script setup>
+import { computed, defineAsyncComponent, ref } from 'vue';
+import { ElDialog } from 'element-plus';
+const Resolver = defineAsyncComponent(() => import('../../../resolver-web.vue'))
+
+const props = defineProps({
+  busiIdentityId: {
+    type: String,
+    default: ''
+  },
+  // 请求方法的实列
+  axiosInstance: {
+      type: [Object, Function],
+      default: () => null
+    },
+  // config的额外属性配置
+  polyfillConfigs: {
+    type: Object,
+    default: () => ({})
+  },
+  axiosConfig: {
+    type: Object,
+    default: null
+  },
+  lang: {
+    type: String,
+    default: 'zh'
+  },
+  loadEvnetsReq: {
+    type: Object,
+    default: () => ({})
+  },
+  rootStoreChange: Function
+})
+const formData = ref({})
+const dialogVisible = ref(true)
+const rootOptionComp = ref({})
+const dialogHeight = computed(() => {
+  return rootOptionComp.value?.widgetHeight
+})
+const dialogWidth = computed(() => {
+  return rootOptionComp.value?.widgetWidth
+})
+const dialogStyle = computed(() => {
+  return {color: 'red', 'height': dialogHeight}
+})
+
+function loadedConfigCompeted(pageConfig) {
+  rootOptionComp.value = pageConfig.rootOptionComp
+}
+function rootStoreChange(rootStore) {
+  props.rootStoreChange(rootStore)
+}
+
+
+defineExpose({
+  dialogVisible
+})
+</script>
+<template>
+  <ElDialog class="open-child-frame" v-model="dialogVisible"
+    :style="dialogStyle"
+    :close-on-click-modal="false" :width="dialogWidth"
+  >
+    <div>
+    </div>
+    <Resolver v-if="dialogVisible" ref="resolverRef"
+      @loadedConfigCompeted="loadedConfigCompeted"
+      @rootStoreChange="rootStoreChange"
+      v-model="formData"
+      :busiIdentityId="busiIdentityId"
+      :lang="props.lang"
+      :loadEvnetsReq="props.loadEvnetsReq"
+      :polyfillConfigs="props.polyfillConfigs"
+      :axiosInstance="props.axiosInstance"
+      :axiosConfig="props.axiosConfig"
+    ></Resolver>
+  </ElDialog>
+</template>
+
+<style lang="scss">
+.open-child-frame {
+  overflow-y: auto;
+  &.el-dialog {
+    margin-top: 30px !important;
+    margin-bottom: 30px;
+    iframe {
+      border: 1px solid #dee0e3;
+      height: 80vh;
+      width: 100%;
+    }
+  }
+}
+</style>

package/src/components/helper/button.js

@@ -1,4 +1,5 @@
 import { getRelateConfigKeys } from "../../rules/ruleUtils"
+import { openChildDialog } from "../childDialog"
 
 export async function dispatchClickEvents  ({serviceList = [], axiosInstance, dynamicMapComp, rootValue, dynamicHireRelat, messageInstance}) {
   const dynamicMapCompKeys = Object.keys(dynamicMapComp)
@@ -25,12 +26,12 @@ export async function dispatchClickEvent(service, { dynamicMapComp, rootValue, d
     method: "post",
     data: reqData
   }))
-  // if (!ret?.data?.success) {
-  //   messageInstance?.value?.error(ret?.data?.resultMessage || '')
-  //   await Promise.reject()
-  //   return
-  // }
-  ret.data = {result: {pageTotalCount: 100, result: [{},{},{},{},{}]}}
+  if (!ret?.data?.success) {
+    messageInstance?.value?.error(ret?.data?.resultMessage || '')
+    await Promise.reject()
+    return
+  }
+  // ret.data = {result: {pageTotalCount: 100, result: [{},{},{},{},{}]}}
   initOutParamData(service.outParamMappingList, {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, outResult: ret.data})
   if (tableConfig?.vm) {
     const total = parseInt(ret.data?.result?.[service.pageTotalCount || 'pageTotalCount'])
@@ -98,4 +99,59 @@ export function getTableConfig(outParamMappingList = [], { dynamicMapComp, dynam
       return compConfig
     }
   }
-}
+}
+
+export function openDailg({
+  pagePopupMap,
+  axiosInstance,
+  rootValue,
+  dynamicMapComp,
+  dynamicHireRelat,
+  messageInstance,
+  lang,
+  appContext,
+}) {
+  const busiIdentityId = pagePopupMap.popupBusiIdentityId
+  const dynamicMapCompKeys = Object.keys(dynamicMapComp)
+  const reqData = getReqData(pagePopupMap.inParamMappingList || [], {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat})
+
+  const outParamMappingList = pagePopupMap?.outParamMappingList?.map(item => {
+    return {
+      ...item,
+      orignParam: item.orignParam ? item.orignParam.split('->')[0] : ''
+    }
+  }) || []
+
+  let rootStore = {}
+  let dialogClose = null
+  const polyfillConfigs = {}
+  if (pagePopupMap.outDisplayTrigger) {
+    polyfillConfigs[pagePopupMap.outDisplayTrigger] = (config) => {
+      return {
+        onClick() {
+          initOutParamData(outParamMappingList, {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, outResult: rootStore.tableSelectedInfo})
+          dialogClose?.()
+        }
+      }
+    }
+  }
+  if (pagePopupMap.closedTrigger) {
+    polyfillConfigs[pagePopupMap.closedTrigger] = (config) => {
+      return {
+        onClick() {
+          dialogClose?.()
+        }
+      }
+    }
+  }
+  dialogClose = openChildDialog({
+    busiIdentityId,
+    axiosInstance: axiosInstance?.value,
+    lang,
+    loadEvnetsReq: reqData,
+    polyfillConfigs,
+    rootStoreChange: (val) => {
+      rootStore = val
+    }
+  }, appContext)
+}

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

@@ -76,10 +76,10 @@ const stopPropagation = (e) => {
 }
 
 const component = computed(() => {
-  return props.config.needWrap ? ElCard : 'div'
+  return (props.config.needWrap === true || props.config.needWrap === '1')  ? ElCard : 'div'
 })
 const componentProps = computed(() => {
-  return props.config.needWrap ? {
+  return (props.config.needWrap === true || props.config.needWrap === '1') ? {
     shadow: 'never'
   } : {}
 })

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

@@ -6,6 +6,7 @@ import { commonPropsType, TABLE_COLUMN_NOT_RENDER_META_TYPE, DISPLAY_SHOW, compa
 import '../styles/CustomComponenTable.scss'
 
 export default {
+  inheritAttrs: false,
   name: 'CustomComponentTable',
   props: {
     ...commonPropsType,
@@ -50,6 +51,7 @@ export default {
       return getCompEvents(ElPagination)
     })
 
+    const rootStore = inject('_rootStore', {})
     const lang = inject('lang')
     const rootValue = inject('rootValue')
     const selects = inject('selects')
@@ -240,10 +242,12 @@ export default {
     const currentChange = (row) => {
       selectedRow.value = row
       tableEvents?.onCurrentChange?.(row)
+      rootStore.tableSelectedInfo = row
     }
     const multipleSelection = ref([])
     const handleSelectionChange = (val) => {
       multipleSelection.value = val
+      rootStore.tableSelectedInfo = val
     }
 
     // 是否配置分页功能     ====== start======

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

@@ -1,5 +1,5 @@
 <template>
-  <ElButton @click="buttonAction" v-bind="{...attrs, ...calcPorps}">
+  <ElButton @click.stop="buttonAction" v-bind="{...calcAttrs, ...calcPorps}">
     {{label}}
   </ElButton>
 </template>
@@ -8,9 +8,12 @@ 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 } from '../helper/button.js';
+import { dispatchClickEvents, openDailg } from '../helper/button.js';
 import { getRelateConfigKeys } from '../../rules/ruleUtils.js';
 
+defineOptions({
+  inheritAttrs: false
+})
 const appContext = getCurrentInstance()?.appContext
 
 const props = defineProps({
@@ -32,7 +35,7 @@ const calcPorps = computed(() => {
   } else {
     ret.circle = false
   }
-  if (props?.config?.rounds && props?.config?.rounds == '1') {
+  if (props?.config?.rounds === true && props?.config?.rounds == '1') {
     ret.round = true
   }
   if (props?.config?.widgetSize) {
@@ -45,6 +48,13 @@ const calcPorps = computed(() => {
 })
 
 const attrs = useAttrs()
+const calcAttrs = computed(() => {
+  const props = {
+    ...attrs,
+  }
+  delete props.onClick
+  return props
+})
 
 const lang = inject('lang')
 
@@ -79,7 +89,6 @@ const buttonAction = (...arg) => {
     rootForm,
     routeQuery
   }, appContext)
-  
   const PageServiceMapVOList = props.config.lcpPageServiceMapVOList
   if (PageServiceMapVOList?.length) {
     const dynamicHireRelat = props.config?.dynamicHireRelat
@@ -92,5 +101,19 @@ const buttonAction = (...arg) => {
       messageInstance
     })
   }
+  const lcpPagePopupMapVO = props.config.lcpPagePopupMapVO
+  if (lcpPagePopupMapVO) {
+    const dynamicHireRelat = props.config?.dynamicHireRelat
+    openDailg({
+      pagePopupMap: lcpPagePopupMapVO,
+      axiosInstance: _axiosInstance,
+      rootValue: rootValue?.value,
+      dynamicMapComp,
+      dynamicHireRelat,
+      messageInstance,
+      appContext,
+      lang: lang?.value
+    })
+  }
 }
 </script>