Browse Source

【看板展示】【引用打包之后的样式文件】

zhuth 8 years ago
parent
commit
deb02a2a33

+ 4 - 0
kanban-client/app/assets/Form/index.css

@@ -20,6 +20,7 @@ body,
 }
 .rc-form {
   height: 100%;
+  overflow: hidden;
 }
 .rc-form-header {
   font-size: large;
@@ -42,3 +43,6 @@ body,
   width: 50%;
   float: left;
 }
+.rc-form-item-value {
+  padding-right: 30px;
+}

+ 4 - 0
kanban-client/app/assets/Form/index.less

@@ -21,6 +21,7 @@ html,body,#root{
 
 .@{prefixCls} {
     height: 100%;
+    overflow: hidden;
 }
 .@{prefixCls}-header {
     font-size: large;
@@ -42,4 +43,7 @@ html,body,#root{
 .@{prefixCls}-item-field {
     width: 50%;
     float: left;
+}
+.@{prefixCls}-item-value {
+    padding-right: 30px;
 }

+ 0 - 3
kanban-client/app/component/Table.jsx

@@ -3,9 +3,6 @@ import ReactDOM from 'react-dom';
 import Table from '../src/Table/index.js';
 import Animate from 'rc-animate';
 import renders from '../utils/RenderUtils.js';
-import '../assets/Table/index.less';
-import '../assets/Table/animation.less';
-
 
 class TableModel extends React.Component {
 	constructor(props) {

+ 4 - 28
kanban-client/app/data/testform.json

@@ -5,17 +5,18 @@
                 "items": [
                     {
                         "layout": {
-                            "w": 50,
+                            "w": 100,
                             "h": 30,
                             "y": 0,
                             "x": 0
                         },
                         "config": {
+                            "fontSize": 20,
                             "data": [
                                 {
-                                    "field": "字段1",
+                                    "field": { "text": "公", "style": {"color": "red"}},
                                     "width": 100,
-                                    "value": 11
+                                    "value": { "text": "告", "style": {"color": "red"}}
                                 },
                                 {
                                     "field": "字段2",
@@ -29,31 +30,6 @@
                                     "field": "字段4",
                                     "width": 100,
                                     "value": 3
-                                },
-                                {
-                                    "field": "字段5",
-                                    "width": 100,
-                                    "value": 5
-                                },{
-                                    "field": "字段6",
-                                    "value": 3
-                                },
-                                {
-                                    "field": "字段7",
-                                    "value": 511
-                                },
-                                {
-                                    "field": "字段8",
-                                    "width": 100,
-                                    "value": 11
-                                },
-                                {
-                                    "field": "字段9",
-                                    "value": 3
-                                },
-                                {
-                                    "field": "字段10",
-                                    "value": 5
                                 }
                             ],
                             "columns": 4

+ 137 - 103
kanban-client/app/data/testtable.json

@@ -4,128 +4,162 @@
             "content": {
                 "items": [
                     {
-                        "layout": {
-                            "w": 100,
-                            "h": 100,
-                            "y": 0,
-                            "x": 0
-                        },
+                        "type": "table",
                         "config": {
-                            "title": "测试Grid",
-                            "data": [
-                                {
-                                    "prj_end": 1506700800000,
-                                    "prj_start": 1504627200000,
-                                    "prj_assignto": "詹国胜",
-                                    "prj_name": "平板电脑充电器(通用型)"
-                                },
-                                {
-                                    "prj_end": 1506700800000,
-                                    "prj_start": 1504540800000,
-                                    "prj_assignto": "USER0005",
-                                    "prj_name": "测试项目文档权限"
-                                },
-                                {
-                                    "prj_end": 1504108800000,
-                                    "prj_start": 1501776000000,
-                                    "prj_assignto": "詹国胜",
-                                    "prj_name": "无线手机充电器"
-                                },
-                                {
-                                    "prj_end": 1504108800000,
-                                    "prj_start": 1503849600000,
-                                    "prj_assignto": "TEST0821",
-                                    "prj_name": "测试AAA"
-                                },
-                                {
-                                    "prj_end": 1504108800000,
-                                    "prj_start": 1502726400000,
-                                    "prj_assignto": "顾群2",
-                                    "prj_name": "test"
-                                },
-                                {
-                                    "prj_end": 1504886400000,
-                                    "prj_start": 1503936000000,
-                                    "prj_assignto": "顾群",
-                                    "prj_name": "测试测试"
-                                },
+                            "rowHeight": 100,
+                            "columns": [
                                 {
-                                    "prj_end": 1504108800000,
-                                    "prj_start": 1501776000000,
-                                    "prj_assignto": "詹国胜",
-                                    "prj_name": "法拉利F1赛车车载导航"
+                                    "title": "时段",
+                                    "width": 150,
+                                    "dataIndex": "time"
                                 },
                                 {
-                                    "prj_end": 1504108800000,
-                                    "prj_start": 1501948800000,
-                                    "prj_assignto": "杨若楠",
-                                    "prj_name": "平板电脑充电器"
+                                    "title": "计划数",
+                                    "dataIndex": "plan"
                                 },
                                 {
-                                    "prj_end": 1506700800000,
-                                    "prj_start": 1504540800000,
-                                    "prj_assignto": "顾群",
-                                    "prj_name": "测试开启项目"
+                                    "title": "投入数",
+                                    "dataIndex": "input"
                                 },
                                 {
-                                    "prj_end": 1505577600000,
-                                    "prj_start": 1504540800000,
-                                    "prj_assignto": "刘萌冰",
-                                    "prj_name": "测试任务的推送"
+                                    "title": "送检数",
+                                    "dataIndex": "check"
                                 },
                                 {
-                                    "prj_end": 1506700800000,
-                                    "prj_start": 1504540800000,
-                                    "prj_assignto": "陈虎",
-                                    "prj_name": "测试万利达科技0905"
+                                    "title": "包装数",
+                                    "dataIndex": "pack"
                                 },
                                 {
-                                    "prj_end": 1506700800000,
-                                    "prj_start": 1504540800000,
-                                    "prj_assignto": "陈虎",
-                                    "prj_name": "测试万利达科技0904"
+                                    "title": "达成率",
+                                    "dataIndex": "success",
+                                    "render": "rateRender"
                                 },
                                 {
-                                    "prj_end": 1506441600000,
-                                    "prj_start": 1504627200000,
-                                    "prj_assignto": "周兵",
-                                    "prj_name": "UU互联测试项目001"
+                                    "title": "备注",
+                                    "dataIndex": "desc",
+                                    "render": "descRender"
                                 }
                             ],
-                            "columns": [
-                                {
-                                    "title": "项目负责人",
-                                    "sort": 0,
-                                    "width": 100,
-                                    "dataIndex": "prj_assignto"
-                                },
-                                {
-                                    "title": "计划开始日期",
-                                    "sort": 0,
-                                    "width": 100,
-                                    "dataIndex": "prj_start"
-                                },
-                                {
-                                    "title": "计划结束日期",
-                                    "sort": 0,
-                                    "width": 100,
-                                    "dataIndex": "prj_end"
-                                },
-                                {
-                                    "title": "项目名称",
-                                    "sort": 0,
-                                    "width": 100,
-                                    "dataIndex": "prj_name"
-                                },
+                            "data": [
                                 {
-                                    "title": "状态",
-                                    "sort": 0,
-                                    "width": 100,
-                                    "render": "prj_istimeout_render"
+                                    "key": "1",
+                                    "time": "8-9",
+                                    "plan": "150",
+                                    "input": "160",
+                                    "check": "100",
+                                    "pack": "0",
+                                    "success": "70%",
+                                    "desc": "11"
+                                },
+                                {
+                                    "key": "2",
+                                    "time": "9-10",
+                                    "plan": "200",
+                                    "input": "200",
+                                    "check": "200",
+                                    "pack": "0",
+                                    "success": "100%",
+                                    "desc": "10"
+                                },
+                                {
+                                    "key": "3",
+                                    "time": "10-11",
+                                    "plan": "200",
+                                    "input": "203",
+                                    "check": "400",
+                                    "pack": "0",
+                                    "success": "120%",
+                                    "desc": "9"
+                                },
+                                {
+                                    "key": "4",
+                                    "time": "11-12",
+                                    "plan": "",
+                                    "input": "",
+                                    "check": "",
+                                    "pack": "",
+                                    "success": "",
+                                    "desc": "8"
+                                },
+                                {
+                                    "key": "1",
+                                    "time": "8-9",
+                                    "plan": "150",
+                                    "input": "160",
+                                    "check": "100",
+                                    "pack": "0",
+                                    "success": "70%",
+                                    "desc": "7"
+                                },
+                                {
+                                    "key": "1",
+                                    "time": "8-9",
+                                    "plan": "150",
+                                    "input": "160",
+                                    "check": "100",
+                                    "pack": "0",
+                                    "success": "70%",
+                                    "desc": "6"
+                                },
+                                {
+                                    "key": "1",
+                                    "time": "8-9",
+                                    "plan": "150",
+                                    "input": "160",
+                                    "check": "100",
+                                    "pack": "0",
+                                    "success": "70%",
+                                    "desc": "5"
+                                },
+                                {
+                                    "key": "1",
+                                    "time": "8-9",
+                                    "plan": "150",
+                                    "input": "160",
+                                    "check": "100",
+                                    "pack": "0",
+                                    "success": "70%",
+                                    "desc": "4"
+                                },
+                                {
+                                    "key": "1",
+                                    "time": "8-9",
+                                    "plan": "150",
+                                    "input": "160",
+                                    "check": "100",
+                                    "pack": "0",
+                                    "success": "70%",
+                                    "desc": "3"
+                                },
+                                {
+                                    "key": "1",
+                                    "time": "8-9",
+                                    "plan": "150",
+                                    "input": "160",
+                                    "check": "100",
+                                    "pack": "0",
+                                    "success": "70%",
+                                    "desc": "2"
+                                },
+                                {
+                                    "key": "1",
+                                    "time": "8-9",
+                                    "plan": "150",
+                                    "input": "160",
+                                    "check": "100",
+                                    "pack": "0",
+                                    "success": "70%",
+                                    "desc": "1"
                                 }
-                            ]
+                            ],
+                            "render": "tableRender"
                         },
-                        "type": "table"
+                        "layout": {
+                            "x": 0,
+                            "y": 0,
+                            "w": 80,
+                            "h": 50
+                        }
                     }
                 ]
             }

+ 6 - 0
kanban-client/app/main.js

@@ -2,6 +2,12 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import Factory from './component/Factory.js';
 
+import './assets/Table/index.less';
+import './assets/Table/animation.less';
+import './assets/Form/index.less';
+import './assets/FixedBox/index.less';
+import './assets/Title/index.less';
+
 var code = window.location.search.substring(6);
 
 ReactDOM.render(

+ 0 - 1
kanban-client/app/src/FixedBox/FixedBox.jsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import '../../assets/FixedBox/index.less';
 import renders from '../../utils/RenderUtils.js';
 
 export default class FixedBox extends React.Component {

+ 1 - 2
kanban-client/app/src/Form/Form.jsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import FormItem from './FormItem.jsx';
-import '../../assets/Form/index.less';
 import renders from '../../utils/RenderUtils.js';
 
 export default class Form extends React.Component {
@@ -67,7 +66,7 @@ export default class Form extends React.Component {
         const { fontSize, prefixCls, fieldCls, fieldStyle, valueCls, valueStyle } = this.state;
         const { columns } = this.state;
         let columnsData = this.getItemColumns();
-        const contentEl = <tbody className={`${prefixCls}-content`} key="form_content">
+        const contentEl = <tbody style={{fontSize: fontSize}} className={`${prefixCls}-content`} key="form_content">
             {
                 columnsData.map((tr, i) => (
                     <tr className={`${prefixCls}-tr`} key={`content_item_tr_${i}`}>

+ 0 - 1
kanban-client/app/src/Title/Title.jsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import renders from '../../utils/RenderUtils.js';
-import '../../assets/Title/index.less';
 
 export default class Title extends React.Component {
   static propTypes = {

+ 1 - 0
kanban-client/build/index.html

@@ -2,6 +2,7 @@
 <html>
 <head lang="en">
   <meta charset="UTF-8">
+  <link rel="stylesheet" href="./css/main.css" type="text/css" />
   <title>Board</title>
 </head>
 <body style="margin:0px">

+ 12 - 8
kanban-client/webpack.config.js

@@ -32,6 +32,7 @@ module.exports = {
             {
                 test: /\.(less|css)$/,
                 exclude: /node_modules/,
+                // loader: 'style-loader!css-loader!less-loader',
                 use: ExtractTextPlugin.extract({
                     fallback: 'style-loader',
                     use: ['css-loader', 'less-loader']
@@ -51,16 +52,19 @@ module.exports = {
         new webpack.LoaderOptionsPlugin({
             options: {
                 devServer: {
-                    historyApiFallback: true, //不跳转
-                    inline: true //实时刷新
+                    historyApiFallback: true,
+                    inline: true
                 }
             }
         }),
-        new webpack.optimize.UglifyJsPlugin({
-            compress: {
-                warnings: false
-            }
-        }),
+        /**
+         * 代码压缩
+         */
+        // new webpack.optimize.UglifyJsPlugin({
+        //     compress: {
+        //         warnings: false
+        //     }
+        // }),
         new webpack.DefinePlugin({
             "process.env": {
                 NODE_ENV: JSON.stringify("production")
@@ -68,7 +72,7 @@ module.exports = {
         }),
         new ExtractTextPlugin({
             filename: (getPath) => {
-                return getPath('css/[name].css').replace('css/js', 'css');
+                return getPath('css/[name].css').replace('src/', '').replace('css/js', 'css');
             },
             allChunks: true
         })