resolver-egretimp-plus 0.0.39 → 0.0.41

package/package.json

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

package/src/analysisComponent.jsx

@@ -1,9 +1,11 @@
 import { computed, defineAsyncComponent, getCurrentInstance, inject, onBeforeMount, provide, ref } from 'vue'
-import { getComponentPropsKeys, hasOwn } from './utils/index.js'
+import { commonPropsType, getComponentPropsKeys, hasOwn } from './utils/index.js'
 import { useVmodels } from './hooks/index.js'
 import { getRenderComponentProps, generateFormItemPolyfill } from './utils/index.js'
 import rulesDriver from './rules/rulesDriver'
 import { penddingRules } from './rules/ruleUtils.js'
+import { useRoute } from 'vue-router'
+import { executeEventOrchestration } from './components/helper/eventOrchestration.js'
 
 export default {
   name: 'AnalysisComponent',
@@ -39,9 +41,29 @@ export default {
   },
   emits: ['update:modelValue'],
   setup(props, { emit, attrs }) {
+    const currentAttrs = computed(() => {
+      const ret = {
+        ...attrs
+      }
+      delete ret.onClick
+      return ret
+    })
+    const route = useRoute()
+    const routeQuery= route?.query
+    const hireRelatMapRules = inject('hireRelatMapRules')
+    const components = inject('components')
+    const dataLoad = inject('dataLoad')
+    const rootForm = inject('rootForm')
+    const _axiosInstance = inject('_axiosInstance')
+    const confirmInstance = inject('_confirmInstance')
+    const openChildDialogInstance = inject('_openChildDialogInstance')
+    const messageCb = inject('_messageCb')
+    const messageInstance = inject('_messageInstance')
+
     const selects = inject('selects')
     // 当前组件的实例
     const instance = getCurrentInstance()
+    const appContext = instance?.appContext
     props.config.wrapVm = instance
     const refFn = e => {
       // 具体渲染的组件
@@ -142,8 +164,39 @@ export default {
     const _isH5 = inject('_isH5')
     const lang = inject('lang')
     const rootValue = inject('rootValue')
+    const onClick = (e) => {
+      e.stopPropagation()
+      const context = {
+        props,
+        dynamicMapComp,
+        hireRelatMapRules,
+        components,
+        selects,
+        rootValue: rootValue?.value,
+        dataLoad,
+        rootForm,
+        routeQuery,
+        appContext
+      }
+      attrs?.onClick?.call(context, e) // 如果配置中有点击事件
+
+      executeEventOrchestration({
+        props,
+        axiosInstance: _axiosInstance?.value,
+        rootValue: rootValue?.value,
+        confirmInstance: confirmInstance?.value,
+        dynamicMapComp,
+        openChildDialog: openChildDialogInstance?.value,
+        messageInstance: messageInstance?.value,
+        messageCb,
+        lang: lang?.value,
+        appContext
+      })
+    }
     return () => {
       const compProps = getRenderComponentProps({config: props.config, props, component: props.component, modelValue, selects})
+      const compPropsOnClick = compProps?.onClick
+      delete compProps.onClick
       const formItemPolyfill = generateFormItemPolyfill(props.config, lang.value, compProps, _isH5?.value, {
         lang,
         rootValue,
@@ -152,14 +205,15 @@ export default {
       }) // 生成formItem（）的辅助函数
       return formItemPolyfill(
         <currentComponent.value
-          ref={refFn}
-          onVnodeMounted={onVnodeMounted}
-          onVnodeUnmounted={onVnodeUnmounted}
-          {...attrs}
-          {...componentProps.value}
-          {...compProps}
-          {...vModelObjs}
-        ></currentComponent.value>
+        ref={refFn}
+        onVnodeMounted={onVnodeMounted}
+        onVnodeUnmounted={onVnodeUnmounted}
+        {...currentAttrs.value}
+        onClick={(e) => {onClick(e);compPropsOnClick?.(e)}}
+        {...componentProps.value}
+        {...compProps}
+        {...vModelObjs}
+      ></currentComponent.value>
       )
     }
   }

package/src/api/builtIn.js

@@ -2,3 +2,4 @@ export const QUERY_PAGE_CONFIG_DATA = '/sa-lcp/api/v1/pageConfig/queryPageConfig
 export const LCP_LOGIN = '/sa-lcp/login'
 export const GET_SYS_PARAM_CACHE = '/sa-lcp/api/v1/sysparam/getSysParamCache'
 export const REFRESH_TOKEN = '/sa-lcp/changePwd/refreshToken'
+export const DATA_VALID_RULE_EXECUTE = '/sa-lcp/api/v1/validate/dataValidRuleExecute'

package/src/components/helper/eventOrchestration.js

@@ -1,3 +1,4 @@
+import { DATA_VALID_RULE_EXECUTE } from "../../api/builtIn"
 import { getRelateConfigKeys } from "../../rules/ruleUtils"
 import { RESULT_CODE, resultToast } from "../../utils/respone"
 
@@ -159,28 +160,40 @@ export function openDailg({
 }
 
 // 数据校验服务
-export async function executeDataValid(validConfig, { dynamicMapComp, rootValue, axiosInstance, lang}) {
-  let reqData = rootValue
-  const url = service.serviceCode
+export async function executeDataValid(validConfig, { dynamicMapComp, mixinServiceConfig, rootValue, axiosInstance, lang}) {
+  let reqData = rootValue || {}
+  const url = DATA_VALID_RULE_EXECUTE
   const ret = await (axiosInstance && axiosInstance({
     url,
     method: "post",
-    data: reqData
+    data: {
+      pmHandleBusinessIdentity: {
+        busiIdentityId: validConfig.busiIdentityId,
+        pageMetaId: validConfig.pageMetaId,
+        tenantId: validConfig.tenantId,
+        mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
+      },
+      ...reqData
+    }
   }))
   const result = ret.data || {}
   const resultCode = result.resultCode
   const resultMessage = result?.resultMessage || ''
   let type = ''
+  let weakFlag = false
+
   if (RESULT_CODE.SUCCESS !== resultCode) {
     switch (resultCode) {
-      case RESULT_CODE.INFO:
-        type = 'info'
-        break;
       case RESULT_CODE.WARNING:
         type = 'warning'
+        weakFlag = true
         break;
       case RESULT_CODE.ERROR:
         type = 'error'
+        weakFlag = false
+        break;
+      case RESULT_CODE.INFO:
+        type = 'info'
         break;
       case RESULT_CODE.OTHER:
         type = 'error'
@@ -190,10 +203,9 @@ export async function executeDataValid(validConfig, { dynamicMapComp, rootValue,
         break;
     }
   }
-  let weakFlag = false
-  if (validConfig?.validationType === '2') {
-    weakFlag = true
-  }
+  // if (validConfig?.validationType === '2') {
+  //   weakFlag = true
+  // }
   return new Promise((resolver, inject) => {
     confirmInstance(resultMessage, lang?.indexOf('zh') > -1 ? '提示' : 'Hint', {
       type,
@@ -211,18 +223,25 @@ export async function executeDataValid(validConfig, { dynamicMapComp, rootValue,
 }
 
 export async function executeEventOrchestration({props, axiosInstance, rootValue, confirmInstance, dynamicMapComp, messageInstance, openChildDialog, messageCb, lang, appContext } = {}) {
-  // 数据校验服务
-  const valid = await executeDataValid(null, {
-    dynamicMapComp,
-    rootValue,
-    axiosInstance,
-    lang
-  })
-  if (!valid) {
-    return
+  const lcpPageRuleVOLis = props.config?.lcpPageRuleVOList || []
+  const PageServiceMapVOList = props.config.lcpPageServiceMapVOList || []
+  const mixinServiceConfig = PageServiceMapVOList.find(service => service.serviceType === '1')
+  if (lcpPageRuleVOLis?.length && mixinServiceConfig) {
+    // for(let i = 0; i < lcpPageRuleVOLis.length; i++) {
+      // 数据校验服务
+      const validConfig = lcpPageRuleVOLis[0]
+      const valid = await executeDataValid(validConfig, {
+        dynamicMapComp,
+        rootValue,
+        axiosInstance,
+        mixinServiceConfig,
+        lang
+      })
+      if (!valid) {
+        return
+      }
+    // }
   }
-
-  const PageServiceMapVOList = props.config.lcpPageServiceMapVOList
   if (PageServiceMapVOList?.length) {
     const dynamicHireRelat = props.config?.dynamicHireRelat
     dispatchClickEvents({

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

@@ -20,6 +20,7 @@ const checkboxGroupProps = computed(() => {
 
 const checkboxProps = computed(() => {
   return {
+    label: lang?.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,
     size: props?.config?.size,
     disabled: props.disabled,
     block: props?.config?.block === '1',
@@ -50,6 +51,7 @@ const onSigleChange = ({ detail }) => {
 <template>
   <cmi-checkbox-group :value="modeValue" @change="onChange" v-if="props.options && props.options.length" v-bind="{...checkboxGroupProps, ...attrs}">
     <cmi-checkbox 
+      class="mr-20"
       v-for="option in props.options" :key="option.columnValue"
       :disabled="option.columnStatus == '0' || option.columnStatus == '2'"
       :name="option.columnValue" :label="lang.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc"
@@ -57,7 +59,12 @@ const onSigleChange = ({ detail }) => {
       {{lang.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc}}
     </cmi-checkbox>
   </cmi-checkbox-group>
-  <cmi-checkbox v-else v-bind="{...checkboxProps, ...attrs}" :checked="modeValue === '1'" :value="modeValue" @change="onSigleChange">
+  <cmi-checkbox v-else v-bind="{...attrs, ...checkboxProps}" :checked="modeValue === '1'" :value="modeValue" @change="onSigleChange">
     {{ label }}
   </cmi-checkbox>
-</template>
+</template>
+<style lang="scss" scoped>
+.mr-20 {
+  margin-right: 20px;
+}
+</style>

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

@@ -0,0 +1,30 @@
+<script setup>
+import { computed, defineProps, inject } from 'vue'
+import { commonPropsType } from '../../utils/index.js'
+
+const lang = inject('lang')
+const props = defineProps({
+  ...commonPropsType,
+})
+const dividerProps = computed(() => {
+  return {
+    direction: props.config?.direction,
+    borderStyle: props.config?.borderStyle,
+    borderwidth: props.config?.borderwidth,
+    position: props.config?.position,
+  }
+})
+const modelValue = defineModel()
+
+const label = computed(() => {
+  return modelValue.value || (lang?.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn)
+})
+</script>
+
+<template>
+  <cmi-divider
+    v-bind="{...dividerProps}"
+  >
+    {{ label }}
+  </cmi-divider>
+</template>

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

@@ -5,7 +5,7 @@ import { commonPropsType } from '../../utils/index.js'
 const modelValue = defineModel()
 const props = defineProps({
   ...commonPropsType,
-  isMutiple: [String, Boolean]
+  multiple: [String, Boolean]
 })
 const attrs = useAttrs()
 const lang = inject('lang')
@@ -47,7 +47,7 @@ const value = computed({
 
 const selectProps = computed(() => {
   return {
-    label: lang?.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,
+    // label: lang?.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,
     value: value.value,
     disabled: props.disabled,
     clearable: props.clearable,

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

@@ -8,8 +8,6 @@ import { ElButton } from 'element-plus'
 import { defineProps, inject, getCurrentInstance, computed, useAttrs } from 'vue'
 import { commonPropsType } from '../../utils/index.js'
 import { useRoute } from 'vue-router'
-import { executeEventOrchestration } from '../helper/eventOrchestration.js';
-import { getRelateConfigKeys } from '../../rules/ruleUtils.js';
 
 defineOptions({
   inheritAttrs: false
@@ -63,9 +61,7 @@ const label = computed(() => {
 })
 const route = useRoute()
 const buttonActions = inject('buttonActions', {})
-const messageCb = inject('_messageCb')
 
-const messageInstance = inject('_messageInstance')
 const dynamicMapComp = inject('dynamicMapComp')
 const hireRelatMapRules = inject('hireRelatMapRules')
 const components = inject('components')
@@ -73,14 +69,12 @@ const selects = inject('selects')
 const rootValue = inject('rootValue')
 const dataLoad = inject('dataLoad')
 const rootForm = inject('rootForm')
-const _axiosInstance = inject('_axiosInstance')
-const confirmInstance = inject('_confirmInstance')
-const openChildDialogInstance = inject('_openChildDialogInstance')
 
 const routeQuery= route?.query
 
 const buttonAction = async (...arg) => {
-  attrs?.onClick?.(...arg) // 如果配置中有点击事件
+  attrs?.onClick?.(...arg)
+
   const actionKey = props.config?.clickActionKey || props.config?.buttonActionKey || props.config?.hireRelat
   const actionFn = buttonActions[actionKey]
   actionFn && actionFn(props, {
@@ -93,14 +87,5 @@ const buttonAction = async (...arg) => {
     rootForm,
     routeQuery
   }, appContext)
-
-  executeEventOrchestration({
-    props, axiosInstance: _axiosInstance?.value, rootValue, confirmInstance: confirmInstance?.value,
-    dynamicMapComp,
-    openChildDialog: openChildDialogInstance?.value,
-    messageInstance: messageInstance?.value,
-    messageCb, lang: lang?.value,
-    appContext
-  })
 }
 </script>

package/src/hooks/pageConfig.js

@@ -55,6 +55,12 @@ export function useBuildInData(messageTipInstance, loadingInstance) {
         cb(pageConfig.value)
         getSelects(ret.data.result?.pmBusinessIdentityVO?.tenantId)
         return
+      } else {
+        if (loadingInstance.finish && typeof loadingInstance.finish === 'function') {
+          loadingInstance.finish()
+        } else if (loadingInstance.hide && typeof loadingInstance.hide === 'function') {
+          loadingInstance.hide()
+        }
       }
     }).catch(() => {
       if (loadingInstance.finish && typeof loadingInstance.finish === 'function') {
@@ -72,6 +78,12 @@ export function useBuildInData(messageTipInstance, loadingInstance) {
       if (resultToast(ret.data, messageTipInstance, { noSuccessIip: true })) {
         selects.value = JSON.parse(ret.data.result || '{}')
         return
+      } else {
+        if (loadingInstance.finish && typeof loadingInstance.finish === 'function') {
+          loadingInstance.finish()
+        } else if (loadingInstance.hide && typeof loadingInstance.hide === 'function') {
+          loadingInstance.hide()
+        }
       }
     }).finally(() => {
       if (loadingInstance.finish && typeof loadingInstance.finish === 'function') {

package/src/utils/const.js

@@ -22,7 +22,18 @@ export const NOT_NEED_FORM_ITEM_META_TYPE = [
   'ElButton',
   'CustomComponentTable',
   'CustomComponentRow',
-  'CustomComponentCol'
+  'CustomComponentCol',
+
+  'CustomComponentCardH5',
+  'CustomComponentCollapseH5',
+  'CustomComponentTabsH5',
+  'CustomComponentTabPaneH5',
+  'CustomComponentTableH5',
+  'cmi-cell',
+  'cmi-button',
+  'cmi-link',
+  'cmi-dropdown-menu',
+  'cmi-divider'
 ]
 export const NOT_NEED_COL_ITEM_META_TYPE = ['CustomComponentTabPane', 'CustomComponentDialog', 'CustomComponentCol', 'CustomComponentTabPaneH5']
 export const MULTI_PAGE_META_LIST_TYPES = ['CustomComponentTable']
@@ -134,7 +145,19 @@ export const commonPropsType = {
     getValue(config, props, modelValue, selects) {
       const referenceOptions = config.referenceOptions
       const selectKey = config.selectKey
-      const options = (selects?.value && selects?.value?.[selectKey]) || (selects?.value && selects?.value?.[`${config.metaCode}ListValue`]) || (selects?.value && selects?.value?.[referenceOptions]) || []
+      let optionItemsList = []
+      try {
+        optionItemsList = JSON.parse(config?.optionItems || '[]').map(item => {
+          return {
+            columnValue: item.value,
+            columnDesc_zh: item.label,
+            columnDesc: item.label_en || item.label,
+          }
+        })
+      } 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
     }
   }

package/src/utils/render.jsx

@@ -5,6 +5,7 @@ import CustomComponentColH5 from '../components/packages-H5/CustomComponentColH5
 import {
   commonPropsType,
   FORM_META_TYPE,
+  FORM_META_TYPE_H5,
   NOT_NEED_FORM_ITEM_META_TYPE,
   SPECIAL_SET_FULL_WIDTH_ITEM_META_TYPE,
   NOT_NEED_COL_ITEM_META_TYPE,
@@ -19,7 +20,6 @@ import {
   META_TYPE_MAP,
   H5_REPLACE_PREFIX_FLAG,
   H5_PREFIX_FLAG,
-  FORM_META_TYPE_H5
 } from './const.js'
 import { preserveCheck } from './preserveFunc.js'
 import { isArray, isFunction, isString } from './is.js'
@@ -166,9 +166,12 @@ export function normalConfig({
   }
   
   let extendAttrObj = parseExtendAttr(config)
+  if (metaType == 'cmi-card') {
+    debugger
+  }
   let extendObj = {
     removeCol: findComponent(NOT_NEED_COL_ITEM_META_TYPE, extendAttrObj.renderby) !== -1 || findComponent(NOT_NEED_COL_ITEM_META_TYPE, metaType) !== -1,
-    needformItem: (findComponent(NOT_NEED_FORM_ITEM_META_TYPE, extendAttrObj.renderby) !== -1 || findComponent(NOT_NEED_FORM_ITEM_META_TYPE, metaType) !== -1) ? false : needformItem, // 表示这个配置项对应的渲染组件是否需要formItem进行包装
+    needformItem: (findComponent(NOT_NEED_FORM_ITEM_META_TYPE, extendAttrObj.renderby) !== -1 || findComponent(NOT_NEED_FORM_ITEM_META_TYPE, metaType) !== -1) ? false : needformItem, // 表示这个配置项对应的渲染组件是否需要formItem进行包装 移动端是cmi-form-item
   }
   if (config.defStyle) {
     extendObj.style = parseDefStyle(config.defStyle)
@@ -188,7 +191,7 @@ export function normalConfig({
         axiosInstance,
         messageInstance ,
         messageCb
-      }, metaItem, hireRelat, mapComp, needformItem || [FORM_META_TYPE].includes(metaType))
+      }, metaItem, hireRelat, mapComp, needformItem || [FORM_META_TYPE, FORM_META_TYPE_H5].includes(metaType))
       return pageConfig
     })?.sort((a, b) => a.seqNo - b.seqNo)
   }
@@ -465,7 +468,9 @@ export function generateLayoutPolyfill(config, disabled, isH5) {
     if (config.removeCol) {
       return node
     }
-    let ret = <colComp {...props}>{node}</colComp>
+    let ret = <colComp {...props}>
+      {node}
+    </colComp>
     if (config.isAllRow) {
       ret = <colComp span={24}>{ret}</colComp>
     }