resolver-egretimp-plus 0.0.259 → 0.0.261

package/package.json

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

package/src/components/helper/resolver.js

@@ -1,6 +1,6 @@
 import rulesDriver from "../../rules/rulesDriver"
 import { penddingRules } from "../../rules/ruleUtils"
-import { hasOwn, isPlainObject } from "../../utils"
+import { hasOwn, isPlainObject, isPromise } from "../../utils"
 import { resultToast } from "../../utils/respone"
 
 export async function executeLoadServices(services = [], {
@@ -52,7 +52,6 @@ export async function executeLoadServices(services = [], {
       reqConfig.params = reqResult
       delete reqConfig.data
     }
-    
     if (loadEventsBefore && typeof loadEventsBefore === 'function') {
       let beforeRequestRet = true
       if (loadEventsBefore) {

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

@@ -1,4 +1,5 @@
 <template>
+  <!-- <ElText v-bind="{...attrs, ...elTextProps}">{{ labelDesc }}</ElText> -->
   <renderNode></renderNode>
 </template>
 <script setup>
@@ -22,14 +23,20 @@ const props = defineProps({
 const attrs = useAttrs()
 
 const normalVal = computed(() => {
-  const findItem = props?.options?.find(item => item.columnValue == modelValue.value)
+  let val = (modelValue.value !== null && modelValue.value !== undefined) ? modelValue.value : ''
+  try {
+    val = JSON.stringify(val)
+  } catch (error) {
+    val = ''
+  }
+  const findItem = props?.options?.find(item => item.columnValue == val)
   if (findItem) {
     return lang?.value?.indexOf('zh') > -1 ? findItem.columnDesc_zh : findItem.columnDesc
   }
-  return modelValue.value
+  return val
 })
 
-const elRowProps = computed(() => {
+const elTextProps = computed(() => {
   const result = Object.keys(ElText.props).reduce((ret, key) => {
     ret[key] = props[key]
     return ret
@@ -44,7 +51,7 @@ const labelDesc = computed(() => {
 const renderNode = computed(() => {
   const textNode = h(ElText, {
     ...attrs,
-    ...elRowProps.value,
+    ...elTextProps.value,
     onClick: () => {
       clickAction()
     }

package/src/index.jsx

@@ -204,7 +204,7 @@ export default {
             reqConfig,
           }) => {
             if (props.loadEventsBefore && typeof props.loadEventsBefore === 'function') {
-              return props.loadEventsAfter({reqConfig})
+              return props.loadEventsBefore({reqConfig})
             }
           },
           respCb: (result) => {