From c4148e2f07dd7bc92fe1c3b8aac282e40435e17c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A1=BE=E4=BA=91=E7=BF=94?= Date: Thu, 9 Feb 2017 10:24:00 +0800 Subject: [PATCH] change file CRLF to LF --- .gitignore | 2 +- .npmignore | 2 +- .yo-rc.json | 2 +- HISTORY.md | 2 +- demo/index.js | 1 - mock/query/child.json | 68 +++++------ mock/query/firstLevel.json | 188 +++++++++++++++---------------- tests/CascadeMultiSelect.spec.js | 2 +- tests/index.js | 2 +- 9 files changed, 134 insertions(+), 135 deletions(-) diff --git a/.gitignore b/.gitignore index 4d59cac..6730e40 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,4 @@ spm_modules dist build assets/**/*.css -.vscode/ +.vscode diff --git a/.npmignore b/.npmignore index b89d465..6531ca0 100644 --- a/.npmignore +++ b/.npmignore @@ -26,4 +26,4 @@ sea-modules spm_modules .cache .happypack -dist \ No newline at end of file +dist diff --git a/.yo-rc.json b/.yo-rc.json index 32fcf8c..abaa648 100644 --- a/.yo-rc.json +++ b/.yo-rc.json @@ -1,3 +1,3 @@ { "generator-uxcore": {} -} \ No newline at end of file +} diff --git a/HISTORY.md b/HISTORY.md index d7b6499..edbde51 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1 +1 @@ -# history \ No newline at end of file +# history diff --git a/demo/index.js b/demo/index.js index f171cfe..84cc087 100644 --- a/demo/index.js +++ b/demo/index.js @@ -10,4 +10,3 @@ const ReactDOM = require('react-dom'); const React = require('react'); const Demo = require('./CascadeMultiSelectDemo'); ReactDOM.render(, document.getElementById('UXCoreDemo')); - diff --git a/mock/query/child.json b/mock/query/child.json index 0b2de01..bedb0b0 100755 --- a/mock/query/child.json +++ b/mock/query/child.json @@ -1,34 +1,34 @@ -{ - "content": [{ - "value": "测试二级类目", - "key": "TEST00", - "parentName": "TEST", - "leaf": false, - "fullNamePath": "0\/TEST\/TEST00" - }, { - "value": "测试二级类目超长名称样式测试，二级类目超长名称样式测试", - "key": "TEST01", - "parentName": "TEST", - "leaf": false, - "fullNamePath": "0\/TEST\/TEST01" - }, { - "value": "测试二级类目超长名称样式测试，二级类目超长名称样式测试", - "key": "TEST02", - "parentName": "TEST", - "leaf": false, - "fullNamePath": "0\/TEST\/TEST02" - }, { - "value": "测试二级类目超长名称样式测试，二级类目超长名称样式测试", - "key": "TEST03", - "parentName": "TEST", - "leaf": false, - "fullNamePath": "0\/TEST\/TEST03" - }, { - "value": "测试二级类目超长名称样式测试，二级类目超长名称样式测试", - "key": "TEST04", - "parentName": "TEST", - "leaf": false, - "fullNamePath": "0\/TEST\/TEST04" - }], - "hasError": false -} +{ + "content": [{ + "value": "测试二级类目", + "key": "TEST00", + "parentName": "TEST", + "leaf": false, + "fullNamePath": "0\/TEST\/TEST00" + }, { + "value": "测试二级类目超长名称样式测试，二级类目超长名称样式测试", + "key": "TEST01", + "parentName": "TEST", + "leaf": false, + "fullNamePath": "0\/TEST\/TEST01" + }, { + "value": "测试二级类目超长名称样式测试，二级类目超长名称样式测试", + "key": "TEST02", + "parentName": "TEST", + "leaf": false, + "fullNamePath": "0\/TEST\/TEST02" + }, { + "value": "测试二级类目超长名称样式测试，二级类目超长名称样式测试", + "key": "TEST03", + "parentName": "TEST", + "leaf": false, + "fullNamePath": "0\/TEST\/TEST03" + }, { + "value": "测试二级类目超长名称样式测试，二级类目超长名称样式测试", + "key": "TEST04", + "parentName": "TEST", + "leaf": false, + "fullNamePath": "0\/TEST\/TEST04" + }], + "hasError": false +} diff --git a/mock/query/firstLevel.json b/mock/query/firstLevel.json index 1bc75f0..8204163 100755 --- a/mock/query/firstLevel.json +++ b/mock/query/firstLevel.json @@ -1,94 +1,94 @@ -{ - "content": [{ - "value": "测试", - "key": "TEST", - "parentName": "ROOT", - "leaf": false, - "fullNamePath": "0\/TEST" - }, { - "value": "测试1", - "key": "TEST1", - "parentName": "ROOT", - "leaf": false, - "fullNamePath": "0\/TEST1" - }, { - "value": "测试2", - "key": "TEST2", - "parentName": "ROOT", - "leaf": false, - "fullNamePath": "0\/TEST2" - }, { - "value": "测试3", - "key": "TEST3", - "parentName": "ROOT", - "leaf": false, - "fullNamePath": "0\/TEST3" - }, { - "value": "测试4", - "key": "TEST4", - "parentName": "ROOT", - "leaf": false, - "fullNamePath": "0\/TEST4" - }, { - "value": "测试5", - "key": "TEST5", - "parentName": "ROOT", - "leaf": false, - "fullNamePath": "0\/TEST5" - }, { - "value": "测试6", - "key": "TEST6", - "parentName": "ROOT", - "leaf": false, - "fullNamePath": "0\/TEST6" - }, { - "value": "测试7", - "key": "TEST7", - "parentName": "ROOT", - "leaf": false, - "fullNamePath": "0\/TEST7" - }, { - "value": "测试8", - "key": "TEST8", - "parentName": "ROOT", - "leaf": false, - "fullNamePath": "0\/TEST8" - }, { - "value": "测试9", - "key": "TEST9", - "parentName": "ROOT", - "leaf": false, - "fullNamePath": "0\/TEST9" - }, { - "value": "测试10", - "key": "TEST10", - "parentName": "ROOT", - "leaf": false, - "fullNamePath": "0\/TEST10" - }, { - "value": "测试11", - "key": "TEST11", - "parentName": "ROOT", - "leaf": false, - "fullNamePath": "0\/TEST11" - }, { - "value": "测试12", - "key": "TEST12", - "parentName": "ROOT", - "leaf": false, - "fullNamePath": "0\/TEST12" - }, { - "value": "测试13", - "key": "TEST13", - "parentName": "ROOT", - "leaf": false, - "fullNamePath": "0\/TEST13" - }, { - "value": "测试一级类目超长名称展示效果，一级类目超长名称展示效果，一级类目超长名称展示效果", - "key": "TEST14", - "parentName": "ROOT", - "leaf": false, - "fullNamePath": "0\/TEST14" - }], - "hasError": false -} +{ + "content": [{ + "value": "测试", + "key": "TEST", + "parentName": "ROOT", + "leaf": false, + "fullNamePath": "0\/TEST" + }, { + "value": "测试1", + "key": "TEST1", + "parentName": "ROOT", + "leaf": false, + "fullNamePath": "0\/TEST1" + }, { + "value": "测试2", + "key": "TEST2", + "parentName": "ROOT", + "leaf": false, + "fullNamePath": "0\/TEST2" + }, { + "value": "测试3", + "key": "TEST3", + "parentName": "ROOT", + "leaf": false, + "fullNamePath": "0\/TEST3" + }, { + "value": "测试4", + "key": "TEST4", + "parentName": "ROOT", + "leaf": false, + "fullNamePath": "0\/TEST4" + }, { + "value": "测试5", + "key": "TEST5", + "parentName": "ROOT", + "leaf": false, + "fullNamePath": "0\/TEST5" + }, { + "value": "测试6", + "key": "TEST6", + "parentName": "ROOT", + "leaf": false, + "fullNamePath": "0\/TEST6" + }, { + "value": "测试7", + "key": "TEST7", + "parentName": "ROOT", + "leaf": false, + "fullNamePath": "0\/TEST7" + }, { + "value": "测试8", + "key": "TEST8", + "parentName": "ROOT", + "leaf": false, + "fullNamePath": "0\/TEST8" + }, { + "value": "测试9", + "key": "TEST9", + "parentName": "ROOT", + "leaf": false, + "fullNamePath": "0\/TEST9" + }, { + "value": "测试10", + "key": "TEST10", + "parentName": "ROOT", + "leaf": false, + "fullNamePath": "0\/TEST10" + }, { + "value": "测试11", + "key": "TEST11", + "parentName": "ROOT", + "leaf": false, + "fullNamePath": "0\/TEST11" + }, { + "value": "测试12", + "key": "TEST12", + "parentName": "ROOT", + "leaf": false, + "fullNamePath": "0\/TEST12" + }, { + "value": "测试13", + "key": "TEST13", + "parentName": "ROOT", + "leaf": false, + "fullNamePath": "0\/TEST13" + }, { + "value": "测试一级类目超长名称展示效果，一级类目超长名称展示效果，一级类目超长名称展示效果", + "key": "TEST14", + "parentName": "ROOT", + "leaf": false, + "fullNamePath": "0\/TEST14" + }], + "hasError": false +} diff --git a/tests/CascadeMultiSelect.spec.js b/tests/CascadeMultiSelect.spec.js index a8a9b92..cb75d04 100644 --- a/tests/CascadeMultiSelect.spec.js +++ b/tests/CascadeMultiSelect.spec.js @@ -6,4 +6,4 @@ import CascadeMultiSelect from '../src'; describe('CascadeMultiSelect', () => { -}); \ No newline at end of file +}); diff --git a/tests/index.js b/tests/index.js index fffec71..96d9bdb 100644 --- a/tests/index.js +++ b/tests/index.js @@ -3,4 +3,4 @@ */ const req = require.context('.', false, /\.spec\.js(x)?$/); - req.keys().forEach(req); \ No newline at end of file + req.keys().forEach(req);