resolver-egretimp-plus 0.0.288 → 0.0.290

package/package.json

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

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

@@ -113,8 +113,8 @@ export default {
     const displayValue = computed(() => {
       return props.showMoney == '1' ? (isFocus.value ? currentVal.value : formatValue(modelValue.value)) : modelValue.value
     })
-    const isPagePopup = computed(() => {
-      return props.config?.lcpPagePopupMapVO
+    const isPagePopupAndSearch = computed(() => {
+      return props.config?.lcpPagePopupMapVO && inputProps.value.suffixIcon == 'Search'
     })
     // 弹框是否只能支持点击icon进行触发，默认是
     const isOnlyIconClickFlag = computed(() => {
@@ -128,7 +128,7 @@ export default {
       const ret = {
         modelValue: displayValue.value
       }
-      if (!(isPagePopup.value && !isPagePopupAlwayEdit.value)) {
+      if (!(isPagePopupAndSearch.value && !isPagePopupAlwayEdit.value)) {
         ret['onUpdate:modelValue'] = (val) => {
           if (props.showMoney == '1') {
             currentVal.value = val
@@ -165,7 +165,7 @@ export default {
         ...attrs
       }
       delete ret.class
-      if (isPagePopup.value && isOnlyIconClickFlag.value) {
+      if (isPagePopupAndSearch.value && isOnlyIconClickFlag.value) {
         delete ret.onClick
       }
       if (ret.onWrapClick) {
@@ -238,7 +238,7 @@ export default {
         const suffixIcon = resolveComponent(inputProps.value.suffixIcon)
         ret.suffix = () => {
           const iconProps = {}
-          if (isPagePopup.value && inputProps.value.suffixIcon == 'Search') {
+          if (isPagePopupAndSearch.value) {
             if (!props.disabled) {
               iconProps.onClick = attrs.onClick
               iconProps.style = {

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

@@ -3,11 +3,14 @@
   <renderNode></renderNode>
 </template>
 <script setup>
-import { ElText } from 'element-plus'
+import { ElText, ElIcon } from 'element-plus'
 import { computed, defineProps, inject, getCurrentInstance, useAttrs, useSlots } from 'vue'
 import { commonPropsType } from '../../utils/index.js'
-import { h } from 'vue'
+import { h, resolveComponent, withModifiers } from 'vue'
 
+defineOptions({
+  inheritAttrs: false
+})
 const slots = useSlots()
 const lang = inject('lang')
 const modelValue = defineModel()
@@ -20,6 +23,16 @@ const props = defineProps({
     type: [String, Number],
     default: '0'
   },
+  suffixIcon: {
+    type: [String, Object],
+    default: ''
+  },
+  isPointer: {
+    type: [String, Number]
+  }
+})
+const isPagePopup = computed(() => {
+  return props.config?.lcpPagePopupMapVO
 })
 const attrs = useAttrs()
 
@@ -53,12 +66,18 @@ const buttonActions = inject('buttonActions', {})
 const labelDesc = computed(() => {
   return normalVal.value
 })
+
 const renderNode = computed(() => {
   const textNode = h(ElText, {
     ...attrs,
     ...elTextProps.value,
-    onClick: () => {
+    onClick: withModifiers(() => {
       clickAction()
+    }, [
+      'stop'
+    ]),
+    class:{
+      cursor: props.isPointer == '1'
     }
   }, {
     default: () => labelDesc.value,
@@ -66,8 +85,15 @@ const renderNode = computed(() => {
   })
   if (props.needWrap == '1') {
     return h('div', {
-      class: 'cust-input-wrap',
-    }, textNode)
+      class: {
+        'cust-input-wrap': true,
+        'is-disabled': props.disabled
+      },
+
+    }, [
+      textNode,
+      getSuffixIcon()
+    ])
   } else {
     return textNode
   }
@@ -82,7 +108,7 @@ const dataLoad = inject('dataLoad')
 const rootForm = inject('rootForm')
 
 const clickAction = (e) => {
-  attrs?.onClick?.(e) // 如果配置中有点击事件
+  // attrs?.onClick?.(e) // 如果配置中有点击事件
   const actionKey = props.config?.clickActionKey || props.config?.buttonActionKey || props.config?.hireRelat
   const actionFn = buttonActions[actionKey]
   actionFn && actionFn(props, {
@@ -95,6 +121,30 @@ const clickAction = (e) => {
     rootForm
   }, appContext)
 }
+function getSuffixIcon() {
+  if (props.suffixIcon && !props.disabled) {
+    const iconProps = {
+      color: '#a8abb2',
+      size: 14
+    }
+    let suffixIcon = props.suffixIcon
+    if (typeof suffixIcon === 'string') {
+      if (isPagePopup.value && suffixIcon == 'Search') {
+        iconProps.onClick = withModifiers(attrs.onClick, [
+          'stop'
+        ]),
+        iconProps.style = {
+          cursor: 'pointer',
+        }
+      }
+      suffixIcon = resolveComponent(suffixIcon)
+    }
+    return h(ElIcon, {
+      ...iconProps
+    }, [h(suffixIcon)])
+  }
+  return null
+}
 </script>
 <style lang="scss" scoped>
 .cust-input-wrap {
@@ -107,7 +157,13 @@ const clickAction = (e) => {
   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);
+  // background: var(--el-disabled-bg-color);
   cursor: 'not-allowed';
 }
+.is-disabled {
+  background: var(--el-disabled-bg-color);
+}
+.cursor {
+  cursor: pointer;
+}
 </style>

package/src/utils/const.js

@@ -36,7 +36,7 @@ export const NOT_NEED_FORM_ITEM_META_TYPE = [
   'cmi-dropdown-menu',
   'cmi-divider'
 ]
-export const EXECTE_CLICK_EVENT_COMPONENTS = ['ElInput', 'ElButton', 'CmiInput', 'CmiButton']
+export const EXECTE_CLICK_EVENT_COMPONENTS = ['ElInput', 'ElButton', 'CmiInput', 'CmiButton', 'ElText']
 export const TRANS_CELL_COMPONETS = ['CmiInput', 'CmiSelect', 'CmiPicker']
 export const NOT_NEED_COL_ITEM_META_TYPE = ['CustomComponentTabPane', 'CustomComponentDialog', 'CustomComponentCol', 'CustomComponentTabPaneH5']
 export const MULTI_PAGE_META_LIST_TYPES = ['CustomComponentTable']