resolver-egretimp-plus 0.0.234 → 0.0.236

package/package.json

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

package/src/components/helper/resolver.js

@@ -1,9 +1,19 @@
 import rulesDriver from "../../rules/rulesDriver"
 import { penddingRules } from "../../rules/ruleUtils"
-import { hasOwn } from "../../utils"
+import { hasOwn, isPlainObject } from "../../utils"
 import { resultToast } from "../../utils/respone"
 
-export async function executeLoadServices(services = [], { alongLoad, requestTraceId, businessIdentityReqData = {}, axiosInstance, messageInstance, reqData, respCb, notLoadCb }) {
+export async function executeLoadServices(services = [], {
+  alongLoad,
+  requestTraceId,
+  businessIdentityReqData = {},
+  axiosInstance,
+  messageInstance,
+  reqData,
+  respCb,
+  loadEventsBefore,
+  notLoadCb
+}) {
   if (!alongLoad && reqData?.notLoad) {
     notLoadCb && notLoadCb()
     return
@@ -33,7 +43,7 @@ export async function executeLoadServices(services = [], { alongLoad, requestTra
       },
       ...(reqData || {})
     }
-    const reqConfig = {
+    let reqConfig = {
       url,
       method: httpMethod,
       data: reqResult
@@ -42,6 +52,31 @@ export async function executeLoadServices(services = [], { alongLoad, requestTra
       reqConfig.params = reqResult
       delete reqConfig.data
     }
+    
+    if (loadEventsBefore && typeof loadEventsBefore === 'function') {
+      let beforeRequestRet = true
+      if (loadEventsBefore) {
+        beforeRequestRet = loadEventsBefore({
+          reqConfig,
+        })
+      }
+      if (beforeRequestRet !== null && beforeRequestRet !== undefined) {
+        if (isPromise(beforeRequestRet)) {
+          beforeRequestRet = await beforeRequestRet
+          if (beforeRequestRet === false) {
+            return
+          }
+          if (isPlainObject(beforeRequestRet)) {
+            reqConfig = beforeRequestRet
+          }
+        } else {
+          if (beforeRequestRet === false) {
+            console.warn('请求中断')
+            return
+          }
+        }
+      }
+    }
 
     const ret = await (axiosInstance.value && axiosInstance.value(reqConfig))
     if (resultToast(ret.data, messageInstance, { noSuccessIip: true })) {

package/src/index.jsx

@@ -105,6 +105,10 @@ export default {
       type: Function,
       default: null
     },
+    loadEventsBefore: {
+      type: Function,
+      default: null
+    },
     // 在弹框里面的页面，通过弹窗传染的请求数据
     dialogReq: {
       type: Object,
@@ -191,6 +195,13 @@ export default {
           notLoadCb: () => {
             nativeDataLoad.value = true
           },
+          loadEventsBefore: ({
+            reqConfig,
+          }) => {
+            if (props.loadEventsBefore && typeof props.loadEventsBefore === 'function') {
+              return props.loadEventsAfter({reqConfig})
+            }
+          },
           respCb: (result) => {
             let val = result
             if (props.loadEventsAfter && typeof props.loadEventsAfter === 'function') {

package/src/rules/eventsSupplement.js

@@ -67,6 +67,8 @@ const allInitEvents = {
     if (val === ARG_FLAGS.REF_VAL) {
       const { config } = this
       val = config?.bindValue ?? ''
+    } else if(val === ARG_FLAGS.CURRENT_DATE) {
+      val = formatDate(new Date(), 'yyyy-MM-dd')
     }  else {
       let routeMatchs = null
       const _absoluteTarget = /^_absoluteTarget:(.+)$/
@@ -106,10 +108,10 @@ const allInitEvents = {
     configs.forEach(labelInfo => {
       if (!labelInfo) return
       let val = ''
-      if (valArrTypes.includes(labelInfo.labelType)) {
+      if (valArrTypes.includes(labelInfo.metaType || labelInfo.labelType)) {
         val = []
       }
-      if (valBooleanTypes.includes(labelInfo.labelType)) {
+      if (valBooleanTypes.includes(labelInfo.metaType || labelInfo.labelType)) {
         val = false
       }
       hasOwn(labelInfo, 'refValue') && (labelInfo.refValue = val)