resolver-egretimp-plus 0.1.101 → 0.1.103

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.1.101",
+  "version": "0.1.103",
   "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, watch } from 'vue'
-import { commonPropsType, definePrivatelyProp, EXECTE_CLICK_EVENT_COMPONENTS, findComponent, getComponentPropsKeys, getComponentSolt, hasOwn, isPlainObject } from './utils/index.js'
+import { COFNGI_KEY_EVENT_FLAG, commonPropsType, definePrivatelyProp, EXECTE_CLICK_EVENT_COMPONENTS, findComponent, getComponentPropsKeys, getComponentSolt, hasOwn, isPlainObject } from './utils/index.js'
 import { useVmodels } from './hooks/index.js'
 import { getRenderComponentProps, generateFormItemPolyfill } from './utils/index.js'
 import rulesDriver from './rules/rulesDriver'
@@ -191,7 +191,14 @@ export default {
       const obj = {}
       fnComponentkeys.value.forEach(key => {
         if (hasOwn(props.config, key)) {
-          obj[key] = props.config[key]
+          const config = props.config
+          if (COFNGI_KEY_EVENT_FLAG.test(key) && typeof config[key] === 'function') {
+            obj[key] = function(...arg) {
+              return config[key](...arg, vm)
+            }
+          } else {
+            obj[key] = config[key]
+          }
         }
       })
       return obj
@@ -303,7 +310,7 @@ export default {
     })
     return () => {
       const componentProps = getFncomponentProps()
-      const compProps = getRenderComponentProps({config: props.config, props, component: props.component, modelValue, selects, lang: lang.value})
+      const compProps = getRenderComponentProps({config: props.config, props, component: props.component, modelValue, selects, lang: lang.value, vm: instance.proxy})
       const compPropsOnClick = compProps?.onClick
       delete compProps.onClick
       const formItemPolyfill = generateFormItemPolyfill(props.config, lang.value, compProps, _isH5?.value, {

package/src/components/helper/eventOrchestration.js

@@ -266,7 +266,7 @@ export function getTableConfig(outParamMappingList = [], { dynamicMapComp, dynam
     const configCode = configCodes[0]
     if (configCode) {
       const compConfig = dynamicMapComp[configCode]
-      if (compConfig.metaType === 'CustomComponentTable') {
+      if (compConfig.metaType === 'CustomComponentTable' || compConfig.metaType === 'CustomComponentTableH5') {
         return compConfig
       }
     }
@@ -312,8 +312,8 @@ export function openDailg({
       orignParam,
     }
   }) || []
-  let mapList = {}
-  let selectionsObj = {}
+  let mapList = {} // 在返回的是list的数据的时候，我们支持返回数据的key跟父页面的编码不一致，所以这里需要做一个映射
+  let selectionsObj = {} // 打开弹框的时候，如果是多选表格数据，这个的作用就是回显已经选择的数据（list数据需要选择主键，也就是primaryKeyFlag）
   
   if (isList ) {
     const primaryKeys = []

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

@@ -114,6 +114,11 @@ watch(() => page.pageNum, (val) => {
       modelValue.value = ret
     }
   }
+  
+  // 以下是配置的点击事件服务所绑定的调用方法 ==== start ======
+  const serviceFn = props.config?.serviceCurrentChange
+  serviceFn?.(val, props, page)
+  // 以下是配置的点击事件服务所绑定的调用方法 ==== end ======
 })
 // 页面大小变动
 watch(() => page.pageSize, (val) => {
@@ -128,6 +133,11 @@ watch(() => page.pageSize, (val) => {
       modelValue.value = ret
     }
   }
+  
+  // 以下是配置的点击事件服务所绑定的调用方法 ==== start ======
+  const serviceFn = props.config?.serviceSizeChange
+  serviceFn?.(val, props, page)
+  // 以下是配置的点击事件服务所绑定的调用方法 ==== end ======
 })
 
 const pmPageMetaList = computed(() => {
@@ -301,6 +311,14 @@ function normalTableRowValue(row) {
   })
   return ret
 }
+
+defineExpose({
+  page,
+  changePage: (val, key) => {
+    page[key || 'pageNum'] = val
+  },
+})
+
 </script>
 <template>
   <div>

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

@@ -104,9 +104,9 @@ const initSelEmployee = async () => {
     const data = modelValue.value ? modelValue.value.split(separator.value) : []
     let deptForUser = {}
     if (props.deptIds || props.excludeDeptIds) {
-      deptForUser.deptIds = isString(deptForUser.deptIds) ? props.deptIds : ''
-      deptForUser.excludeDeptIds = isString(deptForUser.excludeDeptIds) ? props.excludeDeptIds : ''
-      deptForUser.cascade = isBoolean(deptForUser.cascade) ? deptForUser.cascade : !!(deptForUser.cascade)
+      deptForUser.deptIds = isString(props.deptIds) ? props.deptIds : ''
+      deptForUser.excludeDeptIds = isString(props.excludeDeptIds) ? props.excludeDeptIds : ''
+      deptForUser.cascade = isBoolean(props.cascade) ? props.cascade : !!(props.cascade)
     }
     const initParams = {
       el: `#${metaCode.value}`,
@@ -130,7 +130,7 @@ const initSelEmployee = async () => {
     if (props.disabled) {
       initParams.userIds = data
     }
-    console.log('initParams', initParams)
+    console.log(`metaCode:${props?.config?.metaCode},initParams:`, initParams)
     initSelUser(initParams)
     unWatch && unWatch()
   }, {

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

@@ -164,7 +164,6 @@ export default {
             currentVal.value = modelValue.value
           }
           ret['onBlur'] = () => {
-            debugger
             isFocus.value = false
             modelValue.value = parseValue(formatValue(currentVal.value))
           }

package/src/hooks/index.js

@@ -63,7 +63,7 @@ export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
       }
       const modelValue = props.modelValue
       const metaCode = metaCodeKey
-      if (!metaCode) return
+      // if (!metaCode) return
       if (!modelValue) {
         // frameSet 表示的是一帧之内重复设置对应metaCode的值
         // 一帧之内重复设置metaCode的值需要进行merge，也就是下面modelValueDeepMerge走的逻辑
@@ -76,23 +76,35 @@ export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
         nextTick(() => {
           config.parent && (config.parent.frameSet = false)
         })
-        emit('update:modelValue', {
+        let updateValue = {
           [metaCode]: val
-        })
+        }
+        if (!metaCode) {
+          updateValue = val
+        }
+        emit('update:modelValue', updateValue)
       } else {
+        let updateValue = modelValue?.[metaCode]
         if (config?.frameSet) {
-          if (modelValue?.[metaCode]) {
-            if (typeof modelValue[metaCode] === 'object' || typeof val === 'object') {
-              val = modelValueDeepMerge(modelValue[metaCode], val)
+          if (!metaCode) {
+            updateValue = modelValue
+          }
+          if (updateValue) {
+            if (typeof updateValue === 'object' || typeof val === 'object') {
+              val = modelValueDeepMerge(updateValue, val)
             }
           }
         }
-        if (isNonRefType(modelValue[metaCode]) && isNonRefType(val) && modelValue[metaCode] === val) {
+        if (isNonRefType(updateValue) && isNonRefType(val) && updateValue === val) {
           // 这边的值没有变,就不用出触发下面的其他动作了
           return
         }
         try {
-          props.modelValue[metaCode] = val
+          if (!metaCode) {
+            props.modelValue = val
+          } else {
+            props.modelValue[metaCode] = val
+          }
         } catch (error) {
           console.log('config', config, metaCode)
         }

package/src/utils/render.jsx

@@ -37,6 +37,8 @@ import loadModule from './loadModule.js'
 import { h } from 'vue'
 import dayjs from 'dayjs'
 
+export const COFNGI_KEY_EVENT_FLAG = /^on[A-Z]/
+
 // 解析配置中的defStyle属性
 export function parseDefStyle(defStyle) {
   try {
@@ -453,7 +455,7 @@ export function getComponentForConfig({messageInstance, config, disabled, getNat
 }
 
 // 获取渲染组件的props配置数据
-export function getRenderComponentProps({ props, component, modelValue, selects, lang }) {
+export function getRenderComponentProps({ props, component, modelValue, selects, lang, vm }) {
   if (!component) return {}
   let config = props.config
   if (findComponent(['CustomComponentTabs'], config.renderby || config.metaType) !== -1) {
@@ -472,7 +474,13 @@ export function getRenderComponentProps({ props, component, modelValue, selects,
   if (propsKeys) {
     propsKeys.forEach(key => {
       if (hasOwn(config, key)) {
-        defprops[key] = config[key]
+        if (COFNGI_KEY_EVENT_FLAG.test(key) && typeof config[key] === 'function') {
+          defprops[key] = function(...arg) {
+            return config[key](...arg, vm)
+          }
+        } else {
+          defprops[key] = config[key]
+        }
       }
     })
   }
@@ -1025,7 +1033,7 @@ export function getComponentPropsKeys(comp, config) {
   let emitsKyes = []
   if (config) {
     Object.keys(config).forEach(key => {
-      if (/^on[A-Z]/.test(key) && !['onVnodeMounted'].includes(key)) {
+      if (COFNGI_KEY_EVENT_FLAG.test(key) && !['onVnodeMounted'].includes(key)) {
         emitsKyes.push(key)
       }
     })