resolver-egretimp-plus 0.0.70 → 0.0.72

package/package.json

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

package/src/components/helper/eventOrchestration.js

@@ -25,9 +25,10 @@ export async function dispatchClickEvent(service, { dynamicMapComp, requestTrace
     }
   }
   const url = service.serviceCode
+  const httpMethod = service.httpMethod
   const ret = await (axiosInstance && axiosInstance({
     url,
-    method: "post",
+    method: httpMethod || "post",
     data: {
       requestTraceId,
       pmHandleBusinessIdentity: {

package/src/components/helper/resolver.js

@@ -1,6 +1,6 @@
 import { resultToast } from "../../utils/respone"
 
-export async function executeLoadServices(services = [], { requestTraceId, axiosInstance, messageInstance, reqData, respCb }) {
+export async function executeLoadServices(services = [], { requestTraceId, businessIdentityReqData = {}, axiosInstance, messageInstance, reqData, respCb }) {
   if (reqData?.notLoad) {
     return
   }
@@ -23,6 +23,7 @@ export async function executeLoadServices(services = [], { requestTraceId, axios
           pageMetaId: service.pageMetaId,
           tenantId: service.tenantId,
           mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
+          ...businessIdentityReqData,
         },
         ...(reqData || {})
       }

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

@@ -109,7 +109,7 @@ export default {
       const ret = sortList.reduce((ret, item) => {
         ret = ret.sort((a, b) => (a[item.prop] > b[item.prop] ? (item.order === 'descending' ? 1 : -1) : a[item.prop] === b[item.prop] ? 0 : (item.order === 'descending' ? -1 : 1)))
         return ret
-      }, [...(props.refValue.value || [])])
+      }, [...(normalTableData.value || [])])
       return ret
     })
 

package/src/hooks/pageConfig.js

@@ -44,7 +44,7 @@ export function usePageConfig() {
 
 export function useBuildInData({ messageInstance, loadingInstance, requestTraceId }) {
   const pageConfig = ref(null)
-  function getPageConfig(reqData, cb) {
+  function getPageConfig(reqData, { configCb, selectsCb}) {
     if (loadingInstance.start && typeof loadingInstance.start === 'function') {
       loadingInstance.start()
     } else if (loadingInstance.show && typeof loadingInstance.show === 'function') {
@@ -54,8 +54,8 @@ export function useBuildInData({ messageInstance, loadingInstance, requestTraceI
       if (resultToast(ret.data, messageInstance, { noSuccessIip: true })) {
         // pageConfig.value = normalPageConfigs(mock)
         pageConfig.value = normalPageConfigs(ret.data.result)
-        cb(pageConfig.value)
-        getSelects(ret.data.result?.pmBusinessIdentityVO?.tenantId)
+        configCb && configCb(pageConfig.value)
+        getSelects(ret.data.result?.pmBusinessIdentityVO?.tenantId, selectsCb)
         return
       } else {
         if (loadingInstance.finish && typeof loadingInstance.finish === 'function') {
@@ -73,12 +73,13 @@ export function useBuildInData({ messageInstance, loadingInstance, requestTraceI
     })
   }
   const selects = ref({})
-  function getSelects(tenantId) {
+  function getSelects(tenantId, selectsCb) {
     buildInRequest(GET_SYS_PARAM_CACHE, {
       tenantId
     }).then(ret => {
       if (resultToast(ret.data, messageInstance, { noSuccessIip: true })) {
         selects.value = JSON.parse(ret.data.result || '{}')
+        selectsCb && selectsCb(selects.value)
         return
       } else {
         if (loadingInstance.finish && typeof loadingInstance.finish === 'function') {

package/src/index.jsx

@@ -98,6 +98,11 @@ export default {
       type: Object,
       default: () => ({})
     },
+    // 加载服务中businessIdentity的额外参数
+    businessIdentityReqData: {
+      type: Object,
+      default: () => ({})
+    },
     // 如果当前页面是弹框，这个是父页面传入的根数据
     parentRootValue: {
       type: Object,
@@ -187,6 +192,7 @@ export default {
         {
           requestTraceId: props.requestTraceId,
           messageInstance: toRef(props, 'messageInstance'),
+          businessIdentityReqData: props.businessIdentityReqData,
           axiosInstance,
           reqData: props.loadEvnetsReq,
           respCb: (result) => {

package/src/resolver-common.vue

@@ -36,9 +36,15 @@ getPageConfig({
   busiIdentityId: props.busiIdentityId,
   queryPageMeta: '1',
   queryPageService: '1',
-}, (pageConfig) => {
-  // 配置数据加载完成事件 'loadedConfigCompeted'
-  attrs?.onLoadedConfigCompeted?.(pageConfig)
+}, {
+  configCb: (pageConfig) => {
+    // 配置数据加载完成事件 'loadedConfigCompeted'
+    attrs?.onLoadedConfigCompeted?.(pageConfig)
+  },
+  selectsCb: (selects) => {
+    // 配置数据加载完成事件 'loadedConfigCompeted'
+    attrs?.onLoadedSelectsCompeted?.(selects)
+  },
 })
 const allSelects = computed(() => {
   return {

package/src/theme/element/components/common.scss

@@ -1,11 +1,16 @@
 @mixin nestMargin {
   & > div {
+    & > .CustomComponentCollapse {
+      & > div {
+        margin-right: 16px;
+      }
+    }
+
     & > .CustomComponentTable,
-    & > .CustomComponentCollapse,
     & > .CustomComponentRow {
       & > div {
         margin-right: 16px;
-        // margin-bottom: 16px;
+        margin-bottom: 16px;
       }
     }
   }

package/src/utils/const.js

@@ -153,6 +153,7 @@ export const commonPropsType = {
             columnValue: item.value,
             columnDesc_zh: item.label,
             columnDesc: item.label_en || item.label,
+            columnStatus: item.columnStatus
           }
         })
       } catch (error) {
@@ -160,6 +161,12 @@ export const commonPropsType = {
       }
       const options = (selects?.value && selects?.value?.[selectKey]) || (selects?.value && selects?.value?.[`${config.metaCode}ListValue`]) || (selects?.value && selects?.value?.[referenceOptions]) || optionItemsList || []
       return options
+      // const disabled = calcDisable(config, props.mode)
+      // if (disabled) {
+      //   return options
+      // } else {
+      //   return options.filter(item => !(item.columnStatus == '0' || item.columnStatus == '2'))
+      // }
     }
   },
   placeholder: {