Daily/shina#12
Merged
RobinYang11 merged 6 commits intoRobinYang11:mainfrom Mar 27, 2023
Merged
Conversation
表格组件添加简单排序和输入筛选
Word spelling
fix package.json
RobinYang11
reviewed
Mar 23, 2023
Owner
RobinYang11
left a comment
RobinYang11
left a comment
There was a problem hiding this comment.
代码不要 往 main 分支上推 推到dev 分支
vue 项目用 npm run vue 启动 不用改webpack
| export default function Table(props: ITableProps) { | ||
| const { data, cols, className } = props; | ||
| export default function Table<RowType extends Record<string, any>>(props: ITableProps<RowType>) { | ||
| const { data: OutData, cols: OutCols, className } = props; |
Owner
There was a problem hiding this comment.
代码不要 往 main 分支上推 推到dev 分支
vue 项目用 npm run vue 启动 不用改webpack
Contributor
Author
There was a problem hiding this comment.
vue写的 用npm run vue的路径指向src/react/_test.tsx所以我改了路径
Contributor
Author
There was a problem hiding this comment.
我就不往dev推了,所有的人都在上改代码 ,不是覆盖就是被覆盖 Daily/shina 就是我的分支
Owner
There was a problem hiding this comment.
可以起一个和别人不一样的名字 比如 NanaTable ，解决冲突也是一种能力，我们日常开发 就是在和冲突打交道。
Contributor
Author
There was a problem hiding this comment.
已经合并推送dev分支,vue/App.vue中我的部分已经标出
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.