git pull

src/pages/home/Recommend/index.jsx

@@ -5,14 +5,6 @@ import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import QueryTable from '@/components/QueryTable'
 import { router } from 'umi';
-import { render } from 'enzyme';
-import WxDictSelect from '@/components/SelectButton/WxDictSelect';
-import BuildingSelect from '@/components/SelectButton/BuildSelect';
-import renderAuthorize from '@/components/Authorized/renderAuthorize';
-import { setLocale } from 'umi-plugin-locale';
-import { fromPairs } from 'lodash';
-import { backgroundColor } from 'echarts/lib/theme/dark';
-
 
 
 /**

src/pages/staff/Organization/form.jsx

@@ -1,4 +1,122 @@
+import React from 'react'
+import { Row, Col, Card, Tree, DatePicker, Radio,Form, Select, Input,InputNumber, Button } from 'antd';
 
-export default (props) => {
 
-}
+import ImageUpload from '@/components/XForm/ImageUpload';
+
+const { Option } = Select;
+const FormItem = Form.Item;
+const {RangePicker}=DatePicker
+
+const formItemLayout = {
+    labelCol: { span: 6 },
+    wrapperCol: { span: 14 },
+};
+
+class TreedataFrom extends React.Component {
+  handleSubmit = e => {
+    e.preventDefault();
+    this.props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('Received values of form: ', values);
+      }
+    });
+  };
+
+  handleSelectChange = value => {
+    console.log(value);
+    this.props.form.setFieldsValue({
+      note: `Hi, ${value === 'male' ? 'man' : 'lady'}!`,
+    });
+  };
+
+  render() {
+    const { getFieldDecorator } = this.props.form;
+    return (
+      <Form {...formItemLayout} onSubmit={this.handleSubmit}>
+        <FormItem label="照片" help="建议尺寸：750px*600px，比例5:4，格式：jpg，用于：列表和详情">
+          {
+            getFieldDecorator('curriculumImg', {
+              rules: [
+                { required: true, message: '请上传照片' }
+              ]
+            })(
+              <ImageUpload />
+            )
+          }
+        </FormItem>
+        <FormItem label="姓名">
+          {getFieldDecorator('note', {
+            rules: [{ required: true, message: '请输入姓名!' }],
+          })(<Input />)}
+        </FormItem>
+        <FormItem label="年龄" >
+           {
+            getFieldDecorator('weight', {
+              rules: [{ required: true, message: '请输入年龄' }]
+            })(
+              <InputNumber min='18' />
+            )
+          }
+        </FormItem>
+        <FormItem label="性别">
+          {
+            getFieldDecorator('type', {
+              rules: [
+                { required: true, message: '请选择性别' }
+              ]
+            })(
+              <Radio.Group  style={{ width: '500px' }} defaultValue={1}>
+                {/* onChange={e => setContentType(e.target.value)} */}
+                <Radio value={1}>男</Radio>
+                <Radio value={2}>女</Radio>
+              </Radio.Group>
+            )
+          }
+        </FormItem>
+        <FormItem label="工作总时间" style={{ marginBottom: 0 }} help="如未离职,结束日期和开始日期一样即可">
+          <FormItem style={{ display: 'inline-block' }} >
+            <RangePicker style={{width: '255px'}}/>
+          </FormItem>
+        </FormItem>
+        <FormItem label="Gender">
+          {getFieldDecorator('gender', {
+            rules: [{ required: true, message: 'Please select your gender!' }],
+          })(
+            <Select
+              placeholder="Select a option and change input text above"
+              onChange={this.handleSelectChange}
+            >
+              <Option value="male">male</Option>
+              <Option value="female">female</Option>
+            </Select>,
+          )}
+        </FormItem>
+        <FormItem wrapperCol={{ span: 12, offset: 5 }}>
+          <Button type="primary" htmlType="submit">
+            Submit
+          </Button>
+        </FormItem>
+      </Form>
+    );
+  }
+}
+
+
+TreedataFrom = Form.create({})(TreedataFrom);
+
+export default TreedataFrom
+
+
+
+
+// import React from 'react'
+
+// class Hello extends React.Component{
+//     render(){
+//         return<h1>asdasdasdas</h1>
+//     }
+// }
+
+
+// export default Hello

src/pages/staff/Organization/index.jsx

@@ -205,68 +205,124 @@
 
 
 
-import { Row, Col, Card, Tree, DatePicker, Form, Input, InputNumber, Radio, Button } from 'antd'
-import React, { useEffect, useState, useCallback } from 'react';
-import ImageUpload from '@/components/XForm/ImageUpload';
 
-// import userTrees from './tree'
 
