resolver-egretimp-plus 0.0.47 → 0.0.49

package/package.json

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

package/src/components/cmiFormItem/src/index.vue

@@ -6,8 +6,14 @@ const props = defineProps({
     type: [Object, Function],
     default: () => null
   },
-  config: [Object, Array],
-  lang: String,
+  config: {
+    type: Object,
+    default: () => ({})
+  },
+  lang: {
+    type: String,
+    default: 'zh'
+  },
   labelWidth: [String, Number]
 })
 const attrs = useAttrs()

package/src/components/helper/resolver.js

@@ -1,6 +1,6 @@
 export async function executeLoadServices(services = [], { axiosInstance, messageInstance, reqData, respCb }) {
   const loadServices = services.filter(ser => ser.eventType == '1')
-  // const mixinServiceConfig = services.find(service => service.serviceType === '1')
+  const mixinServiceConfig = services.find(service => service.serviceType === '1')
 
   for (let i = 0; i < loadServices.length; i++) {
     const service = loadServices[i]
@@ -13,7 +13,7 @@ export async function executeLoadServices(services = [], { axiosInstance, messag
           busiIdentityId: service.busiIdentityId,
           pageMetaId: service.pageMetaId,
           tenantId: service.tenantId,
-          // mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
+          mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
         },
         ...(reqData || {})
       }

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

@@ -47,9 +47,9 @@ const selects = inject('selects')
 const rootValue = inject('rootValue')
 const dataLoad = inject('dataLoad')
 const rootForm = inject('rootForm')
+const validate = inject('_validate', () => {})
 const routeQuery= route?.query
 
-
 const buttonAction = (...arg) => {
   attrs?.onClick?.(...arg) // 如果配置中有点击事件
   const actionKey = props.config?.clickActionKey || props.config?.buttonActionKey || props.config?.hireRelat
@@ -62,7 +62,8 @@ const buttonAction = (...arg) => {
     rootValue,
     dataLoad,
     rootForm,
-    routeQuery
+    routeQuery,
+    validate
   }, appContext)
 }
 </script>

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

@@ -5,8 +5,7 @@
 </template>
 <script setup>
 import Renderer from '../../renderer.jsx'
-import { computed, inject } from "vue"
-
+import { computed, inject, onMounted, reactive, ref, watch } from "vue"
 
 const emits = defineEmits(['update:modelValue'])
 const props = defineProps({
@@ -21,13 +20,21 @@ const props = defineProps({
   },
 })
 
+const val = computed({
+  get() {
+    return props.modelValue
+  },
+  set(val) {
+    emits('update:modelValue', val)
+  }
+})
 const rootForm = inject('rootForm')
 const refFn = e => {
   if (props.config?.rootForm) {
     rootForm.value = e
+    rootForm?.value?.setModel?.(val);
   }
 }
-
 const formProps = computed(() => {
   return {
     validatefirst: props.config?.validatefirst == '1' ? true : false,
@@ -41,14 +48,6 @@ const formProps = computed(() => {
 
 const pmPageMetaList = computed(() => props.config.pmPageMetaList)
 
-const val = computed({
-  get() {
-    return props.modelValue
-  },
-  set(val) {
-    emits('update:modelValue', val)
-  }
-})
 defineExpose({
   val
 })

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

@@ -69,6 +69,7 @@ const selects = inject('selects')
 const rootValue = inject('rootValue')
 const dataLoad = inject('dataLoad')
 const rootForm = inject('rootForm')
+const validate = inject('_validate', () => {})
 
 const routeQuery= route?.query
 
@@ -85,7 +86,8 @@ const buttonAction = async (...arg) => {
     rootValue: rootValue?.value,
     dataLoad,
     rootForm,
-    routeQuery
+    routeQuery,
+    validate
   }, appContext)
 }
 </script>

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

@@ -1,7 +1,6 @@
 <template>
-  <ElCheckboxGroup v-model="modeValue" v-if="props.options && props.options.length" v-bind="{...checkboxGroupProps, ...attrs}">
+  <ElCheckboxGroup v-if="isMutiple" v-bind="{...checkboxGroupProps, ...attrs}" v-model="proxyValue" >
     <ElCheckbox 
-      v-bind="{...checkboxProps }"
       v-for="option in props.options"
       :key="option.columnValue"
       :value="option.columnValue"
@@ -9,13 +8,13 @@
       {{lang.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc}}
     </ElCheckbox>
   </ElCheckboxGroup>
-  <ElCheckbox v-else v-bind="{...checkboxProps, ...attrs}" v-model="modeValue">
+  <ElCheckbox v-else v-bind="{...checkboxProps, ...attrs}" v-model="proxyValue">
     {{ label }}
   </ElCheckbox>
 </template>
 <script setup>
 import { ElCheckbox, ElCheckboxGroup } from 'element-plus'
-import { useAttrs, computed, inject } from 'vue'
+import { useAttrs, computed, inject, ref } from 'vue'
 import { commonPropsType, hasOwn } from '../../utils/index.js'
 
 const props = defineProps({
@@ -51,5 +50,27 @@ const checkboxProps = computed(() => {
   return ret
 })
 const attrs = useAttrs()
-const modeValue = defineModel()
+// 是否为多选
+const isMutiple = computed(() => {
+  return props.options && props.options.length
+})
+const modelValue = defineModel()
+
+const proxyValue = computed({
+  get() {
+    if (isMutiple.value) {
+      const val = modelValue.value || ''
+      return val ? val.split(',') : []
+    } else {
+      return modelValue.value
+    }
+  },
+  set(val) {
+    if (isMutiple.value) {
+      modelValue.value = val.join(',')
+    } else {
+      modelValue.value = val
+    }
+  }
+})
 </script>

package/src/index.jsx

@@ -178,7 +178,6 @@ export default {
         }
       )
     })
-    
     provide('_messageCb', props.messageCb)
     provide('_rootStore', rootStore)
     provide('_openChildDialogInstance', toRef(props, 'openChildDialogInstance'))
@@ -208,6 +207,7 @@ export default {
     const validate = (cb) => {
       toValidate(rootForm, cb, dynamicMapComp)
     }
+    provide('_validate', validate)
     expose({
       dynamicMapComp,
       validate,

package/src/resolver-H5.vue

@@ -1,6 +1,6 @@
 <script setup>
 import getNativeComps from './components/patchComponents-H5.js'
-import { useAttrs } from 'vue';
+import { computed, ref, useAttrs } from 'vue';
 import Resolver from './resolver-common.vue'
 import CmiToast from "cmid/lib/toast"
 import CmiFullLoading from "cmid/lib/fullloading"
@@ -36,9 +36,31 @@ defineOptions({
 })
 const attrs = useAttrs()
 
+const resolverRef = ref(null)
+defineExpose({
+  dynamicMapComp: computed({
+    get() {
+      return resolverRef.value?.dynamicMapComp
+    }
+  }),
+  validate(...arg) {
+    return resolverRef.value?.validate(...arg)
+  },
+  pageConfig: computed({
+    get() {
+      return resolverRef.value?.pageConfig
+    }
+  }),
+  rootForm: computed({
+    get() {
+      return resolverRef.value?.rootForm
+    }
+  }),
+})
 </script>
 <template>
   <Resolver
+    ref="resolverRef"
     v-bind="attrs"
     :isH5="true" :getNativeComps="getNativeComps"
     :messageInstance="props.messageInstance"

package/src/resolver-common.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed, useAttrs } from 'vue';
+import { computed, ref, useAttrs } from 'vue';
 import Resolver from './index.jsx'
 import { useBuildInData } from './hooks/pageConfig';
 import { initInterceptors } from './utils/request.js';
@@ -43,7 +43,29 @@ const allSelects = computed(() => {
     ...selects.value
   }
 })
+
+const resolverRef = ref(null)
+defineExpose({
+  dynamicMapComp: computed({
+    get() {
+      return resolverRef.value?.dynamicMapComp
+    }
+  }),
+  validate(...arg) {
+    return resolverRef.value?.validate(...arg)
+  },
+  pageConfig: computed({
+    get() {
+      return resolverRef.value?.pageConfig
+    }
+  }),
+  rootForm: computed({
+    get() {
+      return resolverRef.value?.rootForm
+    }
+  }),
+})
 </script>
 <template>
-  <Resolver v-bind="attrs" :loadingInstance="props.loadingInstance" :messageInstance="props.messageInstance" :getNativeComps="props.getNativeComps" :config="pageConfig || null" :selects="allSelects"></Resolver>
+  <Resolver ref="resolverRef" v-bind="attrs" :loadingInstance="props.loadingInstance" :messageInstance="props.messageInstance" :getNativeComps="props.getNativeComps" :config="pageConfig || null" :selects="allSelects"></Resolver>
 </template>

package/src/resolver-web.vue

@@ -2,7 +2,7 @@
 import getNativeComps from './components/patchComponents-web'
 import { ElMessage, ElMessageBox } from "element-plus"
 import { loadingInstance } from './components/loading'
-import { useAttrs } from 'vue';
+import { computed, ref, useAttrs } from 'vue';
 import Resolver from './resolver-common.vue'
 import { openChildDialog } from './components/childDialog';
 
@@ -35,9 +35,31 @@ defineOptions({
 })
 const attrs = useAttrs()
 
+const resolverRef = ref(null)
+defineExpose({
+  dynamicMapComp: computed({
+    get() {
+      return resolverRef.value?.dynamicMapComp
+    }
+  }),
+  validate(...arg) {
+    return resolverRef.value?.validate(...arg)
+  },
+  pageConfig: computed({
+    get() {
+      return resolverRef.value?.pageConfig
+    }
+  }),
+  rootForm: computed({
+    get() {
+      return resolverRef.value?.rootForm
+    }
+  }),
+})
 </script>
 <template>
   <Resolver
+    ref="resolverRef"
     v-bind="attrs"
     :getNativeComps="getNativeComps"
     :messageInstance="props.messageInstance"

package/src/utils/render.jsx

@@ -337,7 +337,12 @@ export function getComponentForConfig({config, disabled, getNativeComps}) {
   if (renderby && typeof renderby === 'string') {
     let renderbyComp = resolveAssetComponents(allComps, renderby) //则通过传入的获取组件
     if (!renderbyComp) {
-      renderbyComp = resolveComponent(renderby) // 实例上绑定的组件
+      try {
+        renderbyComp = resolveComponent(renderby) // 实例上绑定的组件
+      } catch (error) {
+        console.log('resolveComponent fail, config:', config)
+        renderbyComp = <div>not component</div>
+      }
     }
     component = renderbyComp || component
   }
@@ -614,8 +619,10 @@ export function generateFormItemPolyfill(config, lang, compProps, _isH5, params)
 }
 
 function getFormItemExtendProps(config, lang, params) {
+  const propAttr = config.dynamicHireRelat ? config.dynamicHireRelat?.split('->') : []
+  const prop = propAttr.join('.')
   return {
-    prop: config.dynamicHireRelat,
+    prop,
     rules: getFormItemRule(config, lang, params),
     class: {
       'content-right': config.contentRight,