Skip to content

Commit

Permalink
chore(table): 合并develop处理冲突
Browse files Browse the repository at this point in the history
  • Loading branch information
yunfeic committed Jan 27, 2022
2 parents 1be5c77 + 42cdd8e commit 56f36e1
Show file tree
Hide file tree
Showing 128 changed files with 2,892 additions and 960 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/issue-help-wanted.temp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# force copy from tencent/tdesign
name: Issue Help wanted
on:
issues:
types:
- labeled
jobs:
add-comment:
if: github.event.label.name == 'help wanted'
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- name: Add comment
uses: peter-evans/create-or-update-comment@v1
with:
issue-number: ${{ github.event.issue.number }}
body: |
任何人都可以处理此问题。
**请务必在您的 `pull request` 中引用此问题。** :sparkles:
感谢你的贡献! :sparkles:
reactions: heart
19 changes: 19 additions & 0 deletions .github/workflows/issue-mark-duplicate.temp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# force copy from tencent/tdesign
# 当在 issue 的 comment 回复类似 `Duplicate of #111` 这样的话,issue 将被自动打上 重复提交标签 并且 cloese
name: Issue Mark Duplicate

on:
issue_comment:
types: [created, edited]

jobs:
mark-duplicate:
runs-on: ubuntu-latest
steps:
- name: mark-duplicate
uses: actions-cool/issues-helper@v2
with:
actions: "mark-duplicate"
token: ${{ secrets.GITHUB_TOKEN }}
duplicate-labels: "duplicate"
close-issue: true
21 changes: 21 additions & 0 deletions .github/workflows/issue-reply.temp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# force copy from tencent/tdesign
# 当被打上 Need Reproduce 标签时候,自动提示需要重现实例

name: ISSUE_REPLY

on:
issues:
types: [labeled]

jobs:
issue-reply:
runs-on: ubuntu-latest
steps:
- name: Need Reproduce
if: github.event.label.name == 'Need Reproduce'
uses: actions-cool/issues-helper@v2
with:
actions: 'create-comment'
issue-number: ${{ github.event.issue.number }}
body: |
你好 @${{ github.event.issue.user.login }}, 我们需要你提供一个在线的重现实例以便于我们帮你排查问题。你可以通过点击 [此处](https://codesandbox.io/) 创建一个 codesandbox 或者提供一个最小化的 GitHub 仓库。请确保选择准确的版本。
27 changes: 27 additions & 0 deletions .github/workflows/issue-stale-close.temp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# force copy from tencent/tdesign
# 国际标准时间+8
name: Close stale issues and PRs
on:
schedule:
- cron: "50 5 * * *"

jobs:
close-issues:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v4
with:
stale-issue-message: "这个 Issue 被标记为了过时 stale ,因为它已经 open 了 30 天,没有任何活动。删除 stale 标签或评论,否则将在 7 天内关闭。"
stale-pr-message: '这个 PR 已经过时了,因为它已经开放了 45 天,没有任何活动。 删除 stale 的标签或评论,否则将在 10 天内关闭。'
close-issue-message: "此 Issue 被自动关闭,因为它自被标记为过时 stale 以来已闲置 5 天。"
close-pr-message: "此 PR 被自动关闭,因为它已经 stable 停滞了 10 天,没有任何活动。"
days-before-stale: 30
days-before-close: 7
days-before-pr-stale: 45
days-before-pr-close: 10
repo-token: ${{ secrets.GITHUB_TOKEN }}
exempt-issue-labels: 'WIP'
exempt-pr-labels: 'WIP'
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
"start-server-and-test": "^1.14.0",
"tdesign-icons-view": "^0.0.1",
"tdesign-publish-cli": "^0.0.9",
"tdesign-site-components": "~0.5.44",
"tdesign-site-components": "~0.5.52",
"ts-jest": "^27.1.2",
"ts-morph": "^13.0.02",
"ts-node": "^10.4.0",
Expand Down
4 changes: 2 additions & 2 deletions site/plugin-tdoc/md-to-react.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ export default function mdToReact(options) {
${mdSegment.demoMd.replace(/class=/g, 'className=')}
<td-contributors platform="web" framework="react" component-name="${mdSegment.componentName}" ></td-contributors>
</div>
<div style={isShow('api')} name="API" dangerouslySetInnerHTML={{ __html: \`${mdSegment.apiMd}\` }}></div>
<div style={isShow('design')} name="DESIGN" dangerouslySetInnerHTML={{ __html: \`${mdSegment.designMd}\` }}></div>
<div style={isShow('api')} name="API" dangerouslySetInnerHTML={{ __html: ${JSON.stringify(mdSegment.apiMd)} }}></div>
<div style={isShow('design')} name="DESIGN" dangerouslySetInnerHTML={{ __html: ${JSON.stringify(mdSegment.designMd)} }}></div>
</>
) : <div name="DOC" className="${mdSegment.docClass}">${mdSegment.docMd.replace(/class=/g, 'className=')}</div>
}
Expand Down
12 changes: 6 additions & 6 deletions site/site.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,12 @@ export default {
path: '/react/components/list',
component: () => import('tdesign-react/list/list.md'),
},
{
title: 'Loading 加载',
name: 'loading',
path: '/react/components/loading',
component: () => import('tdesign-react/loading/loading.md'),
},
{
title: 'Progress 进度条',
name: 'progress',
Expand Down Expand Up @@ -344,12 +350,6 @@ export default {
path: '/react/components/drawer',
component: () => import('tdesign-react/drawer/drawer.md'),
},
{
title: 'Loading 加载',
name: 'loading',
path: '/react/components/loading',
component: () => import('tdesign-react/loading/loading.md'),
},
{
title: 'Message 全局提醒',
name: 'message',
Expand Down
5 changes: 3 additions & 2 deletions site/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ import { BrowserRouter, Switch, Route, Redirect } from 'react-router-dom';
import Loading from 'tdesign-react/loading';
import Select from 'tdesign-react/select';
import ConfigProvider from 'tdesign-react/config-provider';
// import locale from 'tdesign-react/locale/zh_CN';
// import locale from 'tdesign-react/locale/en_US';
import siteConfig from '../site.config.js';
import { getRoute, filterVersions } from './utils';
// import locale from 'tdesign-react/locale/en_US';
import packageJson from '@/package.json';

const LazyDemo = lazy(() => import('./components/Demo'));
Expand Down Expand Up @@ -84,7 +85,7 @@ function Components(props) {
<td-doc-aside ref={tdDocAsideRef} title="React for Web">
{versionOptions.length ? (
<div slot="extra">
<Select value={version} options={versionOptions} onChange={changeVersion} />
<Select popupProps={{ zIndex: 800 }} value={version} options={versionOptions} onChange={changeVersion} />
</div>
) : null}
</td-doc-aside>
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/codesandbox/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from 'react';
import ReactDOM from 'react-dom';
import Demo from './demo';
import './index.css';
import 'tdesign-react/dist/tdesign.css';
import 'tdesign-react/es/style/index.css';

const rootElement = document.getElementById('app');
ReactDOM.render(<Demo />, rootElement);
Loading

0 comments on commit 56f36e1

Please sign in to comment.