resolver-egretimp-plus 0.0.236 → 0.0.237

package/package.json

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

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

@@ -3,9 +3,11 @@
 </template>
 <script setup>
 import { ElDatePicker } from 'element-plus'
-import { useAttrs, computed } from 'vue'
+import { useAttrs, computed, watch, nextTick } from 'vue'
 import { commonPropsType, formatDate, isDate } from '../../utils/index.js'
+import { useFormItem } from 'element-plus'
 
+const { formItem: elFormItem } = useFormItem()
 const props = defineProps({
   ...ElDatePicker.props,
   ...commonPropsType,
@@ -47,6 +49,11 @@ const value = computed({
     modeValue.value = val
   }
 })
+watch(value, () => {
+  nextTick(() => {
+    elFormItem?.validate?.('blur').catch()
+  })
+})
 
 const disabledDate = (date) => {
   let dateTime = formatDate(date, 'yyyy-MM-dd')

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

@@ -13,6 +13,11 @@ import { ElSelect, ElOption } from 'element-plus'
 import { computed, defineProps, inject, useAttrs } from 'vue'
 import { commonPropsType } from '../../utils/index.js'
 
+const VALUE_TYPES = {
+  LIST: 'list',
+  OBJECT: 'object',
+  STRING: 'string',
+}
 const modelValue = defineModel()
 const props = defineProps({
   ...ElSelect.props,
@@ -31,11 +36,18 @@ const attrs = useAttrs()
 const separator = computed(() => {
   return props.separator
 })
+const valueTypes = computed(() => {
+  return props.config?.valueType
+})
 // 值是list 还是,连起来的string
 const isStrVal = computed(() => {
   // valueType 值为 list 或者 string
-  return props.config?.valueType !== 'list'
+  return valueTypes.value !== VALUE_TYPES.LIST && valueTypes.value !== VALUE_TYPES.OBJECT
 })
+const isObject = computed(() => {
+  return valueTypes.value === VALUE_TYPES.OBJECT
+})
+
 // 是否为多选
 const isMutiple = computed(() => {
   return props.multiple == '1'
@@ -52,7 +64,17 @@ const value = computed({
   get() {
     if (isMutiple.value) {
       const val = modelValue.value || ''
-      return val ? (isStrVal.value ? val.split(separator.value) : val) : []
+      return val ? 
+        (
+          isStrVal.value ?
+            val.split(separator.value) :
+            (
+              isObject.value ?
+                Object.values(val || {}) :
+                val
+            )
+        ) :
+        []
     } else {
       if (modelValue.value !== null && modelValue.value !== undefined) {
         if (options.value?.some(item => item.columnValue == modelValue.value)) {
@@ -69,7 +91,13 @@ const value = computed({
   },
   set(val) {
     if (isMutiple.value) {
-      modelValue.value = isStrVal.value ? val.join(separator.value) : val
+      modelValue.value = isStrVal.value ? 
+        val.join(separator.value) :
+        (
+          isObject.value ?
+            val?.reduce((ret, item, idx) => {ret[idx] = item; return ret;}, {}) :
+            val
+        )
     } else {
       modelValue.value = val
     }