-const { TreeNode, DirectoryTree } = Tree
-const FormItem = Form.Item;
 
 
 
 
-const userTree = React.forwardRef((props, ref) => {
-  const [loading, setLoading] = useState(false);//防止多次点击 定义loadind
-  // const [formData, setFormData] = useState();//提交表单的数据
-  const [contentType, setContentType] = useState(1);//单选。初始默认显示1 富文本框。点击视频， 渲染2
-  const { form, history } = props;
-  const { getFieldDecorator, setFieldsValue, validateFields } = form;
-  const {RangePicker} = DatePicker;
-  const { curriculumId } = history.location.query || {}
-  const formItemLayout = {
-    //布局
-    labelCol: { span: 6 },
-    wrapperCol: { span: 14 },
+import { Row, Col, Card, Tree, DatePicker, Form, Input, InputNumber, Radio, Button } from 'antd'
+import { title } from 'echarts/lib/theme/dark';
+import React, { useEffect, useState, useCallback,useRef } from 'react';
+import TreedataFrom from './form';
+
+const { TreeNode,DirectoryTree } = Tree;
+
+// const [treeData, settreeData] = useState([])
+
+
+const treeData = [
+  {
+    title: '分厂厂长管理',
+    key: '0-0',
+    children: [
+        { title: '刘厂长', key: '0-0-0-1' },
+        { title: '王副厂长', key: '0-0-0-2' },
+    ],
+  },
+  {
+      title: '分厂员工管理',
+      key: '0-0-1',
+      children: [
+        { title: '王王王', key: '0-0-1-0' },
+        { title: '张张张', key: '0-0-1-1' },
+        { title: '刘刘刘', key: '0-0-1-2' },
+      ],
+  },
+];
+
+class Demo extends React.Component {
+
+  state = {
+    expandedKeys: ['0-0', '0-0-1'],
+    autoExpandParent: false,
+    checkedKeys: ['0-0-1'],
+    selectedKeys: [],
+  };
+
+  onExpand = expandedKeys => {
+    //自动展开
+    console.log('onExpand', expandedKeys);
+      // 如果没有将 autoExpandParent 设置为 false，如果子项展开，父项不能折叠。
+     // 或者，您可以删除所有扩展的子键。
+    this.setState({
+      expandedKeys,
+      autoExpandParent: false,
+    });
+  };
+
+  onCheck = checkedKeys => {
+    //单击复选框
+    console.log('onCheck', checkedKeys);
+    this.setState({ checkedKeys });
+    
+  };
 
+  onSelect = (selectedKeys, info) => {
+    //单击姓名
+    for (let i = 0; i < selectedKeys.length; i++) {
+      const element = selectedKeys[i];
+      console.log(element);
+  }
+  
+    console.log('onSelect',info);
+    this.setState({ selectedKeys });
   };
 
-  return (
-    <Card>
-      <Row justify='center'>
+  renderTreeNodes = data =>
+    data.map(item => {
+      if (item.children) {
+        return (
+          <TreeNode title={item.title} key={item.key} dataRef={item}  >
+            {this.renderTreeNodes(item.children)}
+          </TreeNode>
+        );
+      }
+      return <TreeNode key={item.key} {...item} />;
+    });
+
+
+
+  render() {
+    return (
+     <Card>
+      <Row>
         <Col xs={{ span: 5, offset: 1 }} lg={{ span: 6, offset: 0 }}>
           <Card>
-            <Button type='danger' style={{ marginLeft: '2em' }} >
-              删除
-            </Button>
-            <DirectoryTree >
-              <TreeNode title="厂长管理" key="0-0">
-                <TreeNode  title="刘张" value='刘帐' key="0-0-0" isLeaf />
-                <TreeNode title="李徐" key="0-0-1" isLeaf />
-              </TreeNode>
-              <TreeNode title="员工管理" key="0-1">
-                <TreeNode title="leaf 1-0" key="0-1-0" isLeaf />
-                <TreeNode title="leaf 1-1" key="0-1-1" isLeaf />
-                <TreeNode title="leaf 1-1" key="0-1-2" isLeaf />
-                <TreeNode title="leaf 1-1" key="0-1-3" isLeaf />
-                <TreeNode title="leaf 1-1" key="0-1-4" isLeaf />
-                <TreeNode title="leaf 1-1" key="0-1-5" isLeaf />
-              </TreeNode>
-            </DirectoryTree>
+              <Tree 
+                // checkable
+                showLine={true}
+                onExpand={this.onExpand}
+                expandedKeys={this.state.expandedKeys}
+                autoExpandParent={this.state.autoExpandParent}
+                onCheck={this.onCheck}
+                checkedKeys={this.state.checkedKeys}
+                onSelect={this.onSelect}
+                selectedKeys={this.state.selectedKeys}
+              >
+                {this.renderTreeNodes(treeData)}
+              </Tree >
           </Card>
         </Col>
-        {/* FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF>Form表单 */}
         <Col xs={{ span: 10, offset: 10 }} lg={{ span: 10, offset: 4 }}>
           <Card>
-            
+          <TreedataFrom />
           </Card>
         </Col>
       </Row>
-    </Card>
-
-  )
-})
-
+     </Card> 
+    );
+  }
+}
 
-export default Form.create({})(userTree);
+export default Demo 

src/pages/staff/Organization/tree.jsx

@@ -1,18 +1,110 @@
-import { Tree } from 'antd'
-
-export default (props) => {
-    const { TreeNode, DirectoryTree } = Tree
-
-    return (
-        <DirectoryTree multiple>
-            <TreeNode title="parent 0" key="0-0">
-                <TreeNode title="leaf 0-0" key="0-0-0" isLeaf />
-                <TreeNode title="leaf 0-1" key="0-0-1" isLeaf />
-            </TreeNode>
-            <TreeNode title="parent 1" key="0-1">
-                <TreeNode title="leaf 1-0" key="0-1-0" isLeaf />
-                <TreeNode title="leaf 1-1" key="0-1-1" isLeaf />
-            </TreeNode>
-        </DirectoryTree>
-    )
-}
+
+
+
+// import { Tree } from 'antd';
+
+// const { TreeNode } = Tree;
+
+// const treeData = [
+//   {
+//     title: '0-0',
+//     key: '0-0',
+//     children: [
+//       {
+//         title: '0-0-0',
+//         key: '0-0-0',
+//         children: [
+//           { title: '0-0-0-0', key: '0-0-0-0' },
+//           { title: '0-0-0-1', key: '0-0-0-1' },
+//           { title: '0-0-0-2', key: '0-0-0-2' },
+//         ],
+//       },
+//       {
+//         title: '0-0-1',
+//         key: '0-0-1',
+//         children: [
+//           { title: '0-0-1-0', key: '0-0-1-0' },
+//           { title: '0-0-1-1', key: '0-0-1-1' },
+//           { title: '0-0-1-2', key: '0-0-1-2' },
+//         ],
+//       },
+//       {
+//         title: '0-0-2',
+//         key: '0-0-2',
+//       },
+//     ],
+//   },
+//   {
+//     title: '0-1',
+//     key: '0-1',
+//     children: [
+//       { title: '0-1-0-0', key: '0-1-0-0' },
+//       { title: '0-1-0-1', key: '0-1-0-1' },
+//       { title: '0-1-0-2', key: '0-1-0-2' },
+//     ],
+//   },
+//   {
+//     title: '0-2',
+//     key: '0-2',
+//   },
+// ];
+
+// class Demo extends React.Component {
+//   state = {
+//     expandedKeys: ['0-0-0', '0-0-1'],
+//     autoExpandParent: true,
+//     checkedKeys: ['0-0-0'],
+//     selectedKeys: [],
+//   };
+
+//   onExpand = expandedKeys => {
+//     console.log('onExpand', expandedKeys);
+//     // if not set autoExpandParent to false, if children expanded, parent can not collapse.
+//     // or, you can remove all expanded children keys.
+//     this.setState({
+//       expandedKeys,
+//       autoExpandParent: false,
+//     });
+//   };
+
+//   onCheck = checkedKeys => {
+//     console.log('onCheck', checkedKeys);
+//     this.setState({ checkedKeys });
+//   };
+
+//   onSelect = (selectedKeys, info) => {
+//     console.log('onSelect', info);
+//     this.setState({ selectedKeys });
+//   };
+
+//   renderTreeNodes = data =>
+//     data.map(item => {
+//       if (item.children) {
+//         return (
+//           <TreeNode title={item.title} key={item.key} dataRef={item}>
+//             {this.renderTreeNodes(item.children)}
+//           </TreeNode>
+//         );
+//       }
+//       return <TreeNode key={item.key} {...item} />;
+//     });
+
+//   render() {
+//     return (
+//       <Tree
+//         checkable
+//         onExpand={this.onExpand}
+//         expandedKeys={this.state.expandedKeys}
+//         autoExpandParent={this.state.autoExpandParent}
+//         onCheck={this.onCheck}
+//         checkedKeys={this.state.checkedKeys}
+//         onSelect={this.onSelect}
+//         selectedKeys={this.state.selectedKeys}
+//       >
+//         {this.renderTreeNodes(treeData)}
+//       </Tree>
+//     );
+//   }
+// }
+
+// export default Demo