diff --git a/pc4mobx/organization/components/resource/FormItem.js b/pc4mobx/organization/components/resource/FormItem.js
index e52ca52..1813dec 100644
--- a/pc4mobx/organization/components/resource/FormItem.js
+++ b/pc4mobx/organization/components/resource/FormItem.js
@@ -121,7 +121,9 @@ export default class FormItem extends React.Component {
{item.map((subItem) => {
return (
-
{subItem.fieldId}
+ {subItem.fieldId.length > 4 ?
+ {subItem.fieldId}
+ :
{subItem.fieldId}}
{subItem.fieldValue.length > 10 ?
{subItem.fieldValue}
:
{subItem.fieldValue}}
diff --git a/pc4mobx/organization/components/tree/affix.js b/pc4mobx/organization/components/tree/affix.js
deleted file mode 100644
index cc0a78c..0000000
--- a/pc4mobx/organization/components/tree/affix.js
+++ /dev/null
@@ -1,32 +0,0 @@
-
-import React from 'react'
-import '../../style/index.less'
-
-export default class AffixComs extends React.Component {
-
-
- render(){
- const {scale} = this.props.orgStore;
- return(
-
-
})
{
- this.props.orgStore.horizontal = false
- }} />
-
})
{
- this.props.orgStore.horizontal = true
- }} />
-
{
- if(scale <= 2) {
- this.props.orgStore.scale += 0.1
- }
- }}/>
- {
- if(scale >= 0.5){
- this.props.orgStore.scale -= 0.1
- }
- }}/>
-
- )
- }
-}
\ No newline at end of file
diff --git a/pc4mobx/organization/components/tree/baseForm.js b/pc4mobx/organization/components/tree/baseForm.js
deleted file mode 100644
index 0f3a274..0000000
--- a/pc4mobx/organization/components/tree/baseForm.js
+++ /dev/null
@@ -1,150 +0,0 @@
-import React from 'react'
-import { Checkbox, Button, Row, Col } from "antd"
-import { WeaInput, WeaDatePicker, WeaSelect, WeaCheckbox } from "ecCom"
-const CheckboxGroup = Checkbox.Group;
-import moment from "moment";
-
-import domtoimage from 'dom-to-image';
-import { saveAs } from 'file-saver';
-
-
-export default class BaseForm extends React.Component {
- constructor(props) {
- super(props);
- this.state = {
- dateValue: moment().format('YYYY-MM-DD HH:mm:ss'),
- latitudeValue: "0",
- nodeValue: "1",
- hierarchyValue: "5",
- checked: "1"
-
- }
- }
-
-
- //导出架构图
- exportImage = () => {
- const node = document.getElementById("node");
- domtoimage.toBlob(node).then((blob) => {
- // 调用file-save方法 直接保存图片
- saveAs(blob, '组织架构.png')
- })
- }
-
- //查询
- selectProps = () => {
- const params = this.state;
- this.props.getSearch(params);
- }
-
-
-
- render() {
- const dimension = [
- {
- "key": "0",
- "selected": false,
- "showname": "行政组织",
- }, {
- "key": "1",
- "selected": false,
- "showname": "虚拟组织",
- }];
-
- const node = [
- {
- "key": "1",
- "selected": false,
- "showname": "集团",
- }, {
- "key": "2",
- "selected": false,
- "showname": "部门",
- }]
-
- const hierarchy = [
- {
- "key": "1",
- "selected": false,
- "showname": "一级",
- }, {
- "key": "2",
- "selected": false,
- "showname": "二级",
- }, {
- "key": "3",
- "selected": false,
- "showname": "三级",
- }, {
- "key": "4",
- "selected": false,
- "showname": "四级",
- },{
- "key": "5",
- "selected": false,
- "showname": "五级",
- }]
-
- const { dateValue, latitudeValue, nodeValue, hierarchyValue, checked } = this.state;
-
- return (
-
-
- 数据日期 :
- this.setState({ dateValue: value })}
- needSecond={true}
- />
-
-
- 维度 :
- {
- this.setState({ latitudeValue: v })
- }}
- />
-
-
- 根节点 :
- {
- this.setState({ nodeValue: v })
- }}
- />
-
-
- 显示层级 :
- {
- this.setState({ hierarchyValue: v })
- }}
- />
-
-
- {
- this.setState({ checked: value });
- }} />
-
-
-
-
- )
- }
-}
\ No newline at end of file
diff --git a/pc4mobx/organization/components/tree/index.js b/pc4mobx/organization/components/tree/index.js
deleted file mode 100644
index fd9d17a..0000000
--- a/pc4mobx/organization/components/tree/index.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import React from 'react';
-import { inject, observer } from 'mobx-react';
-import { toJS } from 'mobx';
-import OrgTree from '../../public/tree/index.js';
-import BaseForm from './baseForm.js';
-import Slider from './slider.js';
-import AffixComs from './affix.js';
-
-import domtoimage from 'dom-to-image';
-import '../../style/index.less';
-
-
-
-
-import { Button, Image } from 'antd';
-import { WeaLogView } from 'comsMobx';
-import { WeaTop, WeaRightMenu, WeaLocaleProvider, WeaNewScroll } from 'ecCom';
-import { renderNoright, renderLoading, getSearchs, renderNoData, isEmpty } from '../../util'; // 从util文件引入公共的方法
-const getLabel = WeaLocaleProvider.getLabel;
-const WeaLogViewComp = WeaLogView.Component;
-
-
-
-@inject('simpleOrgStore')
-@observer
-export default class simpleOrg extends React.Component {
-
- componentWillMount() { // 初始化渲染页面
- const { simpleOrgStore: { doInit } } = this.props;
- doInit();
- }
-
- componentWillReceiveProps(nextProps) {
- const { simpleOrgStore: { doInit } } = this.props;
- if (this.props.horizontal !== nextProps.horizontal) { // 手动刷新、切换菜单 重新初始化
- doInit();
- }
- }
-
- getSearch = (params) => {
- const { simpleOrgStore } = this.props;
- simpleOrgStore.getSimpleOrg(params);
- }
-
- render() {
- const { simpleOrgStore } = this.props;
- const { loading, hasRight, form, condition, data, horizontal, collapsable, expandAll, labelClassName, treeType, scale } = simpleOrgStore; // 从后台取数据 和 方法
-
- if (!hasRight && !loading) { // 无权限处理
- return renderNoright();
- }
-
- if (isEmpty(data)) { //无数据处理
- return renderNoData();
- }
-
-
-
- return (
-
- {loading ? renderLoading() :
-
- {/* {getSearchs(form, toJS(condition), 1)} 初始化表单*/}
-
-
- {
- //todo
- }}
- >
-
-
-
- {/*
*/}
-
- }
-
- )
- }
-}
\ No newline at end of file
diff --git a/pc4mobx/organization/components/tree/side.js b/pc4mobx/organization/components/tree/side.js
deleted file mode 100644
index fc0f12a..0000000
--- a/pc4mobx/organization/components/tree/side.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import React from 'react';
-import { WeaSlideModal } from 'ecCom';
-import { Button } from 'antd';
-
-
-export default class SidePage extends React.Component {
- constructor(props) {
- super(props);
- this.state = {
- visible: false,
- data:{}
- }
- }
-
- componentDidMount() {
- this.props.onRef(this)
- }
-
- componentDidUpdate(prevProps, prevState) {
- if (prevProps.data !== this.props.data) {
- }
- }
-
- openSide = (data) => {
- this.setState({ visible: true,
- data:data})
- }
-
- render() {
- const { visible,data } = this.state;
- return (
-
{JSON.stringify(data)} )}
- onClose={() => this.setState({ visible: false })}
- onAnimationEnd={() => console.log('onAnimationEnd')} />
- )
- }
-}
\ No newline at end of file
diff --git a/pc4mobx/organization/components/tree/slider.js b/pc4mobx/organization/components/tree/slider.js
deleted file mode 100644
index ca9c863..0000000
--- a/pc4mobx/organization/components/tree/slider.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react'
-import { Slider } from "antd"
-
-export default class SliderCom extends React.Component {
-
- render() {
- const style = {
- display: 'inline-block',
- width: 300,
- }
-
- return (
-