diff --git a/package.json b/package.json index 9c023c250..1432ffbb7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ppfish", - "version": "1.7.7-beta.2", + "version": "1.7.7-beta.3", "description": "fish design ui components", "scripts": { "precommit": "lint-staged", diff --git a/site/assets/github.png b/site/assets/github.png new file mode 100644 index 000000000..8993fb6fc Binary files /dev/null and b/site/assets/github.png differ diff --git a/site/assets/logo-color.png b/site/assets/logo-color.png new file mode 100644 index 000000000..818ee2d12 Binary files /dev/null and b/site/assets/logo-color.png differ diff --git a/site/assets/qrcode.svg b/site/assets/qrcode.svg new file mode 100644 index 000000000..b30348132 --- /dev/null +++ b/site/assets/qrcode.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + diff --git "a/site/assets/\347\273\204\344\273\266\345\272\223\347\273\264\346\212\244\346\265\201\347\250\213.png" "b/site/assets/\347\273\204\344\273\266\345\272\223\347\273\264\346\212\244\346\265\201\347\250\213.png" index 9ac4c9702..1a6b22d3f 100644 Binary files "a/site/assets/\347\273\204\344\273\266\345\272\223\347\273\264\346\212\244\346\265\201\347\250\213.png" and "b/site/assets/\347\273\204\344\273\266\345\272\223\347\273\264\346\212\244\346\265\201\347\250\213.png" differ diff --git a/site/componentsPage/index.js b/site/componentsPage/index.js index 973bd09f6..18a8e94d5 100755 --- a/site/componentsPage/index.js +++ b/site/componentsPage/index.js @@ -135,15 +135,15 @@ export const components = { props: { source: [ { - "src": "//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe", + "src": "//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe", "name": "pic1" }, { - "src": "//nos.netease.com/ysf/080b89be8a980ab9951a1b0de643d939", + "src": "//ysf.qiyukf.net/080b89be8a980ab9951a1b0de643d939", "name": "pic2" }, { - "src": "//nos.netease.com/ysf/260c0731b07b2933fe04f1a4d629450c", + "src": "//ysf.qiyukf.net/260c0731b07b2933fe04f1a4d629450c", "name": "pic3" } ] diff --git a/site/docs/upgradeNotes/1.7/1.7.7.md b/site/docs/upgradeNotes/1.7/1.7.7.md index 6c356a3cd..9c2b7b770 100644 --- a/site/docs/upgradeNotes/1.7/1.7.7.md +++ b/site/docs/upgradeNotes/1.7/1.7.7.md @@ -16,3 +16,8 @@ - 🎊 新增 API `rateOptions`,用于支持调节播放速度 - TreeSelect - 🔨 优化不可编辑的多选模式下,未选择时的鼠标样式 + +### 1.7.7-beta.3 +- Tree、TreeSelect + - 🎊 新增 API `checkType` 用于支持父子节点选择时的单向联动 + - 🎊 新增 API `checkable` 用于支持单节点Checkbox的展示或隐藏 diff --git "a/site/docs/upgradeNotes/\347\211\210\346\234\254\345\215\207\347\272\247\350\257\264\346\230\216.md" "b/site/docs/upgradeNotes/\347\211\210\346\234\254\345\215\207\347\272\247\350\257\264\346\230\216.md" index 791e25b4b..d3c79184e 100644 --- "a/site/docs/upgradeNotes/\347\211\210\346\234\254\345\215\207\347\272\247\350\257\264\346\230\216.md" +++ "b/site/docs/upgradeNotes/\347\211\210\346\234\254\345\215\207\347\272\247\350\257\264\346\230\216.md" @@ -1078,3 +1078,12 @@ - 🎊 新增 API `rateOptions`,用于支持调节播放速度 - TreeSelect - 🔨 优化不可编辑的多选模式下,未选择时的鼠标样式 + +--- +`2020.11.30` + +## 1.7.7-beta.3 +- Tree、TreeSelect + - 🎊 新增 API `checkType` 用于支持父子节点选择时的单向联动 + - 🎊 新增 API `checkable` 用于支持单节点Checkbox的展示或隐藏 + \ No newline at end of file diff --git a/site/docs/zh-CN/guide.md b/site/docs/zh-CN/guide.md index 8979b8f4a..b5f8d6292 100644 --- a/site/docs/zh-CN/guide.md +++ b/site/docs/zh-CN/guide.md @@ -83,18 +83,18 @@ title: '标题 1', subtitle: '春眠不觉晓,处处闻啼鸟。夜来风雨声,花落知多少。', content: ( - 图片 + 图片 ) }, { title: '标题 2', content: ( - 图片 + 图片 ) }, { content: ( - 图片 + 图片 ) }, ]} diff --git a/site/docs/zh-CN/richEditor.md b/site/docs/zh-CN/richEditor.md index 47f3a64da..6cc289786 100644 --- a/site/docs/zh-CN/richEditor.md +++ b/site/docs/zh-CN/richEditor.md @@ -96,37 +96,37 @@ { id: 0, className: 'e0', - url: '//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe', + url: '//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe', title: 'pic1' }, { id: 1, className: 'e1', - url: '//nos.netease.com/ysf/080b89be8a980ab9951a1b0de643d939', + url: '//ysf.qiyukf.net/080b89be8a980ab9951a1b0de643d939', title: 'pic2' }, { id: 2, className: 'e2', - url: '//nos.netease.com/ysf/260c0731b07b2933fe04f1a4d629450c', + url: '//ysf.qiyukf.net/260c0731b07b2933fe04f1a4d629450c', title: 'pic3' }, { id: 3, className: 'e3', - url: "//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe", + url: "//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe", title: "pic4" }, { id: 4, className: 'e4', - url: "//nos.netease.com/ysf/080b89be8a980ab9951a1b0de643d939", + url: "//ysf.qiyukf.net/080b89be8a980ab9951a1b0de643d939", title: "pic5" }, { id: 5, className: 'e5', - url: '//nos.netease.com/ysf/260c0731b07b2933fe04f1a4d629450c', + url: '//ysf.qiyukf.net/260c0731b07b2933fe04f1a4d629450c', title: 'pic6' }, ] @@ -317,7 +317,7 @@ // 模拟上传图片至服务器并设置图片URL的异步过程 setTimeout(() => { - let imageUrl = "//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe"; + let imageUrl = "//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe"; callback({ src: imageUrl, alt: 'image alt', @@ -372,7 +372,7 @@ [].forEach.call(imgFiles, (file, index) => { // 模拟上传图片至服务器并设置图片URL的异步过程 setTimeout(() => { - let imageUrl = "//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe"; + let imageUrl = "//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe"; callback({ src: imageUrl, alt: 'image alt', @@ -482,23 +482,23 @@ let files = [{ name: '普通文件.doc', type: 'other', - url: "//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe" + url: "//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe" },{ name: '普通文件.pdf', type: 'other', - url: "//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe" + url: "//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe" },{ name: '图片文件.jpg', type: 'image', - url: "//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe" + url: "//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe" },{ name: '视频文件.mp4', type: 'video', - url: "//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe" + url: "//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe" },{ name: '普通文件.txt', type: 'other', - url: "//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe" + url: "//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe" }] callback(files); @@ -529,7 +529,7 @@ }} value={`

