resolver-egretimp-plus 0.1.2 → 0.1.4

package/package.json

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

package/src/analysisComponent.jsx

@@ -71,11 +71,13 @@ export default {
     const builtPolyfillReq = inject('_builtPolyfillReq')
     const rootValue = inject('rootValue')
     const validate = inject('_validate')
+    const lang = inject('lang')
 
     const selects = inject('selects')
     const _parentRootValue = inject('_parentRootValue')
     const _parentDynamicMapComp = inject('_parentDynamicMapComp')
 
+    definePrivatelyProp(props.config, '_lang', lang)
     definePrivatelyProp(props.config, '_rootValue', rootValue)
     definePrivatelyProp(props.config, 'router', router)
     definePrivatelyProp(props.config, 'route', route)
@@ -234,7 +236,6 @@ export default {
     provide('parent', props.config)
 
     const _isH5 = inject('_isH5')
-    const lang = inject('lang')
     const onClick = (e, params) => {
       const context = {
         props,

package/src/components/helper/eventOrchestration.js

@@ -25,7 +25,7 @@ function assignmentPathVal(obj = {}, path, val) {
   let currentObj = obj
   paths.forEach((item, idx) => {
     if (idx + 1 === paths.length) {
-      currentObj[item] = val
+      currentObj[item] = val ?? ''
     } else {
       if (!currentObj[item]) {
         currentObj[item] = {}
@@ -85,7 +85,7 @@ export async function dispatchClickEvent(service, {
   }
 
   if (service.transactionType == '1') {
-    reqData = getReqData(service.inParamMappingList || [], {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat})
+    reqData = getReqData(service.inParamMappingList || [], {emptyUpdate: true, dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat})
     tableConfig = getTableConfig(service.outParamMappingList, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat })
     if (tableConfig?.vm) {
       if (!isUndefined(tableConfig.vm.page?.pageNum) && !isNull(tableConfig.vm.page?.pageNum) ) {
@@ -102,7 +102,8 @@ export async function dispatchClickEvent(service, {
   }
   const url = service.serviceCode
   const httpMethod = service.httpMethod || "post"
-  const reqResult = {
+
+  let reqResult = {
     aid_language: lang,
     requestTraceId,
     pmHandleBusinessIdentity: {
@@ -111,6 +112,15 @@ export async function dispatchClickEvent(service, {
       tenantId: service.tenantId,
       mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
     },
+    
+  }
+  const notDefaultParmas = serviceCustomProps?.notDefaultParmas
+  if (notDefaultParmas) {
+    reqResult = {
+    }
+  }
+  reqResult = {
+    ...reqResult,
     ...reqData
   }
 
@@ -177,7 +187,7 @@ export async function dispatchClickEvent(service, {
   }
 }
 
-function getReqData(inParamMappingList = [], {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat}) {
+function getReqData(inParamMappingList = [], {emptyUpdate, dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat}) {
   return inParamMappingList.reduce((ret, params) => {
     const { orignParam = '', destParam = '' } = params
     const configCodes = getRelateConfigKeys(dynamicMapCompKeys, orignParam, dynamicHireRelat)
@@ -187,8 +197,18 @@ function getReqData(inParamMappingList = [], {dynamicMapComp, dynamicMapCompKeys
     const configCode = configCodes[0]
     if (
       configCode &&
-      !isUndefined(dynamicMapComp[configCode]?.refValue) &&
-      !isNull(dynamicMapComp[configCode]?.refValue)
+      (
+        (
+          (
+            isUndefined(dynamicMapComp[configCode]?.refValue) ||
+            isNull(dynamicMapComp[configCode]?.refValue)
+          ) && emptyUpdate
+        ) ||
+        (
+          !isUndefined(dynamicMapComp[configCode]?.refValue) &&
+          !isNull(dynamicMapComp[configCode]?.refValue)
+        )
+      )
     ) {
       let destParamArr
       if (destParam?.indexOf('->') !== -1) {
@@ -196,7 +216,7 @@ function getReqData(inParamMappingList = [], {dynamicMapComp, dynamicMapCompKeys
       } else {
         destParamArr = destParam?.split('.') || []
       }
-      assignmentPathVal(ret, destParamArr, dynamicMapComp[configCode]?.refValue)
+      assignmentPathVal(ret, destParamArr, dynamicMapComp?.[configCode]?.refValue)
     }
     return ret
   }, {})

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

@@ -47,7 +47,13 @@ const reserveBottomMargin = computed(() => {
 })
 </script>
 <style lang="scss">
+.el-form-item__content {
+  & > .custom-component-row {
+    width: 100%;
+  }
+}
 .custom-component-row {
+  max-width: 100%;
   .el-col {
     & > .el-form-item {
     }

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

@@ -1,6 +1,6 @@
 import { ElSelect, ElOption } from 'element-plus'
-import { computed, inject} from 'vue'
-import { commonPropsType } from '../../utils/index.js'
+import { computed, inject, onMounted, watch} from 'vue'
+import { commonPropsType, isString } from '../../utils/index.js'
 
 export default {
   inheritAttrs: false,
@@ -28,7 +28,26 @@ export default {
     // 这个是真实的值
     const modelValue = computed({
       get() {
-        return props.modelValue
+        let val = props.modelValue
+        if (isStrVal.value || !isMutiple.value) {
+          if (!isString(val)) {
+            try {
+              val = Object.values(val).join(props.separator)
+              emit('update:modelValue', val)
+            } catch (error) {
+              val = val
+            }
+          }
+        } else {
+          if (val && isString(val)) {
+            val = val?.split(props.separator)
+            if (isObject.value) {
+              val = val?.reduce((ret, item, idx) => {ret[idx] = item; return ret;}, {})
+            }
+            emit('update:modelValue', val)
+          }
+        }
+        return val
       },
       set(val) {
         emit('update:modelValue', val)
@@ -150,7 +169,6 @@ export default {
         })
       }
     }
-
     return () => {
       return (
         <ElSelect class="custom-self-select" { ...{...attrs, ...selectProps.value }} v-model={value.value} onClear={clear}>

package/src/rules/eventsSupplement.js

@@ -50,11 +50,48 @@ const eventsMap = {
   14: 'setNoDisableNotEffect',
   16: 'setProps'
 }
+function replaceDefValue(str, {config, dynamicMapComp}) {
+  return str?.replace(/\$\{([^}]+)\}/g, (a, val, c) => {
+    let routeMatchs = null
+    const _absoluteTarget = /^_absoluteTarget:(.+)$/
+    const matchs = val?.match?.(_absoluteTarget)
+    if (val === ARG_FLAGS.REF_VAL) {
+      val = config?.bindValue ?? ''
+    } else if(val === ARG_FLAGS.CURRENT_DATE) {
+      val = formatDate(new Date(), 'yyyy-MM-dd')
+    } else if (routeMatchs = val.match(/^_route:(.*)$/)) {
+      const queryKey = routeMatchs[1]
+      const routeQuery = config?.route?.query
+      val = routeQuery?.[queryKey]
+    } else if ( typeof val === 'string' && (/^_lang$/.test(val))) {
+      val = config?._lang
+    } else if (matchs?.[1]) {
+      const targetConfig = dynamicMapComp?.[matchs[1]]
+      val = targetConfig?.bindValue || ''
+    } else {
+      const _assginKey = /^_assgin:(.*)$/
+      const matchs = val?.match?.(_assginKey)
+      if (matchs) {
+        val = matchs?.[1]
+      } else {
+        val = ''
+      }
+    }
+    return val
+  })
+}
 const allInitEvents = {
   setDefaultValue(event, isInit, tabpanelCode) {
-    const { targetObj: target, targetObjVal } = event
+    let { targetObj: target, targetObjVal } = event
     if (!target) return
+    const { config } = this
+    const { dynamicMapComp } = this
     const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
+    const isReplace = /^_replace:/.test(targetObjVal)
+    if (isReplace) {
+      targetObjVal = replaceDefValue(targetObjVal?.replace(/^_replace:/, ''), {config, dynamicMapComp})
+      
+    }
     let val = ''
     try {
       val = JSON.parse(targetObjVal)
@@ -64,8 +101,10 @@ const allInitEvents = {
     if (typeof val === 'number') {
       val = `${val}`
     }
-    if (val === ARG_FLAGS.REF_VAL) {
-      const { config } = this
+    
+    if (isReplace) {
+      val = val
+    } else if (val === ARG_FLAGS.REF_VAL) {
       val = config?.bindValue ?? ''
     } else if(val === ARG_FLAGS.CURRENT_DATE) {
       val = formatDate(new Date(), 'yyyy-MM-dd')
@@ -74,12 +113,12 @@ const allInitEvents = {
       const _absoluteTarget = /^_absoluteTarget:(.+)$/
       const matchs = val?.match?.(_absoluteTarget)
       if ( typeof val === 'string' && (routeMatchs = val.match(/^_route:(.*)$/))) {
-        const { config } = this
         const queryKey = routeMatchs[1]
         const routeQuery = config?.route?.query
         val = routeQuery?.[queryKey]
+      } else if ( typeof val === 'string' && (/^_lang$/.test(val))) {
+        val = config?._lang
       } else if (typeof val === 'string' && matchs?.[1]) {
-        const { dynamicMapComp } = this
         const targetConfig = dynamicMapComp?.[matchs[1]]
         val = targetConfig?.bindValue || ''
       } else {
@@ -87,7 +126,7 @@ const allInitEvents = {
         const matchs = val?.match?.(_assginKey)
         if (matchs) {
           val = matchs?.[1]
-        } else {
+        } else  {
           const curVal = getConfigValue.call(this, targetObj, true)
           if (curVal || curVal == '0') {
             val = curVal
@@ -95,6 +134,7 @@ const allInitEvents = {
         }
       }
     }
+    
     setFormVal.call(this, targetObj, val)
   },
   setClear(event, isInit, tabpanelCode) {

package/src/utils/defaultVal.js

@@ -11,6 +11,8 @@ export default function defaultVal(config) {
         const queryKey = routeMatchs[1]
         const routeQuery = config?.route?.query
         defaultVal = routeQuery?.[queryKey]
+      } else if ( typeof configDefaultVal === 'string' && (/^_lang$/.test(configDefaultVal))) {
+        defaultVal = config?._lang
       } else if (/^{[\w\W]*}$/.test(configDefaultVal) || /^\[[\w\W]*\]$/.test(configDefaultVal)) {
         defaultVal = JSON.parse(configDefaultVal)
       } else {