resolver-egretimp-plus 0.0.257 → 0.0.259

package/package.json

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

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

@@ -20,7 +20,7 @@ const props = defineProps({
   loadingcolor: String,
 })
 const calcPorps = computed(() => {
-  return ['displayType', 'widgetSize', 'plain', 'color', 'loading', 'loadtype', 'loadingcolor'].reduce((ret, key) => {
+  return ['displayType', 'widgetSize', 'plain', 'color', 'loading', 'loadtype', 'loadingcolor', 'disabled'].reduce((ret, key) => {
     if (['plain', 'loading', 'loadtype'].includes(key)) {
       ret[key] = props[key] === '1' ? true : false
     } else if (key === 'displayType') {

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

@@ -117,10 +117,24 @@ watch(() => {
   immediate: true
 })
 
+const inputProps = computed(() => {
+  return {
+    placeholder: lang?.value?.indexOf('zh') > -1 ? props.config?.defPlacehold : props.config?.defPlaceholdEn,
+    disabled: props.disabled
+  }
+})
+
+const onFocus = (e) => {
+  open.value = true
+  e.preventDefault()
+  e.stopPropagation()
+  e.target.blur()
+}
+
 </script>
 
 <template>
-  <cmi-input v-if="!calcProps.tiled" :value="valueDesc" suffixIcon @focus="open = true">
+  <cmi-input v-if="!calcProps.tiled" :value="valueDesc" 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/components/packages-H5/CmiDatetimePicker.vue

@@ -64,10 +64,24 @@ const onConfirm = (e) => {
   open.value = false
 }
 
+const inputProps = computed(() => {
+  return {
+    placeholder: lang?.value?.indexOf('zh') > -1 ? props.config?.defPlacehold : props.config?.defPlaceholdEn,
+    disabled: props.disabled
+  }
+})
+
+const onFocus = (e) => {
+  open.value = true
+  e.preventDefault()
+  e.stopPropagation()
+  e.target.blur()
+}
+
 </script>
 
 <template>
-  <cmi-input :value="formatValue" suffixIcon @focus="open = true">
+  <cmi-input :value="formatValue" 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/components/packages-H5/CmiDropdownMenu.vue

@@ -32,6 +32,7 @@ const getItemValue = (idx) => {
 const getDropdownItemProps = (config, idx) => {
   return {
     value: getItemValue(idx),
+    disabled: props.disabled,
     title: config?.label,
     activetype: props.config?.activetype,
     options: ((selects?.value && selects?.value?.[config?.selectKey]) || []).map(option => {

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

@@ -105,7 +105,8 @@ const modelvalDesc = computed(() => {
 
 const inputProps = computed(() => {
   return {
-    placeholder: lang?.value?.indexOf('zh') > -1 ? props.config?.defPlacehold : props.config?.defPlaceholdEn
+    placeholder: lang?.value?.indexOf('zh') > -1 ? props.config?.defPlacehold : props.config?.defPlaceholdEn,
+    disabled: props.disabled
   }
 })
 

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

@@ -22,7 +22,7 @@ const onChange = (e) => {
   <cmi-radio-group :value="modelValue" v-bind="{ ...attrs, ...calcProps}" @change="onChange">
     <cmi-radio 
       v-for="option in props.options" :key="option.columnValue"
-      :disabled="option.columnStatus == '0' || option.columnStatus == '2'"
+      :disabled="props.disabled || option.columnStatus == '0' || option.columnStatus == '2'"
       :name="option.columnValue" :label="lang.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc"
     />
   </cmi-radio-group>

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

@@ -1,12 +1,11 @@
 <template>
-  <ElText v-bind="{...attrs, ...elRowProps,}" @click="clickAction" >
-    {{ labelDesc }}
-  </ElText>
+  <renderNode></renderNode>
 </template>
 <script setup>
 import { ElText } from 'element-plus'
 import { computed, defineProps, inject, getCurrentInstance, useAttrs } from 'vue'
 import { commonPropsType } from '../../utils/index.js'
+import { h } from 'vue'
 
 const lang = inject('lang')
 const modelValue = defineModel()
@@ -14,7 +13,11 @@ const appContext = getCurrentInstance()?.appContext
 const props = defineProps({
   ...commonPropsType,
   ...ElText.props,
-  fontSize: [String, Number]
+  fontSize: [String, Number],
+  needWrap: {
+    type: [String, Number],
+    default: '0'
+  },
 })
 const attrs = useAttrs()
 
@@ -38,6 +41,23 @@ const buttonActions = inject('buttonActions', {})
 const labelDesc = computed(() => {
   return normalVal.value
 })
+const renderNode = computed(() => {
+  const textNode = h(ElText, {
+    ...attrs,
+    ...elRowProps.value,
+    onClick: () => {
+      clickAction()
+    }
+  }, labelDesc.value)
+  if (props.needWrap == '1') {
+    return h('div', {
+      class: 'cust-input-wrap',
+    }, [textNode])
+  } else {
+    return textNode
+  }
+})
+
 const dynamicMapComp = inject('dynamicMapComp')
 const hireRelatMapRules = inject('hireRelatMapRules')
 const components = inject('components')
@@ -61,3 +81,19 @@ const clickAction = (e) => {
   }, appContext)
 }
 </script>
+<style lang="scss" scoped>
+.cust-input-wrap {
+  display: flex;
+  width: 100%;
+  align-items: center;
+  justify-content: space-between;
+  min-height: 32px;
+  line-height: 24px;
+  padding: 1px 11px;
+  box-sizing: border-box;
+  border-radius: var(--el-input-border-radius, var(--el-border-radius-base));
+  box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
+  background: var(--el-disabled-bg-color);
+  cursor: 'not-allowed';
+}
+</style>

package/src/resolver-common.vue

@@ -54,17 +54,17 @@ getPageConfig({
   },
   selectsCb: (selects) => {
     // 配置数据加载完成事件 'loadedConfigCompeted'
-    attrs?.onLoadedSelectsCompeted?.(selects)
+    Object.keys(selects || {}).forEach(key => {
+      props.selects[key] = selects[key]
+    })
+    attrs?.onLoadedSelectsCompeted?.(props.selects)
   },
   selectPolyReq: {
     ...(props.builtPolyfillReq || {}),
   }
 })
 const allSelects = computed(() => {
-  return {
-    ...props.selects,
-    ...selects.value
-  }
+  return props.selects
 })
 
 const resolverRef = ref(null)

package/src/utils/const.js

@@ -37,7 +37,7 @@ export const NOT_NEED_FORM_ITEM_META_TYPE = [
   'cmi-divider'
 ]
 export const EXECTE_CLICK_EVENT_COMPONENTS = ['ElInput', 'ElButton', 'CmiInput', 'CmiButton']
-export const TRANS_CELL_COMPONETS = ['CmiInput', 'CmiSelect']
+export const TRANS_CELL_COMPONETS = ['CmiInput', 'CmiSelect', 'CmiPicker']
 export const NOT_NEED_COL_ITEM_META_TYPE = ['CustomComponentTabPane', 'CustomComponentDialog', 'CustomComponentCol', 'CustomComponentTabPaneH5']
 export const MULTI_PAGE_META_LIST_TYPES = ['CustomComponentTable']
 export const SPECIAL_SET_FULL_WIDTH_ITEM_META_TYPE = ['el-select', 'el-date-picker', 'el-time-picker', 'el-time-select', 'el-cascader', 'el-input-number', 'CustomComponentTree', 'CustomComponentSteps']

package/src/utils/render.jsx

@@ -981,7 +981,7 @@ function isTransCellMobile(config, disabled) {
 }
 
 function isHidden({config}) {
-  return (typeof config.hidden === 'boolean' && config.hidden) || config.hidden === '1' || config.collapseHidden == '1'
+  return (typeof config.hidden === 'boolean' && config.hidden) || config.hidden == '1' || config.collapseHidden == '1'
 }
 // 如果父级有一个是hidden了，那就表示hidden了
 function isChainHidden({config}) {