resolver-egretimp-plus 0.0.50 → 0.0.52

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 +4 -3
  4. package/scripts/webpack.config.js +0 -1
  5. package/src/components/packages-H5/CmiButton.vue +14 -13
  6. package/src/components/packages-web/ElButton.vue +14 -13
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "resolver-egretimp-plus",
3
- "version": "0.0.50",
3
+ "version": "0.0.52",
4
4
  "description": "交付体验渲染",
5
5
  "main": "./dist/web/index.js",
6
6
  "module": "./dist/web/index.js",
@@ -22,8 +22,7 @@
22
22
  "@babel/runtime-corejs3": "^7.24.7",
23
23
  "@vue/babel-plugin-jsx": "^1.2.2",
24
24
  "@vue/cli-plugin-babel": "^5.0.8",
25
- "@vue/compiler-sfc": "^3.4.29",
26
- "@vueuse/core": "^10.11.1",
25
+ "@vueuse/core": "9.1.0",
27
26
  "axios": "^1.7.7",
28
27
  "babel-loader": "^9.1.3",
29
28
  "consola": "^3.2.3",
@@ -44,6 +43,8 @@
44
43
  "qs": "^6.13.0",
45
44
  "sass": "1.77.6",
46
45
  "sass-loader": "^14.2.1",
46
+ "vue": "^3.5.12",
47
+ "vue-demi": "^0.14.10",
47
48
  "vue-loader": "^17.4.2",
48
49
  "vue-style-loader": "^4.1.3",
49
50
  "vue3-quill": "^0.3.1",
package/scripts/webpack.config.js CHANGED
@@ -10,7 +10,6 @@ module.exports = {
10
10
  output: {
11
11
  clean: true,
12
12
  library: {
13
- // name: 'resolver',
14
13
  type: 'module'
15
14
  },
16
15
  path: path.resolve(__dirname, '../dist'),
package/src/components/packages-H5/CmiButton.vue CHANGED
@@ -56,8 +56,10 @@ const buttonAction = (...arg) => {
56
56
  }
57
57
  const actionKey = props.config?.clickActionKey || props.config?.buttonActionKey || props.config?.hireRelat
58
58
  const actionFn = buttonActions[actionKey]
59
+
60
+ let actionFnRet = null
59
61
  if (actionFn) {
60
- const ret = actionFn(props, {
62
+ actionFnRet = actionFn(props, {
61
63
  dynamicMapComp,
62
64
  hireRelatMapRules,
63
65
  components,
@@ -69,22 +71,21 @@ const buttonAction = (...arg) => {
69
71
  validate,
70
72
  lastClick
71
73
  }, appContext)
72
-
73
- if (ret !== null && ret !== undefined) {
74
- if (isPromise(ret)) {
75
- ret.then(res => {
76
- if (res) {
77
- lastClick()
78
- }
79
- })
80
- } else {
81
- if (ret) {
74
+ }
75
+ if (actionFnRet !== null && actionFnRet !== undefined) {
76
+ if (isPromise(actionFnRet)) {
77
+ actionFnRet.then(res => {
78
+ if (res) {
82
79
  lastClick()
83
80
  }
84
- }
81
+ })
85
82
  } else {
86
- lastClick()
83
+ if (actionFnRet) {
84
+ lastClick()
85
+ }
87
86
  }
87
+ } else {
88
+ lastClick()
88
89
  }
89
90
  }
90
91
  </script>
package/src/components/packages-web/ElButton.vue CHANGED
@@ -79,8 +79,10 @@ const buttonAction = async (...arg) => {
79
79
  }
80
80
  const actionKey = props.config?.clickActionKey || props.config?.buttonActionKey || props.config?.hireRelat
81
81
  const actionFn = buttonActions[actionKey]
82
+
83
+ let actionFnRet = null
82
84
  if (actionFn) {
83
- const ret = actionFn(props, {
85
+ actionFnRet = actionFn(props, {
84
86
  dynamicMapComp,
85
87
  hireRelatMapRules,
86
88
  components,
@@ -92,22 +94,21 @@ const buttonAction = async (...arg) => {
92
94
  validate,
93
95
  lastClick
94
96
  }, appContext)
95
-
96
- if (ret !== null && ret !== undefined) {
97
- if (isPromise(ret)) {
98
- ret.then(res => {
99
- if (res) {
100
- lastClick()
101
- }
102
- })
103
- } else {
104
- if (ret) {
97
+ }
98
+ if (actionFnRet !== null && actionFnRet !== undefined) {
99
+ if (isPromise(actionFnRet)) {
100
+ actionFnRet.then(res => {
101
+ if (res) {
105
102
  lastClick()
106
103
  }
107
- }
104
+ })
108
105
  } else {
109
- lastClick()
106
+ if (actionFnRet) {
107
+ lastClick()
108
+ }
110
109
  }
110
+ } else {
111
+ lastClick()
111
112
  }
112
113
  }
113
114
  </script>