resolver-egretimp-plus 0.0.216 → 0.0.218
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 +1 -1
- package/dist/theme/element/index.css +1 -1
- package/dist/theme/element/src/components/collapse.scss +1 -1
- package/dist/web/index.js +1 -1
- package/package.json +1 -1
- package/src/components/packages-web/CustomComponentCollapse.vue +2 -3
- package/src/theme/element/components/collapse.scss +1 -1
- package/src/utils/render.jsx +1 -1
package/package.json
CHANGED
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
import { ElCollapse, ElCollapseItem, ElCard, ElRow } from 'element-plus'
|
|
25
25
|
import Renderer from '../../renderer.jsx'
|
|
26
26
|
import { computed, inject, useAttrs, defineEmits, defineProps } from 'vue'
|
|
27
|
-
import { commonPropsType } from '../../utils/index.js'
|
|
27
|
+
import { commonPropsType, hasOwn } from '../../utils/index.js'
|
|
28
28
|
|
|
29
29
|
defineOptions({
|
|
30
30
|
inheritAttrs: false
|
|
@@ -51,13 +51,12 @@ const collapseProps = computed(() => {
|
|
|
51
51
|
})
|
|
52
52
|
// 是否禁止折叠
|
|
53
53
|
const noCollpase = computed(() => {
|
|
54
|
-
return true
|
|
55
54
|
return props?.config?.noCollpase == '1'
|
|
56
55
|
})
|
|
57
56
|
|
|
58
57
|
const collapseClass = computed(() => {
|
|
59
58
|
return {
|
|
60
|
-
'underline-hidden': props.config.underlineHidden,
|
|
59
|
+
'underline-hidden': hasOwn(props.config, 'underlineHidden') ? props.config.underlineHidden : noCollpase.value,
|
|
61
60
|
'not-wrap-border': !props.config.needSegment
|
|
62
61
|
}
|
|
63
62
|
})
|
package/src/utils/render.jsx
CHANGED
|
@@ -553,7 +553,7 @@ export function generateLayoutPolyfill(config, disabled, isH5) {
|
|
|
553
553
|
[normalCapitalizeComponent(config.metaType)]: true,
|
|
554
554
|
}
|
|
555
555
|
if (isElCol) {
|
|
556
|
-
props.class['is-card'] = config?.needWrap, // 这个样式主要用于折叠上面，控制被卡片包裹的时候，下边距是16，没有被包裹的时候，是12
|
|
556
|
+
props.class['is-card'] = config?.needWrap == '1', // 这个样式主要用于折叠上面，控制被卡片包裹的时候，下边距是16，没有被包裹的时候，是12
|
|
557
557
|
props = {
|
|
558
558
|
...props,
|
|
559
559
|
...getDefaultColProps(config),
|