resolver-egretimp-plus 0.1.4 → 0.1.5

package/package.json

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

package/src/components/helper/calcTooltip.jsx

@@ -6,6 +6,7 @@ export function useToolTip({
   offset,
   displayValue,
   calcFn,
+  config
 }) {
   const isFocus = ref(false) // 是否是焦点状态
   const isEnter = ref(false) // 鼠标是否在内部
@@ -102,7 +103,7 @@ export function useToolTip({
     } = opt || {}
     const nodeComp = defineComponent(node)
     if (maintain && !showTooltip.value) {
-      <nodeComp></nodeComp>
+      return <nodeComp></nodeComp>
     }
     return (
       <div class="resolver-calc-contrainer custom-error-tip-block">

package/src/components/helper/eventOrchestration.js

@@ -195,19 +195,17 @@ function getReqData(inParamMappingList = [], {emptyUpdate, dynamicMapComp, dynam
       console.error('search arg muti', params, configCodes)
     }
     const configCode = configCodes[0]
+    const val = dynamicMapComp?.[configCode]?.refValue
     if (
-      configCode &&
       (
         (
-          (
-            isUndefined(dynamicMapComp[configCode]?.refValue) ||
-            isNull(dynamicMapComp[configCode]?.refValue)
-          ) && emptyUpdate
-        ) ||
-        (
-          !isUndefined(dynamicMapComp[configCode]?.refValue) &&
-          !isNull(dynamicMapComp[configCode]?.refValue)
-        )
+          isUndefined(val) ||
+          isNull(val)
+        ) && emptyUpdate
+      ) ||
+      (
+        !isUndefined(val) &&
+        !isNull(val)
       )
     ) {
       let destParamArr
@@ -216,7 +214,7 @@ function getReqData(inParamMappingList = [], {emptyUpdate, dynamicMapComp, dynam
       } else {
         destParamArr = destParam?.split('.') || []
       }
-      assignmentPathVal(ret, destParamArr, dynamicMapComp?.[configCode]?.refValue)
+      assignmentPathVal(ret, destParamArr, (isUndefined(val) || isNull(val)) ? '' : val)
     }
     return ret
   }, {})

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, isString } from '../../utils/index.js'
+import { commonPropsType, isArray, isNumber, isPlainObject, isString } from '../../utils/index.js'
 
 export default {
   inheritAttrs: false,
@@ -29,22 +29,24 @@ export default {
     const modelValue = computed({
       get() {
         let val = props.modelValue
-        if (isStrVal.value || !isMutiple.value) {
-          if (!isString(val)) {
-            try {
-              val = Object.values(val).join(props.separator)
-              emit('update:modelValue', val)
-            } catch (error) {
-              val = val
+        if (!props.hidden) {
+          if (isStrVal.value) {
+            if (isPlainObject(val) || isArray(val)) {
+              try {
+                val = Object.values(val).join(props.separator)
+                emit('update:modelValue', val)
+              } catch (error) {
+                val = val
+              }
             }
-          }
-        } else {
-          if (val && isString(val)) {
-            val = val?.split(props.separator)
-            if (isObject.value) {
-              val = val?.reduce((ret, item, idx) => {ret[idx] = item; return ret;}, {})
+          } else {
+            if (isString(val) || isNumber(val)) {
+              val =  `${val}`?.split(props.separator)
+              if (isObject.value) {
+                val = val?.reduce((ret, item, idx) => {ret[idx] = item; return ret;}, {})
+              }
+              emit('update:modelValue', val)
             }
-            emit('update:modelValue', val)
           }
         }
         return val

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

@@ -25,7 +25,7 @@ export default {
     // 是否在超出的时候展示tooltip
     showTooltip: {
       type: [String, Number],
-      default: '1'
+      default: '0'
     },
     truncated: {
       type: [String, Number, Boolean],
@@ -98,6 +98,7 @@ export default {
         return offset
       }),
       displayValue: labelDesc,
+      config: props.config,
       calcFn(node) {
         return node?.getBoundingClientRect?.()?.width
       }

package/src/utils/const.js

@@ -104,6 +104,14 @@ export const commonPropsType = {
       return config.requiredFlag == '1'
     }
   },
+  // 组件是否必填
+  hidden: {
+    type: Boolean,
+    default: false,
+    getValue(config, props, modelValue) {
+      return isHidden({config})
+    }
+  },
   // 组件是否展示必填标识
   onlyRequiredFlag: {
     type: [Boolean, String, Number],
@@ -165,6 +173,10 @@ export const commonPropsType = {
   },
 }
 
+export function isHidden({config}) {
+  return (typeof config.hidden === 'boolean' && config.hidden) || config.hidden == '1' || config.collapseHidden == '1'
+}
+
 export function calcDisable(config, mode) {
   const specicesType = [
     'CustomComponentTabs',

package/src/utils/defaultVal.js

@@ -1,3 +1,4 @@
+import { toRaw } from 'vue'
 import { formatDate } from './common'
 import { ARG_FLAGS } from './const'
 
@@ -6,23 +7,27 @@ export default function defaultVal(config) {
     const configDefaultVal = config.defaultVal || config.defaultValue
     let defaultVal = null
     try {
-      let routeMatchs = null
-      if ( typeof configDefaultVal === 'string' && (routeMatchs = configDefaultVal.match(/^_route:(.*)$/))) {
-        const queryKey = routeMatchs[1]
-        const routeQuery = config?.route?.query
-        defaultVal = routeQuery?.[queryKey]
-      } else if ( typeof configDefaultVal === 'string' && (/^_lang$/.test(configDefaultVal))) {
-        defaultVal = config?._lang
-      } else if (/^{[\w\W]*}$/.test(configDefaultVal) || /^\[[\w\W]*\]$/.test(configDefaultVal)) {
-        defaultVal = JSON.parse(configDefaultVal)
-      } else {
-        if (configDefaultVal === ARG_FLAGS.CURRENT_DATE || configDefaultVal === 'currentDate') {
-          defaultVal = formatDate(new Date(), 'yyyy-MM-dd')
-        } else if (['true', 'false'].includes(configDefaultVal)) {
-          defaultVal = configDefaultVal == 'true' ? true : false
+      if (typeof configDefaultVal === 'string') {
+        let routeMatchs = null
+        if ( typeof configDefaultVal === 'string' && (routeMatchs = configDefaultVal.match(/^_route:(.*)$/))) {
+          const queryKey = routeMatchs[1]
+          const routeQuery = config?.route?.query
+          defaultVal = routeQuery?.[queryKey]
+        } else if ( typeof configDefaultVal === 'string' && (/^_lang$/.test(configDefaultVal))) {
+          defaultVal = config?._lang
+        } else if (/^{[\w\W]*}$/.test(configDefaultVal) || /^\[[\w\W]*\]$/.test(configDefaultVal)) {
+          defaultVal = JSON.parse(configDefaultVal)
         } else {
-          defaultVal = configDefaultVal
+          if (configDefaultVal === ARG_FLAGS.CURRENT_DATE || configDefaultVal === 'currentDate') {
+            defaultVal = formatDate(new Date(), 'yyyy-MM-dd')
+          } else if (['true', 'false'].includes(configDefaultVal)) {
+            defaultVal = configDefaultVal == 'true' ? true : false
+          } else {
+            defaultVal = configDefaultVal
+          }
         }
+      } else {
+        defaultVal = toRaw(configDefaultVal)
       }
       console.log(`${config.dynamicHireRelat},${config.hireRelat} to set defaultValue, ${defaultVal}`)
       config.refValue = defaultVal

package/src/utils/render.jsx

@@ -23,6 +23,8 @@ import {
   PLAIN_TYPE_ALONG_COLUMNS,
   TRANS_CELL_COMPONETS,
   MODE,
+
+  isHidden
 } from './const.js'
 import { preserveCheck } from './preserveFunc.js'
 import { isArray, isFunction, isString } from './is.js'
@@ -1016,9 +1018,6 @@ function isTransCellMobile(config, disabled) {
   return config?.alwaysNative !== '1' && disabled && findComponent(TRANS_CELL_COMPONETS, config.renderby || config.metaType) !== -1
 }
 
-function isHidden({config}) {
-  return (typeof config.hidden === 'boolean' && config.hidden) || config.hidden == '1' || config.collapseHidden == '1'
-}
 // 如果父级有一个是hidden了，那就表示hidden了
 function isChainHidden({config}) {
   if (isHidden({config})) {