Skip to content

X
xiaomai-cloud-class-web
Commit 83adcd86 by maolipeng
Options

fix:sadafsdsvs

parent d4563bc4
Showing with 117 additions and 11 deletions
package-lock.json
...@@ -1788,6 +1788,21 @@ ...@@ -1788,6 +1788,21 @@
"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==" "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
}, },
"@react-dnd/asap": {
"version": "4.0.0",
"resolved": "https://registry.nlark.com/@react-dnd/asap/download/@react-dnd/asap-4.0.0.tgz",
"integrity": "sha1-swDu7YPpgB9RvWawM3yabwRUhlE="
},
"@react-dnd/invariant": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/@react-dnd/invariant/download/@react-dnd/invariant-2.0.0.tgz",
"integrity": "sha1-CdLoHNOeDnZ9faYt+TJYYPJOUX4="
},
"@react-dnd/shallowequal": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/@react-dnd/shallowequal/download/@react-dnd/shallowequal-2.0.0.tgz",
"integrity": "sha1-owMetUEp8sZrJ1P4QEJm7Hv2fwo="
},
"@sheerun/mutationobserver-shim": { "@sheerun/mutationobserver-shim": {
"version": "0.3.3", "version": "0.3.3",
"resolved": "https://registry.npmjs.org/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz", "resolved": "https://registry.npmjs.org/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz",
...@@ -3987,6 +4002,23 @@ ...@@ -3987,6 +4002,23 @@
"tweetnacl": "^0.14.3" "tweetnacl": "^0.14.3"
} }
}, },
"better-npm-run": {
"version": "0.1.1",
"resolved": "https://registry.npm.taobao.org/better-npm-run/download/better-npm-run-0.1.1.tgz",
"integrity": "sha1-a7YAhZHeG3JVSqiwzvoNoVcv1IE=",
"requires": {
"commander": "^2.9.0",
"dotenv": "^2.0.0",
"object-assign": "^4.0.1"
},
"dependencies": {
"dotenv": {
"version": "2.0.0",
"resolved": "https://registry.nlark.com/dotenv/download/dotenv-2.0.0.tgz",
"integrity": "sha1-vXWcNXqqcDZeAclrewvsCKbg2Uk="
}
}
},
"big.js": { "big.js": {
"version": "5.2.2", "version": "5.2.2",
"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
...@@ -6028,6 +6060,16 @@ ...@@ -6028,6 +6060,16 @@
"path-type": "^3.0.0" "path-type": "^3.0.0"
} }
}, },
"dnd-core": {
"version": "14.0.0",
"resolved": "https://registry.npm.taobao.org/dnd-core/download/dnd-core-14.0.0.tgz?cache=0&sync_timestamp=1615266963925&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdnd-core%2Fdownload%2Fdnd-core-14.0.0.tgz",
"integrity": "sha1-lzqzRw0KmsWg+pAhxP66k60SNH0=",
"requires": {
"@react-dnd/asap": "^4.0.0",
"@react-dnd/invariant": "^2.0.0",
"redux": "^4.0.5"
}
},
"dns-equal": { "dns-equal": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
...@@ -13541,9 +13583,9 @@ ...@@ -13541,9 +13583,9 @@
} }
}, },
"react": { "react": {
"version": "16.13.1", "version": "16.14.0",
"resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz", "resolved": "https://registry.nlark.com/react/download/react-16.14.0.tgz?cache=0&sync_timestamp=1629216991382&other_urls=https%3A%2F%2Fregistry.nlark.com%2Freact%2Fdownload%2Freact-16.14.0.tgz",
"integrity": "sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==", "integrity": "sha1-lNd23dCqo32j7aj8W2sYpMmjEU0=",
"requires": { "requires": {
"loose-envify": "^1.1.0", "loose-envify": "^1.1.0",
"object-assign": "^4.1.1", "object-assign": "^4.1.1",
...@@ -13698,6 +13740,33 @@ ...@@ -13698,6 +13740,33 @@
} }
} }
}, },
"react-dnd": {
"version": "14.0.3",
"resolved": "https://registry.nlark.com/react-dnd/download/react-dnd-14.0.3.tgz",
"integrity": "sha1-F2LB7ISBVDny2KakDv0fV+7kG6Y=",
"requires": {
"@react-dnd/invariant": "^2.0.0",
"@react-dnd/shallowequal": "^2.0.0",
"dnd-core": "14.0.0",
"fast-deep-equal": "^3.1.3",
"hoist-non-react-statics": "^3.3.2"
},
"dependencies": {
"fast-deep-equal": {
"version": "3.1.3",
"resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz",
"integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU="
}
}
},
"react-dnd-html5-backend": {
"version": "14.0.1",
"resolved": "https://registry.nlark.com/react-dnd-html5-backend/download/react-dnd-html5-backend-14.0.1.tgz",
"integrity": "sha1-N9Q9a23dkQaRAZadnqxtaIqdV+8=",
"requires": {
"dnd-core": "14.0.0"
}
},
"react-dom": { "react-dom": {
"version": "16.13.1", "version": "16.13.1",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz",
......
package.json
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
"babel-plugin-jsx-control-statements": "^4.1.0", "babel-plugin-jsx-control-statements": "^4.1.0",
"babel-plugin-named-asset-import": "^0.3.6", "babel-plugin-named-asset-import": "^0.3.6",
"babel-preset-react-app": "^9.1.2", "babel-preset-react-app": "^9.1.2",
"better-npm-run": "^0.1.0",
"bizcharts": "^3.3.0", "bizcharts": "^3.3.0",
"camelcase": "^5.3.1", "camelcase": "^5.3.1",
"case-sensitive-paths-webpack-plugin": "2.3.0", "case-sensitive-paths-webpack-plugin": "2.3.0",
...@@ -77,11 +78,13 @@ ...@@ -77,11 +78,13 @@
"postcss-safe-parser": "4.0.1", "postcss-safe-parser": "4.0.1",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"qs": "^6.9.4", "qs": "^6.9.4",
"react": "^16.13.1", "react": "^16.14.0",
"react-app-polyfill": "^1.0.6", "react-app-polyfill": "^1.0.6",
"react-async-component": "^2.0.0", "react-async-component": "^2.0.0",
"react-cropper": "^2.1.8", "react-cropper": "^2.1.8",
"react-dev-utils": "^10.2.1", "react-dev-utils": "^10.2.1",
"react-dnd": "^14.0.3",
"react-dnd-html5-backend": "^14.0.1",
"react-dom": "^16.13.1", "react-dom": "^16.13.1",
"react-infinite-scroller": "^1.2.4", "react-infinite-scroller": "^1.2.4",
"react-lottie": "^1.2.3", "react-lottie": "^1.2.3",
...@@ -93,7 +96,6 @@ ...@@ -93,7 +96,6 @@
"style-loader": "0.23.1", "style-loader": "0.23.1",
"terser-webpack-plugin": "2.3.8", "terser-webpack-plugin": "2.3.8",
"ts-pnp": "1.1.6", "ts-pnp": "1.1.6",
"better-npm-run": "^0.1.0",
"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",
...@@ -143,7 +145,7 @@ ...@@ -143,7 +145,7 @@
"BRAND": "syoo" "BRAND": "syoo"
} }
}, },
"build:dev1":{ "build:dev1": {
"command": "node scripts/build.js", "command": "node scripts/build.js",
"env": { "env": {
"DEPLOY_ENV": "dev1", "DEPLOY_ENV": "dev1",
...@@ -180,4 +182,4 @@ ...@@ -180,4 +182,4 @@
"ali-oss": "^6.12.0", "ali-oss": "^6.12.0",
"react-sortable-hoc": "^1.11.0" "react-sortable-hoc": "^1.11.0"
} }
} }
\ No newline at end of file
src/modules/store-manage/H5DecorEdit/index.jsx
import React from "react"; import React from "react";
import { DndProvider } from 'react-dnd'
import { HTML5Backend } from 'react-dnd-html5-backend'
import "./index.less" import "./index.less"
...@@ -6,7 +9,17 @@ export default function H5DecorEdit(props) { ...@@ -6,7 +9,17 @@ export default function H5DecorEdit(props) {
return ( return (
<div className="h5decor-edit"> <div className="h5decor-edit">
dsdffa <div className="edit-header"></div>
<DndProvider backend={HTML5Backend}>
<div className="eidt-main-layout">
<div className="module-list">
</div>
<div className="overview"></div>
<div className="module-edit"></div>
</div>
</DndProvider>
</div> </div>
) )
} }
\ No newline at end of file
src/modules/store-manage/H5DecorEdit/index.less
...@@ -5,5 +5,26 @@ ...@@ -5,5 +5,26 @@
left: 0; left: 0;
right: 0; right: 0;
z-index: 100; z-index: 100;
background-color: white;
.edit-header {
height: 60px;
background-color: #2966FF;
}
.eidt-main-layout {
display: flex;
.module-list {
width: 200px;
height: calc(100vh - 60px);
background-color: antiquewhite;
}
.overview {
min-width: 380px;
background-color: aquamarine;
}
.module-edit {
background-color: brown;
width: 380px;
height: calc(100vh - 60px);
}
}
} }
\ No newline at end of file
src/routes/config/mainRoutes.tsx
...@@ -75,7 +75,7 @@ const mainRoutes = [ ...@@ -75,7 +75,7 @@ const mainRoutes = [
name: '学院装修', name: '学院装修',
}, },
{ {
path: '/store-decoration/h5decoredit', path: '/h5decoredit',
component: H5DecorEdit, component: H5DecorEdit,
name: 'H5学院装修', name: 'H5学院装修',
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment