resolver-egretimp-plus 0.0.33 → 0.0.35

package/package.json

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

package/src/components/helper/button.js

@@ -1,4 +1,5 @@
 import { getRelateConfigKeys } from "../../rules/ruleUtils"
+import { resultToast } from "../../utils/respone"
 import { openChildDialog } from "../childDialog"
 
 export async function dispatchClickEvents  ({serviceList = [], axiosInstance, dynamicMapComp, rootValue, dynamicHireRelat, messageInstance}) {
@@ -26,8 +27,7 @@ export async function dispatchClickEvent(service, { dynamicMapComp, rootValue, d
     method: "post",
     data: reqData
   }))
-  if (!ret?.data?.success) {
-    messageInstance?.value?.error(ret?.data?.resultMessage || '')
+  if (!resultToast(ret?.data, messageInstance)) {
     await Promise.reject()
     return
   }
@@ -104,10 +104,8 @@ export function getTableConfig(outParamMappingList = [], { dynamicMapComp, dynam
 export function openDailg({
   pagePopupMap,
   axiosInstance,
-  rootValue,
   dynamicMapComp,
   dynamicHireRelat,
-  messageInstance,
   lang,
   appContext,
 }) {

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

@@ -44,6 +44,7 @@ const calcPorps = computed(() => {
   if (props?.config?.displayType) {
     ret.type = props?.config?.displayType
   }
+  return ret
 })
 
 const attrs = useAttrs()
@@ -97,7 +98,7 @@ const buttonAction = (...arg) => {
       rootValue: rootValue?.value,
       dynamicMapComp,
       dynamicHireRelat,
-      messageInstance
+      messageInstance: messageInstance?.value
     })
   }
   const lcpPagePopupMapVO = props.config.lcpPagePopupMapVO
@@ -106,10 +107,8 @@ const buttonAction = (...arg) => {
     openDailg({
       pagePopupMap: lcpPagePopupMapVO,
       axiosInstance: _axiosInstance,
-      rootValue: rootValue?.value,
       dynamicMapComp,
       dynamicHireRelat,
-      messageInstance,
       appContext,
       lang: lang?.value
     })

package/src/hooks/pageConfig.js

@@ -4,6 +4,7 @@ import { buildInRequest } from "../utils/request"
 import { GET_SYS_PARAM_CACHE, QUERY_PAGE_CONFIG_DATA } from "../api/builtIn"
 import { normalPageConfigs } from "../components/helper/resolver"
 import mock from "./mock"
+import { resultToast } from "../utils/respone"
 
 export function usePageConfig() {
   const pageConfigRef = ref(null)
@@ -46,14 +47,13 @@ export function useBuildInData(messageTipInstance, loadingInstance) {
       loadingInstance.show()
     }
     buildInRequest(QUERY_PAGE_CONFIG_DATA, reqData).then(ret => {
-      if (ret.data.success) {
+      if (resultToast(ret.data, messageTipInstance)) {
         // pageConfig.value = normalPageConfigs(mock)
         pageConfig.value = normalPageConfigs(ret.data.result)
         cb(pageConfig.value)
         getSelects(ret.data.result?.pmBusinessIdentityVO?.tenantId)
         return
       }
-      messageTipInstance?.error(ret.data.resultMessage)
     }).catch(() => {
       if (loadingInstance.finish && typeof loadingInstance.finish === 'function') {
         loadingInstance.finish()
@@ -67,11 +67,10 @@ export function useBuildInData(messageTipInstance, loadingInstance) {
     buildInRequest(GET_SYS_PARAM_CACHE, {
       tenantId
     }).then(ret => {
-      if (ret.data.success) {
+      if (resultToast(ret.data, messageTipInstance)) {
         selects.value = JSON.parse(ret.data.result || '{}')
         return
       }
-      messageTipInstance?.error(ret.data.resultMessage)
     }).finally(() => {
       if (loadingInstance.finish && typeof loadingInstance.finish === 'function') {
         loadingInstance.finish()

package/src/resolver-common.vue

@@ -2,6 +2,7 @@
 import { computed, useAttrs } from 'vue';
 import Resolver from './index.jsx'
 import { useBuildInData } from './hooks/pageConfig';
+import { initInterceptors } from './utils/request.js';
 
 const props = defineProps({
   busiIdentityId: String,
@@ -26,7 +27,7 @@ defineOptions({
   inheritAttrs: false
 })
 const attrs = useAttrs()
-
+initInterceptors(props.messageInstance)
 const { getPageConfig, pageConfig, selects } = useBuildInData(props.messageInstance, props.loadingInstance)
 getPageConfig({
   busiIdentityId: props.busiIdentityId,

package/src/utils/render.jsx

@@ -204,7 +204,7 @@ export function normalConfig({
     pageConfig.type = 'daterange'
   }
   if (config.metaType == 'card') {
-    pageConfig.needWrap = '2'
+    pageConfig.needWrap = '1'
   }
   mapComp[hireRelat] = pageConfig
   parsePolyfillConfigs({ polyfillConfigs, instance }, pageConfig)

package/src/utils/request.js

@@ -4,6 +4,7 @@ import { AUTH_CODE, NOT_AUTH_APIS, PASSWORD, USER_NAME, USER_TYPE } from '../enu
 import { LCP_LOGIN, REFRESH_TOKEN } from '../api/builtIn'
 import { HashingFactory } from './cipher'
 import dayjs from 'dayjs'
+import { resultToast } from './respone'
 
 export function generateRequester(config) {
   const interceptors = config?.interceptors || {}
@@ -20,67 +21,69 @@ let EXPIRATION_Time = null
 const service = axios.create({
   timeout: 60000 // request timeout
 })
-service.interceptors.request.use(
-  config => {
-    let data = config.data
-    const url = config.url
-    if (
-      config && config.headers &&
-      (
-        config.headers['Content-type']?.includes('application/x-www-form-urlencoded')
-      )
-    ) {
-      data = qs.stringify(data)
-    }
-    const reqConfig = {
-      ...config,
-      data
-    }
-    return new Promise(async (resolve, reject) => {
-      try {
-        if ((!NOT_AUTH_APIS.includes(url) && !loginToken)) {
-          await simulatelogin()
-          reqConfig.headers = {
-            ...(reqConfig.headers || {}),
-            Authorization: `Bearer ${loginToken}`
-          }
-        } else {
-          if (!NOT_AUTH_APIS.includes(url)) {
-            if ((EXPIRATION_Time.getTime() - new Date().getTime()) < THRESHOLD_TIME && REFRESH_TOKEN !== url) {
-              await refreshToken()
-              reqConfig.headers = {
-                ...(reqConfig.headers || {}),
-                Authorization: `Bearer ${loginToken}`
-              }
-            } else {
-              reqConfig.headers = {
-                ...(reqConfig.headers || {}),
-                Authorization: `Bearer ${loginToken}`
+export function initInterceptors(messageInstance) {
+  service.interceptors.request.use(
+    config => {
+      let data = config.data
+      const url = config.url
+      if (
+        config && config.headers &&
+        (
+          config.headers['Content-type']?.includes('application/x-www-form-urlencoded')
+        )
+      ) {
+        data = qs.stringify(data)
+      }
+      const reqConfig = {
+        ...config,
+        data
+      }
+      return new Promise(async (resolve, reject) => {
+        try {
+          if ((!NOT_AUTH_APIS.includes(url) && !loginToken)) {
+            await simulatelogin(messageInstance)
+            reqConfig.headers = {
+              ...(reqConfig.headers || {}),
+              Authorization: `Bearer ${loginToken}`
+            }
+          } else {
+            if (!NOT_AUTH_APIS.includes(url)) {
+              if ((EXPIRATION_Time.getTime() - new Date().getTime()) < THRESHOLD_TIME && REFRESH_TOKEN !== url) {
+                await refreshToken(messageInstance)
+                reqConfig.headers = {
+                  ...(reqConfig.headers || {}),
+                  Authorization: `Bearer ${loginToken}`
+                }
+              } else {
+                reqConfig.headers = {
+                  ...(reqConfig.headers || {}),
+                  Authorization: `Bearer ${loginToken}`
+                }
               }
             }
           }
+          resolve(reqConfig)
+        } catch (error) {
+          reject()
         }
-        resolve(reqConfig)
-      } catch (error) {
-        reject()
-      }
-    })
-  },
-  error => {
-    return Promise.reject(error)
-  }
-)
+      })
+    },
+    error => {
+      return Promise.reject(error)
+    }
+  )
 
-// response interceptor
-service.interceptors.response.use(
-  response => {
-    // const { config } = response
-    return response
-  },
-  error => {
-    return error
-  }
-)
+  // response interceptor
+  service.interceptors.response.use(
+    response => {
+      // const { config } = response
+      return response
+    },
+    error => {
+      return error
+    }
+  )
+}
 
 export function buildInRequest(url, data, config = {}) {
   const reqConfig = {
@@ -97,7 +100,7 @@ export function buildInRequest(url, data, config = {}) {
   return service(reqConfig)
 }
 
-function simulatelogin() {
+function simulatelogin(messageInstance) {
   const MD5HashingInstance = HashingFactory.createMD5Hashing()
   return buildInRequest(LCP_LOGIN, {
     username: USER_NAME,
@@ -109,7 +112,7 @@ function simulatelogin() {
       'Content-Type': 'application/x-www-form-urlencoded'
     },
   }).then(res => {
-    if (res.data && res.data.resultCode === '000000') {
+    if (resultToast(res.data, messageInstance, {noSuccessIip: true})) {
       loginToken = res.data.result.token
       EXPIRATION_Time = dayjs(new Date()).add(2, 'hours').toDate()
       return Promise.resolve(res)
@@ -120,9 +123,9 @@ function simulatelogin() {
 }
 
 
-function refreshToken() {
+function refreshToken(messageInstance) {
   return buildInRequest(REFRESH_TOKEN).then(res => {
-    if (res.data && res.data.resultCode === '000000') {
+    if (resultToast(res.data, messageInstance, {noSuccessIip: true})) {
       loginToken = res.data.result
       EXPIRATION_Time = dayjs(new Date()).add(2, 'hours').toDate()
       return Promise.resolve(res)

package/src/utils/respone.js

@@ -0,0 +1,41 @@
+export const RESULT_CODE = {
+  SUCCESS: '000000',
+  INFO: '000088',
+  WARNING: '000099',
+  ERROR: '000000',
+  OTHER: '020002'
+}
+export function resultToast(result = {}, messageInstance, {noSuccessIip = false} = {}) {
+  let ret = false
+  const resultMessage = result?.resultMessage || ''
+  const resultCode = result.resultCode
+  switch (resultCode) {
+    case RESULT_CODE.SUCCESS:
+      if (!noSuccessIip) {
+        messageInstance?.success(resultMessage)
+      }
+      ret = true
+      break;
+    case RESULT_CODE.INFO:
+      if (messageInstance.info && typeof messageInstance.info === 'function') {
+        messageInstance.info(resultMessage)
+      } else if (messageInstance.text && typeof messageInstance.text === 'function') {
+        // 移动端兼容写法
+        messageInstance.text(resultMessage)
+      }
+      break;
+    case RESULT_CODE.WARNING:
+      messageInstance?.warning(resultMessage)
+      break;
+    case RESULT_CODE.ERROR:
+      messageInstance?.error(resultMessage)
+      break;
+    case RESULT_CODE.OTHER:
+      messageInstance?.error(resultMessage)
+      break;
+    default:
+      messageInstance?.error(resultMessage)
+      break;
+  }
+  return ret
+}