Skip to content

Commit 792ee8c

Browse files
author
姚观寿
committed
合并代码
1 parent 41aac49 commit 792ee8c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+245443
-71364
lines changed

‎common/js/browser.5.8.38.js

Lines changed: 72 additions & 72 deletions
Large diffs are not rendered by default.

‎common/js/react-dom.development.v16.12.0.js

Lines changed: 35101 additions & 34521 deletions
Large diffs are not rendered by default.

‎common/js/react-dom.development.v16.14.0.js

Lines changed: 25147 additions & 0 deletions
Large diffs are not rendered by default.

‎common/js/react-dom.development.v17.0.2.js

Lines changed: 31892 additions & 0 deletions
Large diffs are not rendered by default.

‎common/js/react.development.v16.12.0.js

Lines changed: 1557 additions & 825 deletions
Large diffs are not rendered by default.

‎common/js/react.development.v16.14.0.js

Lines changed: 3318 additions & 0 deletions
Large diffs are not rendered by default.

‎common/js/react.development.v17.0.2.js

Lines changed: 4076 additions & 0 deletions
Large diffs are not rendered by default.

‎common/js/react.v16.12.0.js

Lines changed: 35393 additions & 34473 deletions
Large diffs are not rendered by default.

‎common/js/react.v16.14.0.js

Lines changed: 34109 additions & 0 deletions
Large diffs are not rendered by default.

‎common/js/react.v17.0.2.js

Lines changed: 36774 additions & 0 deletions
Large diffs are not rendered by default.

‎common/js/react.v17.0.2copy.js

Lines changed: 34945 additions & 0 deletions
Large diffs are not rendered by default.

‎demo.js

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/*
2+
* @Author: your name
3+
* @Date: 2021-05-10 18:11:35
4+
* @LastEditTime: 2021-05-10 18:15:06
5+
* @LastEditors: Please set LastEditors
6+
* @Description: In User Settings Edit
7+
* @FilePath: /react/demo.js
8+
*/
9+
10+
var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
11+
var ReactCurrentBatchConfig$1 = ReactSharedInternals.ReactCurrentBatchConfig;
12+
13+
14+
ReactSharedInternals
15+
ReactCurrentBatchConfig: ReactCurrentBatchConfig, // *跟踪当前批处理的配置，比如更新多长时间 , *如有需要，应暂停。
16+
17+
var ReactCurrentBatchConfig = {
18+
suspense: null,
19+
};
20+
21+
22+
var ReactSharedInternals = {
23+
ReactCurrentDispatcher: ReactCurrentDispatcher, // 跟踪当前调度程序。
24+
ReactCurrentBatchConfig: ReactCurrentBatchConfig, // *跟踪当前批处理的配置，比如更新多长时间 , *如有需要，应暂停。
25+
ReactCurrentOwner: ReactCurrentOwner, //跟踪当前的所有者。*当前所有者是应该拥有任何组件的组件 *正在执行中。
26+
IsSomeRendererActing: IsSomeRendererActing, //由act()使用，以跟踪您是否处于act()范围内。
27+
// Used by renderers to avoid bundling object-assign twice in UMD bundles:
28+
assign: objectAssign, //浅拷贝函数
29+
};
30+
31+
{
32+
objectAssign(ReactSharedInternals, {
33+
// These should not be included in production. 这些不应该包括在生产中。
34+
ReactDebugCurrentFrame: ReactDebugCurrentFrame,
35+
// Shim for React DOM 16.0.0 which still destructured (but not used) this. 用于DOM 16.0.0的垫片仍然破坏(但没有使用)这个。
36+
// TODO: remove in React 17.0. 待办事项:在17.0 react中移除。
37+
ReactComponentTreeHook: {},
38+
});
39+
}
40+
41+
42+
43+
var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
44+
45+
function requestCurrentSuspenseConfig() {
46+
/*
47+
var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
48+
var ReactCurrentBatchConfig$1 = ReactSharedInternals.ReactCurrentBatchConfig;
49+
*/
50+
return ReactCurrentBatchConfig.suspense;
51+
}
52+

‎es5_code/es5_react_code/01/01.js

