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.

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

feat: collapse add item classname #1226

Merged
merged 2 commits into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion compiled/alipay/src/Collapse/index.axml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
a:for-index="index"
a:for-item="item">
<view
class="ant-collapse-item {{ utils.isActive(mixin.value, index, item.disabled) ? 'ant-collapse-item-active' : '' }} {{ item.disabled ? 'ant-collapse-item-disabled' : '' }}">
class="ant-collapse-item {{ item.className || '' }} {{ utils.isActive(mixin.value, index, item.disabled) ? 'ant-collapse-item-active' : '' }} {{ item.disabled ? 'ant-collapse-item-disabled' : '' }}">
<view
class="ant-collapse-item-title"
data-active="{{ utils.isActive(mixin.value, index, item.disabled) }}"
Expand Down
1 change: 1 addition & 0 deletions compiled/alipay/src/Collapse/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@ toc: 'content'
| content | 内容 | string | - |
| disabled | 是否禁用 | boolean | false |
| title | 标题 | string | - |
| className | 类名 | string | - |
1 change: 1 addition & 0 deletions compiled/alipay/src/Collapse/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export interface ICollapseProps extends IBaseProps {
title?: string;
content?: string;
disabled?: boolean;
className?: string;
}[];

/**
Expand Down
1 change: 1 addition & 0 deletions compiled/wechat/src/Collapse/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@ toc: 'content'
| content | 内容 | string | - |
| disabled | 是否禁用 | boolean | false |
| title | 标题 | string | - |
| className | 类名 | string | - |
2 changes: 1 addition & 1 deletion compiled/wechat/src/Collapse/index.wxml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
wx:for-index="index"
wx:for-item="item">
<view
class="ant-collapse-item {{ utils.isActive(mixin.value, index, item.disabled) ? 'ant-collapse-item-active' : '' }} {{ item.disabled ? 'ant-collapse-item-disabled' : '' }}">
class="ant-collapse-item {{ item.className || '' }} {{ utils.isActive(mixin.value, index, item.disabled) ? 'ant-collapse-item-active' : '' }} {{ item.disabled ? 'ant-collapse-item-disabled' : '' }}">
<view
class="ant-collapse-item-title"
data-active="{{ utils.isActive(mixin.value, index, item.disabled) }}"
Expand Down
2 changes: 1 addition & 1 deletion src/Collapse/index.axml.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default (
<View class={`ant-collapse ${className ? className : ''}`} style={style}>
{items.map((item, index) => (
<View
class={`ant-collapse-item ${
class={`ant-collapse-item ${item.className || ''} ${
utils.isActive(mixin.value, index, item.disabled)
? 'ant-collapse-item-active'
: ''
Expand Down
1 change: 1 addition & 0 deletions src/Collapse/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@ toc: 'content'
| content | 内容 | string | - |
| disabled | 是否禁用 | boolean | false |
| title | 标题 | string | - |
| className | 类名 | string | - |
1 change: 1 addition & 0 deletions src/Collapse/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export interface ICollapseProps extends IBaseProps {
title?: string;
content?: string;
disabled?: boolean;
className?: string;
}[];

/**
Expand Down
55 changes: 55 additions & 0 deletions tests/alipay/Form/form.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,59 @@ it('测试 updateRules', async () => {
'errors': ['input最少6个字符'],
'status': 'error',
});

// 测试 getFieldValidatorStatus 找不到字段的情况
expect(form.getFieldValidatorStatus('xx')).toEqual(undefined);
});

it('测试 实例方法', async () => {
const form = createForm({
validateMessages: {
required: '需要输入${label}',
string: {
min: '${label}最少${min}个字符',
},
},
rules: {
test: [
{
required: true,
min: 6,
},
],
},
});
const instance = getInstance('Form/FormInput', {
name: 'test',
label: 'input',
});
form.addItem(instance.ref());

let changedValue;
let changedAllValues;
form.onValueChange('test', (value) => {
changedValue = value;
});

form.onValuesChange((allValues) => {
changedAllValues = allValues;
});
instance.callMethod('onChange', '111');
await sleep(10);
expect(changedValue).toEqual('111');
expect(changedAllValues).toEqual({
test: '111',
});

// 校验不通过
try {
await form.submit();
} catch (err) {
expect(err.errorFields.length > 0).toBeTruthy();
}

// 通过校验
instance.callMethod('onChange', '1234567');
const values = await form.submit();
expect(values.test).toEqual('1234567');
});
Loading