resolver-egretimp-plus 0.0.68 → 0.0.70

package/package.json

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

package/src/analysisComponent.jsx

@@ -48,6 +48,7 @@ export default {
       delete ret.onClick
       return ret
     })
+    const requestTraceId = inject('requestTraceId')
     const polyfillConfigs = inject('_polyfillConfigs', {})
     const buttonActions = inject('buttonActions', {})
     const route = useRoute()
@@ -184,6 +185,7 @@ export default {
       attrs?.onClick?.call(context, e) // 如果配置中有点击事件
       executeEventOrchestration({
         props,
+        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 = [], 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, 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, 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') {
@@ -29,6 +29,7 @@ export async function dispatchClickEvent(service, { dynamicMapComp, mixinService
     url,
     method: "post",
     data: {
+      requestTraceId,
       pmHandleBusinessIdentity: {
         busiIdentityId: service.busiIdentityId,
         pageMetaId: service.pageMetaId,
@@ -232,13 +233,14 @@ export function openDailg({
 }
 
 // 数据校验服务
-export async function executeDataValid(validConfig, { dynamicMapComp, 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: {
+      requestTraceId,
       pmHandleBusinessIdentity: {
         busiIdentityId: validConfig.busiIdentityId,
         pageMetaId: validConfig.pageMetaId,
@@ -303,7 +305,7 @@ function closePage(lcpPageClosedMapVO) {
   }
 }
 
-export async function executeEventOrchestration({props, 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')
@@ -312,6 +314,7 @@ export async function executeEventOrchestration({props, axiosInstance, polyfillC
       const validConfig = lcpPageRuleVOLis[0]
       const valid = await executeDataValid(validConfig, {
         dynamicMapComp,
+        requestTraceId,
         rootValue,
         axiosInstance,
         mixinServiceConfig,
@@ -327,6 +330,7 @@ export async function executeEventOrchestration({props, axiosInstance, polyfillC
     dispatchClickEvents({
       serviceList: PageServiceMapVOList,
       axiosInstance,
+      requestTraceId,
       rootValue,
       dynamicMapComp,
       dynamicHireRelat,

package/src/components/helper/resolver.js

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

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

@@ -62,6 +62,16 @@ const pagenationEvents = computed(() => {
   }
   return ret
 })
+const tableEvents = computed(() => {
+  const ret = {
+    onRowclick: (e) => {
+      if (attrs.onRowclick) {
+        attrs.onRowclick?.(e)
+      }
+    }
+  }
+  return ret
+})
 // 是否配置分页功能     ====== start======
 const pageable = computed(() => {
   return props.config?.pageable === '1'
@@ -130,7 +140,7 @@ watch(modelValue, (val) => {
 })
 </script>
 <template>
-  <cmi-table ref="tableRef" :key="`${tableProps.card}${tableProps.display}`" v-bind="tableProps" :data="normalTableData">
+  <cmi-table ref="tableRef" :key="`${tableProps.card}${tableProps.display}`" v-bind="tableProps" :data="normalTableData" @rowclick="tableEvents.onRowclick">
     <cmi-table-column
       v-for="column in pmPageMetaList" :key="column.metaCode"
       v-bind="{

package/src/hooks/pageConfig.js

@@ -42,7 +42,7 @@ export function usePageConfig() {
   }
 }
 
-export function useBuildInData(messageTipInstance, loadingInstance) {
+export function useBuildInData({ messageInstance, loadingInstance, requestTraceId }) {
   const pageConfig = ref(null)
   function getPageConfig(reqData, cb) {
     if (loadingInstance.start && typeof loadingInstance.start === 'function') {
@@ -50,8 +50,8 @@ export function useBuildInData(messageTipInstance, loadingInstance) {
     } else if (loadingInstance.show && typeof loadingInstance.show === 'function') {
       loadingInstance.show()
     }
-    buildInRequest(QUERY_PAGE_CONFIG_DATA, reqData).then(ret => {
-      if (resultToast(ret.data, messageTipInstance, { noSuccessIip: true })) {
+    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)
         cb(pageConfig.value)
@@ -77,7 +77,7 @@ export function useBuildInData(messageTipInstance, loadingInstance) {
     buildInRequest(GET_SYS_PARAM_CACHE, {
       tenantId
     }).then(ret => {
-      if (resultToast(ret.data, messageTipInstance, { noSuccessIip: true })) {
+      if (resultToast(ret.data, messageInstance, { noSuccessIip: true })) {
         selects.value = JSON.parse(ret.data.result || '{}')
         return
       } else {

package/src/index.jsx

@@ -1,7 +1,7 @@
 import { provide, toRef, watch, computed, ref, defineExpose, reactive, getCurrentInstance } from "vue"
 import Renderer from './renderer.jsx'
 // import './style/index.scss'
-import { useBuildInData, usePageConfig } from './hooks/pageConfig'
+import { usePageConfig } from './hooks/pageConfig'
 import { toValidate } from './utils/valid.js'
 import { MODE } from "./utils/const.js"
 import { generateRequester } from "./utils/request.js"
@@ -112,6 +112,9 @@ export default {
     },
     // 提示语的回调
     messageCb: Function,
+    requestTraceId: {
+      type: String,
+    }
   },
   setup(props, { emit, attrs, expose }) {
     const rootStore = reactive({})
@@ -154,6 +157,7 @@ export default {
     executeLoadServices(
       props.config?.pmPageServiceMapVOList || props.config?.lcpPageServiceMapVOList || [],
       {
+        requestTraceId: props.requestTraceId,
         messageInstance: toRef(props, 'messageInstance'),
         axiosInstance,
         reqData: props.loadEvnetsReq,
@@ -181,6 +185,7 @@ export default {
       executeLoadServices(
         props.config?.pmPageServiceMapVOList || [],
         {
+          requestTraceId: props.requestTraceId,
           messageInstance: toRef(props, 'messageInstance'),
           axiosInstance,
           reqData: props.loadEvnetsReq,
@@ -218,6 +223,7 @@ export default {
     provide('_parentRootValue', props.parentRootValue) 
     provide('_selectionsObj', props.selectionsObj) 
     provide('_polyfillConfigs', props.polyfillConfigs)
+    provide('requestTraceId', toRef(props, 'requestTraceId')) // 所有渲染器调用的接口，都需要加次参数（生哥提）
 
     const rootForm = ref(null)
     provide('rootForm', rootForm)

package/src/resolver-H5.vue

@@ -5,6 +5,7 @@ import Resolver from './resolver-common.vue'
 import CmiToast from "cmid/lib/toast"
 import CmiFullLoading from "cmid/lib/fullloading"
 import { confirmDialog } from './components/confirmInstance-H5/index.js';
+import { generateUniqueId } from './utils/common.js';
 
 const props = defineProps({
   loadingInstance: {
@@ -29,6 +30,10 @@ const props = defineProps({
       return () => {}
     }
   },
+  requestTraceId: {
+    type: String,
+    default: generateUniqueId()
+  }
 })
 
 defineOptions({
@@ -67,5 +72,6 @@ defineExpose({
     :confirmInstance="props.confirmInstance"
     :openChildDialogInstance="props.openChildDialogInstance"
     :loadingInstance="props.loadingInstance"
+    :requestTraceId="props.requestTraceId"
   ></Resolver>
 </template>

package/src/resolver-common.vue

@@ -22,13 +22,16 @@ const props = defineProps({
     type: [Object, Function],
     default: () => null
   },
+  requestTraceId: {
+    type: String,
+  }
 })
 defineOptions({
   inheritAttrs: false
 })
 const attrs = useAttrs()
 initInterceptors(props.messageInstance)
-const { getPageConfig, pageConfig, selects } = useBuildInData(props.messageInstance, props.loadingInstance)
+const { getPageConfig, pageConfig, selects } = useBuildInData({messageInstance: props.messageInstance, loadingInstance: props.loadingInstance, requestTraceId: props.requestTraceId})
 getPageConfig({
   busiIdentityId: props.busiIdentityId,
   queryPageMeta: '1',
@@ -67,5 +70,14 @@ defineExpose({
 })
 </script>
 <template>
-  <Resolver ref="resolverRef" v-bind="attrs" :loadingInstance="props.loadingInstance" :messageInstance="props.messageInstance" :getNativeComps="props.getNativeComps" :config="pageConfig || null" :selects="allSelects"></Resolver>
+  <Resolver
+    ref="resolverRef"
+    v-bind="attrs"
+    :loadingInstance="props.loadingInstance"
+    :messageInstance="props.messageInstance"
+    :getNativeComps="props.getNativeComps"
+    :config="pageConfig || null"
+    :selects="allSelects"
+    :requestTraceId="props.requestTraceId"
+  ></Resolver>
 </template>

package/src/resolver-web.vue

@@ -5,6 +5,7 @@ import { loadingInstance } from './components/loading'
 import { computed, ref, useAttrs } from 'vue';
 import Resolver from './resolver-common.vue'
 import { openChildDialog } from './components/childDialog';
+import { generateUniqueId } from './utils/common.js';
 
 const props = defineProps({
   loadingInstance: {
@@ -28,6 +29,10 @@ const props = defineProps({
       return openChildDialog
     }
   },
+  requestTraceId: {
+    type: String,
+    default: generateUniqueId()
+  }
 })
 
 defineOptions({
@@ -66,5 +71,6 @@ defineExpose({
     :confirmInstance="props.confirmInstance"
     :openChildDialogInstance="props.openChildDialogInstance"
     :loadingInstance="props.loadingInstance"
+    :requestTraceId="props.requestTraceId"
   ></Resolver>
 </template>

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

@@ -5,7 +5,7 @@
     & > .CustomComponentRow {
       & > div {
         margin-right: 16px;
-        margin-bottom: 16px;
+        // margin-bottom: 16px;
       }
     }
   }

package/src/utils/common.js

@@ -227,5 +227,33 @@ export function getDate(...arg) {
 }
 // 生成唯一值
 export function generateUniqueId() {
-  return Date.now().toString(36) + Math.random().toString(36).substr(2, 5);
+  return `${formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')}-${getUuid()}`;
+}
+
+export function getUuid () {
+  if (typeof crypto === 'object') {
+    if (typeof crypto.randomUUID === 'function') {
+      return crypto.randomUUID();
+    }
+    if (typeof crypto.getRandomValues === 'function' && typeof Uint8Array === 'function') {
+      const callback = (c) => {
+        const num = Number(c);
+        return (num ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (num / 4)))).toString(16);
+      };
+      return ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, callback);
+    }
+  }
+  let timestamp = new Date().getTime();
+  let perforNow = (typeof performance !== 'undefined' && performance.now && performance.now() * 1000) || 0;
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
+    let random = Math.random() * 16;
+    if (timestamp > 0) {
+      random = (timestamp + random) % 16 | 0;
+      timestamp = Math.floor(timestamp / 16);
+    } else {
+      random = (perforNow + random) % 16 | 0;
+      perforNow = Math.floor(perforNow / 16);
+    }
+    return (c === 'x' ? random : (random & 0x3) | 0x8).toString(16);
+  });
 }

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
   }