resolver-egretimp-plus 0.0.244 → 0.0.246

package/package.json

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

package/src/analysisComponent.jsx

@@ -73,6 +73,8 @@ export default {
     const validate = inject('_validate')
 
     const selects = inject('selects')
+    const _parentRootValue = inject('_parentRootValue')
+    const _parentDynamicMapComp = inject('_parentDynamicMapComp')
 
     definePrivatelyProp(props.config, '_rootValue', rootValue)
     definePrivatelyProp(props.config, 'router', router)
@@ -80,6 +82,8 @@ export default {
     definePrivatelyProp(props.config, '_validate', validate)
     definePrivatelyProp(props.config, '_rowScope', props.rowScope)
     definePrivatelyProp(props.config, '_selects', selects)
+    definePrivatelyProp(props.config, '_parentRootValue', _parentRootValue)
+    definePrivatelyProp(props.config, '_parentDynamicMapComp', _parentDynamicMapComp)
     // 当前组件的实例
     const instance = getCurrentInstance()
     const appContext = instance?.appContext

package/src/components/childDialog/src/index.vue

@@ -52,7 +52,10 @@ const props = defineProps({
     type: Object,
     default: () => ({})
   },
-  
+  parentSelects: {
+    type: Object,
+    default: () => ({})
+  },
   selectionsObj: {
     type: Object,
     // selections
@@ -94,9 +97,6 @@ const dialogProps = computed(() => {
   if (props.dialogProps?.titleEn && props.lang?.indexOf('zh') == -1) {
     ret.title = props.dialogProps?.titleEn
   }
-  if (!ret.title) {
-    ret['headerClass'] = ret['headerClass'] ? `${ret['headerClass']} hidden-head` : 'hidden-head'
-  }
   return ret
 })
 
@@ -129,6 +129,9 @@ defineExpose({
       v-bind="dialogProps"
       :width="dialogWidth"
       v-model="dialogVisible"
+      :class="{
+        'hidden-head': !dialogProps.title
+      }"
       :style="dialogStyle"
     >
       <div>
@@ -142,6 +145,7 @@ defineExpose({
         :selectionsObj="props.selectionsObj"
         :busiIdentityId="busiIdentityId"
         :lang="props.lang"
+        :selects="parentSelects"
         :buttonActions="props.buttonActions"
         :dialogReq="props.loadEvnetsReq"
         :polyfillConfigs="props.polyfillConfigs"
@@ -168,7 +172,7 @@ defineExpose({
   .el-dialog__header {
     min-height: 40px;
   }
-  .hidden-head {
+  &.hidden-head {
     & > .el-dialog__header {
       display: none;
     }

package/src/components/helper/eventOrchestration.js

@@ -493,6 +493,7 @@ export function openDailg({
       loadEvnetsReq: reqData,
       initData: reqData,
       components,
+      parentSelects: compConfig?._selects,
       polyfillConfigs: {
         ...initPolyfillConfigs,
         ...(polyfillConfigs || {})

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

@@ -103,10 +103,16 @@ const modelvalDesc = computed(() => {
   }, '')
 })
 
+const inputProps = computed(() => {
+  return {
+    placeholder: lang?.value?.indexOf('zh') > -1 ? props.config?.defPlacehold : props.config?.defPlaceholdEn
+  }
+})
+
 </script>
 
 <template>
-  <cmi-input :value="modelvalDesc" suffixIcon @focus="onFocus">
+  <cmi-input :value="modelvalDesc" suffixIcon @focus="onFocus" v-bind="{...attrs, ...inputProps}" >
     <div slot="suffix-icon" v-if="suffixIcon">
       <component :is="`cmi-icon-${suffixIcon}`" color="#4E5969"></component>
     </div>

package/src/utils/render.jsx

@@ -781,7 +781,7 @@ function getFormItemRule(config, lang, params) {
       const val = config?.refValue
       const message = lang.indexOf('zh') > -1 ? `${config.metaNameZh}不能为空` : `${config.metaNameEn} can not be empty`
       if (!onlyRequiredFlag && required) {
-        if (val === '' || val === null || val === undefined || !val.length) {
+        if (val === '' || val === null || val === undefined || (Array.isArray(val) && !val.length)) {
           callback(new Error(message))
         } else {
           // isMatch在下来框的时候，表示当前值没有在下拉选项中匹配到，就表示没有选中值；因为后端在表字段为数字类型的时候，默认返回的是0值