resolver-egretimp-plus 0.0.43 → 0.0.44

package/package.json

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

package/src/components/helper/eventOrchestration.js

@@ -4,14 +4,15 @@ import { RESULT_CODE, resultToast } from "../../utils/respone"
 
 export async function dispatchClickEvents  ({serviceList = [], axiosInstance, dynamicMapComp, rootValue, dynamicHireRelat, messageCb, compConfig, messageInstance}) {
   const dynamicMapCompKeys = Object.keys(dynamicMapComp)
+  const mixinServiceConfig = serviceList.find(service => service.serviceType === '1')
   for (let i = 0; i < serviceList.length; i++) {
     const service = serviceList[i]
-    dispatchClickEvent(service, {dynamicMapComp, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageCb, compConfig, messageInstance})
+    dispatchClickEvent(service, {dynamicMapComp, mixinServiceConfig, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageCb, compConfig, messageInstance})
   }
 }
 
-export async function dispatchClickEvent(service, { dynamicMapComp, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageCb, compConfig, messageInstance }) {
-  let reqData = rootValue
+export async function dispatchClickEvent(service, { dynamicMapComp, mixinServiceConfig, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageCb, compConfig, messageInstance }) {
+  let reqData = rootValue || {}
   let tableConfig = null
   if (service.transactionType == '1') {
     reqData = getReqData(service.inParamMappingList || [], {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat})
@@ -25,7 +26,15 @@ export async function dispatchClickEvent(service, { dynamicMapComp, rootValue, d
   const ret = await (axiosInstance && axiosInstance({
     url,
     method: "post",
-    data: reqData
+    data: {
+      pmHandleBusinessIdentity: {
+        busiIdentityId: service.busiIdentityId,
+        pageMetaId: service.pageMetaId,
+        tenantId: service.tenantId,
+        mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
+      },
+      ...reqData
+    }
   }))
   if (!resultToast(ret?.data, messageInstance, {messageCb, service, compConfig})) {
     await Promise.reject()

package/src/components/helper/resolver.js

@@ -1,12 +1,22 @@
 export async function executeLoadServices(services = [], { axiosInstance, messageInstance, reqData, respCb }) {
   const loadServices = services.filter(ser => ser.eventType == '1')
+  // const mixinServiceConfig = services.find(service => service.serviceType === '1')
+
   for (let i = 0; i < loadServices.length; i++) {
     const service = loadServices[i]
     const url = service.serviceCode
     const ret = await (axiosInstance.value && axiosInstance.value({
       url,
       method: "post",
-      data: reqData
+      data: {
+        pmHandleBusinessIdentity: {
+          busiIdentityId: service.busiIdentityId,
+          pageMetaId: service.pageMetaId,
+          tenantId: service.tenantId,
+          // mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
+        },
+        ...(reqData || {})
+      }
     }))
     // const ret = await (new Promise((res) => {
     //   setTimeout(() => {

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

@@ -25,12 +25,20 @@ const onChange = (e) => {
   modelValue.value = e.detail.value
 }
 
+const normalVal = computed(() => {
+  const findItem = props?.options?.find(item => item.columnValue == modelValue.value)
+  if (findItem) {
+    return lang?.value?.indexOf('zh') > -1 ? findItem.columnDesc_zh : findItem.columnDesc
+  }
+  return modelValue.value
+})
+
 </script>
 
 <template>
   <cmi-cell-group>
     <cmi-cell
-      :value="modelValue" v-bind="{ ...attrs, ...calcProps}" 
+      :value="normalVal" v-bind="{ ...attrs, ...calcProps}" 
       @change="onChange"
     ></cmi-cell>
   </cmi-cell-group>

package/src/index.jsx

@@ -139,7 +139,7 @@ export default {
     })
     // 触发加载事件执行
     executeLoadServices(
-      props.config?.pmPageServiceMapVOList || [],
+      props.config?.pmPageServiceMapVOList || props.config?.lcpPageServiceMapVOList || [],
       {
         messageInstance: toRef(props, 'messageInstance'),
         axiosInstance,

package/src/resolver-common.vue

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

package/src/utils/render.jsx

@@ -627,7 +627,7 @@ function getFormItemRule(config, lang, params) {
   const required = config.requiredFlag === '1'
   const onlyRequiredFlag = config.onlyRequiredFlag
   const rules = [{
-    required,
+    // required,
     validator: (rule, value, callback) => {
       if (config.editFlag === '0') callback()
       const val = config.bindValue
@@ -673,7 +673,7 @@ function getFormItemRule(config, lang, params) {
     rules.push({
       validator: (rule, value, callback) => {
         if (config.editFlag === '0') callback()
-        const val = config.bindValue
+        const val = (config.bindValue === null || config.bindValue === undefined) ? '' : config.bindValue
 
         for (let i = 0; i < regexPattern.length; i++) {
           const validInfo = regexPattern[i]