更新GCN

SystemLight · SystemLight · commit 461422d1e9aa · 2020-08-05T17:15:01.000+08:00
diff --git a/template/gcn/src/component/index.jsx b/template/gcn/src/component/index.jsx
@@ -4,7 +4,7 @@ import {
     InputNumber, Checkbox,
     Form, Select, DatePicker,
     Typography, ImageWrap, InputButton,
-    Button
+    Button, DateStrRange, DateStrPicker
 } from "@/lib";
 
 export default function Trial(p) {
@@ -53,6 +53,17 @@ export default function Trial(p) {
                                             onChange={(val) => (onChange("g", val))} {...props["g"]}/>
                 </Form.Item>
             </Col>
+            <Col span={8}>
+                <Form.Item label={"标题"}>
+                    <DatePicker name={"f1"} value={data["f1"]} onChange={onChange} {...props["f1"]}/>
+                </Form.Item>
+            </Col>
+            <Col span={8}>
+                <Form.Item label={"标题"}>
+                    <DateStrRange name={"g1,g2"} value={[data["g1"], data["g2"]]}
+                                  onChange={onChange} {...props["g1,g2"]}/>
+                </Form.Item>
+            </Col>
             <Col span={8}>
                 <Form.Item label={"标题"}>
                     <InputButton field={"h"} value={data["h"]} onChange={onChange} {...props["h"]}/>
diff --git a/template/gcn/src/lib/index.jsx b/template/gcn/src/lib/index.jsx
@@ -1,73 +1,78 @@
 const ExportJsonExcel = require("js-export-excel");
 import React, {useEffect, useState} from "react";
+import moment from "moment";
 import {Link} from "react-router-dom";
-import {Row, Table, Button, message, Form, Input} from "antd";
+import {
+    Row, Table, Button, message,
+    Form, Input, Space, Breadcrumb,
+    DatePicker
+} from "antd";
 import {EllipsisOutlined} from "@ant-design/icons";
 
-export {default as Affix} from 'antd/es/affix';
-export {default as Anchor} from 'antd/es/anchor';
-export {default as AutoComplete} from 'antd/es/auto-complete';
-export {default as Alert} from 'antd/es/alert';
-export {default as Avatar} from 'antd/es/avatar';
-export {default as BackTop} from 'antd/es/back-top';
-export {default as Badge} from 'antd/es/badge';
-export {default as Breadcrumb} from 'antd/es/breadcrumb';
-export {default as Button} from 'antd/es/button';
-export {default as Calendar} from 'antd/es/calendar';
-export {default as Card} from 'antd/es/card';
-export {default as Collapse} from 'antd/es/collapse';
-export {default as Carousel} from 'antd/es/carousel';
-export {default as Cascader} from 'antd/es/cascader';
-export {default as Checkbox} from 'antd/es/checkbox';
-export {default as Col} from 'antd/es/col';
-export {default as Comment} from 'antd/es/comment';
-export {default as ConfigProvider} from 'antd/es/config-provider';
-export {default as DatePicker} from 'antd/es/date-picker';
-export {default as Descriptions} from 'antd/es/descriptions';
-export {default as Divider} from 'antd/es/divider';
-export {default as Dropdown} from 'antd/es/dropdown';
-export {default as Drawer} from 'antd/es/drawer';
-export {default as Empty} from 'antd/es/empty';
-export {default as Form} from 'antd/es/form';
-export {default as Grid} from 'antd/es/grid';
-export {default as Input} from 'antd/es/input';
-export {default as InputNumber} from 'antd/es/input-number';
-export {default as Layout} from 'antd/es/layout';
-export {default as List} from 'antd/es/list';
-export {default as message} from 'antd/es/message';
-export {default as Menu} from 'antd/es/menu';
-export {default as Mentions} from 'antd/es/mentions';
-export {default as Modal} from 'antd/es/modal';
-export {default as Statistic} from 'antd/es/statistic';
-export {default as notification} from 'antd/es/notification';
-export {default as PageHeader} from 'antd/es/page-header';
-export {default as Pagination} from 'antd/es/pagination';
-export {default as Popconfirm} from 'antd/es/popconfirm';
-export {default as Popover} from 'antd/es/popover';
-export {default as Progress} from 'antd/es/progress';
-export {default as Radio} from 'antd/es/radio';
-export {default as Rate} from 'antd/es/rate';
-export {default as Result} from 'antd/es/result';
-export {default as Row} from 'antd/es/row';
-export {default as Select} from 'antd/es/select';
-export {default as Skeleton} from 'antd/es/skeleton';
-export {default as Slider} from 'antd/es/slider';
-export {default as Space} from 'antd/es/space';
-export {default as Spin} from 'antd/es/spin';
-export {default as Steps} from 'antd/es/steps';
-export {default as Switch} from 'antd/es/switch';
-export {default as Table} from 'antd/es/table';
-export {default as Transfer} from 'antd/es/transfer';
-export {default as Tree} from 'antd/es/tree';
-export {default as TreeSelect} from 'antd/es/tree-select';
-export {default as Tabs} from 'antd/es/tabs';
-export {default as Tag} from 'antd/es/tag';
-export {default as TimePicker} from 'antd/es/time-picker';
-export {default as Timeline} from 'antd/es/timeline';
-export {default as Tooltip} from 'antd/es/tooltip';
-export {default as Typography} from 'antd/es/typography';
-export {default as Upload} from 'antd/es/upload';
-export {default as version} from 'antd/es/version';
+export {default as Affix} from "antd/es/affix";
+export {default as Anchor} from "antd/es/anchor";
+export {default as AutoComplete} from "antd/es/auto-complete";
+export {default as Alert} from "antd/es/alert";
+export {default as Avatar} from "antd/es/avatar";
+export {default as BackTop} from "antd/es/back-top";
+export {default as Badge} from "antd/es/badge";
+export {default as Breadcrumb} from "antd/es/breadcrumb";
+export {default as Button} from "antd/es/button";
+export {default as Calendar} from "antd/es/calendar";
+export {default as Card} from "antd/es/card";
+export {default as Collapse} from "antd/es/collapse";
+export {default as Carousel} from "antd/es/carousel";
+export {default as Cascader} from "antd/es/cascader";
+export {default as Checkbox} from "antd/es/checkbox";
+export {default as Col} from "antd/es/col";
+export {default as Comment} from "antd/es/comment";
+export {default as ConfigProvider} from "antd/es/config-provider";
+export {default as DatePicker} from "antd/es/date-picker";
+export {default as Descriptions} from "antd/es/descriptions";
+export {default as Divider} from "antd/es/divider";
+export {default as Dropdown} from "antd/es/dropdown";
+export {default as Drawer} from "antd/es/drawer";
+export {default as Empty} from "antd/es/empty";
+export {default as Form} from "antd/es/form";
+export {default as Grid} from "antd/es/grid";
+export {default as Input} from "antd/es/input";
+export {default as InputNumber} from "antd/es/input-number";
+export {default as Layout} from "antd/es/layout";
+export {default as List} from "antd/es/list";
+export {default as message} from "antd/es/message";
+export {default as Menu} from "antd/es/menu";
+export {default as Mentions} from "antd/es/mentions";
+export {default as Modal} from "antd/es/modal";
+export {default as Statistic} from "antd/es/statistic";
+export {default as notification} from "antd/es/notification";
+export {default as PageHeader} from "antd/es/page-header";
+export {default as Pagination} from "antd/es/pagination";
+export {default as Popconfirm} from "antd/es/popconfirm";
+export {default as Popover} from "antd/es/popover";
+export {default as Progress} from "antd/es/progress";
+export {default as Radio} from "antd/es/radio";
+export {default as Rate} from "antd/es/rate";
+export {default as Result} from "antd/es/result";
+export {default as Row} from "antd/es/row";
+export {default as Select} from "antd/es/select";
+export {default as Skeleton} from "antd/es/skeleton";
+export {default as Slider} from "antd/es/slider";
+export {default as Space} from "antd/es/space";
+export {default as Spin} from "antd/es/spin";
+export {default as Steps} from "antd/es/steps";
+export {default as Switch} from "antd/es/switch";
+export {default as Table} from "antd/es/table";
+export {default as Transfer} from "antd/es/transfer";
+export {default as Tree} from "antd/es/tree";
+export {default as TreeSelect} from "antd/es/tree-select";
+export {default as Tabs} from "antd/es/tabs";
+export {default as Tag} from "antd/es/tag";
+export {default as TimePicker} from "antd/es/time-picker";
+export {default as Timeline} from "antd/es/timeline";
+export {default as Tooltip} from "antd/es/tooltip";
+export {default as Typography} from "antd/es/typography";
+export {default as Upload} from "antd/es/upload";
+export {default as version} from "antd/es/version";
 
 import {ImageBoxStyle} from "@/styles";
 
@@ -82,7 +87,7 @@ import {ImageBoxStyle} from "@/styles";
     可编辑表格
  */
 export function EditTable(props) {
-    let {columns, data, editURL, tableTitle, loading} = props;
+    let {columns, data, editURL, tableTitle, loading, onAdd} = props;
 
     const [selectedRowKeys, setSelectedRowKeys] = useState([]);
 
@@ -94,13 +99,13 @@ export function EditTable(props) {
         if (index % 2 !== 0) {
             return "odd";
         } else {
-            return "";
+            return "even";
         }
     };
 
     const exportExcel = () => {
         if (!data || data.length === 0) {
-            message.info('没有可导出的数据');
+            message.info("没有可导出的数据");
             return;
         }
 
@@ -119,7 +124,7 @@ export function EditTable(props) {
         let finalData = [];
 
         columns.forEach(c => {
-            header[c["dataIndex"]] = c["title"]
+            header[c["dataIndex"]] = c["title"];
             keys.push(c["dataIndex"]);
         });
 
@@ -149,9 +154,10 @@ export function EditTable(props) {
         return (
             <div className={"clearfix export-table-title"}>
                 <p>{tableTitle || ""}</p>
-                <p>
+                <Space direction={"horizontal"}>
+                    <Button type={"primary"} onClick={() => (onAdd && onAdd())}>新增</Button>
                     <Button type={"primary"} onClick={exportExcel}>导出</Button>
-                </p>
+                </Space>
             </div>
         );
     };
@@ -176,13 +182,18 @@ export function EditTable(props) {
         },
         ...columns,
         {
-            key: 'edit',
+            key: "edit",
             dataIndex: "edit",
-            title: '编辑',
+            title: "编辑",
             render: (text, record) => (
-                <Link to={`${editURL}${record["key"]}`} target={"_blank"}>
-                    <Button type={"primary"}>编辑</Button>
-                </Link>
+                <Space>
+                    <Link to={`${editURL}edit/${record["key"]}`} target={"_blank"}>
+                        <Button type={"link"} size={"small"}>编辑</Button>
+                    </Link>
+                    <Link to={`${editURL}view/${record["key"]}`} target={"_blank"}>
+                        <Button type={"link"} size={"small"}>查看</Button>
+                    </Link>
+                </Space>
             ),
         }
     ].map(v => {
@@ -191,10 +202,10 @@ export function EditTable(props) {
         }
         return {
             ...v,
-            sortDirections: ['descend', 'ascend'],
+            sortDirections: ["descend", "ascend"],
             sorter: (a, b) => {
-                let stringA = a[v.dataIndex].toUpperCase();
-                let stringB = b[v.dataIndex].toUpperCase();
+                let stringA = a[v.dataIndex];
+                let stringB = b[v.dataIndex];
                 if (stringA < stringB) {
                     return -1;
                 }
@@ -203,7 +214,7 @@ export function EditTable(props) {
                 }
                 return 0;
             },
-        }
+        };
     });
     // endregion
 
@@ -225,11 +236,11 @@ export function EditTable(props) {
                                 <Table.Summary.Cell key={c["key"]}>{
                                     getTotal(currentData, c["dataIndex"])
                                 }</Table.Summary.Cell>
-                            )
+                            );
                         } else {
                             return (
                                 <Table.Summary.Cell key={c["key"]}/>
-                            )
+                            );
                         }
                     })
                 )}
