diff --git a/public/react/package-lock.json b/public/react/package-lock.json index 4cb59a032..ce3ac05c7 100644 --- a/public/react/package-lock.json +++ b/public/react/package-lock.json @@ -3323,6 +3323,25 @@ "object-assign": "^4.1.1" } }, + "create-react-context": { + "version": "0.3.0", + "resolved": "https://registry.npm.taobao.org/create-react-context/download/create-react-context-0.3.0.tgz", + "integrity": "sha1-VG3t6dxCLe8NP8L+A6/gvA9PfYw=", + "requires": { + "gud": "^1.0.0", + "warning": "^4.0.3" + }, + "dependencies": { + "warning": { + "version": "4.0.3", + "resolved": "https://registry.npm.taobao.org/warning/download/warning-4.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwarning%2Fdownload%2Fwarning-4.0.3.tgz", + "integrity": "sha1-Fungd+uKhtavfWSqHgX9hbRnjKM=", + "requires": { + "loose-envify": "^1.0.0" + } + } + } + }, "cropperjs": { "version": "0.7.2", "resolved": "https://registry.npm.taobao.org/cropperjs/download/cropperjs-0.7.2.tgz", @@ -14559,6 +14578,73 @@ "object-assign": "^4.1.1" } }, + "react-datepicker": { + "version": "2.14.0", + "resolved": "https://registry.npm.taobao.org/react-datepicker/download/react-datepicker-2.14.0.tgz", + "integrity": "sha1-zbLyNvEgp+bpc7YX9xNYtchheqw=", + "requires": { + "classnames": "^2.2.6", + "date-fns": "^2.0.1", + "prop-types": "^15.7.2", + "react-onclickoutside": "^6.9.0", + "react-popper": "^1.3.4" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.8.7", + "resolved": "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.8.7.tgz?cache=0&sync_timestamp=1583373718614&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.8.7.tgz", + "integrity": "sha1-j+/OmALbVIgbpZ+Quyhxm0mWMk0=", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "date-fns": { + "version": "2.11.0", + "resolved": "https://registry.npm.taobao.org/date-fns/download/date-fns-2.11.0.tgz?cache=0&sync_timestamp=1584132572779&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdate-fns%2Fdownload%2Fdate-fns-2.11.0.tgz", + "integrity": "sha1-7CtEl3RludyzcAIdXmwBmxnzbQY=" + }, + "deep-equal": { + "version": "1.1.1", + "resolved": "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.1.1.tgz", + "integrity": "sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o=", + "requires": { + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" + } + }, + "react-popper": { + "version": "1.3.7", + "resolved": "https://registry.npm.taobao.org/react-popper/download/react-popper-1.3.7.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-popper%2Fdownload%2Freact-popper-1.3.7.tgz", + "integrity": "sha1-9qNHE2LvHw0QpJY2c3id4brKIyQ=", + "requires": { + "@babel/runtime": "^7.1.2", + "create-react-context": "^0.3.0", + "deep-equal": "^1.1.1", + "popper.js": "^1.14.4", + "prop-types": "^15.6.1", + "typed-styles": "^0.0.7", + "warning": "^4.0.2" + } + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.5.tgz?cache=0&sync_timestamp=1584052597708&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.5.tgz", + "integrity": "sha1-2Hih0JS0MG0QuQlkhLM+vVXiZpc=" + }, + "warning": { + "version": "4.0.3", + "resolved": "https://registry.npm.taobao.org/warning/download/warning-4.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwarning%2Fdownload%2Fwarning-4.0.3.tgz", + "integrity": "sha1-Fungd+uKhtavfWSqHgX9hbRnjKM=", + "requires": { + "loose-envify": "^1.0.0" + } + } + } + }, "react-dev-utils": { "version": "5.0.3", "resolved": "http://registry.npm.taobao.org/react-dev-utils/download/react-dev-utils-5.0.3.tgz", @@ -14718,6 +14804,11 @@ } } }, + "react-onclickoutside": { + "version": "6.9.0", + "resolved": "https://registry.npm.taobao.org/react-onclickoutside/download/react-onclickoutside-6.9.0.tgz", + "integrity": "sha1-pUvDF66M9hMaXXis6lWhEGfzeh8=" + }, "react-player": { "version": "1.15.2", "resolved": "https://registry.npm.taobao.org/react-player/download/react-player-1.15.2.tgz", @@ -17482,6 +17573,11 @@ "mime-types": "~2.1.18" } }, + "typed-styles": { + "version": "0.0.7", + "resolved": "https://registry.npm.taobao.org/typed-styles/download/typed-styles-0.0.7.tgz", + "integrity": "sha1-kzkqAIeUxFlRGf9i3eaAnbxAo9k=" + }, "typedarray": { "version": "0.0.6", "resolved": "http://registry.npm.taobao.org/typedarray/download/typedarray-0.0.6.tgz", diff --git a/public/react/src/components/mini-pagination/index.jsx b/public/react/src/components/mini-pagination/index.jsx index 5a940ad68..0404e422d 100644 --- a/public/react/src/components/mini-pagination/index.jsx +++ b/public/react/src/components/mini-pagination/index.jsx @@ -1,5 +1,5 @@ import React, { useState } from 'react' -import './index.less' +import './index.scss' function noop() { } export default ({ current, defaultCurrent, total, pageSize, onChange = noop }) => { diff --git a/public/react/src/components/mini-pagination/index.less b/public/react/src/components/mini-pagination/index.scss similarity index 100% rename from public/react/src/components/mini-pagination/index.less rename to public/react/src/components/mini-pagination/index.scss diff --git a/public/react/src/modules/paths/ShixunPathSearch.js b/public/react/src/modules/paths/ShixunPathSearch.js index 7fd2f6ae6..db7802c0f 100644 --- a/public/react/src/modules/paths/ShixunPathSearch.js +++ b/public/react/src/modules/paths/ShixunPathSearch.js @@ -4,8 +4,6 @@ import { Dropdown, Menu } from 'antd'; import { getImageUrl } from 'educoder'; import PathCard from "./ShixunPathCard"; import UpgradeModals from '../modals/UpgradeModals'; -import Pagination from '@icedesign/base/lib/pagination'; -import '@icedesign/base/lib/pagination/style.js'; import './ShixunPaths.css'; import KeywordList from '../tpm/shixuns/shixun-keyword-list'; import btnUrl from './btn-new.png'; diff --git a/public/react/src/modules/tpm/shixuns/shixun-card.js b/public/react/src/modules/tpm/shixuns/shixun-card.js index c673ac4e2..51618aef2 100644 --- a/public/react/src/modules/tpm/shixuns/shixun-card.js +++ b/public/react/src/modules/tpm/shixuns/shixun-card.js @@ -1,7 +1,7 @@ import React from 'react'; import { getImageUrl, setImagesUrl, getUrl } from 'educoder'; import { Spin, Tooltip, Rate } from 'antd'; -import './shixunCss/shixunCard.less'; +import './shixunCss/shixunCard.scss'; import Pagination from '../../../components/mini-pagination' export default ({ middleshixundata, pagination, typepvisible, pages, totalcount, shixunsPage }) => {