Lines changed: 117 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,117 @@
1-
'use strict';
2-
3-
4-
var element = React.createElement(
5-
'h1',
6-
null,
7-
'Hello, world'
8-
)
9-
10-
console.log('element==',element)
11-
ReactDOM.render(React.createElement(
12-
'h1',
13-
null,
14-
'Hello, world'
15-
), document.getElementById('example'));
1+
"use strict";
2+
3+
var _slicedToArray = (function() {
4+
function sliceIterator(arr, i) {
5+
var _arr = [];
6+
var _n = true;
7+
var _d = false;
8+
var _e = undefined;
9+
try {
10+
for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
11+
_arr.push(_s.value);
12+
if (i && _arr.length === i) break;
13+
}
14+
} catch (err) {
15+
_d = true;
16+
_e = err;
17+
} finally {
18+
try {
19+
if (!_n && _i["return"]) _i["return"]();
20+
} finally {
21+
if (_d) throw _e;
22+
}
23+
}
24+
return _arr;
25+
}
26+
return function(arr, i) {
27+
if (Array.isArray(arr)) {
28+
return arr;
29+
} else if (Symbol.iterator in Object(arr)) {
30+
return sliceIterator(arr, i);
31+
} else {
32+
throw new TypeError("Invalid attempt to destructure non-iterable instance");
33+
}
34+
};
35+
})();
36+
37+
var H = function H() {
38+
return React.createElement(
39+
"div",
40+
null,
41+
"你好"
42+
);
43+
};
44+
var Show = function Show(props) {
45+
var flag = props.flag;
46+
47+
React.useEffect(function() {
48+
console.log(1);
49+
50+
return function() {
51+
console.log(2);
52+
};
53+
});
54+
55+
return React.createElement(
56+
"div",
57+
null,
58+
React.createElement(H, null),
59+
flag ? React.createElement(
60+
"div",
61+
null,
62+
" 显示"
63+
) : null,
64+
" "
65+
);
66+
};
67+
68+
var LazyPage = function LazyPage() {
69+
var _React$useState = React.useState("zhangsan");
70+
71+
var _React$useState2 = _slicedToArray(_React$useState, 2);
72+
73+
var name = _React$useState2[0];
74+
var setName = _React$useState2[1];
75+
76+
var _React$useState3 = React.useState(true);
77+
78+
var _React$useState32 = _slicedToArray(_React$useState3, 2);
79+
80+
var flag = _React$useState32[0];
81+
var setFlag = _React$useState32[1];
82+
83+
return React.createElement(
84+
"div",
85+
null,
86+
React.createElement(
87+
"button", {
88+
onClick: function() {
89+
setFlag(false);
90+
}
91+
},
92+
"按钮"
93+
),
94+
React.createElement(
95+
Show, {
96+
flag: flag
97+
},
98+
" "
99+
),
100+
React.createElement(
101+
"p",
102+
null,
103+
" My Name is: ",
104+
name,
105+
" "
106+
),
107+
React.createElement("input", {
108+
type: "text",
109+
value: name,
110+
onChange: function(e) {
111+
return setName(e.target.value);
112+
}
113+
})
114+
);
115+
};
116+
117+
ReactDOM.render(React.createElement(LazyPage, null), document.getElementById("example"));

‎es5_code/es5_react_code/02/02_01.js renamed to ‎es5_code/es5_react_code/02/01.js

File renamed without changes.

‎es5_code/es5_react_code/03/03_01.js renamed to ‎es5_code/es5_react_code/03/01.js

File renamed without changes.

‎es5_code/es5_react_code/04/04_01.js renamed to ‎es5_code/es5_react_code/04/01.js

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
21
"use strict";
3-
=======
4-
'use strict';
5-
>>>>>>> 46e5d654750168326619cd5ec4cf48a1c0506d86
62

