Skip to content

Commit 81d1834

Browse files
author
Yellin
committed
feat: 放开miniDesc模式开关的限制
1 parent 3581f3c commit 81d1834

File tree

9 files changed

+30
-32
lines changed

9 files changed

+30
-32
lines changed

‎packages/lib/vue2/vue2-core/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ const globalOptions = {
108108
},
109109
HELPERS: {
110110
// 是否mini显示 description
111-
isMiniDes(formProps) {
112-
return formProps && ['left', 'right'].includes(formProps.labselPosition);
113-
}
111+
// isMiniDes(formProps) {
112+
// return formProps && ['left', 'right'].includes(formProps.labselPosition);
113+
// }
114114
}
115115
};
116116

‎packages/lib/vue2/vue2-core/src/components/Widget.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ export default {
178178
const isRootNode = isRootNodePath(curNodePath);
179179

180180
const isMiniDes = self.formProps && self.formProps.isMiniDes;
181-
const miniDesModel = isMiniDes || self.globalOptions.HELPERS.isMiniDes(self.formProps);
182181

183182
const descriptionVNode = (self.description) ? h(
184183
'div',
@@ -188,14 +187,14 @@ export default {
188187
},
189188
class: {
190189
genFromWidget_des: true,
191-
genFromWidget_des_mini: miniDesModel
190+
genFromWidget_des_mini: isMiniDes
192191
}
193192
},
194193
) : null;
195194

196195
const { COMPONENT_MAP } = self.globalOptions;
197196

198-
const miniDescriptionVNode = (miniDesModel && descriptionVNode) ? h(COMPONENT_MAP.popover, {
197+
const miniDescriptionVNode = (isMiniDes && descriptionVNode) ? h(COMPONENT_MAP.popover, {
199198
style: {
200199
margin: '0 2px',
201200
fontSize: '16px',
@@ -302,7 +301,7 @@ export default {
302301

303302
// description
304303
// 非mini模式显示 description
305-
!miniDesModel ? descriptionVNode : null,
304+
!isMiniDes ? descriptionVNode : null,
306305
h( // 关键输入组件
307306
self.widget,
308307
{

‎packages/lib/vue2/vue2-form-element/src/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ const globalOptions = Object.freeze({
2424
}),
2525
HELPERS: {
2626
// 是否mini显示 description
27-
isMiniDes(formProps) {
28-
return formProps && ['left', 'right'].includes(formProps.labelPosition);
29-
}
27+
// isMiniDes(formProps) {
28+
// return formProps && ['left', 'right'].includes(formProps.labelPosition);
29+
// }
3030
}
3131
});
3232

‎packages/lib/vue2/vue2-form-iview3/src/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ const globalOptions = Object.freeze({
6767
}),
6868
HELPERS: {
6969
// 是否mini显示 description
70-
isMiniDes(formProps) {
71-
return formProps && ['left', 'right'].includes(formProps.labelPosition);
72-
}
70+
// isMiniDes(formProps) {
71+
// return formProps && ['left', 'right'].includes(formProps.labelPosition);
72+
// }
7373
}
7474
});
7575

‎packages/lib/vue3/vue3-core/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ const globalOptions = {
108108
},
109109
HELPERS: {
110110
// 是否mini显示 description
111-
isMiniDes(formProps) {
112-
return formProps && ['left', 'right'].includes(formProps.labselPosition);
113-
}
111+
// isMiniDes(formProps) {
112+
// return formProps && ['left', 'right'].includes(formProps.labselPosition);
113+
// }
114114
}
115115
};
116116

‎packages/lib/vue3/vue3-core/src/components/Widget.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -178,21 +178,20 @@ export default {
178178
const isRootNode = isRootNodePath(props.curNodePath);
179179

180180
const isMiniDes = props.formProps && props.formProps.isMiniDes;
181-
const miniDesModel = isMiniDes;
182181

183182
const descriptionVNode = (props.description) ? h(
184183
'div',
185184
{
186185
innerHTML: props.description,
187186
class: {
188187
genFromWidget_des: true,
189-
genFromWidget_des_mini: miniDesModel
188+
genFromWidget_des_mini: isMiniDes
190189
}
191190
},
192191
) : null;
193192

194193
const { COMPONENT_MAP } = props.globalOptions;
195-
const miniDescriptionVNode = (miniDesModel && descriptionVNode) ? h(resolveComponent(COMPONENT_MAP.popover), {
194+
const miniDescriptionVNode = (isMiniDes && descriptionVNode) ? h(resolveComponent(COMPONENT_MAP.popover), {
196195
style: {
197196
margin: '0 2px',
198197
fontSize: '16px',
@@ -304,7 +303,7 @@ export default {
304303
default: otherAttrs => [
305304
// description
306305
// 非mini模式显示 description
307-
...(!miniDesModel && descriptionVNode) ? [descriptionVNode] : [],
306+
...(!isMiniDes && descriptionVNode) ? [descriptionVNode] : [],
308307

309308
...props.widget ? [
310309
h( // 关键输入组件

‎packages/lib/vue3/vue3-form-ant/src/index.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,12 @@ const globalOptions = {
135135
},
136136
HELPERS: {
137137
// 是否mini显示 description
138-
isMiniDes(formProps) {
139-
return formProps && (
140-
['left', 'right'].includes(formProps.labelPosition)
141-
|| formProps.layout === 'horizontal' || formProps.inline === true
142-
);
143-
}
138+
// isMiniDes(formProps) {
139+
// return formProps && (
140+
// ['left', 'right'].includes(formProps.labelPosition)
141+
// || formProps.layout === 'horizontal' || formProps.inline === true
142+
// );
143+
// }
144144
}
145145
};
146146

‎packages/lib/vue3/vue3-form-element/src/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ const globalOptions = {
4848
},
4949
HELPERS: {
5050
// 是否mini显示 description
51-
isMiniDes(formProps) {
52-
return formProps && ['left', 'right'].includes(formProps.labelPosition);
53-
}
51+
// isMiniDes(formProps) {
52+
// return formProps && ['left', 'right'].includes(formProps.labelPosition);
53+
// }
5454
}
5555
};
5656

‎packages/lib/vue3/vue3-form-naive/src/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ const globalOptions = {
105105
},
106106
HELPERS: {
107107
// 是否mini显示 description
108-
isMiniDes(formProps) {
109-
return formProps && ['left', 'right'].includes(formProps.labelPosition);
110-
}
108+
// isMiniDes(formProps) {
109+
// return formProps && ['left', 'right'].includes(formProps.labelPosition);
110+
// }
111111
}
112112
};
113113

0 commit comments

Comments
 (0)