resolver-egretimp-plus 0.0.258 → 0.0.260

package/package.json

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

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

@@ -1,12 +1,12 @@
 <template>
-  <ElText v-bind="{...attrs, ...elRowProps,}" @click="clickAction" >
-    {{ labelDesc }}
-  </ElText>
+  <!-- <ElText v-bind="{...attrs, ...elTextProps}">{{ 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,19 +14,29 @@ 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()
 
 const normalVal = computed(() => {
-  const findItem = props?.options?.find(item => item.columnValue == modelValue.value)
+  let val = (modelValue.value !== null && modelValue.value !== undefined) ? modelValue.value : ''
+  try {
+    val = JSON.stringify(val)
+  } catch (error) {
+    val = ''
+  }
+  const findItem = props?.options?.find(item => item.columnValue == val)
   if (findItem) {
     return lang?.value?.indexOf('zh') > -1 ? findItem.columnDesc_zh : findItem.columnDesc
   }
-  return modelValue.value
+  return val
 })
 
-const elRowProps = computed(() => {
+const elTextProps = computed(() => {
   const result = Object.keys(ElText.props).reduce((ret, key) => {
     ret[key] = props[key]
     return ret
@@ -38,6 +48,23 @@ const buttonActions = inject('buttonActions', {})
 const labelDesc = computed(() => {
   return normalVal.value
 })
+const renderNode = computed(() => {
+  const textNode = h(ElText, {
+    ...attrs,
+    ...elTextProps.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 +88,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)