resolver-egretimp-plus 0.0.124 → 0.0.126

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.0.124",
+  "version": "0.0.126",
   "description": "交付体验渲染",
   "main": "./dist/web/index.js",
   "module": "./dist/web/index.js",
@@ -49,9 +49,10 @@
     "vue-loader": "^17.4.2",
     "vue-style-loader": "^4.1.3",
     "vue3-quill": "^0.3.1",
+    "vue3-sfc-loader": "^0.9.5",
     "webpack": "^5.90.0",
-    "webpack-cli": "^5.1.4",
-    "vue3-sfc-loader": "^0.9.5"
+    "json-rules-engine": "^7.2.1",
+    "webpack-cli": "^5.1.4"
   },
   "dependencies": {}
 }

package/src/analysisComponent.jsx

@@ -49,6 +49,7 @@ export default {
       delete ret.onClick
       return ret
     })
+    const ruleExecuter = inject('_ruleExecuter')
     const dialogReq = inject('_dialogReq', {})
     const requestTraceId = inject('requestTraceId')
     const polyfillConfigs = inject('_polyfillConfigs', {})
@@ -113,9 +114,21 @@ export default {
         })
         penddingRules[hireRelat] = null
       }
+      // 使用json-rules-engine书写的规则，打开这边，需要对之前的规则进行注释，并且需要再index.js文件中进行开启 ====start====
+      if (ruleExecuter?.penddingRules?.[hireRelat]?.length) {
+        ruleExecuter?.penddingRules[hireRelat].forEach(context => {
+          const rules = context.rules
+          delete context.rules
+          setTimeout(() => {
+            rulesDriver.call(context, rules)
+          }, 0)
+        })
+        ruleExecuter.penddingRules[hireRelat] = null
+      }
       if (props.config?.immediateClickEvent) {
         executeClickEvents()
       }