附件测试:
- [文件] 测试文件.jpg + [文件] 测试文件.jpg

`} /> ); @@ -566,16 +566,16 @@ { name: '普通文件.doc', type: 'other', - url: "//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe" + url: "//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe" }, { name: '普通文件.pdf', type: 'other', - url: "//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe" + url: "//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe" }, { type: 'image', - src: "//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe", + src: "//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe", // 添加其他可选属性 width: 200, height: 100, @@ -593,7 +593,7 @@ { name: '普通文件.txt', type: 'other', - url: "//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe" + url: "//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe" } ]; callback(filesInfo); diff --git a/site/docs/zh-CN/tree.md b/site/docs/zh-CN/tree.md index 11d87aadb..231676e93 100644 --- a/site/docs/zh-CN/tree.md +++ b/site/docs/zh-CN/tree.md @@ -884,7 +884,7 @@ | 参数 | 说明 | 类型 | 默认值 | | --- | --- | --- | --- | -| checkable | 当树为 checkable 时,设置独立节点是否展示 Checkbox,默认继承Tree当中的checkable属性 | Boolean | - | +| checkable | 当树为 checkable 时,设置独立节点是否展示 Checkbox,默认值继承自 checkable 属性 | Boolean | - | | disableCheckbox | 禁掉 checkbox | Boolean | false | | disabled | 禁掉响应 | Boolean | false | | icon | 自定义当前节点 title 前的图标。可接收组件,props 为当前节点的 props | ReactNode \| (props) => ReactNode | - | diff --git a/site/docs/zh-CN/treeSelect.md b/site/docs/zh-CN/treeSelect.md index b265537b9..5a84b41e6 100644 --- a/site/docs/zh-CN/treeSelect.md +++ b/site/docs/zh-CN/treeSelect.md @@ -1247,7 +1247,7 @@ | 参数 | 说明 | 类型 | 默认值 | | --- | --- | --- | --- | -| checkable | 当树为 checkable 时,设置独立节点是否展示 Checkbox,默认继承Tree当中的checkable属性 | Boolean | - | +| checkable | 当树为 checkable 时,设置独立节点是否展示 Checkbox,默认值继承自 treeCheckable 属性 | Boolean | - | | disableCheckbox | 禁掉 checkbox | Boolean | false | | disabled | 是否禁用 | Boolean | false | | icon | 自定义当前节点 title 前的图标。可接收组件,props 为当前节点的 props。Tree props 中 `showIcon` 为 true 时有效。 | ReactNode \| (props) => ReactNode | - | diff --git a/site/docs/zh-CN/upload.md b/site/docs/zh-CN/upload.md index d4e672b94..97f1150ba 100644 --- a/site/docs/zh-CN/upload.md +++ b/site/docs/zh-CN/upload.md @@ -71,7 +71,7 @@ render() { uid: -1, name: 'xxx.png', status: 'done', - url: '//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe', + url: '//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe', }], }; @@ -384,8 +384,8 @@ render(){ uid: -1, name: 'xxx.png', status: 'done', - url: '//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe', - thumbUrl: '//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe', + url: '//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe', + thumbUrl: '//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe', }, { uid: -2, name: 'yyy.png', diff --git a/site/locales/index.js b/site/locales/index.js index 554799f12..c62231259 100755 --- a/site/locales/index.js +++ b/site/locales/index.js @@ -12,6 +12,6 @@ export default { 'feedback': '反馈建议', 'demo': '演示环境', 'mobileComponent': 'Mobile组件', - 'version': 'v1.7.7' + 'version': '1.7.7' } }; diff --git a/site/pages/common/layout.js b/site/pages/common/layout.js index 3a9e11b54..de1c33c5b 100644 --- a/site/pages/common/layout.js +++ b/site/pages/common/layout.js @@ -92,13 +92,12 @@ export default class Layout extends React.Component { - fish-design + fish-design @@ -122,19 +121,20 @@ export default class Layout extends React.Component { const CommonFooter = (!hideFooter &&