resolver-egretimp-plus 0.0.69 → 0.0.71

package/package.json

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

package/src/analysisComponent.jsx

@@ -48,7 +48,7 @@ export default {
       delete ret.onClick
       return ret
     })
-    const request_traceId = inject('request_traceId')
+    const requestTraceId = inject('requestTraceId')
     const polyfillConfigs = inject('_polyfillConfigs', {})
     const buttonActions = inject('buttonActions', {})
     const route = useRoute()
@@ -185,7 +185,7 @@ export default {
       attrs?.onClick?.call(context, e) // 如果配置中有点击事件
       executeEventOrchestration({
         props,
-        request_traceId: request_traceId?.value,
+        requestTraceId: requestTraceId?.value,
         axiosInstance: _axiosInstance?.value,
         polyfillConfigs,
         rootValue: rootValue?.value,

package/src/components/helper/eventOrchestration.js

@@ -4,16 +4,16 @@ import { getRelateConfigKeys } from "../../rules/ruleUtils"
 import { RESULT_CODE, resultToast } from "../../utils/respone"
 import { unionWith } from "../../utils/index"
 
-export async function dispatchClickEvents  ({serviceList = [], request_traceId, axiosInstance, dynamicMapComp, rootValue, dynamicHireRelat, messageCb, compConfig, messageInstance}) {
+export async function dispatchClickEvents  ({serviceList = [], requestTraceId, 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, request_traceId, mixinServiceConfig, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageCb, compConfig, messageInstance})
+    dispatchClickEvent(service, {dynamicMapComp, requestTraceId, mixinServiceConfig, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageCb, compConfig, messageInstance})
   }
 }
 
-export async function dispatchClickEvent(service, { dynamicMapComp, request_traceId, mixinServiceConfig, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageCb, compConfig, messageInstance }) {
+export async function dispatchClickEvent(service, { dynamicMapComp, requestTraceId, mixinServiceConfig, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageCb, compConfig, messageInstance }) {
   let reqData = rootValue || {}
   let tableConfig = null
   if (service.transactionType == '1') {
@@ -25,13 +25,13 @@ export async function dispatchClickEvent(service, { dynamicMapComp, request_trac
     }
   }
   const url = service.serviceCode
+  const httpMethod = service.httpMethod
   const ret = await (axiosInstance && axiosInstance({
     url,
-    method: "post",
+    method: httpMethod || "post",
     data: {
-      request_traceId,
+      requestTraceId,
       pmHandleBusinessIdentity: {
-        request_traceId,
         busiIdentityId: service.busiIdentityId,
         pageMetaId: service.pageMetaId,
         tenantId: service.tenantId,
@@ -234,16 +234,15 @@ export function openDailg({
 }
 
 // 数据校验服务
-export async function executeDataValid(validConfig, { dynamicMapComp, request_traceId, mixinServiceConfig, rootValue, axiosInstance, lang}) {
+export async function executeDataValid(validConfig, { dynamicMapComp, requestTraceId, mixinServiceConfig, rootValue, axiosInstance, lang}) {
   let reqData = rootValue || {}
   const url = DATA_VALID_RULE_EXECUTE
   const ret = await (axiosInstance && axiosInstance({
     url,
     method: "post",
     data: {
-      request_traceId,
+      requestTraceId,
       pmHandleBusinessIdentity: {
-        request_traceId,
         busiIdentityId: validConfig.busiIdentityId,
         pageMetaId: validConfig.pageMetaId,
         tenantId: validConfig.tenantId,
@@ -307,7 +306,7 @@ function closePage(lcpPageClosedMapVO) {
   }
 }
 
-export async function executeEventOrchestration({props, request_traceId, axiosInstance, polyfillConfigs, buttonActions, rootValue, confirmInstance, dynamicMapComp, messageInstance, openChildDialog, messageCb, lang, appContext } = {}) {
+export async function executeEventOrchestration({props, requestTraceId, axiosInstance, polyfillConfigs, buttonActions, 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')
@@ -316,7 +315,7 @@ export async function executeEventOrchestration({props, request_traceId, axiosIn
       const validConfig = lcpPageRuleVOLis[0]
       const valid = await executeDataValid(validConfig, {
         dynamicMapComp,
-        request_traceId,
+        requestTraceId,
         rootValue,
         axiosInstance,
         mixinServiceConfig,
@@ -332,7 +331,7 @@ export async function executeEventOrchestration({props, request_traceId, axiosIn
     dispatchClickEvents({
       serviceList: PageServiceMapVOList,
       axiosInstance,
-      request_traceId,
+      requestTraceId,
       rootValue,
       dynamicMapComp,
       dynamicHireRelat,

package/src/components/helper/resolver.js

@@ -1,6 +1,6 @@
 import { resultToast } from "../../utils/respone"
 
-export async function executeLoadServices(services = [], { request_traceId, axiosInstance, messageInstance, reqData, respCb }) {
+export async function executeLoadServices(services = [], { requestTraceId, axiosInstance, messageInstance, reqData, respCb }) {
   if (reqData?.notLoad) {
     return
   }
@@ -17,9 +17,8 @@ export async function executeLoadServices(services = [], { request_traceId, axio
       url,
       method: "post",
       data: {
-        request_traceId,
+        requestTraceId,
         pmHandleBusinessIdentity: {
-          request_traceId,
           busiIdentityId: service.busiIdentityId,
           pageMetaId: service.pageMetaId,
           tenantId: service.tenantId,

package/src/hooks/pageConfig.js

@@ -42,7 +42,7 @@ export function usePageConfig() {
   }
 }
 
-export function useBuildInData({ messageInstance, loadingInstance, request_traceId }) {
+export function useBuildInData({ messageInstance, loadingInstance, requestTraceId }) {
   const pageConfig = ref(null)
   function getPageConfig(reqData, cb) {
     if (loadingInstance.start && typeof loadingInstance.start === 'function') {
@@ -50,7 +50,7 @@ export function useBuildInData({ messageInstance, loadingInstance, request_trace
     } else if (loadingInstance.show && typeof loadingInstance.show === 'function') {
       loadingInstance.show()
     }
-    buildInRequest(QUERY_PAGE_CONFIG_DATA, {...reqData, request_traceId}).then(ret => {
+    buildInRequest(QUERY_PAGE_CONFIG_DATA, {...reqData, requestTraceId}).then(ret => {
       if (resultToast(ret.data, messageInstance, { noSuccessIip: true })) {
         // pageConfig.value = normalPageConfigs(mock)
         pageConfig.value = normalPageConfigs(ret.data.result)

package/src/index.jsx

@@ -112,7 +112,7 @@ export default {
     },
     // 提示语的回调
     messageCb: Function,
-    request_traceId: {
+    requestTraceId: {
       type: String,
     }
   },
@@ -157,7 +157,7 @@ export default {
     executeLoadServices(
       props.config?.pmPageServiceMapVOList || props.config?.lcpPageServiceMapVOList || [],
       {
-        request_traceId: props.request_traceId,
+        requestTraceId: props.requestTraceId,
         messageInstance: toRef(props, 'messageInstance'),
         axiosInstance,
         reqData: props.loadEvnetsReq,
@@ -185,7 +185,7 @@ export default {
       executeLoadServices(
         props.config?.pmPageServiceMapVOList || [],
         {
-          request_traceId: props.request_traceId,
+          requestTraceId: props.requestTraceId,
           messageInstance: toRef(props, 'messageInstance'),
           axiosInstance,
           reqData: props.loadEvnetsReq,
@@ -223,7 +223,7 @@ export default {
     provide('_parentRootValue', props.parentRootValue) 
     provide('_selectionsObj', props.selectionsObj) 
     provide('_polyfillConfigs', props.polyfillConfigs)
-    provide('request_traceId', toRef(props, 'request_traceId')) // 所有渲染器调用的接口，都需要加次参数（生哥提）
+    provide('requestTraceId', toRef(props, 'requestTraceId')) // 所有渲染器调用的接口，都需要加次参数（生哥提）
 
     const rootForm = ref(null)
     provide('rootForm', rootForm)

package/src/resolver-H5.vue

@@ -30,7 +30,7 @@ const props = defineProps({
       return () => {}
     }
   },
-  request_traceId: {
+  requestTraceId: {
     type: String,
     default: generateUniqueId()
   }
@@ -72,6 +72,6 @@ defineExpose({
     :confirmInstance="props.confirmInstance"
     :openChildDialogInstance="props.openChildDialogInstance"
     :loadingInstance="props.loadingInstance"
-    :request_traceId="props.request_traceId"
+    :requestTraceId="props.requestTraceId"
   ></Resolver>
 </template>

package/src/resolver-common.vue

@@ -22,7 +22,7 @@ const props = defineProps({
     type: [Object, Function],
     default: () => null
   },
-  request_traceId: {
+  requestTraceId: {
     type: String,
   }
 })
@@ -31,7 +31,7 @@ defineOptions({
 })
 const attrs = useAttrs()
 initInterceptors(props.messageInstance)
-const { getPageConfig, pageConfig, selects } = useBuildInData({messageInstance: props.messageInstance, loadingInstance: props.loadingInstance, request_traceId: props.request_traceId})
+const { getPageConfig, pageConfig, selects } = useBuildInData({messageInstance: props.messageInstance, loadingInstance: props.loadingInstance, requestTraceId: props.requestTraceId})
 getPageConfig({
   busiIdentityId: props.busiIdentityId,
   queryPageMeta: '1',
@@ -78,6 +78,6 @@ defineExpose({
     :getNativeComps="props.getNativeComps"
     :config="pageConfig || null"
     :selects="allSelects"
-    :request_traceId="props.request_traceId"
+    :requestTraceId="props.requestTraceId"
   ></Resolver>
 </template>

package/src/resolver-web.vue

@@ -29,7 +29,7 @@ const props = defineProps({
       return openChildDialog
     }
   },
-  request_traceId: {
+  requestTraceId: {
     type: String,
     default: generateUniqueId()
   }
@@ -71,6 +71,6 @@ defineExpose({
     :confirmInstance="props.confirmInstance"
     :openChildDialogInstance="props.openChildDialogInstance"
     :loadingInstance="props.loadingInstance"
-    :request_traceId="props.request_traceId"
+    :requestTraceId="props.requestTraceId"
   ></Resolver>
 </template>

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

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

package/src/utils/common.js

@@ -227,7 +227,7 @@ export function getDate(...arg) {
 }
 // 生成唯一值
 export function generateUniqueId() {
-  return `${getUuid()}-${Date.now()}`;
+  return `${formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')}-${getUuid()}`;
 }
 
 export function getUuid () {

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: {

package/src/utils/render.jsx

@@ -268,10 +268,9 @@ function getTableServices(lcpPageServiceMapVOList = [], { dynamicMapComp, dynami
   }
   return []
 }
-
 function parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue }, config) {
   const hireRelat = config.hireRelat
-  const findKeys = Object.keys(polyfillConfigs).filter(key => hireRelat.endsWith(key))
+  const findKeys = Object.keys(polyfillConfigs || {}).filter(key => hireRelat.endsWith(key))
   if (!findKeys.length) {
     return
   }