@@ -241,7 +252,7 @@ export function EditTable(props) {
         <div style={{width: "100%", overflow: "hidden", marginTop: 15}}>
             <Table className={"advanced-table"} dataSource={data} columns={mergedColumns}
                    rowClassName={rowClassName} title={title} pagination={false}
-                   rowSelection={rowSelection} scroll={{x: 'max-content'}} bordered={true}
+                   rowSelection={rowSelection} scroll={{x: "max-content"}} bordered={true}
                    tableLayout={"auto"} loading={loading} summary={summary}
             />
         </div>
@@ -256,13 +267,13 @@ export function ImageWrap(props) {
 
     const onClick = () => {
         trigger && trigger(href);
-    }
+    };
 
     return (
         <ImageBoxStyle onClick={onClick}>
             <img src={src} alt="图片"/>
         </ImageBoxStyle>
-    )
+    );
 }
 
 /*
@@ -281,7 +292,7 @@ export function InputButton(props) {
             value={value}
             onChange={({target: {value}}) => (onChange(field, value))}
         />
-    )
+    );
 }
 
 /*
@@ -291,10 +302,57 @@ export function Container(props) {
     let {children} = props;
 
     return (
-        <Form colon={false} labelCol={{span: 5}}>
+        <Form colon={false} className={"g-from"}>
             <Row gutter={[15, 0]} className={"container-panel"}>
                 {children}
             </Row>
         </Form>
     );
 }
+
+/*
+    面包屑导航标题
+ */
+export function NavPath(props) {
+    let {paths} = props;
+    paths = paths || [];
+
+    return (
+        <Breadcrumb separator=">" style={{padding: "15px 0"}}>
+            {paths.map(v => {
+                return (
+                    <Breadcrumb.Item key={v}>{v}</Breadcrumb.Item>
+                );
+            })}
+        </Breadcrumb>
+    );
+}
+
+export function DateStrPicker(props) {
+    let {onChange, value, name} = props;
+
+    const changeVal = (val, strVal) => {
+        onChange(name, strVal);
+    };
+
+    return (
+        <DatePicker style={{width: "100%"}} value={moment(value)} onChange={changeVal}/>
+    );
+}
+
+export function DateStrRange(props) {
+    let {onChange, value, name} = props;
+
+    let [n1, n2] = name.split(",");
+    let [d1, d2] = value;
+
+    const changeVal = (momentVal, strVal) => {
+        onChange(n1, strVal[0]);
+        onChange(n2, strVal[1]);
+    };
+
+    return (
+        <DatePicker.RangePicker value={[moment(d1), moment(d2)]} style={{width: "100%"}}
+                                onChange={changeVal}/>
+    );
+}
