Skip to content

Commit a131267

Browse files
author
rulishu
committed
fix: 解决merge冲突
2 parents 10e86a7 + 45505cb commit a131267

File tree

15 files changed

+43
-72
lines changed

15 files changed

+43
-72
lines changed

packages/core/src/Modal/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Modal 模态框
88

99
### 基础示例
1010

11-
1211
```jsx mdx:preview
1312
import React, { useState, Fragment } from 'react';
1413
import { View, Text, SafeAreaView } from 'react-native';

website/src/component/Preview/Footer.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@ import { Divider } from 'uiw';
22

33
export default function (props) {
44
const { path } = props;
5-
const url = /^http/.test(path || '') ? path : `https://github.com/uiwjs/react-native-uiw/edit/master/${path}`;
5+
const url = /^http/.test(path || '')
6+
? path
7+
: `https://github.com/uiwjs/react-native-uiw/edit/master/${path?.replace(/^\//, '')}`;
68
return (
79
<div style={{ paddingBlock: 20 }}>
8-
{url && (
9-
<a href={url} target="_blank" rel="noopener noreferrer">
10-
在Github上编辑本页!
11-
</a>
12-
)}
10+
{path && url && <a href={url} target="_blank" rel="noopener noreferrer" style={{ color: '#333' }}></a>}
1311
<Divider type="vertical" />
14-
<a target="_blank" rel="noopener noreferrer" href="https://github.com/uiwjs/react-native-uiw/issues">
15-
提交bug
16-
</a>
12+
<a
13+
target="_blank"
14+
rel="noopener noreferrer"
15+
href="https://github.com/uiwjs/react-native-uiw/issues"
16+
style={{ color: '#333' }}
17+
></a>
1718
</div>
1819
);
1920
}

website/src/component/Preview/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ const getBooleanValue = (param, field, defaultValue) => {
3939

4040
const Preview = ({ path, ...mdData }) => {
4141
const $dom = useRef(null);
42-
4342
return (
4443
<Wrapper ref={$dom}>
4544
<Markdown

website/src/pages/docs/app-store/android/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@ const transformImageUri = (url: string) => {
77
return urlAddr;
88
};
99

10-
const DEMO = () => <Preview {...md} transformImageUri={transformImageUri} />;
10+
const DEMO = () => (
11+
<Preview {...md} transformImageUri={transformImageUri} path="website/src/pages/docs/app-store/android/README.md" />
12+
);
1113
export default DEMO;

website/src/pages/docs/app-store/ios/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ const transformImageUri = (url: string) => {
77
return urlAddr
88
}
99

10-
const DEMO = () => <Preview {...md} transformImageUri={transformImageUri} />;
10+
const DEMO = () => <Preview {...md} transformImageUri={transformImageUri} path="website/src/pages/docs/app-store/ios/README.md" />;
1111
export default DEMO;

website/src/pages/docs/changelog/README.md

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -6,53 +6,3 @@
66
严格遵循 [`Semantic Versioning 2.0.0`](http://semver.org/lang/zh-CN/) 语义化版本规范。
77

88
Github [`更新日志`](https://github.com/uiwjs/react-native-uiw/releases)
9-
10-
## `v3.0.3`
11-
12-
- Presets Updates
13-
- 组件性能优化
14-
- 统一 `ios` 以及 `android` 组件差异
15-
- 🚧 减少第三方依赖
16-
- 即将删除组件 ~~`SelectCascader`~~<!--rehype:style=color: #e00000;-->
17-
- 即将删除依赖 ~~`@react-native-picker/picker`~~<!--rehype:style=color: #e00000;-->
18-
- New Components
19-
- 🌟 `Calendar` 日历
20-
- 🌟 `ScreenRoot` 自定义导航栏
21-
- 🌟 `DragDrawer` 拖曳抽屉
22-
- 🌟 `TreeSelect` 级联选择器
23-
- 🌟 `RNText` 字体文本
24-
- Components Change
25-
- `Radio` 新增选中颜色
26-
- 🌟 add `borderColor`
27-
- 🌟 add `checkedColor`
28-
- `Card` 新增自定选中状态
29-
- 🌟 add `selectedStyle`
30-
- `Rating` 新增只读功能 & 自定义每项的提示信息
31-
- 🌟 add `tooltips`
32-
- 🌟 add `tooltipsText`
33-
- 🌟 add `disabled`
34-
- `Timeline` 新增自定义图标
35-
- 🚧 ~~`icon?:IconsProps`~~<!--rehype:style=color: #e00000;--> => `icon?: IconsName | React.ReactElement | React.ReactNode`
36-
- 🌟 add `size`
37-
- 🌟 add `color`
38-
- `Pagination` 新增简洁版本
39-
- 🌟 add `simple`
40-
- 🐞 `NoticeBar` 解决 NoticeBar首次渲染报错问题
41-
- 🐞 `Modal` 解决 Modal弹出动画底层延迟收起问题
42-
- 🐞 `SwipeAction` 解决 SwipeAction key报错
43-
- Dependencies Update
44-
- 💄 ~~`react-native-gesture-handler@1.10.3`~~ -> `react-native-gesture-handler@2.0.0`
45-
46-
## `v3.0.2`
47-
48-
- New Components
49-
- 🌟 `RnText` 组件
50-
- Components Change
51-
- `Picker` ~~`<Picker key="label" />`~~<!--rehype:style=color: #e00000;--> => `<Picker rowKey="label" />`
52-
- `DragDrawer` 自定义抽屉样式
53-
- add `style` props.
54-
- add `icon` props.
55-
- `DragDrawer`
56-
- Dependencies Update
57-
- update dependency color to v4.0.2
58-
- update dependency react-native-gesture-handler to v2.0.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Preview from 'src/component/Preview';
22
import md from './README.md';
33

4-
const DEMO = () => <Preview {...md} />;
4+
const DEMO = () => <Preview {...md} path="/website/src/pages/docs/changelog/README.md" />;
55
export default DEMO;

website/src/pages/docs/development/components/index.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,11 @@ const transformImageUri = (url: string) => {
77
return urlAddr;
88
};
99

10-
const DEMO = () => <Preview {...md} transformImageUri={transformImageUri} />;
10+
const DEMO = () => (
11+
<Preview
12+
{...md}
13+
transformImageUri={transformImageUri}
14+
path="website/src/pages/docs/development/components/README.md"
15+
/>
16+
);
1117
export default DEMO;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Preview from 'src/component/Preview';
22
import md from './README.md';
33

4-
const DEMO = () => <Preview {...md} />;
4+
const DEMO = () => <Preview {...md} path="website/src/pages/docs/development/document/README.md" />;
55
export default DEMO;

website/src/pages/docs/environment-setup/android-windows/index.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,11 @@ const transformImageUri = (url: string) => {
77
return urlAddr;
88
};
99

10-
const DEMO = () => <Preview {...md} transformImageUri={transformImageUri} />;
10+
const DEMO = () => (
11+
<Preview
12+
{...md}
13+
transformImageUri={transformImageUri}
14+
path="website/src/pages/docs/environment-setup/android-windows/README.md"
15+
/>
16+
);
1117
export default DEMO;

0 commit comments

Comments
 (0)