resolver-egretimp-plus 0.0.110 → 0.0.112

package/package.json

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

package/src/analysisComponent.jsx

@@ -1,5 +1,5 @@
 import { computed, defineAsyncComponent, getCurrentInstance, inject, onBeforeMount, provide, ref } from 'vue'
-import { commonPropsType, definePrivatelyProp, getComponentPropsKeys, hasOwn } from './utils/index.js'
+import { commonPropsType, definePrivatelyProp, EXECTE_CLICK_EVENT_COMPONENTS, findComponent, getComponentPropsKeys, hasOwn } from './utils/index.js'
 import { useVmodels } from './hooks/index.js'
 import { getRenderComponentProps, generateFormItemPolyfill } from './utils/index.js'
 import rulesDriver from './rules/rulesDriver'
@@ -187,7 +187,6 @@ export default {
     const lang = inject('lang')
     const rootValue = inject('rootValue')
     const onClick = (e, { beforeRequestService, afterRequestService } = {}) => {
-      e?.stopPropagation?.()
       const context = {
         props,
         dynamicMapComp,
@@ -201,7 +200,9 @@ export default {
         appContext
       }
       attrs?.onClick?.call(context, e) // 如果配置中有点击事件
-      executeClickEvents({ beforeRequestService, afterRequestService })
+      if (findComponent(EXECTE_CLICK_EVENT_COMPONENTS, props.config?.renderby || props.config?.metaType) !== -1 ) {
+        executeClickEvents({ beforeRequestService, afterRequestService })
+      }
     }
     function executeClickEvents({ beforeRequestService, afterRequestService } = {}) {
       executeEventOrchestration({

package/src/components/helper/eventOrchestration.js

@@ -5,7 +5,19 @@ import { RESULT_CODE, resultToast } from "../../utils/respone"
 import { isPromise, parseExtendAttr, unionWith } from "../../utils/index"
 import { buildInRequest } from "../../utils/request"
 
-function assignmentPatchVal(obj = {}, path, val) {
+function getPathVal(obj = {}, path) {
+  let paths = path
+  if (typeof path === 'string') {
+    paths = path.split('.')
+  }
+  return paths.reduce((ret, key) => {
+    if (ret) {
+      return ret[key]
+    }
+    return null
+  }, obj) || ''
+}
+function assignmentPathVal(obj = {}, path, val) {
   let paths = path
   if (typeof path === 'string') {
     paths = path.split('.')
@@ -39,8 +51,8 @@ export async function dispatchClickEvent(service, { dynamicMapComp, requestTrace
     reqData = getReqData(service.inParamMappingList || [], {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat})
     tableConfig = getTableConfig(service.outParamMappingList, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat })
     if (tableConfig?.vm) {
-      assignmentPatchVal(reqData, service.pageNum || 'pageNum', tableConfig.vm.page?.pageNum)
-      assignmentPatchVal(reqData, service.pageSize || 'pageSize', tableConfig.vm.page?.pageSize)
+      assignmentPathVal(reqData, service.pageNum || 'pageNum', tableConfig.vm.page?.pageNum)
+      assignmentPathVal(reqData, service.pageSize || 'pageSize', tableConfig.vm.page?.pageSize)
     }
     reqData = {
       ...reqData,
@@ -97,7 +109,7 @@ export async function dispatchClickEvent(service, { dynamicMapComp, requestTrace
   // ret.data = {result: {pageTotalCount: 100, result: [{},{},{},{},{}]}}
   initOutParamData(service.outParamMappingList, {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, outResult: ret.data})
   if (tableConfig?.vm) {
-    const total = parseInt(ret.data?.result?.[service.pageTotalCount || 'pageCount'])
+    const total = parseInt(getPathVal(ret.data?.result || {}, service.pageTotalCount || 'pageCount'))
     tableConfig.vm.page.total = total
     // tableConfig.vm?.changePage(total, 'total')
   }
@@ -113,7 +125,7 @@ function getReqData(inParamMappingList = [], {dynamicMapComp, dynamicMapCompKeys
     const configCode = configCodes[0]
     if (configCode) {
       const destParamArr = destParam?.split('.') || []
-      assignmentPatchVal(ret, destParamArr, dynamicMapComp[configCode]?.refValue)
+      assignmentPathVal(ret, destParamArr, dynamicMapComp[configCode]?.refValue)
 
       // let currentObj = ret
       // destParamArr.forEach((item, idx) => {

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

@@ -226,8 +226,8 @@ export default {
     }, (length) => {
       let list = []
       if (length) {
-        const newVal = tableData?.value
-        list = newVal.map((row, idx) => {
+        const newVal = tableData.value
+        list = newVal?.map?.((row, idx) => {
           const columnsCgs = rowColumnConfgsMap.get(row)
           if (columnsCgs) {
             columnsCgs.forEach(config => {

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

@@ -16,7 +16,8 @@ const appContext = getCurrentInstance()?.appContext
 
 const props = defineProps({
   ...commonPropsType,
-  ...ElButton.props
+  ...ElButton.props,
+  plain: [String, Boolean]
 })
 const calcPorps = computed(() => {
   const ret = {

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

@@ -16,7 +16,8 @@ import { commonPropsType } from '../../utils/index.js'
 const modelValue = defineModel()
 const props = defineProps({
   ...ElSelect.props,
-  ...commonPropsType
+  ...commonPropsType,
+  multiple: [String, Boolean]
 })
 const attrs = useAttrs()
 

package/src/utils/const.js

@@ -35,6 +35,7 @@ export const NOT_NEED_FORM_ITEM_META_TYPE = [
   'cmi-dropdown-menu',
   'cmi-divider'
 ]
+export const EXECTE_CLICK_EVENT_COMPONENTS = ['ElInput', 'ElButton', 'CmiInput', 'CmiButton']
 export const TRANS_CELL_COMPONETS = ['CmiInput', 'CmiSelect']
 export const NOT_NEED_COL_ITEM_META_TYPE = ['CustomComponentTabPane', 'CustomComponentDialog', 'CustomComponentCol', 'CustomComponentTabPaneH5']
 export const MULTI_PAGE_META_LIST_TYPES = ['CustomComponentTable']