mirror of
https://github.com/vbenjs/vue-vben-admin.git
synced 2025-08-27 15:41:32 +08:00
fix(form): fix baseColProps not work
This commit is contained in:
@@ -91,7 +91,11 @@ export default defineComponent({
|
||||
function getShow() {
|
||||
const { show, ifShow } = props.schema;
|
||||
const { showAdvancedButton } = props.formProps;
|
||||
const itemIsAdvanced = showAdvancedButton ? !!props.schema.isAdvanced : true;
|
||||
const itemIsAdvanced = showAdvancedButton
|
||||
? isBoolean(props.schema.isAdvanced)
|
||||
? props.schema.isAdvanced
|
||||
: true
|
||||
: true;
|
||||
let isShow = true;
|
||||
let isIfShow = true;
|
||||
|
||||
|
@@ -132,6 +132,8 @@ export default function ({
|
||||
function updateAdvanced() {
|
||||
let itemColSum = 0;
|
||||
let realItemColSum = 0;
|
||||
const { baseColProps = {} } = unref(getProps);
|
||||
|
||||
for (const schema of unref(getSchema)) {
|
||||
const { show, colProps } = schema;
|
||||
let isShow = true;
|
||||
@@ -152,8 +154,11 @@ export default function ({
|
||||
});
|
||||
}
|
||||
|
||||
if (isShow && colProps) {
|
||||
const { itemColSum: sum, isAdvanced } = getAdvanced(colProps, itemColSum);
|
||||
if (isShow && (colProps || baseColProps)) {
|
||||
const { itemColSum: sum, isAdvanced } = getAdvanced(
|
||||
{ ...baseColProps, ...colProps },
|
||||
itemColSum
|
||||
);
|
||||
|
||||
itemColSum = sum || 0;
|
||||
if (isAdvanced) {
|
||||
|
@@ -8,9 +8,9 @@
|
||||
}"
|
||||
>
|
||||
<BasicForm
|
||||
:submitOnReset="true"
|
||||
v-bind="getFormProps"
|
||||
v-if="getBindValues.useSearchForm"
|
||||
:submitOnReset="true"
|
||||
:submitButtonOptions="{ loading }"
|
||||
:tableAction="tableAction"
|
||||
@register="registerForm"
|
||||
|
Reference in New Issue
Block a user