feat:解决合并代码后的冲突
Showing
| ... | @@ -11,6 +11,7 @@ | ... | @@ -11,6 +11,7 @@ |
| "@testing-library/jest-dom": "^4.2.4", | "@testing-library/jest-dom": "^4.2.4", | ||
| "@testing-library/react": "^9.3.2", | "@testing-library/react": "^9.3.2", | ||
| "@testing-library/user-event": "^7.1.2", | "@testing-library/user-event": "^7.1.2", | ||
| "@types/ali-oss": "^6.0.5", | |||
| "@types/qs": "^6.9.5", | "@types/qs": "^6.9.5", | ||
| "@types/react": "^16.9.46", | "@types/react": "^16.9.46", | ||
| "@types/react-dom": "^16.9.8", | "@types/react-dom": "^16.9.8", | ||
| ... | @@ -18,7 +19,9 @@ | ... | @@ -18,7 +19,9 @@ |
| "@types/underscore": "^1.10.22", | "@types/underscore": "^1.10.22", | ||
| "@typescript-eslint/eslint-plugin": "^2.10.0", | "@typescript-eslint/eslint-plugin": "^2.10.0", | ||
| "@typescript-eslint/parser": "^2.10.0", | "@typescript-eslint/parser": "^2.10.0", | ||
| "antd": "^4.8.5", | "ali-oss": "^6.12.0", | ||
| "antd": "^4.9.4", | |||
| "array-move": "^3.0.1", | |||
| "axios": "^0.20.0", | "axios": "^0.20.0", | ||
| "babel-eslint": "10.1.0", | "babel-eslint": "10.1.0", | ||
| "babel-jest": "^24.9.0", | "babel-jest": "^24.9.0", | ||
| ... | @@ -28,6 +31,7 @@ | ... | @@ -28,6 +31,7 @@ |
| "babel-preset-react-app": "^9.1.2", | "babel-preset-react-app": "^9.1.2", | ||
| "camelcase": "^5.3.1", | "camelcase": "^5.3.1", | ||
| "case-sensitive-paths-webpack-plugin": "2.3.0", | "case-sensitive-paths-webpack-plugin": "2.3.0", | ||
| "classnames": "^2.2.6", | |||
| "cropper": "^3.1.4", | "cropper": "^3.1.4", | ||
| "cross-env": "^7.0.2", | "cross-env": "^7.0.2", | ||
| "css-loader": "3.4.2", | "css-loader": "3.4.2", | ||
| ... | @@ -46,6 +50,7 @@ | ... | @@ -46,6 +50,7 @@ |
| "file-loader": "4.3.0", | "file-loader": "4.3.0", | ||
| "fs-extra": "^8.1.0", | "fs-extra": "^8.1.0", | ||
| "html-webpack-plugin": "4.0.0-beta.11", | "html-webpack-plugin": "4.0.0-beta.11", | ||
| "html2canvas": "^1.0.0-rc.7", | |||
| "husky": "^4.2.5", | "husky": "^4.2.5", | ||
| "identity-obj-proxy": "3.0.0", | "identity-obj-proxy": "3.0.0", | ||
| "jest": "24.9.0", | "jest": "24.9.0", | ||
| ... | @@ -53,10 +58,13 @@ | ... | @@ -53,10 +58,13 @@ |
| "jest-resolve": "24.9.0", | "jest-resolve": "24.9.0", | ||
| "jest-watch-typeahead": "0.4.2", | "jest-watch-typeahead": "0.4.2", | ||
| "jquery": "^3.4.1", | "jquery": "^3.4.1", | ||
| "less": "^3.12.2", | |||
| "less-loader": "^6.2.0", | "less-loader": "^6.2.0", | ||
| "microevent": "^1.0.0", | "microevent": "^1.0.0", | ||
| "mini-css-extract-plugin": "0.9.0", | "mini-css-extract-plugin": "0.9.0", | ||
| "moment": "^2.27.0", | |||
| "optimize-css-assets-webpack-plugin": "5.0.3", | "optimize-css-assets-webpack-plugin": "5.0.3", | ||
| "photoclip": "^3.4.8", | |||
| "pnp-webpack-plugin": "1.6.4", | "pnp-webpack-plugin": "1.6.4", | ||
| "postcss-flexbugs-fixes": "4.1.0", | "postcss-flexbugs-fixes": "4.1.0", | ||
| "postcss-loader": "3.0.0", | "postcss-loader": "3.0.0", | ||
| ... | @@ -70,7 +78,9 @@ | ... | @@ -70,7 +78,9 @@ |
| "react-async-component": "^2.0.0", | "react-async-component": "^2.0.0", | ||
| "react-dev-utils": "^10.2.1", | "react-dev-utils": "^10.2.1", | ||
| "react-dom": "^16.13.1", | "react-dom": "^16.13.1", | ||
| "react-infinite-scroller": "^1.2.4", | |||
| "react-router-dom": "^5.2.0", | "react-router-dom": "^5.2.0", | ||
| "react-sortable-hoc": "^1.11.0", | |||
| "resolve": "1.15.0", | "resolve": "1.15.0", | ||
| "resolve-url-loader": "3.1.1", | "resolve-url-loader": "3.1.1", | ||
| "semver": "6.3.0", | "semver": "6.3.0", | ||
| ... | @@ -80,10 +90,13 @@ | ... | @@ -80,10 +90,13 @@ |
| "typescript": "^4.0.2", | "typescript": "^4.0.2", | ||
| "underscore": "^1.10.2", | "underscore": "^1.10.2", | ||
| "url-loader": "2.3.0", | "url-loader": "2.3.0", | ||
| "video-react": "0.14.1", | |||
| "wangeditor": "^3.1.1", | |||
| "webpack": "4.42.0", | "webpack": "4.42.0", | ||
| "webpack-dev-server": "3.11.0", | "webpack-dev-server": "3.11.0", | ||
| "webpack-manifest-plugin": "2.2.0", | "webpack-manifest-plugin": "2.2.0", | ||
| "workbox-webpack-plugin": "4.3.1" | "workbox-webpack-plugin": "4.3.1", | ||
| "xiaomai-b-components": "1.4.4" | |||
| }, | }, | ||
| "scripts": { | "scripts": { | ||
| "start": "node scripts/start.js", | "start": "node scripts/start.js", | ||
| ... | @@ -116,8 +129,10 @@ | ... | @@ -116,8 +129,10 @@ |
| "jsx-control-statements" | "jsx-control-statements" | ||
| ] | ] | ||
| }, | }, | ||
| "devDependencies": { | "devDependencies": { | ||
| "@types/jquery": "^3.5.4" | "@types/ali-oss": "^6.0.5", | ||
| "@types/jquery": "^3.5.4", | |||
| "ali-oss": "^6.12.0", | |||
| "react-sortable-hoc": "^1.11.0" | |||
| } | } | ||
| } | } |
report.20201225.164952.12984.0.001.json
0 → 100644
This diff is collapsed.
Click to expand it.
src/bu-components/ChooseMembersModal.jsx
0 → 100644
This diff is collapsed.
Click to expand it.
src/bu-components/ChooseMembersModal.less
0 → 100644
src/bu-components/CopyFileModal.jsx
0 → 100644
This diff is collapsed.
Click to expand it.
src/bu-components/CopyFileModal.less
0 → 100644
src/bu-components/Introduction.jsx
0 → 100644
src/bu-components/Introduction.less
0 → 100644
src/bu-components/ManagingMembersModal.jsx
0 → 100644
This diff is collapsed.
Click to expand it.
src/bu-components/ManagingMembersModal.less
0 → 100644
src/bu-components/NonCompliantFileModal.jsx
0 → 100644
src/bu-components/NonCompliantFileModal.less
0 → 100644
src/bu-components/PreviewCourseModal.jsx
0 → 100644
src/bu-components/PreviewCourseModal.less
0 → 100644
src/bu-components/README.md
0 → 100644
src/bu-components/SelectPrepareFileModal.jsx
0 → 100644
This diff is collapsed.
Click to expand it.
src/bu-components/ShareLiveModal.jsx
0 → 100644
src/bu-components/ShareLiveModal.less
0 → 100644
src/bu-components/ShowTip.jsx
0 → 100644
src/bu-components/ShowTip.less
0 → 100644
src/bu-components/UploadProgressModal.jsx
0 → 100644
This diff is collapsed.
Click to expand it.
src/bu-components/UploadProgressModal.less
0 → 100644
src/common/constants/XMEnum.js
0 → 100644
src/common/constants/academic.js
0 → 100644
src/common/constants/academic/cloudClass.js
0 → 100644
src/common/constants/academic/lessonEnum.js
0 → 100644
src/common/constants/academic/liveEnum.js
0 → 100644
src/common/constants/classHour.js
0 → 100644
src/common/constants/marketing/README.md
0 → 100644
src/common/constants/marketing/eform.js
0 → 100644
src/common/constants/marketing/mall.js
0 → 100644
src/common/constants/marketing/member.js
0 → 100644
src/common/constants/marketing/show.js
0 → 100644
src/components/ClassSearchSelect.jsx
0 → 100644
src/components/CourseSearchSelect.jsx
0 → 100644
src/components/DownloadLiveModal.jsx
0 → 100644
src/components/DownloadLiveModal.less
0 → 100644
src/components/EditorBox.jsx
0 → 100644
src/components/EditorBox.less
0 → 100644
src/components/ImgCutModal.jsx
0 → 100644
src/components/ImgCutModalNew.jsx
0 → 100644
src/components/MultipleDatePicker.jsx
0 → 100644
src/components/MultipleDatePicker.less
0 → 100644
src/components/ShowTips.jsx
0 → 100644
src/components/ShowTips.less
0 → 100644
src/core/util.js
0 → 100644
src/data-source/basic/basic-apis.ts
0 → 100644
src/data-source/course/request-api.ts
0 → 100644
src/domains/course-domain/CourseService.ts
0 → 100644
src/domains/course-domain/constants.ts
0 → 100644
src/domains/course-domain/utils.ts
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
src/domains/resource-disk/constants.ts
0 → 100644
This diff is collapsed.
Click to expand it.
src/domains/resource-disk/utils.ts
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
src/libs/qrcode/qrcode.js
0 → 100644
This diff is collapsed.
Click to expand it.
src/libs/qrcode/qrcodealg.js
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/common/ClassSearchSelect.tsx
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/common/CommonSelect.less
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/common/CourseSearchSelect.jsx
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/common/DateRangePicker.jsx
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/common/DefaultIcon.jsx
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/common/DefaultIcon.less
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/common/StaticSelect.jsx
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/common/StaticSelect.less
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/common/TeacherSearchSelect.jsx
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/common/TeacherSearchSelect.less
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
src/modules/course-manage/AddLive.jsx
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/course-manage/AddLive.less
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
src/modules/course-manage/LiveCoursePage.jsx
0 → 100644
This diff is collapsed.
Click to expand it.
File moved
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
src/modules/course-manage/types.tsx
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
src/modules/lottie/activity/data.json
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/lottie/activity/demo.html
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
src/modules/lottie/content/data.json
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/lottie/content/demo.html
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
src/modules/lottie/course/data.json
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/lottie/course/demo.html
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
src/modules/lottie/data/data.json
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/lottie/data/demo.html
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
src/modules/lottie/money/data.json
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/lottie/money/demo.html
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
src/modules/lottie/news/data.json
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/lottie/news/demo.html
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
src/modules/lottie/student/data.json
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/lottie/teacher/data.json
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/lottie/teacher/demo.html
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
src/modules/prepare-lesson/index.jsx
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/prepare-lesson/index.less
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
src/modules/resource-disk/index.jsx
0 → 100644
This diff is collapsed.
Click to expand it.
src/modules/resource-disk/index.less
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
src/modules/root/SwitchRoute.tsx
0 → 100644
This diff is collapsed.
Click to expand it.
File moved
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
File moved
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
File moved
File moved
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
src/routes/config/redirectRoutes.tsx
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
Please
register
or
sign in
to comment