73
var _slicedToArray = (function() {
84
function sliceIterator(arr, i) {
@@ -20,11 +16,7 @@ var _slicedToArray = (function() {
2016
_e = err;
2117
} finally {
2218
try {
23-
<<<<<<< HEAD
2419
if (!_n && _i["return"]) _i["return"]();
25-
=======
26-
if (!_n && _i['return']) _i['return']();
27-
>>>>>>> 46e5d654750168326619cd5ec4cf48a1c0506d86
2820
} finally {
2921
if (_d) throw _e;
3022
}
@@ -37,16 +29,11 @@ var _slicedToArray = (function() {
3729
} else if (Symbol.iterator in Object(arr)) {
3830
return sliceIterator(arr, i);
3931
} else {
40-
<<<<<<< HEAD
4132
throw new TypeError("Invalid attempt to destructure non-iterable instance");
42-
=======
43-
throw new TypeError('Invalid attempt to destructure non-iterable instance');
44-
>>>>>>> 46e5d654750168326619cd5ec4cf48a1c0506d86
4533
}
4634
};
4735
})();
4836

49-
<<<<<<< HEAD
5037
var Show = function Show(props) {
5138
var flag = props.flag;
5239

@@ -73,18 +60,12 @@ var Show = function Show(props) {
7360

7461
var LazyPage = function LazyPage() {
7562
var _React$useState = React.useState("zhangsan");
76-
=======
77-
var LazyPage = function LazyPage() {
78-
var _React$useState = React.useState('zhangsan');
79-
console.log('_React$useState=',_React$useState)
80-
>>>>>>> 46e5d654750168326619cd5ec4cf48a1c0506d86
8163

8264
var _React$useState2 = _slicedToArray(_React$useState, 2);
8365

8466
var name = _React$useState2[0];
8567
var setName = _React$useState2[1];
8668

87-
<<<<<<< HEAD
8869
var _React$useState3 = React.useState(true);
8970

9071
var _React$useState32 = _slicedToArray(_React$useState3, 2);
@@ -118,19 +99,6 @@ var LazyPage = function LazyPage() {
11899
),
119100
React.createElement("input", {
120101
type: "text",
121-
=======
122-
return React.createElement(
123-
'div',
124-
null,
125-
React.createElement(
126-
'p',
127-
null,
128-
'My Name is: ',
129-
name
130-
),
131-
React.createElement('input', {
132-
type: 'text',
133-
>>>>>>> 46e5d654750168326619cd5ec4cf48a1c0506d86
134102
value: name,
135103
onChange: function(e) {
136104
return setName(e.target.value);
@@ -139,8 +107,4 @@ var LazyPage = function LazyPage() {
139107
);
140108
};
141109

142-
<<<<<<< HEAD
143-
ReactDOM.render(React.createElement(LazyPage, null), document.getElementById("example"));
144-
=======
145-
ReactDOM.render(React.createElement(LazyPage, null), document.getElementById('example'));
146-
>>>>>>> 46e5d654750168326619cd5ec4cf48a1c0506d86
110+
ReactDOM.render(React.createElement(LazyPage, null), document.getElementById("example"));

‎es6.html

Lines changed: 47 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!--
22
* @Author: your name
33
* @Date: 2021-05-06 12:29:53
4-
* @LastEditTime: 2021-05-07 10:00:58
5-
* @LastEditors: your name
4+
* @LastEditTime: 2021-05-17 11:56:27
5+
* @LastEditors: Please set LastEditors
66
* @Description: In User Settings Edit
77
* @FilePath: /react/es6.html
88
-->
@@ -14,11 +14,12 @@
1414
<title>Hello React!</title>
1515
<script src="./common/js/ajax.js"></script>
1616
<!--官方提供的 CDN 地址：-->
17-
<!-- <script src="./common/js/react.development.v16.12.0.js"></script>
18-
<script src="./common/js/react-dom.development.v16.12.0.js"></script> -->
17+
<script src="./common/js/browser.5.8.38.js"></script>
18+
<!-- <script src="./common/js/react.development.v17.0.2.js"></script>
19+
<script src="./common/js/react-dom.development.v17.0.2.js"></script> -->
1920
<!-- <script src="./common/js/browser-polyfill.5.8.38.js"></script> -->
20-
<script src="./common/js/react.v16.12.0.js"></script>
21-
<script src="./common/js/browser.5.8.38.js"></script>
21+
<script src="./common/js/react.v17.0.2.js"></script>
22+
2223

2324
</head>
2425
<style>
@@ -45,44 +46,51 @@
4546
</style>
4647
<body>
4748

48-
<div id="example" class="lsft-box"></div>
49+
<div id="example" class="lsft-box">
50+
<p></p>
51+
52+
</div>
4953
<textarea id="textarea" class='textarea right-box' ></textarea>
5054

51-
<script src="./es6_code/es6_react_code/04/04_01.js" type="text/babel"></script>
52-
<!-- <script>
55+
<script src="./es6_code/es6_react_code/demo/functionConpoment.js" type="text/babel"></script>
56+
<script>
5357

54-
var oTextarea= document.getElementById('textarea');
55-
setTimeout(() => {
56-
oTextarea.value=code
57-
var oldCode = window.localStorage.getItem('code');
58-
// 如果同样代码 则不会在发送请求
59-
if(oldCode===code){
60-
return false
61-
}
62-
window.localStorage.setItem('code',code);
63-
//把代码发送到服务器
64-
ajax({
65-
url: "http://127.0.0.1:5000/createCode",
66-
type: 'post',
67-
data: {
68-
path: '/es5_code/es5_react_code/04/04_01.js',
69-
code: code,
70-
},
71-
dataType: 'json',
72-
timeout: 10000,
73-
contentType: "application/json",
74-
success: function (data) {
75-
console.log('data====',data)
76-
},
77-
//异常处理
78-
error: function (e) {
79-
console.log(e);
80-
}
81-
})
82-
}, 100);
58+
// var oTextarea= document.getElementById('textarea');
59+
// setTimeout(() => {
60+
// // console.log('code=',code)
61+
// // debugger
62+
// oTextarea.value=code
63+
// // console.log('code=',code)
64+
// // debugger
65+
// var oldCode = window.localStorage.getItem('code');
66+
// // 如果同样代码 则不会在发送请求
67+
// if(oldCode===code){
68+
// return false
69+
// }
70+
// window.localStorage.setItem('code',code);
71+
// //把代码发送到服务器
72+
// ajax({
73+
// url: "http://127.0.0.1:5000/createCode",
74+
// type: 'post',
75+
// data: {
76+
// path: '/es5_code/es5_react_code/01/01.js',
77+
// code: code,
78+
// },
79+
// dataType: 'json',
80+
// timeout: 10000,
81+
// contentType: "application/json",
82+
// success: function (data) {
83+
// console.log('data====',data)
84+
// },
85+
// //异常处理
86+
// error: function (e) {
87+
// console.log(e);
88+
// }
89+
// })
90+
// }, 200);
8391

8492

85-
</script> -->
93+
</script>
8694

8795
</body>
8896

0 commit comments

Comments
 (0)