+      // 使用json-rules-engine书写的规则，打开这边，需要对之前的规则进行注释，并且需要再index.js文件中进行开启 ====end====
     }
     const onVnodeUnmounted = () => {
       props.config.vmIsBind = false

package/src/components/helper/eventOrchestration.js

@@ -419,6 +419,7 @@ export async function executeDataValid(validConfig, {
     return
   }
   const ret = await buildInRequest(url, {
+    aid_language: lang,
     requestTraceId,
     ...reqData,
     pmHandleBusinessIdentity: {

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

@@ -17,6 +17,9 @@ const props = defineProps({
   formatter: {
     type: Function,
     default: null
+  },
+  isPointer: {
+    type: [String]
   }
 })
 const lang = inject('lang')
@@ -27,7 +30,7 @@ const value = computed(() => {
   if (
     isPatchComponent(PLAIN_TYPE_OPTIONS_COLUMNS, props)
   ) {
-    return props?.options?.find(item => item.columnValue == modelValue.value)?.[lang?.value?.indexOf('zh') > -1 ? 'columnDesc_zh' : 'columnDesc']
+    return selectFormat(modelValue.value)
   } else {
     if (isPatchComponent(['ElDatePicker'], props)) {
       if (!modelValue.value) {
@@ -40,7 +43,8 @@ const value = computed(() => {
 })
 
 const classObj = computed(() => ({
-  [`custom-component-plain--${props.type}`]: true
+  [`custom-component-plain--${props.type}`]: true,
+  cursor: props.isPointer == '1'
 }))
 
 
@@ -67,6 +71,20 @@ const clickAction = () => {
     rootForm
   }, appContext)
 }
+
+function selectFormat(value) {
+  let valList = value
+  const multiple = props?.config?.multiple == '1'
+  const isStrVal = props.config?.valueType !== 'list'
+  // 在满足多选，并且不是str格式的时候，就表示value为数组类型，取反就表示不满足的时候，需要转换成数组格式进行计算
+  if (!(multiple && !isStrVal)) {
+    valList = valList ? (valList?.split(',') || []) : []
+  }
+  return valList?.reduce((ret, val) => {
+    const str = props?.options?.find(item => item.columnValue == val)?.[lang?.value?.indexOf('zh') > -1 ? 'columnDesc_zh' : 'columnDesc']
+    return `${ret}${ret ? ',' : ''}${str}`
+  }, '')
+}
 </script>
 <style lang="scss" scoped>
 .custom-component-plain {
@@ -77,4 +95,7 @@ const clickAction = () => {
 .custom-component-plain--error {
   color: #F54A45;
 }
+.cursor {
+  cursor: pointer;
+}
 </style>

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

@@ -0,0 +1,180 @@
+import { ElInput } from 'element-plus'
+import { computed, defineProps, useAttrs } from 'vue'
+import { commonPropsType, hasOwn, isElement } from '../../utils/index.js'
+import { ref } from 'vue';
+import { onMounted } from 'vue';
+import { getDomWidth } from '../../utils/dom.js';
+import { watch } from 'vue';
+import { nextTick } from 'vue';
+import { resolveComponent } from 'vue';
+
+export default {
+  inheritAttrs: false,
+  props: {
+    ...commonPropsType,
+    ...ElInput.props
+  },
+  emits: ['update:modelValue'],
+  setup(props, { emit, attrs }) {
+    const isOverflow = ref(false)
+    const inputWrapRef = ref(null)
+    const calcSpanRef = ref(null)
+    const inputProps = computed(() => {
+      const ret = Object.keys(ElInput.props).reduce((total, key) => {
+        total[key] = props[key]
+        return total
+      }, {})
+      if (props.config?.icon) {
+        ret.suffixIcon = props.config?.icon
+      }
+      return ret
+    })
+    const normalInputProps = computed(() => {
+      const ret = {
+        ...inputProps.value
+      }
+      delete ret.suffixIcon
+      delete ret.prefixIcon
+      return ret
+    })
+    const showTooltip = computed(() => {
+      return props?.config?.showTooltip == '1' && props.disabled
+    })
+    const modelValue = computed({
+      get() {
+        return props.modelValue
+      },
+      set(val) {
+        emit('update:modelValue', val)
+      }
+    })
+    const isPagePopup = computed(() => {
+      return props.config?.lcpPagePopupMapVO
+    })
+    // 弹框是否只能支持点击icon进行触发，默认是
+    const isOnlyIconClickFlag = computed(() => {
+      return hasOwn(props.config, 'onlyIconClickFlag') ? props.config?.onlyIconClickFlag == '1' : true
+    })
+    // 输入点击弹框的情况下，是否仍然可以编辑
+    const isPagePopupAlwayEdit = computed(() => {
+      return props.config?.pagePopupEditFlag == '1'
+    })
+    const vmodelProps = computed(() => {
+      const ret = {
+        modelValue: modelValue.value
+      }
+      if (!(isPagePopup.value && !isPagePopupAlwayEdit.value)) {
+        ret['onUpdate:modelValue'] = (val) => {
+          modelValue.value = val
+        }
+      } else {
+        ret['onClear'] = () => {
+          attrs?.onClear?.()
+          modelValue.value = ''
+        }
+      }
+      return ret
+    })
+    const normalAttrs = computed(() => {
+      const ret = {
+        ...attrs
+      }
+      if (isPagePopup.value && isOnlyIconClickFlag.value) {
+        delete ret.onClick
+      }
+      return ret
+    })
+
+    const tooltipCalc = (() => {
+      let unWatch = null
+      let onResize = null
+      return {
+        clear: () => {
+          unWatch && unWatch()
+          onResize && window.removeEventListener('resize', onResize)
+        },
+        calc() {
+          this.clear()
+          let inputWrapWidth = getDomWidth(inputWrapRef.value, 0)
+          let textLengthWidth = getDomWidth(calcSpanRef.value, -22)
+          isOverflow.value = inputWrapWidth < textLengthWidth
+          unWatch = watch(() => modelValue.value, (val) => {
+            nextTick(() => {
+              textLengthWidth = getDomWidth(calcSpanRef.value, -22)
+              isOverflow.value = inputWrapWidth < textLengthWidth
+            })
+          })
+          onResize = () => {
+            inputWrapWidth = getDomWidth(inputWrapRef.value, 0)
+            isOverflow.value = inputWrapWidth < textLengthWidth
+            console.log('isOverflow==:', isOverflow.value, inputWrapWidth)
+          }
+          window.addEventListener('resize', onResize)
+        }
+      }
+    })()
+
+    onMounted(() => {
+      watch(showTooltip, (val) => {
+        if (val) {
+          tooltipCalc?.calc()
+        }
+      }, {
+        immediate: true
+      })
+    })
+    const polyfillInputWrap = (node) => {
+      if (isOverflow.value) {
+        return (
+          <el-tooltip content={modelValue.value} placement="top">
+            { node }
+          </el-tooltip>
+        )
+      }
+      return node
+    }
+    const getInputSolts = () => {
+      const ret = {}
+      if (inputProps.value?.suffixIcon) {
+        const suffixIcon = resolveComponent(inputProps.value.suffixIcon)
+        ret.suffix = () => {
+          const iconProps = {}
+          if (isPagePopup.value && inputProps.value.suffixIcon == 'Search') {
+            iconProps.onClick = attrs.onClick
+            iconProps.style = {
+              cursor: 'pointer'
+            }
+          }
+
+          return <el-icon {...iconProps}><suffixIcon /></el-icon>
+        }
+      }
+      if (inputProps.value?.prefixIcon) {
+        const prefixIcon = resolveComponent(inputProps.value.prefixIcon)
+        ret.prefix = () => {
+          return <el-icon><prefixIcon /></el-icon>
+        }
+      }
+      return ret
+    }
+    return () => {
+      return (
+        <div class="input-contrainer">
+          <span ref={(e) => calcSpanRef.value = e} class="calc-span">{ modelValue.value }</span>
+          {
+            polyfillInputWrap(
+              <div v-else class="input-wrap" ref={(e) => inputWrapRef.value = e}>
+                <ElInput {...vmodelProps.value} {...{...normalAttrs.value, ...normalInputProps.value}}>
+                  {
+                    getInputSolts()
+                  }
+                </ElInput>
+              </div>
+            )
+          }
+        </div>
+      )
+    }
+  }
+}
+

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

@@ -0,0 +1,102 @@
+<script setup>
+import { ElInput } from 'element-plus'
+import { computed, defineProps, useAttrs } from 'vue'
+import { commonPropsType, isElement } from '../../utils/index.js'
+import { ref } from 'vue';
+import { onMounted } from 'vue';
+import { getDomWidth } from '../../utils/dom.js';
+import { watch } from 'vue';
+import { nextTick } from 'vue';
+
+const isOverflow = ref(false)
+const inputWrapRef = ref(null)
+const calcSpanRef = ref(null)
+const props = defineProps({
+  ...commonPropsType,
+  ...ElInput.props
+})
+const inputProps = computed(() => {
+  const ret = Object.keys(ElInput.props).reduce((total, key) => {
+    total[key] = props[key]
+    return total
+  }, {})
+  if (props.config?.icon) {
+    ret.suffixIcon = props.config?.icon
+  }
+  return ret
+})
+const showTooltip = computed(() => {
+  return props?.config?.showTooltip == '1' && props.disabled
+})
+const attrs = useAttrs()
+const modelValue = defineModel()
+
+
+const tooltipCalc = (() => {
+  let unWatch = null
+  let onResize = null
+  return {
+    clear: () => {
+      unWatch && unWatch()
+      onResize && window.removeEventListener('resize', onResize)
+    },
+    calc() {
+      this.clear()
+      let inputWrapWidth = getDomWidth(inputWrapRef.value, 0)
+      let textLengthWidth = getDomWidth(calcSpanRef.value, -22)
+      isOverflow.value = inputWrapWidth < textLengthWidth
+      unWatch = watch(() => modelValue.value, (val) => {
+        nextTick(() => {
+          textLengthWidth = getDomWidth(calcSpanRef.value, -22)
+          isOverflow.value = inputWrapWidth < textLengthWidth
+        })
+      })
+      onResize = () => {
+        inputWrapWidth = getDomWidth(inputWrapRef.value, 0)
+        isOverflow.value = inputWrapWidth < textLengthWidth
+        console.log('isOverflow==:', isOverflow.value, inputWrapWidth)
+      }
+      window.addEventListener('resize', onResize)
+    }
+  }
+})()
+
+onMounted(() => {
+  watch(showTooltip, (val) => {
+    if (val) {
+      tooltipCalc?.calc()
+    }
+  }, {
+    immediate: true
+  })
+})
+</script>
+<template>
+  <div class="input-contrainer">
+    <span ref="calcSpanRef" class="calc-span">{{ modelValue }}</span>
+    <el-tooltip v-if="isOverflow" :content="modelValue" placement="top">
+      <div class="input-wrap" :ref="(e) => inputWrapRef = e">
+        <ElInput v-model="modelValue" v-bind="{...attrs, ...inputProps}"></ElInput>
+      </div>
+    </el-tooltip>
+    <div v-else class="input-wrap" :ref="(e) => inputWrapRef = e">
+      <ElInput v-model="modelValue" v-bind="{...attrs, ...inputProps}"></ElInput>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.input-contrainer {
+  width: 100%;
+  .calc-span {
+    white-space: nowrap;
+    position: absolute;
+    visibility: hidden;
+    padding: 0 11px;
+    box-sizing: border-box;
+  }
+  .input-wrap{
+    width: 100%;
+  }
+}
+</style>

package/src/hooks/index.js

@@ -9,7 +9,7 @@ export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
   // const dataLoad = inject('dataLoad')
   // const dynamicMapComp = inject('dynamicMapComp')
   // const lang = inject('lang')
-  const { hireRelatMapRules, dataLoad, dynamicMapComp, lang, _mapComp } = this
+  const { hireRelatMapRules, messageInstance, rootValue, ruleExecuter, dataLoad, dynamicMapComp, lang, _mapComp } = this
   const currentRules = hireRelatMapRules.value[config.hireRelat]
   let metaCodeKey = config.metaCode
   if (modelKey !== 'update:modelValue') {
@@ -34,11 +34,22 @@ export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
         // 事件初始化执行，在dataLoaded请求完成之后，执行一次事件
         if (dataLoad.value && !config.eventInit && !config.notInit) {
           setTimeout(() => {
+            ruleExecuter?.run({
+              rootValue,
+              rules: currentRules,
+              config,
+              dynamicMapComp,
+              lang,
+              messageInstance,
+              _mapComp,
+              isInit: true,
+            })
             rulesDriver.call({
               config,
               dynamicMapComp,
               lang,
-              _mapComp
+              _mapComp,
+              messageInstance
             }, currentRules, true)
             config.eventInit = true
           }, 0)
@@ -68,11 +79,21 @@ export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
       }
       if (config) {
         setTimeout(() => {
+          ruleExecuter?.run({
+            rootValue,
+            rules: currentRules,
+            config,
+            dynamicMapComp,
+            lang,
+            messageInstance,
+            _mapComp,
+          })
           rulesDriver.call({
             config,
             dynamicMapComp,
             lang,
-            _mapComp
+            _mapComp,
+            messageInstance
           }, currentRules)
         }, 0)
       }
@@ -86,13 +107,19 @@ export function useVmodels(props, emit) {
   const dynamicMapComp = inject('dynamicMapComp')
   const lang = inject('lang')
   const _mapComp = inject('_mapComp')
+  const rootValue = inject('rootValue')
+  const ruleExecuter = inject('_ruleExecuter')
+  const messageInstance = inject('_messageInstance')
 
   const thisObj = {
     hireRelatMapRules,
     dataLoad,
     dynamicMapComp,
     lang,
-    _mapComp
+    rootValue,
+    _mapComp,
+    ruleExecuter,
+    messageInstance: messageInstance?.value
   }
 
   const vModelObjs = reactive({})

package/src/index.jsx

@@ -7,8 +7,7 @@ import { MODE } from "./utils/const.js"
 import { generateRequester } from "./utils/request.js"
 import { executeLoadServices } from "./components/helper/resolver.js"
 import { deepMerge } from "./utils/index.js"
-// import { useRouter } from "vue-router"
-// import { useRoute } from "vue-router"
+// import { RuleExecuter } from "./rulesImp/index.js"
 export default {
   name: 'Resolver',
   props: {
@@ -130,6 +129,8 @@ export default {
     }
   },
   setup(props, { emit, attrs, expose }) {
+    const ruleExecuter = null
+    // const ruleExecuter = new RuleExecuter()
     const rootStore = reactive({})
     const nativeDataLoad = ref(false)
     // const router = useRouter()
@@ -213,6 +214,7 @@ export default {
       })
       toExecuteLoadServices()
     })
+    provide('_ruleExecuter', ruleExecuter)
     provide('_toExecuteLoadServices', toExecuteLoadServices)
     provide('_dialogReq', props.dialogReq)
     provide('_messageCb', props.messageCb)

package/src/rules/eventsSupplement.js

@@ -342,7 +342,7 @@ const allInitEvents = {
   setPopup(event, isInit, tabpanelCode) {
     const { targetMsg, targetMsgEn } = event
     const msg = this.lang.value.indexOf('zh') > -1 ? targetMsg : targetMsgEn
-    this.$alert(msg, '', {
+    this.messageInstance.warning(msg, '', {
       showCancelButton: false,
     });
     // commModal({