resolver-egretimp-plus 0.1.104 → 0.1.106
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 +18 -18
- package/dist/theme/element/index.css +1 -1
- package/dist/theme/element/src/components/select.scss +6 -0
- package/dist/web/index.js +1 -1
- package/package.json +1 -1
- package/src/components/packages-H5/CmiPicker.vue +1 -1
- package/src/resolver-common.vue +12 -7
- package/src/theme/element/components/select.scss +6 -0
package/package.json
CHANGED
|
@@ -53,7 +53,7 @@ const isFilter = computed(() => {
|
|
|
53
53
|
})
|
|
54
54
|
const calcProps = computed(() => {
|
|
55
55
|
const ret = {
|
|
56
|
-
type: props?.config?.displayType,
|
|
56
|
+
type: isFilter.value ? 'normal' : props?.config?.displayType,
|
|
57
57
|
title: lang.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,
|
|
58
58
|
canceltext: props?.config?.canceltext,
|
|
59
59
|
confirmtext: props?.config?.confirmtext,
|
package/src/resolver-common.vue
CHANGED
|
@@ -42,7 +42,14 @@ const props = defineProps({
|
|
|
42
42
|
defineOptions({
|
|
43
43
|
inheritAttrs: false
|
|
44
44
|
})
|
|
45
|
+
const loadSelects = ref({})
|
|
45
46
|
const attrs = useAttrs()
|
|
47
|
+
const allSelects = computed(() => {
|
|
48
|
+
return {
|
|
49
|
+
...(props.selects || {}),
|
|
50
|
+
...loadSelects.value
|
|
51
|
+
}
|
|
52
|
+
})
|
|
46
53
|
initInterceptors(props.messageInstance)
|
|
47
54
|
const { getPageConfig, pageConfig, selects } = useBuildInData({messageInstance: props.messageInstance, loadingInstance: props.loadingInstance, requestTraceId: props.requestTraceId})
|
|
48
55
|
getPageConfig({
|
|
@@ -58,18 +65,16 @@ getPageConfig({
|
|
|
58
65
|
},
|
|
59
66
|
selectsCb: (selects) => {
|
|
60
67
|
// 配置数据加载完成事件 'loadedConfigCompeted'
|
|
61
|
-
Object.keys(selects || {}).forEach(key => {
|
|
62
|
-
|
|
63
|
-
})
|
|
64
|
-
|
|
68
|
+
// Object.keys(selects || {}).forEach(key => {
|
|
69
|
+
// props.selects[key] = selects[key]
|
|
70
|
+
// })
|
|
71
|
+
loadSelects.value = selects
|
|
72
|
+
attrs?.onLoadedSelectsCompeted?.(allSelects.value)
|
|
65
73
|
},
|
|
66
74
|
selectPolyReq: {
|
|
67
75
|
...(props.builtPolyfillReq || {}),
|
|
68
76
|
}
|
|
69
77
|
})
|
|
70
|
-
const allSelects = computed(() => {
|
|
71
|
-
return props.selects
|
|
72
|
-
})
|
|
73
78
|
|
|
74
79
|
const resolverRef = ref(null)
|
|
75
80
|
defineExpose({
|