fix: lint error
parent
b155627923
commit
19d5e7a14a
|
@ -67,8 +67,8 @@ if (process.env.NODE_ENV === 'test') {
|
||||||
inheritAttrs: false,
|
inheritAttrs: false,
|
||||||
props: ['tag', 'class'],
|
props: ['tag', 'class'],
|
||||||
setup(props, { slots }) {
|
setup(props, { slots }) {
|
||||||
const { tag: Tag, ...rest } = props;
|
|
||||||
return () => {
|
return () => {
|
||||||
|
const { tag: Tag, ...rest } = props;
|
||||||
const children = slots.default?.() || [];
|
const children = slots.default?.() || [];
|
||||||
if (Tag) {
|
if (Tag) {
|
||||||
return <Tag {...rest}>{children}</Tag>;
|
return <Tag {...rest}>{children}</Tag>;
|
||||||
|
|
|
@ -250,22 +250,6 @@ export default defineComponent({
|
||||||
|
|
||||||
return promise;
|
return promise;
|
||||||
},
|
},
|
||||||
getRules() {
|
|
||||||
let formRules = this.FormContext.rules;
|
|
||||||
const selfRules = this.rules;
|
|
||||||
const requiredRule =
|
|
||||||
this.required !== undefined
|
|
||||||
? { required: !!this.required, trigger: this.mergedValidateTrigger }
|
|
||||||
: [];
|
|
||||||
const prop = getPropByPath(formRules, this.namePath);
|
|
||||||
formRules = formRules ? prop.o[prop.k] || prop.v : [];
|
|
||||||
const rules = [].concat(selfRules || formRules || []);
|
|
||||||
if (find(rules, rule => rule.required)) {
|
|
||||||
return rules;
|
|
||||||
} else {
|
|
||||||
return rules.concat(requiredRule);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
onFieldBlur() {
|
onFieldBlur() {
|
||||||
this.validateRules({ triggerName: 'blur' });
|
this.validateRules({ triggerName: 'blur' });
|
||||||
},
|
},
|
||||||
|
|
|
@ -47,7 +47,7 @@ const ARow = defineComponent<RowProps>({
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
token = ResponsiveObserve.subscribe(screen => {
|
token = ResponsiveObserve.subscribe(screen => {
|
||||||
const currentGutter = gutterRef.value || 0;
|
const currentGutter = props.gutter || 0;
|
||||||
if (
|
if (
|
||||||
(!Array.isArray(currentGutter) && typeof currentGutter === 'object') ||
|
(!Array.isArray(currentGutter) && typeof currentGutter === 'object') ||
|
||||||
(Array.isArray(currentGutter) &&
|
(Array.isArray(currentGutter) &&
|
||||||
|
@ -70,8 +70,6 @@ const ARow = defineComponent<RowProps>({
|
||||||
xl: true,
|
xl: true,
|
||||||
xxl: true,
|
xxl: true,
|
||||||
});
|
});
|
||||||
const gutterRef = ref<Gutter | [Gutter, Gutter]>();
|
|
||||||
gutterRef.value = props.gutter;
|
|
||||||
|
|
||||||
const { getPrefixCls } = inject('configProvider', defaultConfigProvider);
|
const { getPrefixCls } = inject('configProvider', defaultConfigProvider);
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { watchEffect, reactive, defineComponent, nextTick } from 'vue';
|
import { reactive, defineComponent, nextTick, computed, watch } from 'vue';
|
||||||
import FilterFilled from '@ant-design/icons-vue/FilterFilled';
|
import FilterFilled from '@ant-design/icons-vue/FilterFilled';
|
||||||
import Menu, { SubMenu, Item as MenuItem } from '../vc-menu';
|
import Menu, { SubMenu, Item as MenuItem } from '../vc-menu';
|
||||||
import closest from 'dom-closest';
|
import closest from 'dom-closest';
|
||||||
|
@ -27,32 +27,44 @@ export default defineComponent({
|
||||||
props: initDefaultProps(FilterMenuProps, {
|
props: initDefaultProps(FilterMenuProps, {
|
||||||
column: {},
|
column: {},
|
||||||
}),
|
}),
|
||||||
setup(nextProps) {
|
setup(props) {
|
||||||
let preProps = { ...nextProps };
|
const sSelectedKeys = computed(() => props.selectedKeys);
|
||||||
const { selectedKeys, column } = nextProps;
|
const sVisible = computed(() => {
|
||||||
|
return 'filterDropdownVisible' in props.column ? props.column.filterDropdownVisible : false;
|
||||||
|
});
|
||||||
|
const sValueKeys = computed(() => generateValueMaps(props.column.filters));
|
||||||
const state = reactive({
|
const state = reactive({
|
||||||
neverShown: false,
|
neverShown: false,
|
||||||
sSelectedKeys: selectedKeys,
|
sSelectedKeys: sSelectedKeys.value,
|
||||||
sKeyPathOfSelectedItem: {}, // 记录所有有选中子菜单的祖先菜单
|
sKeyPathOfSelectedItem: {}, // 记录所有有选中子菜单的祖先菜单
|
||||||
sVisible: 'filterDropdownVisible' in column ? column.filterDropdownVisible : false,
|
sVisible: sVisible.value,
|
||||||
sValueKeys: generateValueMaps(column.filters),
|
sValueKeys: sValueKeys.value,
|
||||||
});
|
});
|
||||||
watchEffect(
|
watch(sSelectedKeys, () => {
|
||||||
() => {
|
state.sSelectedKeys = sSelectedKeys.value;
|
||||||
const { column } = nextProps;
|
});
|
||||||
if (!shallowequal(preProps.selectedKeys, nextProps.selectedKeys)) {
|
watch(sVisible, () => {
|
||||||
state.sSelectedKeys = nextProps.selectedKeys;
|
state.sVisible = sVisible.value;
|
||||||
}
|
});
|
||||||
if (!shallowequal((preProps.column || {}).filters, (nextProps.column || {}).filters)) {
|
watch(sValueKeys, () => {
|
||||||
state.sValueKeys = generateValueMaps(nextProps.column.filters);
|
state.sValueKeys = sValueKeys.value;
|
||||||
}
|
});
|
||||||
if ('filterDropdownVisible' in column) {
|
// watchEffect(
|
||||||
state.sVisible = column.filterDropdownVisible;
|
// () => {
|
||||||
}
|
// const { column } = nextProps;
|
||||||
preProps = { ...nextProps };
|
// if (!shallowequal(preProps.selectedKeys, nextProps.selectedKeys)) {
|
||||||
},
|
// state.sSelectedKeys = nextProps.selectedKeys;
|
||||||
{ flush: 'sync' },
|
// }
|
||||||
);
|
// if (!shallowequal((preProps.column || {}).filters, (nextProps.column || {}).filters)) {
|
||||||
|
// state.sValueKeys = generateValueMaps(nextProps.column.filters);
|
||||||
|
// }
|
||||||
|
// if ('filterDropdownVisible' in column) {
|
||||||
|
// state.sVisible = column.filterDropdownVisible;
|
||||||
|
// }
|
||||||
|
// preProps = { ...nextProps };
|
||||||
|
// },
|
||||||
|
// { flush: 'sync' },
|
||||||
|
// );
|
||||||
return state;
|
return state;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -455,7 +455,7 @@ export default function generateSelector<
|
||||||
|
|
||||||
// Display options for OptionList
|
// Display options for OptionList
|
||||||
const displayOptions = computed<OptionsType>(() => {
|
const displayOptions = computed<OptionsType>(() => {
|
||||||
if (!mergedSearchValue.value || !mergedShowSearch) {
|
if (!mergedSearchValue.value || !mergedShowSearch.value) {
|
||||||
return [...mergedOptions.value] as OptionsType;
|
return [...mergedOptions.value] as OptionsType;
|
||||||
}
|
}
|
||||||
const { optionFilterProp = 'value', mode, filterOption } = props;
|
const { optionFilterProp = 'value', mode, filterOption } = props;
|
||||||
|
@ -969,7 +969,7 @@ export default function generateSelector<
|
||||||
() => {
|
() => {
|
||||||
if (triggerOpen.value) {
|
if (triggerOpen.value) {
|
||||||
const newWidth = Math.ceil(containerRef.value.offsetWidth);
|
const newWidth = Math.ceil(containerRef.value.offsetWidth);
|
||||||
if (containerWidth !== newWidth) {
|
if (containerWidth.value !== newWidth) {
|
||||||
containerWidth.value = newWidth;
|
containerWidth.value = newWidth;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,8 +45,10 @@ export default defineComponent({
|
||||||
setup(props) {
|
setup(props) {
|
||||||
let activeKey;
|
let activeKey;
|
||||||
if (props.activeKey !== undefined) {
|
if (props.activeKey !== undefined) {
|
||||||
|
// eslint-disable-next-line vue/no-setup-props-destructure
|
||||||
activeKey = props.activeKey;
|
activeKey = props.activeKey;
|
||||||
} else if (props.defaultActiveKey !== undefined) {
|
} else if (props.defaultActiveKey !== undefined) {
|
||||||
|
// eslint-disable-next-line vue/no-setup-props-destructure
|
||||||
activeKey = props.defaultActiveKey;
|
activeKey = props.defaultActiveKey;
|
||||||
} else {
|
} else {
|
||||||
activeKey = getDefaultActiveKey(props);
|
activeKey = getDefaultActiveKey(props);
|
||||||
|
|
Loading…
Reference in New Issue