resolver-egretimp-plus 0.0.53 → 0.0.54

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/h5/index.js +1 -1
  2. package/dist/web/index.js +1 -1
  3. package/package.json +1 -1
  4. package/src/components/helper/resolver.js +7 -16
  5. package/src/components/packages-web/CustomComponentCollapse.vue +0 -2
  6. package/src/utils/respone.js +6 -6
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "resolver-egretimp-plus",
3
- "version": "0.0.53",
3
+ "version": "0.0.54",
4
4
  "description": "交付体验渲染",
5
5
  "main": "./dist/web/index.js",
6
6
  "module": "./dist/web/index.js",
package/src/components/helper/resolver.js CHANGED
@@ -1,3 +1,5 @@
1
+ import { resultToast } from "../../utils/respone"
2
+
1
3
  export async function executeLoadServices(services = [], { axiosInstance, messageInstance, reqData, respCb }) {
2
4
  const loadServices = services.filter(ser => ser.eventType == '1')
3
5
  const mixinServiceConfig = services.find(service => service.serviceType === '1')
@@ -18,23 +20,12 @@ export async function executeLoadServices(services = [], { axiosInstance, messag
18
20
  ...(reqData || {})
19
21
  }
20
22
  }))
21
- // const ret = await (new Promise((res) => {
22
- // setTimeout(() => {
23
- // res({
24
- // data: {
25
- // success: true,
26
- // result: {
27
- // studentId: 121212
28
- // }
29
- // }
30
- // })
31
- // }, 3000);
32
- // }))
33
- if (!ret?.data?.success) {
34
- messageInstance?.value?.error(ret?.data?.resultMessage || '')
35
- await Promise.reject()
23
+ if (resultToast(ret.data, messageInstance, { noSuccessIip: true })) {
24
+ respCb && respCb(ret?.data?.result?.['PC-root-panel'])
25
+ return
36
26
  }
37
- respCb && respCb(ret?.data?.result)
27
+ messageInstance?.value?.error(ret?.data?.resultMessage || '')
28
+ await Promise.reject()
38
29
  }
39
30
  }
40
31
 
package/src/components/packages-web/CustomComponentCollapse.vue CHANGED
@@ -9,8 +9,6 @@
9
9
  <Renderer @click="stopPropagation" :config="rightSlotPmPageMetaList" v-model="props.refValue.value"></Renderer>
10
10
  </ElRow>
11
11
  <ElRow>
12
- <el-button type="primary">afsdfds</el-button>
13
- <el-button type="primary">afsdfds</el-button>
14
12
  <Renderer @click="stopPropagation" :config="slotPmPageMetaList" v-model="props.refValue.value"></Renderer>
15
13
  </ElRow>
16
14
  </div>
package/src/utils/respone.js CHANGED
@@ -45,22 +45,22 @@ export function resultToast(result = {}, messageInstance, {messageCb, service, c
45
45
  if (isPromise(messageCb)) {
46
46
  messageCb({resultMessage, result, resultCode, service, compConfig}).then(res => {
47
47
  if (res === true) {
48
- if (service?.transactionType === '2') {
48
+ // if (service?.transactionType === '2') {
49
49
  messageInstance?.[cbKey]?.(resultMessage)
50
- }
50
+ // }
51
51
  }
52
52
  })
53
53
  } else {
54
54
  if (messageCb({resultMessage, result, resultCode, service, compConfig}) === true) {
55
- if (service?.transactionType === '2') {
55
+ // if (service?.transactionType === '2') {
56
56
  messageInstance?.[cbKey]?.(resultMessage)
57
- }
57
+ // }
58
58
  }
59
59
  }
60
60
  } else {
61
- if (service?.transactionType === '2') {
61
+ // if (service?.transactionType === '2') {
62
62
  messageInstance?.[cbKey]?.(resultMessage)
63
- }
63
+ // }
64
64
  }
65
65
  return ret
66
66
  }