resolver-egretimp-plus 0.0.236 → 0.0.238

package/package.json

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

package/src/components/packages-web/CustomComponentTable.jsx

@@ -14,7 +14,15 @@ export default {
     ...ElTable.props,
     ...ElPagination.props
   },
-  setup(props, { expose, attrs }) {
+  setup(props, { expose, attrs, emit }) {
+    const modelValue = computed({
+      get() {
+        return props.modelValue
+      },
+      set(val) {
+        emit('update:modelValue', val)
+      }
+    })
     const tableProps = computed(() => {
       const porpsObj =  Object.keys(ElTable.props).reduce((ret, key) => {
         if (props[key] !== undefined && props[key] !== null) {
@@ -91,13 +99,13 @@ export default {
       return props.config?.frontPageFlag == '1'
     })
     const normalPageTotal = computed(() => {
-      return !isFrontPage.value ? page.total : ((props.refValue.value || [])?.length || 0)
+      return !isFrontPage.value ? page.total : ((modelValue.value || [])?.length || 0)
     })
 
     const normalTableData = computed(() => {
       return !isFrontPage.value ?
-        (props.refValue.value || []) :
-        (props.refValue.value || []).slice((page.pageNum - 1) * page.pageSize, page.pageNum * page.pageSize)
+        (modelValue.value || []) :
+        (modelValue.value || []).slice((page.pageNum - 1) * page.pageSize, page.pageNum * page.pageSize)
     })
 
     /** 自定义排序逻辑 ===start==== */
@@ -236,10 +244,10 @@ export default {
       return tableData.value?.[idx]
     }
     const onUpdateModelValue = (val, idx) => {
-      if (!props.refValue.value) {
-        props.refValue.value = []
+      if (!modelValue.value) {
+        modelValue.value = []
       }
-      props.refValue.value[idx] = val
+      modelValue.value[idx] = val
     }
 
     const multiPmPageMetaList = computed(() => {
@@ -409,10 +417,10 @@ export default {
       if (ret) {
         if (isPromise(ret)) {
           ret.then((res) => {
-            res && (props.refValue.value = res)
+            res && (modelValue.value = res)
           })
         } else {
-          props.refValue.value = ret
+          modelValue.value = ret
         }
       }
     })
@@ -423,10 +431,10 @@ export default {
       if (ret) {
         if (isPromise(ret)) {
           ret.then((res) => {
-            res && (props.refValue.value = res)
+            res && (modelValue.value = res)
           })
         } else {
-          props.refValue.value = ret
+          modelValue.value = ret
         }
       }
     })

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
     }

package/src/hooks/index.js

@@ -90,7 +90,11 @@ export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
           // 这边的值没有变,就不用出触发下面的其他动作了
           return
         }
-        props.modelValue[metaCode] = val
+        try {
+          props.modelValue[metaCode] = val
+        } catch (error) {
+          console.log('config', config, metaCode)
+        }
       }
       if (config) {
         setTimeout(() => {

package/src/utils/common.js

@@ -476,7 +476,10 @@ export function createEmptyCopy(source, cache = new WeakMap()) {
     copy = {};
     cache.set(source, copy);
     for (const key of Object.keys(source)) {
-      copy[key] = createEmptyCopy(source[key], cache);
+      const val = createEmptyCopy(source[key], cache)
+      if ( val !== null && val !== undefined) {
+        copy[key] = val
+      }
     }
   }
 

package/src/utils/const.js

@@ -107,7 +107,7 @@ export const commonPropsType = {
   },
   // 组件是否展示必填标识
   onlyRequiredFlag: {
-    type: Boolean,
+    type: [Boolean, String, Number],
     default: false,
     getValue(config, props, modelValue) {
       return config.onlyRequiredFlag

package/src/utils/defaultVal.js

@@ -22,9 +22,10 @@ export default function defaultVal(config) {
           defaultVal = configDefaultVal
         }
       }
+      console.log(`${config.dynamicHireRelat},${config.hireRelat} to set defaultValue, ${defaultVal}`)
+      config.refValue = defaultVal
     } catch (error) {
-      console.log('set default val fail, config', config)
+      console.log('set default val fail, config', config, error)
     }
-    config.refValue = defaultVal
   }
 }