resolver-egretimp-plus 0.0.71 → 0.0.73

package/package.json

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

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

@@ -47,6 +47,10 @@ const props = defineProps({
     // primaryKeys
     default: () => ({})
   },
+  dialogProps: {
+    type: Object,
+    default: () => ({})
+  },
   rootStoreChange: Function
 })
 const formData = ref({})

package/src/components/helper/eventOrchestration.js

@@ -2,7 +2,7 @@ import { isArray, isHasVal } from "../../utils/is"
 import { DATA_VALID_RULE_EXECUTE } from "../../api/builtIn"
 import { getRelateConfigKeys } from "../../rules/ruleUtils"
 import { RESULT_CODE, resultToast } from "../../utils/respone"
-import { unionWith } from "../../utils/index"
+import { parseExtendAttr, unionWith } from "../../utils/index"
 
 export async function dispatchClickEvents  ({serviceList = [], requestTraceId, axiosInstance, dynamicMapComp, rootValue, dynamicHireRelat, messageCb, compConfig, messageInstance}) {
   const dynamicMapCompKeys = Object.keys(dynamicMapComp)
@@ -25,21 +25,27 @@ export async function dispatchClickEvent(service, { dynamicMapComp, requestTrace
     }
   }
   const url = service.serviceCode
-  const httpMethod = service.httpMethod
-  const ret = await (axiosInstance && axiosInstance({
+  const httpMethod = service.httpMethod || "post"
+  const reqResult = {
+    requestTraceId,
+    pmHandleBusinessIdentity: {
+      busiIdentityId: service.busiIdentityId,
+      pageMetaId: service.pageMetaId,
+      tenantId: service.tenantId,
+      mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
+    },
+    ...reqData
+  }
+  const reqConfig = {
     url,
-    method: httpMethod || "post",
-    data: {
-      requestTraceId,
-      pmHandleBusinessIdentity: {
-        busiIdentityId: service.busiIdentityId,
-        pageMetaId: service.pageMetaId,
-        tenantId: service.tenantId,
-        mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
-      },
-      ...reqData
-    }
-  }))
+    method: httpMethod,
+    data: reqResult
+  }
+  if (httpMethod.toLocaleLowerCase() === 'get') {
+    reqConfig.params = reqResult
+    delete reqConfig.data
+  }
+  const ret = await (axiosInstance && axiosInstance(reqConfig))
   if (!resultToast(ret?.data, messageInstance, {messageCb, service, compConfig})) {
     await Promise.reject()
     return
@@ -215,8 +221,10 @@ export function openDailg({
       }
     }
   }
+  const dialogProps = parseExtendAttr({extendAttr: pagePopupMap.extendAttr})
   dialogClose = openChildDialog({
     buttonActions,
+    dialogProps,
     parentRootValue: rootValue,
     selectionsObj,
     busiIdentityId,

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
   }
@@ -13,20 +13,29 @@ export async function executeLoadServices(services = [], { requestTraceId, axios
   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: {
-        requestTraceId,
+    const httpMethod = service.httpMethod || "post"
+    const reqResult = {
+      requestTraceId,
         pmHandleBusinessIdentity: {
-          busiIdentityId: service.busiIdentityId,
-          pageMetaId: service.pageMetaId,
-          tenantId: service.tenantId,
-          mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
-        },
-        ...(reqData || {})
-      }
-    }))
+        busiIdentityId: service.busiIdentityId,
+        pageMetaId: service.pageMetaId,
+        tenantId: service.tenantId,
+        mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
+        ...businessIdentityReqData,
+      },
+      ...(reqData || {})
+    }
+    const reqConfig = {
+      url,
+      method: httpMethod,
+      data: reqResult
+    }
+    if (httpMethod.toLocaleLowerCase() === 'get') {
+      reqConfig.params = reqResult
+      delete reqConfig.data
+    }
+
+    const ret = await (axiosInstance.value && axiosInstance.value(reqConfig))
     if (resultToast(ret.data, messageInstance, { noSuccessIip: true })) {
       respCb && respCb(ret?.data?.result)
       return

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

@@ -1,9 +1,10 @@
 <script setup>
-import { commonPropsType, hasOwn } from '../../utils/index.js'
+import { commonPropsType, getConfigOptions, hasOwn } from '../../utils/index.js'
 import { computed, inject, reactive, ref, useAttrs, watch } from 'vue'
 
 const attrs = useAttrs()
 const lang = inject('lang')
+const selects = inject('selects')
 const tableRef = ref(null)
 const props = defineProps({
   ...commonPropsType,
@@ -12,7 +13,7 @@ const tableData = ref([])
 const modelValue = defineModel()
 
 const isFrontPage = computed(() => {
-  return props.config?.frontPageFlag === '1'
+  return props.config?.frontPageFlag == '1'
 })
 const tableProps = computed(() => {
   return {
@@ -21,6 +22,8 @@ const tableProps = computed(() => {
     display: props.config?.display,
     open: props.config?.defaultOpenFlag === '1',
     showlandscape: props.config?.showLandscape === '1',
+    rowkey: props.config?.rowkey,
+    height: props.config?.height,
   }
 })
 const page = reactive({
@@ -30,9 +33,12 @@ const page = reactive({
 })
 
 const normalTableData = computed(() => {
-  return !isFrontPage.value ?
+  const orgList = !isFrontPage.value ?
     tableData.value :
     tableData.value.slice((page.pageNum - 1) * page.pageSize, page.pageNum * page.pageSize)
+  return orgList.map(row => {
+    return normalTableRowValue(row)
+  })
 })
 
 const normalPageTotal = computed(() => {
@@ -74,7 +80,7 @@ const tableEvents = computed(() => {
 })
 // 是否配置分页功能     ====== start======
 const pageable = computed(() => {
-  return props.config?.pageable === '1'
+  return props.config?.pageable == '1'
 })
 const pageAlign = computed(() => {
   return props.config?.pageAlign
@@ -126,10 +132,10 @@ const getTableColumnProps = (config) => {
     prop: config.metaCode,
     width: config.columnWidth,
     ellipsis: config.ellipsis === '1',
-    showexpand: config.showexpand === '1'
+    showexpand: config.showexpand === '1',
+    fixed: config.fixed,
   }
 }
-
 watch(modelValue, (val) => {
   setTimeout(() => {
     tableData.value = val || (tableProps.value.card ? [] : [])
@@ -138,9 +144,41 @@ watch(modelValue, (val) => {
 }, {
   immediate: true
 })
+// 这个的监听是因为 table正常形态的时候，改变分页，行高会越来越高，所以就设置了key
+// 设置key之后需要重新setTableData
+watch(() => {
+  return `${tableProps.value.card}${tableProps.value.display}${!tableProps.value.card ? page.pageNum : 0}`
+}, () => {
+  setTimeout(() => {
+    tableRef.value?.setTableData(normalTableData.value)
+  }, 100);
+})
+
+function getOptions(config) {
+  return getConfigOptions(config, selects)
+}
+
+function normalVal(val, options) {
+  const findItem = options?.find(item => item.columnValue == val)
+  if (findItem) {
+    return lang?.value?.indexOf('zh') > -1 ? findItem.columnDesc_zh : findItem.columnDesc
+  }
+  return val
+}
+
+
+function normalTableRowValue(row) {
+  const ret = {
+    ...row
+  }
+  pmPageMetaList.value.forEach(config => {
+    ret[config.metaCode] = normalVal(ret[config.metaCode], getOptions(config))
+  })
+  return ret
+}
 </script>
 <template>
-  <cmi-table ref="tableRef" :key="`${tableProps.card}${tableProps.display}`" v-bind="tableProps" :data="normalTableData" @rowclick="tableEvents.onRowclick">
+  <cmi-table ref="tableRef" :key="`${tableProps.card}${tableProps.display}${!tableProps.card ? page.pageNum : 0}`" v-bind="tableProps" :data="normalTableData" @rowclick="tableEvents.onRowclick">
     <cmi-table-column
       v-for="column in pmPageMetaList" :key="column.metaCode"
       v-bind="{

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
     })
 
@@ -134,7 +134,7 @@ export default {
       if (!props.columnWidth) {
         props.minWidth = '160px'
       }
-      if (props.width == 0 || props.width == '0px') {
+      if (props.width == 0 || props.width == '0px' || config.hidden == '1') {
         props.className = 'hidden-column'
         props.width = '1px'
       }

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

@@ -1,4 +1,5 @@
 <template>
+
   <ElSelect class="custom-self-select" v-bind="{...attrs, ...selectProps }" v-model="value" @clear="clear">
     <ElOption v-for="option in props.options"
       :key="option.columnValue"
@@ -66,6 +67,10 @@ const selectProps = computed(() => {
   if (typeof attrs.multiple === 'string') {
     attrs.multiple = attrs.multiple == '1'
   }
+  if (!attrs['suffix-icon'] && !attrs.suffixIcon) {
+    delete attrs.suffixIcon
+    delete attrs['suffix-icon']
+  }
   attrs.multipleLimit = Number(parseInt(attrs.multipleLimit || 0))
   return attrs
 })

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/utils/common.js

@@ -257,3 +257,29 @@ export function getUuid () {
     return (c === 'x' ? random : (random & 0x3) | 0x8).toString(16);
   });
 }
+
+export function getConfigOptions(config, selects) {
+  const referenceOptions = config.referenceOptions
+  const selectKey = config.selectKey
+  let optionItemsList = []
+  try {
+    optionItemsList = JSON.parse(config?.optionItems || '[]').map(item => {
+      return {
+        columnValue: item.value,
+        columnDesc_zh: item.label,
+        columnDesc: item.label_en || item.label,
+        columnStatus: item.columnStatus
+      }
+    })
+  } catch (error) {
+    optionItemsList = []
+  }
+  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'))
+  // }
+}

package/src/utils/const.js

@@ -1,4 +1,4 @@
-import { normalPixel, getDate, findComponent, isPatchComponent } from './common.js'
+import { normalPixel, getDate, findComponent, isPatchComponent, getConfigOptions } from './common.js'
 
 export const MODE = {
   OPERATE: 'operate',
@@ -144,29 +144,7 @@ export const commonPropsType = {
     type: Array,
     default: () => [],
     getValue(config, props, modelValue, selects) {
-      const referenceOptions = config.referenceOptions
-      const selectKey = config.selectKey
-      let optionItemsList = []
-      try {
-        optionItemsList = JSON.parse(config?.optionItems || '[]').map(item => {
-          return {
-            columnValue: item.value,
-            columnDesc_zh: item.label,
-            columnDesc: item.label_en || item.label,
-            columnStatus: item.columnStatus
-          }
-        })
-      } catch (error) {
-        optionItemsList = []
-      }
-      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'))
-      // }
+      return getConfigOptions(config, selects)
     }
   },
   placeholder: {