resolver-egretimp-plus 0.1.8 → 0.1.10

package/package.json

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

package/src/components/helper/eventOrchestration.js

@@ -2,7 +2,7 @@ import { isArray, isHasVal, isNull, isUndefined } from "../../utils/is"
 import { DATA_VALID_RULE_EXECUTE } from "../../api/builtIn"
 import { getRelateConfigKeys } from "../../rules/ruleUtils"
 import { RESULT_CODE, resultToast } from "../../utils/respone"
-import { isPromise, parseExtendAttr, unionWith } from "../../utils/index"
+import { isPromise, modelValueDeepMerge, parseExtendAttr, unionWith } from "../../utils/index"
 import { buildInRequest } from "../../utils/request"
 
 function getPathVal(obj = {}, path) {
@@ -119,10 +119,8 @@ export async function dispatchClickEvent(service, {
     reqResult = {
     }
   }
-  reqResult = {
-    ...reqResult,
-    ...reqData
-  }
+  const mergeObj = modelValueDeepMerge(reqResult, reqData)
+  reqResult = mergeObj
 
   let beforeRequestServiceRet = true
   if (normalBeforeRequestService) {

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

@@ -1,6 +1,6 @@
 import { ElSelect, ElOption } from 'element-plus'
 import { computed, inject, onMounted, watch} from 'vue'
-import { commonPropsType, isArray, isNumber, isPlainObject, isString } from '../../utils/index.js'
+import { commonPropsType, isArray, isNumber, isPlainObject, isString, VALUE_TYPES } from '../../utils/index.js'
 
 export default {
   inheritAttrs: false,
@@ -20,11 +20,6 @@ export default {
   },
   emits: ['update:modelValue'],
   setup(props, { emit, attrs, expose, slots }) {
-    const VALUE_TYPES = {
-      LIST: 'list',
-      OBJECT: 'object',
-      STRING: 'string',
-    }
     // 这个是真实的值
     const modelValue = computed({
       get() {

package/src/rules/ruleUtils.js

@@ -1,5 +1,6 @@
 /* eslint-disable */
 import { hasOwn, isPlainObject } from "../utils"
+import { formatSelectVal } from "../utils/defaultVal"
 import { MULTI_PAGE_META_LIST_TYPES, findComponent } from '../utils/index'
 
 const pmPageMetaListTypeList = ['setShow', 'setHidden']
@@ -45,6 +46,9 @@ export function setFormVal(pathStr, val) {
   const configs = getRelateConfigs.call(this, pathStr, config)
   configs.forEach(cg => {
     if (hasOwn(cg, 'refValue')) {
+      if (cg.metaType === 'ElSelect') {
+        val = formatSelectVal({config, val: val})
+      }
       cg.refValue = val
     } else {
       const { _mapComp } = this

package/src/utils/const.js

@@ -9,6 +9,11 @@ export const ARG_FLAGS = {
   CURRENT_DATE: '_currentDate',
   REF_VAL: '_refVal'
 }
+export const VALUE_TYPES = {
+  LIST: 'list',
+  OBJECT: 'object',
+  STRING: 'string',
+}
 export const NOT_LOG_EFFECT_TYPE = ['CustomComponentTabs', 'CustomComponentTabPane', 'CustomComponentCycleTabPane', 'CustomComponentCollapse', 'CustomComponentTabPaneH5']
 export const FORM_META_TYPE = 'CustomComponentFormLayout'
 export const FORM_META_TYPE_H5 = 'CustomComponentFormLayoutH5'

package/src/utils/defaultVal.js

@@ -1,6 +1,7 @@
 import { toRaw } from 'vue'
-import { formatDate } from './common'
-import { ARG_FLAGS } from './const'
+import { formatDate, isPlainObject } from './common'
+import { ARG_FLAGS, isHidden, VALUE_TYPES } from './const'
+import { isArray, isNumber, isString } from './is'
 
 export default function defaultVal(config) {
   if ((config.defaultVal || config.defaultValue) && !config.bindValue && config.bindValue !== 0) {
@@ -29,10 +30,41 @@ export default function defaultVal(config) {
       } else {
         defaultVal = toRaw(configDefaultVal)
       }
+      if (config.metaType === 'ElSelect') {
+        defaultVal = formatSelectVal({config, val: defaultVal})
+      }
       console.log(`${config.dynamicHireRelat},${config.hireRelat} to set defaultValue, ${defaultVal}`)
       config.refValue = defaultVal
     } catch (error) {
       console.log('set default val fail, config', config, error)
     }
   }
+}
+
+export function formatSelectVal({
+  config,
+  val
+}) {
+  let retValue = val
+  if (!isHidden({config})) {
+    const valueType = config?.valueType
+    const separator = config?.separator
+    if (valueType == VALUE_TYPES.STRING) {
+      if (isPlainObject(val) || isArray(val)) {
+        try {
+          retValue = Object.values(val).join(separator)
+        } catch (error) {
+          retValue = val
+        }
+      }
+    } else {
+      if ((val && isString(val)) || isNumber(val)) {
+        retValue = `${val}`?.split(separator)
+        if (valueType == VALUE_TYPES.OBJECT) {
+          retValue = val?.reduce((ret, item, idx) => {ret[idx] = item; return ret;}, {})
+        }
+      }
+    }
+  }
+  return val
 }