Merge branch 'feature-1.7'

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",

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"
               }
             ]

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的展示或隐藏

site/docs/upgradeNotes/版本升级说明.md

@@ -1078,3 +1078,12 @@
   - 🎊 新增 API `rateOptions`，用于支持调节播放速度
 - TreeSelect
   - 🔨 优化不可编辑的多选模式下，未选择时的鼠标样式
+
+---
+`2020.11.30`
+
+## 1.7.7-beta.3
+- Tree、TreeSelect
+  - 🎊 新增 API `checkType` 用于支持父子节点选择时的单向联动
+  - 🎊 新增 API `checkable` 用于支持单节点Checkbox的展示或隐藏
+

site/docs/zh-CN/guide.md

@@ -83,18 +83,18 @@
               title: '标题 1',
               subtitle: '春眠不觉晓，处处闻啼鸟。夜来风雨声，花落知多少。',
               content: (
-                <img alt="图片" style={{ width: '100%' }} src={'//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe'} />
+                <img alt="图片" style={{ width: '100%' }} src={'//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe'} />
               )
             },
             {
               title: '标题 2',
               content: (
-                <img alt="图片" style={{ width: '100%' }} src={'//nos.netease.com/ysf/080b89be8a980ab9951a1b0de643d939'} />
+                <img alt="图片" style={{ width: '100%' }} src={'//ysf.qiyukf.net/080b89be8a980ab9951a1b0de643d939'} />
               )
             },
             {
               content: (
-                <img alt="图片" style={{ width: '100%' }} src={'//nos.netease.com/ysf/260c0731b07b2933fe04f1a4d629450c'} />
+                <img alt="图片" style={{ width: '100%' }} src={'//ysf.qiyukf.net/260c0731b07b2933fe04f1a4d629450c'} />
               )
             },
           ]}

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={`
         <p>附件测试：<br/>
-        <a data-ql-link-type="attachment" download="测试文件.jpg" href="//nos.netease.com/ysf/3df2280d2319678a091138b0bbba82fe">[文件] 测试文件.jpg</a>
+        <a data-ql-link-type="attachment" download="测试文件.jpg" href="//ysf.qiyukf.net/3df2280d2319678a091138b0bbba82fe">[文件] 测试文件.jpg</a>
         </p>`}
       />
     );
@@ -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);

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 | - |

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 | - |

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',

site/locales/index.js

@@ -12,6 +12,6 @@ export default {
     'feedback': '反馈建议',
     'demo': '演示环境',
     'mobileComponent': 'Mobile组件',
-    'version': 'v1.7.7'
+    'version': '1.7.7'
   }
 };

site/pages/common/layout.js

@@ -92,13 +92,12 @@ export default class Layout extends React.Component {
         <Row>
           <Col xs={24} sm={24} md={24} lg={6} xl={5} xxl={4} className="header-title">
             <Link to="/home" rel="noopener noreferrer">
-              <img src={'//ysf.qiyukf.net/unanqvsjrxhnpwqrulcuumqxicpwsojh'} alt="fish-design"/>
+              <img src={'//ysf.nosdn.127.net/unanqvsjrxhnpwqrulcuumqxicpwsojh'} alt="fish-design" />
             </Link>
           </Col>
           <Col xs={24} sm={24} md={24} lg={18} xl={19} xxl={20} className="header-navbar">
             <div id="search-box" className="search-box">
-              <img src={require('../../assets/[email protected]')} className="search-icon"/>
-              <input type="text" placeholder="在 Fish Design 中搜索" className="fishd-input"/>
+              <input type="text" placeholder="在 Fish Design 中搜索" className="fishd-input" />
             </div>
             <ul className="nav">
               <li className="nav-item">
@@ -108,12 +107,12 @@ export default class Layout extends React.Component {
                 <Link to="/components">{this.getLocale('misc.component')}</Link>
               </li>
               <li className="nav-item">
-                <a href="//nsfi.github.io/fishd-mobile-site/index.html#/zh-CN/components" target="_blank">{this.getLocale('misc.mobileComponent')}</a>
+                <a href="//nsfi.github.io/fishd-mobile-site/index.html" target="_blank">{this.getLocale('misc.mobileComponent')}</a>
               </li>
-              <li className="nav-item">
-                <a href="//nsfi.github.io/ppfish-demo" target="_blank">{this.getLocale('misc.demo')}</a>
-              </li>
-              <span className="nav-version">{this.getLocale('misc.version')}</span>
+              <a className="nav-version">{this.getLocale('misc.version')}</a>
+              <a className="u-github" href="//github.com/NSFI/ppfish-components" target="_blank">
+                <img style={{width: 25, height: 25}} src={require('../../assets/github.png')} alt="github" />
+              </a>
             </ul>
           </Col>
         </Row>
@@ -122,19 +121,20 @@ export default class Layout extends React.Component {
     const CommonFooter = (!hideFooter &&
       <footer className="footer">
         <div className="logo">
-          <img src={'//ysf.qiyukf.net/cipiqsfpsbyreuwspfkybadithmnnlmc'} alt="logo"/>
+          <img src={'//ysf.nosdn.127.net/cipiqsfpsbyreuwspfkybadithmnnlmc'} alt="logo" />
           <h3>Fish Design</h3>
-          <p className="version">- {this.getLocale('misc.version')} -</p>
+          <p className="version">- V  {this.getLocale('misc.version')} -</p>
         </div>
         <div className="link-list">
           <Link to="/home" className="link-item">首页</Link>
-          <Link to="/components" className="link-item">组件</Link>
+          <Link to="/components" className="link-item">Web 组件</Link>
+          <a href="//nsfi.github.io/fishd-mobile-site/index.html" className="link-item">Mobile 组件</a>
           <a href="//nsfi.github.io/ppfish-demo" target="_blank" className="link-item">{this.getLocale('misc.demo')}</a>
-          <a href="https://github.com/NSFI/ppfish-components/issues" target="_blank" className="link-item">问题反馈</a>
+          <a href="//github.com/NSFI/ppfish-components/issues" target="_blank" className="link-item">问题反馈</a>
         </div>
         <div className="github">
           <a href="//github.com/NSFI/ppfish-components" target="_blank">
-            <img src={require('../../assets/[email protected]')} alt="github"/>
+            <img src={require('../../assets/[email protected]')} alt="github" />
             <span>GitHub</span>
           </a>
         </div>