Skip to content

Commit

Permalink
'feact开启cssmudule'
Browse files Browse the repository at this point in the history
  • Loading branch information
horizon188 committed Sep 21, 2020
1 parent 91cd1a8 commit 46cb459
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 40 deletions.
28 changes: 17 additions & 11 deletions app.less
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
.mgb24 {
margin-bottom: 24px;
}
.mgl24 {
margin-left: 24px;
}
.mgt24 {
margin-top: 24px;
}
.mgr24 {
margin-right: 24px;
:global {
.mgb24 {
margin-bottom: 24px;
}
.mgl24 {
margin-left: 24px;
}
.mgt24 {
margin-top: 24px;
}
.mgr24 {
margin-right: 24px;
}
}

// .app {
// background-color: red;
// }
17 changes: 2 additions & 15 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
rel="stylesheet"
href="http://at.alicdn.com/t/font_1301128_tpx3lujm55.js"
/> -->
<!-- <script
<script
type="text/javascript"
src="http://at.alicdn.com/t/font_1056478_rbb39ljr7lf.js"
></script>
Expand Down Expand Up @@ -60,22 +60,9 @@
<script
type="text/javascript"
src="http://at.alicdn.com/t/font_872265_oftixmwgy8b.js"
></script> -->
></script>
</head>
<body style="background-color: #f5f5f5">
<!-- <svg class="icon" aria-hidden="true">
<use xlink:href="#icon-canting1"></use>
</svg>
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-canting3"></use>
</svg>
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-tingchechang3"></use>
</svg>
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-weishengjian1"></use>
</svg> -->

<div id="root"></div>
</body>
</html>
7 changes: 4 additions & 3 deletions src/component/Grid/GridView.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import React from "react";
import { connect } from "react-redux";
import "./GridLess.less";
import { Table, Button, Menu, Dropdown } from "antd";
import { DownOutlined } from "@ant-design/icons";
import styles from "./GridLess.less";

//分页配置
const pageConfig = {
pageSizeOptions: ["10", "20", "30", "40"],
Expand Down Expand Up @@ -94,9 +95,9 @@ class TableComponent extends React.Component {
}
};
return (
<div className={"tableComponet"}>
<div className={styles["tableComponet"]}>
{/* 表格前的节点 */}
<div className={"beforeNode"}>
<div className={styles["beforeNode"]}>
{batchBtns &&
batchBtns.map((item, index) => {
return beforeInfo(item, index);
Expand Down
21 changes: 13 additions & 8 deletions src/component/Query/QueryView.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React from "react";
import { connect } from "react-redux";
import "./QueryLess.less";
// import "./QueryLess.less";
import { Form, InputNumber, Button, Input, Row, Select } from "antd";
import { get } from "lodash";

import styles from "./QueryLess.less";
console.log("styles", styles);
class QueryComponet extends React.Component {
constructor(props) {
super(props);
Expand Down Expand Up @@ -165,9 +166,9 @@ class QueryComponet extends React.Component {
break;
}
return (
<div className="queryItem" key={en_name}>
<div className="queryLabel">{zh_name}</div>
<div className="queryContent">{content}</div>
<div className={styles["queryItem"]} key={en_name}>
<div className={styles["queryLabel"]}>{zh_name}</div>
<div className={styles["queryContent"]}>{content}</div>
{queryConfig && queryConfig.length === index + 1 && (
<div style={{ display: "flex" }}>
<Button type="primary" className="mgr24 mgl24" htmlType="submit">
Expand All @@ -184,9 +185,13 @@ class QueryComponet extends React.Component {
//渲染表单项
let { queryConfig } = this.props;
return (
<div className={"query"} id={this.id}>
<Form layout={"inline"} onFinish={this.onFinish} ref={this.formRef}>
<div className={"queryForm"}>
<div className={styles["query"]} id={this.id}>
<Form
layout={styles["inline"]}
onFinish={this.onFinish}
ref={this.formRef}
>
<div className={styles["queryForm"]}>
{queryConfig &&
queryConfig.map((item, index) => {
return this.renderFields(item, index);
Expand Down
4 changes: 2 additions & 2 deletions src/views/App.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import { connect } from "react-redux";
import "./App.less";
import styles from "./App.less";
import { Tag, Space, Modal, Form, Input, Button } from "antd";
import { Grid, Query } from "component";
import ModalConponet from "./modal";
Expand Down Expand Up @@ -206,7 +206,7 @@ class App extends React.Component {
onChange: this.onSelectInfoChange,
};
return (
<div className={"app"}>
<div className={styles["app"]}>
<div className="mgb24">
<Query
queryConfig={this.queryConfig}
Expand Down
5 changes: 4 additions & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,15 @@ new HappyPack({
// },
{
loader: "css-loader",
options: {
modules: true,
// localIdentName: "[path][name]__[local]--[hash:base64:5]",
},
},
{
loader: "less-loader",
},
],
// include: path.resolve(__dirname, 'node_modules'),
},
{
test: /\.(png|jpg|gif|md)$/,
Expand Down

0 comments on commit 46cb459

Please sign in to comment.