resolver-egretimp-plus 0.0.119 → 0.0.121
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.
- package/dist/h5/index.js +2 -2
- package/dist/theme/element/index.css +1 -1
- package/dist/theme/element/src/components/common.scss +2 -1
- package/dist/web/index.js +2 -2
- package/package.json +1 -1
- package/src/components/packages-web/ElButton.vue +7 -2
- package/src/index.jsx +3 -2
- package/src/rules/eventsSupplement.js +5 -4
- package/src/theme/element/components/common.scss +2 -1
package/package.json
CHANGED
|
@@ -20,8 +20,13 @@ const props = defineProps({
|
|
|
20
20
|
plain: [String, Boolean]
|
|
21
21
|
})
|
|
22
22
|
const calcPorps = computed(() => {
|
|
23
|
-
const ret = {
|
|
24
|
-
|
|
23
|
+
const ret = Object.keys(ElButton.props).reduce((total, key) => {
|
|
24
|
+
total[key] = props[key]
|
|
25
|
+
return total
|
|
26
|
+
}, {})
|
|
27
|
+
|
|
28
|
+
if (props.config?.icon) {
|
|
29
|
+
ret.suffixIcon = props.config?.icon
|
|
25
30
|
}
|
|
26
31
|
if (ret.plain == '1') {
|
|
27
32
|
ret.plain = true
|
package/src/index.jsx
CHANGED
|
@@ -7,8 +7,8 @@ import { MODE } from "./utils/const.js"
|
|
|
7
7
|
import { generateRequester } from "./utils/request.js"
|
|
8
8
|
import { executeLoadServices } from "./components/helper/resolver.js"
|
|
9
9
|
import { deepMerge } from "./utils/index.js"
|
|
10
|
-
import { useRouter } from "vue-router"
|
|
11
|
-
import { useRoute } from "vue-router"
|
|
10
|
+
// import { useRouter } from "vue-router"
|
|
11
|
+
// import { useRoute } from "vue-router"
|
|
12
12
|
export default {
|
|
13
13
|
name: 'Resolver',
|
|
14
14
|
props: {
|
|
@@ -172,6 +172,7 @@ export default {
|
|
|
172
172
|
let val = result
|
|
173
173
|
if (!clearFlag) {
|
|
174
174
|
val = deepMerge(props.modelValue, result, 'replace')
|
|
175
|
+
val = {...val}
|
|
175
176
|
}
|
|
176
177
|
emit('update:modelValue', val)
|
|
177
178
|
emit('loadEvnetsCompleted', result)
|
|
@@ -188,7 +188,8 @@ const allInitEvents = {
|
|
|
188
188
|
configs.forEach(labelInfo => {
|
|
189
189
|
// const oldDisplayType = labelInfo && labelInfo.displayType
|
|
190
190
|
// oldDisplayTypes.push(oldDisplayType)
|
|
191
|
-
|
|
191
|
+
// 兼容开始使用displayType用于显示隐藏的配置
|
|
192
|
+
labelInfo && /^\d+$/.test(labelInfo.displayType) && (labelInfo.displayType = '0')
|
|
192
193
|
labelInfo && (labelInfo.hidden = '1')
|
|
193
194
|
labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '0')
|
|
194
195
|
labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '1')
|
|
@@ -199,7 +200,7 @@ const allInitEvents = {
|
|
|
199
200
|
return () => {
|
|
200
201
|
configs.forEach((labelInfo, idx) => {
|
|
201
202
|
// const oldDisplayType = oldDisplayTypes[idx]
|
|
202
|
-
labelInfo && (labelInfo.displayType = '1')
|
|
203
|
+
labelInfo && /^\d+$/.test(labelInfo.displayType) && (labelInfo.displayType = '1')
|
|
203
204
|
labelInfo && (labelInfo.hidden = '0')
|
|
204
205
|
labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '1')
|
|
205
206
|
labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '0')
|
|
@@ -222,7 +223,7 @@ const allInitEvents = {
|
|
|
222
223
|
configs.forEach((labelInfo) => {
|
|
223
224
|
// const oldDisplayType = labelInfo && labelInfo.displayType
|
|
224
225
|
// oldDisplayTypes.push(oldDisplayType)
|
|
225
|
-
labelInfo && (labelInfo.displayType = '1')
|
|
226
|
+
labelInfo && /^\d+$/.test(labelInfo.displayType) && (labelInfo.displayType = '1')
|
|
226
227
|
labelInfo && (labelInfo.hidden = '0')
|
|
227
228
|
labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '1')
|
|
228
229
|
labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '0')
|
|
@@ -237,7 +238,7 @@ const allInitEvents = {
|
|
|
237
238
|
// }
|
|
238
239
|
configs.forEach((labelInfo, idx) => {
|
|
239
240
|
// const oldDisplayType = oldDisplayTypes[idx]
|
|
240
|
-
labelInfo && (labelInfo.displayType = '0')
|
|
241
|
+
labelInfo && /^\d+$/.test(labelInfo.displayType) && (labelInfo.displayType = '0')
|
|
241
242
|
labelInfo && (labelInfo.hidden = '1')
|
|
242
243
|
labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '0')
|
|
243
244
|
labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '1')
|