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

refactor(collapse): make collapse-panel a separate directory #1453

Merged
merged 2 commits into from
Jan 9, 2023
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
51 changes: 1 addition & 50 deletions example/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,56 +99,7 @@
}
],
"usingComponents": {
"t-demo": "./components/demo-block/index",
"t-avatar": "tdesign-miniprogram/avatar/avatar",
"t-avatar-group": "tdesign-miniprogram/avatar/avatar-group",
"t-badge": "tdesign-miniprogram/badge/badge",
"t-button": "tdesign-miniprogram/button/button",
"t-cell": "tdesign-miniprogram/cell/cell",
"t-cell-group": "tdesign-miniprogram/cell-group/cell-group",
"t-collapse": "tdesign-miniprogram/collapse/collapse",
"t-collapse-panel": "tdesign-miniprogram/collapse/collapse-panel",
"t-tabs": "tdesign-miniprogram/tabs/tabs",
"t-tab-panel": "tdesign-miniprogram/tabs/tab-panel",
"t-loading": "tdesign-miniprogram/loading/loading",
"t-icon": "tdesign-miniprogram/icon/icon",
"t-rate": "tdesign-miniprogram/rate/rate",
"t-progress": "tdesign-miniprogram/progress/progress",
"t-input": "tdesign-miniprogram/input/input",
"t-textarea": "tdesign-miniprogram/textarea/textarea",
"t-message": "tdesign-miniprogram/message/message",
"t-toast": "tdesign-miniprogram/toast/toast",
"t-stepper": "tdesign-miniprogram/stepper/stepper",
"t-slider": "tdesign-miniprogram/slider/slider",
"t-radio": "tdesign-miniprogram/radio/radio",
"t-radio-group": "tdesign-miniprogram/radio-group/radio-group",
"t-checkbox": "tdesign-miniprogram/checkbox/checkbox",
"t-checkbox-group": "tdesign-miniprogram/checkbox-group/checkbox-group",
"t-swipe-cell": "tdesign-miniprogram/swipe-cell/swipe-cell",
"t-sticky": "tdesign-miniprogram/sticky/sticky",
"t-fab": "tdesign-miniprogram/fab/fab",
"t-tab-bar": "tdesign-miniprogram/tab-bar/tab-bar",
"t-tab-bar-item": "tdesign-miniprogram/tab-bar/tab-bar-item",
"t-transition": "tdesign-miniprogram/transition/transition",
"t-indexes": "tdesign-miniprogram/indexes/indexes",
"t-dropdown-menu": "tdesign-miniprogram/dropdown-menu/dropdown-menu",
"t-dropdown-item": "tdesign-miniprogram/dropdown-menu/dropdown-item",
"t-drawer": "tdesign-miniprogram/drawer/drawer",
"t-pull-down-refresh": "tdesign-miniprogram/pull-down-refresh/pull-down-refresh",
"t-footer": "tdesign-miniprogram/footer/footer",
"t-divider": "tdesign-miniprogram/divider/divider",
"t-empty": "tdesign-miniprogram/empty/empty",
"t-back-top": "tdesign-miniprogram/back-top/back-top",
"t-grid-item": "tdesign-miniprogram/grid/grid-item",
"t-grid": "tdesign-miniprogram/grid/grid",
"t-count-down": "tdesign-miniprogram/count-down/count-down",
"t-image": "tdesign-miniprogram/image/image",
"t-search": "tdesign-miniprogram/search/search",
"t-navbar": "tdesign-miniprogram/navbar/navbar",
"t-date-time-picker": "tdesign-miniprogram/date-time-picker/date-time-picker",
"t-action-sheet": "tdesign-miniprogram/action-sheet/action-sheet",
"t-image-viewer": "tdesign-miniprogram/image-viewer/image-viewer",
"t-link": "tdesign-miniprogram/link/link"
"t-demo": "./components/demo-block/index"
},
"window": {
"backgroundTextStyle": "light",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { SuperComponent, wxComponent, RelationsOptions } from '../common/src/index';
import config from '../common/config';
import props from './collapse-panel-props';
import props from './props';
import type { TdCollapsePanelProps } from './type';
import { getRect } from '../common/utils';

Expand All @@ -17,7 +17,7 @@ export default class CollapsePanel extends SuperComponent {
};

relations: RelationsOptions = {
'./collapse': {
'../collapse/collapse': {
type: 'ancestor',
linked(target: WechatMiniprogram.Component.TrivialInstance) {
this.parent = target;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ const props: TdCollapsePanelProps = {
/** 禁止当前面板展开,优先级大于 Collapse 的同名属性 */
disabled: {
type: Boolean,
value: null,
value: undefined,
},
/** 当前折叠面板展开图标,优先级大于 Collapse 的同名属性 */
expandIcon: {
type: Boolean,
value: true,
value: undefined,
},
/** 组件类名,用于组件外层元素、标题、内容 */
externalClasses: {
Expand Down
73 changes: 73 additions & 0 deletions src/collapse-panel/type.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
/* eslint-disable */

/**
* 该文件为脚本自动生成文件,请勿随意修改。如需修改请联系 PMC
* */

export interface TdCollapsePanelProps {
/**
* 折叠面板内容
*/
content?: {
type: StringConstructor;
value?: string;
};
/**
* 自定义组件样式
* @default ''
*/
customStyle?: {
type: StringConstructor;
value?: string;
};
/**
* 禁止当前面板展开,优先级大于 Collapse 的同名属性
*/
disabled?: {
type: BooleanConstructor;
value?: boolean;
};
/**
* 当前折叠面板展开图标,优先级大于 Collapse 的同名属性
*/
expandIcon?: {
type: BooleanConstructor;
value?: boolean;
};
/**
* 组件类名,用于组件外层元素、标题、内容
*/
externalClasses?: {
type: ArrayConstructor;
value?: ['t-class', 't-class-header', 't-class-content'];
};
/**
* 面板头内容
*/
header?: {
type: StringConstructor;
value?: string;
};
/**
* 面板头的右侧区域,一般用于呈现面板操作
*/
headerRightContent?: {
type: StringConstructor;
value?: string;
};
/**
* 选项卡内容的位置
* @default bottom
*/
placement?: {
type: StringConstructor;
value?: 'bottom' | 'top';
};
/**
* 当前面板唯一标识,如果值为空则取当前面下标兜底作为唯一标识
*/
value?: {
type: null;
value?: string | number;
};
}
2 changes: 1 addition & 1 deletion src/collapse/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ isComponent: true
```json
"usingComponents": {
"t-collapse": "tdesign-miniprogram/collapse/collapse",
"t-collapse-panel": "tdesign-miniprogram/collapse/collapse-panel"
"t-collapse-panel": "tdesign-miniprogram/collapse-panel/collapse-panel"
}
```

Expand Down
2 changes: 1 addition & 1 deletion src/collapse/__test__/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"component": true,
"usingComponents": {
"t-collapse": "../collapse",
"t-collapse-panel": "../collapse-panel"
"t-collapse-panel": "../../collapse-panel/collapse-panel"
}
}
2 changes: 1 addition & 1 deletion src/collapse/_example/accordion/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"component": true,
"usingComponents": {
"t-collapse": "tdesign-miniprogram/collapse/collapse",
"t-collapse-panel": "tdesign-miniprogram/collapse/collapse-panel"
"t-collapse-panel": "tdesign-miniprogram/collapse-panel/collapse-panel"
}
}
2 changes: 1 addition & 1 deletion src/collapse/_example/action/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"component": true,
"usingComponents": {
"t-collapse": "tdesign-miniprogram/collapse/collapse",
"t-collapse-panel": "tdesign-miniprogram/collapse/collapse-panel"
"t-collapse-panel": "tdesign-miniprogram/collapse-panel/collapse-panel"
}
}
2 changes: 1 addition & 1 deletion src/collapse/_example/base/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"component": true,
"usingComponents": {
"t-collapse": "tdesign-miniprogram/collapse/collapse",
"t-collapse-panel": "tdesign-miniprogram/collapse/collapse-panel"
"t-collapse-panel": "tdesign-miniprogram/collapse-panel/collapse-panel"
}
}
2 changes: 1 addition & 1 deletion src/collapse/_example/placement/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"component": true,
"usingComponents": {
"t-collapse": "tdesign-miniprogram/collapse/collapse",
"t-collapse-panel": "tdesign-miniprogram/collapse/collapse-panel"
"t-collapse-panel": "tdesign-miniprogram/collapse-panel/collapse-panel"
}
}
2 changes: 1 addition & 1 deletion src/collapse/_example/theme/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"component": true,
"usingComponents": {
"t-collapse": "tdesign-miniprogram/collapse/collapse",
"t-collapse-panel": "tdesign-miniprogram/collapse/collapse-panel"
"t-collapse-panel": "tdesign-miniprogram/collapse-panel/collapse-panel"
}
}
2 changes: 1 addition & 1 deletion src/collapse/collapse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default class Collapse extends SuperComponent {
externalClasses = [`${prefix}-class`];

relations: RelationsOptions = {
'./collapse-panel': {
'../collapse-panel/collapse-panel': {
type: 'descendant',
linked() {
this.updateExpanded();
Expand Down
2 changes: 0 additions & 2 deletions src/collapse/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@ export { default as Collapse } from './collapse';

export * from './type';
export * from './props';
export * from './collapse-panel-props';

export { CollapseProps } from './collapse';
export { CollapsePanelProps } from './collapse-panel';
68 changes: 0 additions & 68 deletions src/collapse/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,72 +70,4 @@ export interface TdCollapseProps {
};
}

export interface TdCollapsePanelProps {
/**
* 折叠面板内容
*/
content?: {
type: StringConstructor;
value?: string;
};
/**
* 自定义组件样式
* @default ''
*/
customStyle?: {
type: StringConstructor;
value?: string;
};
/**
* 禁止当前面板展开,优先级大于 Collapse 的同名属性
*/
disabled?: {
type: BooleanConstructor;
value?: boolean;
};
/**
* 当前折叠面板展开图标,优先级大于 Collapse 的同名属性
*/
expandIcon?: {
type: BooleanConstructor;
value?: boolean;
};
/**
* 组件类名,用于组件外层元素、标题、内容
*/
externalClasses?: {
type: ArrayConstructor;
value?: ['t-class', 't-class-header', 't-class-content'];
};
/**
* 面板头内容
*/
header?: {
type: StringConstructor;
value?: string;
};
/**
* 面板头的右侧区域,一般用于呈现面板操作
*/
headerRightContent?: {
type: StringConstructor;
value?: string;
};
/**
* 选项卡内容的位置
* @default bottom
*/
placement?: {
type: StringConstructor;
value?: 'bottom' | 'top';
};
/**
* 当前面板唯一标识,如果值为空则取当前面下标兜底作为唯一标识
*/
value?: {
type: null;
value?: string | number;
};
}

export type CollapseValue = Array<string | number>;