Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

修复和改进一些小问题 #615

Merged
merged 2 commits into from
May 18, 2021
Merged

修复和改进一些小问题 #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c6c9b7
perf(form): schema required prop support array and strictly tree
mynetfan May 17, 2021
104f0ed
fix(tree): event 'change' triggered correctly
mynetfan May 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 36 additions & 8 deletions src/components/Form/src/components/FormItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import { componentMap } from '../componentMap';
import { BasicHelp } from '/@/components/Basic';

import { isBoolean, isFunction } from '/@/utils/is';
import { isBoolean, isFunction, isNull } from '/@/utils/is';
import { getSlot } from '/@/utils/helper/tsxHelper';
import { createPlaceholderMessage, setComponentRuleType } from '../helper';
import { upperFirst, cloneDeep } from 'lodash-es';
Expand Down Expand Up @@ -141,15 +141,47 @@
}

let rules: ValidationRule[] = cloneDeep(defRules) as ValidationRule[];
const { rulesMessageJoinLabel: globalRulesMessageJoinLabel } = props.formProps;

const joinLabel = Reflect.has(props.schema, 'rulesMessageJoinLabel')
? rulesMessageJoinLabel
: globalRulesMessageJoinLabel;
const defaultMsg = createPlaceholderMessage(component) + `${joinLabel ? label : ''}`;

function validator(rule: any, value: any) {
const msg = rule.message || defaultMsg;
if (value === undefined || isNull(value)) {
// 空值
return Promise.reject(msg);
} else if (Array.isArray(value) && value.length === 0) {
// 数组类型
return Promise.reject(msg);
} else if (typeof value === 'string' && value.trim() === '') {
// 空字符串
return Promise.reject(msg);
} else if (
typeof value === 'object' &&
Reflect.has(value, 'checked') &&
Reflect.has(value, 'halfChecked') &&
Array.isArray(value.checked) &&
Array.isArray(value.halfChecked) &&
value.checked.length === 0 &&
value.halfChecked.length === 0
) {
// 非关联选择的tree组件
return Promise.reject(msg);
}
return Promise.resolve();
}

if ((!rules || rules.length === 0) && required) {
rules = [{ required, type: 'string' }];
rules = [{ required, validator }];
}

const requiredRuleIndex: number = rules.findIndex(
(rule) => Reflect.has(rule, 'required') && !Reflect.has(rule, 'validator')
);
const { rulesMessageJoinLabel: globalRulesMessageJoinLabel } = props.formProps;

if (requiredRuleIndex !== -1) {
const rule = rules[requiredRuleIndex];
const { isShow } = getShow();
Expand All @@ -160,12 +192,8 @@
if (!Reflect.has(rule, 'type')) {
rule.type = component === 'InputNumber' ? 'number' : 'string';
}
const joinLabel = Reflect.has(props.schema, 'rulesMessageJoinLabel')
? rulesMessageJoinLabel
: globalRulesMessageJoinLabel;

rule.message =
rule.message || createPlaceholderMessage(component) + `${joinLabel ? label : ''}`;
rule.message = rule.message || defaultMsg;

if (component.includes('Input') || component.includes('Textarea')) {
rule.whitespace = true;
Expand Down
49 changes: 26 additions & 23 deletions src/components/Tree/src/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,15 @@
const [createContextMenu] = useContextMenu();
const { prefixCls } = useDesign('basic-tree');

const getReplaceFields = computed(
(): Required<ReplaceFields> => {
const { replaceFields } = props;
return {
children: 'children',
title: 'title',
key: 'key',
...replaceFields,
};
}
);
const getReplaceFields = computed((): Required<ReplaceFields> => {
const { replaceFields } = props;
return {
children: 'children',
title: 'title',
key: 'key',
...replaceFields,
};
});

const getBindValues = computed(() => {
let propsData = {
Expand All @@ -92,9 +90,8 @@
onCheck: (v: CheckKeys) => {
state.checkedKeys = v;
const rawVal = toRaw(v);
emit('change', rawVal);
emit('check', rawVal);
emit('update:value', rawVal);
emit('check', rawVal);
},
onRightClick: handleRightClick,
};
Expand All @@ -110,13 +107,8 @@
return searchState.startSearch && searchState.searchData?.length === 0;
});

const {
deleteNodeByKey,
insertNodeByKey,
filterByLevel,
updateNodeByKey,
getAllKeys,
} = useTree(treeDataRef, getReplaceFields);
const { deleteNodeByKey, insertNodeByKey, filterByLevel, updateNodeByKey, getAllKeys } =
useTree(treeDataRef, getReplaceFields);

function getIcon(params: Recordable, icon?: string) {
if (!icon) {
Expand Down Expand Up @@ -234,6 +226,15 @@
}
);

watch(
() => state.checkedKeys,
() => {
const v = toRaw(state.checkedKeys);
emit('update:value', v);
emit('change', v);
}
);

// watchEffect(() => {
// console.log('======================');
// console.log(props.value);
Expand Down Expand Up @@ -292,9 +293,11 @@
return null;
}
return data.map((item) => {
const { title: titleField, key: keyField, children: childrenField } = unref(
getReplaceFields
);
const {
title: titleField,
key: keyField,
children: childrenField,
} = unref(getReplaceFields);

const propsData = omit(item, 'title');
const icon = getIcon({ ...item, level }, item.icon);
Expand Down