From b15144beefeb5d53c040deb1004a30ab251e45b1 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Wed, 12 Jul 2023 10:46:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/organization/components/tree/affix.js | 32 --- .../organization/components/tree/baseForm.js | 150 ---------- pc4mobx/organization/components/tree/index.js | 89 ------ pc4mobx/organization/components/tree/side.js | 44 --- .../organization/components/tree/slider.js | 18 -- .../components/tree/standard_org.js | 100 ------- pc4mobx/organization/index.js | 4 - pc4mobx/organization/public/tree/index.js | 3 - pc4mobx/organization/public/tree/node.less | 129 --------- pc4mobx/organization/public/tree/org_tree.js | 120 -------- pc4mobx/organization/public/tree/org_tree.jsx | 133 --------- .../organization/public/tree/org_tree.less | 260 ------------------ .../organization/public/tree/simple_node.jsx | 19 -- .../public/tree/standard_common.jsx | 26 -- .../organization/public/tree/standard_job.jsx | 26 -- .../public/tree/standard_node.jsx | 36 --- .../public/tree/standard_person.jsx | 25 -- pc4mobx/organization/stores/index.js | 4 - .../organization/stores/tree/simple_org.js | 148 ---------- .../organization/stores/tree/standard_org.js | 156 ----------- tsconfig.json | 1 - 21 files changed, 1523 deletions(-) delete mode 100644 pc4mobx/organization/components/tree/affix.js delete mode 100644 pc4mobx/organization/components/tree/baseForm.js delete mode 100644 pc4mobx/organization/components/tree/index.js delete mode 100644 pc4mobx/organization/components/tree/side.js delete mode 100644 pc4mobx/organization/components/tree/slider.js delete mode 100644 pc4mobx/organization/components/tree/standard_org.js delete mode 100644 pc4mobx/organization/public/tree/index.js delete mode 100644 pc4mobx/organization/public/tree/node.less delete mode 100644 pc4mobx/organization/public/tree/org_tree.js delete mode 100644 pc4mobx/organization/public/tree/org_tree.jsx delete mode 100644 pc4mobx/organization/public/tree/org_tree.less delete mode 100644 pc4mobx/organization/public/tree/simple_node.jsx delete mode 100644 pc4mobx/organization/public/tree/standard_common.jsx delete mode 100644 pc4mobx/organization/public/tree/standard_job.jsx delete mode 100644 pc4mobx/organization/public/tree/standard_node.jsx delete mode 100644 pc4mobx/organization/public/tree/standard_person.jsx delete mode 100644 pc4mobx/organization/stores/tree/simple_org.js delete mode 100644 pc4mobx/organization/stores/tree/standard_org.js 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 ( -
- -
- ) - } -} \ No newline at end of file diff --git a/pc4mobx/organization/components/tree/standard_org.js b/pc4mobx/organization/components/tree/standard_org.js deleted file mode 100644 index 43dbacf..0000000 --- a/pc4mobx/organization/components/tree/standard_org.js +++ /dev/null @@ -1,100 +0,0 @@ -import React from 'react'; -import { inject, observer } from 'mobx-react'; -import { toJS } from 'mobx'; - -import BaseForm from './baseForm.js'; -import Slider from './slider.js'; -import OrgTree from '../../public/tree/index.js'; -import SidePage from './side.js' -import AffixComs from './affix.js'; -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('standardOrgStore') -@observer -export default class StandardOrg extends React.Component { - - componentWillMount() { // 初始化渲染页面 - const { standardOrgStore: { doInit } } = this.props; - doInit(); - } - - componentWillReceiveProps(nextProps) { - const { standardOrgStore: { doInit } } = this.props; - if (this.props.horizontal !== nextProps.horizontal) { // 手动刷新、切换菜单 重新初始化 - doInit(); - } - } - - /** - * 查询 - */ - getSearch = (params) => { - const { standardOrgStore } = this.props; - standardOrgStore.getStandardOrg(params); - } - - //调用侧滑页面子组件 - openSidePage = (params) => { - this.child.openSide(params); - } - - onRef = (ref) => { - this.child = ref - } - - - - render() { - const { standardOrgStore } = this.props; - const { loading, hasRight, form, condition, data, horizontal, collapsable, expandAll, labelClassName, treeType, scale } = standardOrgStore; // 从后台取数据 和 方法 - //alert(JSON.stringify(data)) - - if (!hasRight && !loading) { // 无权限处理 - return renderNoright(); - } - - if (isEmpty(data)) { //无数据处理 - return renderNoData(); - } - - return ( -
- - {loading ? renderLoading() : -
- {/* {getSearchs(form, toJS(condition), 1)} 初始化表单*/} - -
- { - // //this.openSidePage(data, e) - // }} - > - -
- - {/* */} -
- } -
- ) - } -} \ No newline at end of file diff --git a/pc4mobx/organization/index.js b/pc4mobx/organization/index.js index de71a75..e73f6ed 100644 --- a/pc4mobx/organization/index.js +++ b/pc4mobx/organization/index.js @@ -3,8 +3,6 @@ import Route from "react-router/lib/Route"; import { message } from "antd"; import { WeaLocaleProvider } from "ecCom"; import Home from "./components/Home"; -import SimpleOrg from "./components/tree/index"; -import StandardOrg from "./components/tree/standard_org"; import RankScheme from "./components/postionrank/RankScheme"; import JobLevel from "./components/postionrank/JobLevel"; import JobGrade from "./components/postionrank/JobGrade"; @@ -58,8 +56,6 @@ const Routes = ( path="organization" onEnter={getLocaleLabel} component={Home}> - - diff --git a/pc4mobx/organization/public/tree/index.js b/pc4mobx/organization/public/tree/index.js deleted file mode 100644 index 88218e3..0000000 --- a/pc4mobx/organization/public/tree/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import OrgTree from './org_tree.jsx'; - -export default OrgTree \ No newline at end of file diff --git a/pc4mobx/organization/public/tree/node.less b/pc4mobx/organization/public/tree/node.less deleted file mode 100644 index 78c2fa5..0000000 --- a/pc4mobx/organization/public/tree/node.less +++ /dev/null @@ -1,129 +0,0 @@ -.org-tree-node-label-inner { - .node-card { - width: 220px; - height: 140px; - cursor: pointer; - .top { - width: 100%; - height: 48px; - position: relative; - border-top-left-radius: 15px; - border-top-right-radius: 15px; - #org-icon { - position: absolute; - top: 10px; - left: 18px; - font-size: 24px; - color: #ffffff; - } - p { - position: absolute; - left: 56px; - height: 48px; - color: #ffffff; - font-weight: bold; - margin: 0; - line-height: 48px; - } - } - .common-content { - position: relative; - .info { - img { - width: 30px; - height: 30px; - position: absolute; - top: 17px; - left: 24px; - } - div { - span { - position: absolute; - top: 16px; - left: 65px; - font-weight: bold; - } - div { - position: absolute; - top: 36px; - left: 64px; - color: grey; - } - } - } - .detail { - position: absolute; - top: 62px; - color: grey; - left: 25px; - span { - &:last-child { - margin-left: 40px; - } - } - } - } - .job-content { - position: relative; - .title { - position: absolute; - top: 8px; - left: 32px; - font-size: 15px; - font-weight: bold; - } - .detail { - position: absolute; - top: 38px; - color: grey; - left: 28px; - div { - span { - &:last-child { - margin-left: 40px; - } - } - } - } - } - .person-content { - position: relative; - .info { - img { - width: 30px; - height: 30px; - position: absolute; - top: 17px; - left: 24px; - } - div { - span { - position: absolute; - top: 18px; - left: 62px; - font-weight: bold; - } - div { - position: absolute; - top: 37px; - left: 66px; - color: grey; - } - } - } - .address { - position: absolute; - top: 60px; - left: 32px; - color: grey; - } - } - } -} - - - /**simple_node*/ - .simple-node-card { - padding: 10px 15px; - } - \ No newline at end of file diff --git a/pc4mobx/organization/public/tree/org_tree.js b/pc4mobx/organization/public/tree/org_tree.js deleted file mode 100644 index e725df9..0000000 --- a/pc4mobx/organization/public/tree/org_tree.js +++ /dev/null @@ -1,120 +0,0 @@ -import React from 'react'; - -// 判断是否叶子节点 -const isLeaf = (data, prop) => { - const node = prop.node; - return !(Array.isArray(data[node.children]) && data[node.children].length > 0); -}; - -// 创建 node 节点 -export const renderNode = (data, prop) => { - const node = prop.node; - const cls = ['org-tree-node']; - const childNodes = []; - - if (isLeaf(data, prop)) { - cls.push('is-leaf'); - } else if (prop.collapsable && !data[node.expand]) { - cls.push('collapsed'); - } - - childNodes.push(renderLabel(data, prop)); - - if (!prop.collapsable || data[node.expand]) { - childNodes.push(renderChildren(data.children, prop)); - } - - return React.createElement('div', { - key: data.id, - className: cls.join(' ') - }, childNodes); - // return React.createElement('div', { - // key: data.id, - // className: cls.join(' ') - // }, childNodes); -}; - -// 创建展开折叠按钮 -export const renderBtn = (data, prop) => { - const { onExpand } = prop; - const node = prop.node; - - let cls = ['org-tree-node-btn']; - - if (data[node.expand]) { - cls.push('expanded'); - } - - return React.createElement('span', { - key: data.id, - className: cls.join(' '), - onClick: (e) => { - e.stopPropagation(); - typeof onExpand === 'function' && onExpand(e, data); - } - }); -}; - -// 创建 label 节点 -export const renderLabel = (data, prop) => { - const node = prop.node; - const label = data[node.label]; - const renderContent = prop.renderContent; - const onClick = prop.onClick; - const treeType = prop.treeType; - const openSidePage = prop.openSidePage; - - const childNodes = []; - if (typeof renderContent === 'function') { - let vnode = renderContent(data,treeType,openSidePage); - - vnode && childNodes.push(vnode); - } else { - childNodes.push(label); - } - - if (prop.collapsable && !isLeaf(data, prop)) { - childNodes.push(renderBtn(data, prop)); - } - - const cls = ['org-tree-node-label-inner']; - - let { labelWidth, labelClassName } = prop; - - if (typeof labelWidth === 'number') { - labelWidth += 'px'; - } - - labelClassName && cls.push(labelClassName); - - return React.createElement('div', { - key: `label_${data.id}`, - className: 'org-tree-node-label', - onClick: (e) => typeof onClick === 'function' && onClick(e, data) - }, [React.createElement('div', { - key: `label_inner_${data.id}`, - className: cls.join(' '), - style: { width: labelWidth } - }, childNodes)]); - -}; - -// 创建 node 子节点 -export const renderChildren = (list, prop) => { - if (Array.isArray(list) && list.length) { - const children = list.map(item => { - return renderNode(item, prop); - }); - return React.createElement('div', { - key: `children_${children[0].key}`, - className: 'org-tree-node-children' - }, children); - } - return ''; -}; - -export const render = (props) => { - return renderNode(props.data, props); -}; - -export default render; diff --git a/pc4mobx/organization/public/tree/org_tree.jsx b/pc4mobx/organization/public/tree/org_tree.jsx deleted file mode 100644 index cdeba23..0000000 --- a/pc4mobx/organization/public/tree/org_tree.jsx +++ /dev/null @@ -1,133 +0,0 @@ -import React, { Component } from 'react'; -import PropTypes from 'prop-types'; -import classnames from 'classnames'; - -import TreeNode from './org_tree'; - -import './org_tree.less'; -import StandardNode from './standard_node'; -import SimpleNode from './simple_node'; - -//组件 -class OrgTree extends Component { - constructor(props) { - super(props); - this.handleExpand = this.handleExpand.bind(this); - this.collapse = this.collapse.bind(this); - this.toggleExpand = this.toggleExpand.bind(this); - } - - componentDidMount() { - const { expandAll, data } = this.props; - if(expandAll) this.toggleExpand(data, true); - } - - componentDidUpdate(prevProps, prevState) { - if (prevProps.data !== this.props.data) { - const { expandAll, data } = this.props; - if(expandAll) this.toggleExpand(data, true); - } - - } - - componentWillUnmount() { - } - - handleExpand(e, nodeData) { - if ('expand' in nodeData) { - nodeData.expand = !nodeData.expand; - if (!nodeData.expand && nodeData.children) { - this.collapse(nodeData.children); - } - this.forceUpdate(); - }else { - nodeData.expand = true; - this.forceUpdate(); - } - } - - collapse(list) { - let _this = this; - list.forEach(function(child) { - if (child.expand) { - child.expand = false; - } - child.children && _this.collapse(child.children); - }); - } - - toggleExpand(data, val) { - let _this = this; - if (Array.isArray(data)) { - data.forEach(function(item) { - item.expand = val; - if (item.children) { - _this.toggleExpand(item.children, val); - } - }); - } else { - data.expand = val; - if (data.children) { - _this.toggleExpand(data.children, val); - } - } - this.forceUpdate(); - } - - render() { - const { horizontal, node, data, onClick } = this.props; - return
-
- this.handleExpand(e, nodeData)} - onClick={(e, nodeData)=> onClick && onClick(e, nodeData)} - {...this.props} - /> -
-
; - } -} - -OrgTree.propTypes = { - data: PropTypes.object, - node: PropTypes.object, - horizontal: PropTypes.bool, - collapsable: PropTypes.bool, - expandAll: PropTypes.bool, - renderContent: PropTypes.func, - labelWidth: PropTypes.number, - labelClassName: PropTypes.string, - onClick: PropTypes.func, - treeType:PropTypes.string, - openSidePage:PropTypes.func -} - -OrgTree.defaultProps = { - node: { - label: 'label', - expand: 'expand', - children: 'children' - }, - renderContent: function(data,treeType,openSidePage) { - if(treeType == 'simple') { - return React.createElement(SimpleNode, { - key: Date.now(), - data: data - // className: 'x'.join(' ') - }, []); - }else{ - return React.createElement(StandardNode, { - key: Date.now(), - data: data, - openSidePage: openSidePage - // className: 'x'.join(' ') - }, []); - } - } -}; - -export default OrgTree; \ No newline at end of file diff --git a/pc4mobx/organization/public/tree/org_tree.less b/pc4mobx/organization/public/tree/org_tree.less deleted file mode 100644 index f3cc0c6..0000000 --- a/pc4mobx/organization/public/tree/org_tree.less +++ /dev/null @@ -1,260 +0,0 @@ -.org-tree-container { - display: inline-block; - padding: 15px; - background-color: #fff; -} - -.org-tree { - display: table; - text-align: center; - - &:before, &:after { - content: ''; - display: table; - } - - &:after { - clear: both; - } -} - -.org-tree-node, -.org-tree-node-children { - position: relative; - margin: 0; - padding: 0; - list-style-type: none; - - &:before, &:after { - transition: all .35s; - } -} -.org-tree-node-label { - position: relative; - display: inline-block; - - .org-tree-node-label-inner { - // padding: 10px 15px; - // text-align: center; - color: black; - border-radius: 15px; - box-shadow: 0 1px 5px rgba(0, 0, 0, .15); - } -} -.org-tree-node-btn { - position: absolute; - top: 100%; - left: 50%; - width: 20px; - height: 20px; - z-index: 10; - margin-left: -11px; - margin-top: 9px; - background-color: #fff; - border: 1px solid #ccc; - border-radius: 50%; - box-shadow: 0 0 2px rgba(0, 0, 0, .15); - cursor: pointer; - transition: all .35s ease; - - &:hover { - background-color: #e7e8e9; - transform: scale(1.15); - } - - &:before, &:after { - content: ''; - position: absolute; - } - - &:before { - top: 50%; - left: 4px; - right: 4px; - height: 0; - border-top: 1px solid #ccc; - } - - &:after { - top: 4px; - left: 50%; - bottom: 4px; - width: 0; - border-left: 1px solid #ccc; - } - - &.expanded:after { - border: none; - } -} -.org-tree-node { - padding-top: 20px; - display: table-cell; - vertical-align: top; - - &.is-leaf, &.collapsed { - padding-left: 10px; - padding-right: 10px; - } - - &:before, &:after { - content: ''; - position: absolute; - top: 0; - left: 0; - width: 50%; - height: 19px; - } - - &:after { - left: 50%; - border-left: 1px solid #ddd; - } - - &:not(:first-child):before, - &:not(:last-child):after { - border-top: 1px solid #ddd; - } - -} -.collapsable .org-tree-node.collapsed { - padding-bottom: 30px; - - .org-tree-node-label:after { - content: ''; - position: absolute; - top: 100%; - left: 0; - width: 50%; - height: 20px; - border-right: 1px solid #ddd; - } -} -.org-tree > .org-tree-node { - padding-top: 0; - - &:after { - border-left: 0; - } -} -.org-tree-node-children { - padding-top: 20px; - display: table; - - &:before { - content: ''; - position: absolute; - top: 0; - left: 50%; - width: 0; - height: 20px; - border-left: 1px solid #ddd; - } - - &:after { - content: ''; - display: table; - clear: both; - } -} - -.horizontal { - .org-tree-node { - display: table-cell; - float: none; - padding-top: 0; - padding-left: 20px; - - &.is-leaf, &.collapsed { - padding-top: 10px; - padding-bottom: 10px; - } - - &:before, &:after { - width: 19px; - height: 50%; - } - - &:after { - top: 50%; - left: 0; - border-left: 0; - } - - &:only-child:before { - top: 1px; - border-bottom: 1px solid #ddd; - } - - &:not(:first-child):before, - &:not(:last-child):after { - border-top: 0; - border-left: 1px solid #ddd; - } - - &:not(:only-child):after { - border-top: 1px solid #ddd; - } - - .org-tree-node-inner { - display: table; - } - - } - - .org-tree-node-label { - display: table-cell; - vertical-align: middle; - } - - &.collapsable .org-tree-node.collapsed { - padding-right: 30px; - - .org-tree-node-label:after { - top: 0; - left: 100%; - width: 20px; - height: 50%; - border-right: 0; - border-bottom: 1px solid #ddd; - } - } - - .org-tree-node-btn { - top: 50%; - left: 100%; - margin-top: -11px; - margin-left: 9px; - } - - & > .org-tree-node:only-child:before { - border-bottom: 0; - } - - .org-tree-node-children { - display: table-cell; - padding-top: 0; - padding-left: 20px; - - &:before { - top: 50%; - left: 0; - width: 20px; - height: 0; - border-left: 0; - border-top: 1px solid #ddd; - } - - &:after { - display: none; - } - - & > .org-tree-node { - display: block; - } - } -} - -.text-center { - text-align: center; -} \ No newline at end of file diff --git a/pc4mobx/organization/public/tree/simple_node.jsx b/pc4mobx/organization/public/tree/simple_node.jsx deleted file mode 100644 index a01fe10..0000000 --- a/pc4mobx/organization/public/tree/simple_node.jsx +++ /dev/null @@ -1,19 +0,0 @@ -import { Component } from "react"; - -import './node.less' - - -class SimpleNode extends Component { - - render() { - const {label} = this.props.data; - return ( -
- {label} -
- ) - } - -} - -export default SimpleNode; \ No newline at end of file diff --git a/pc4mobx/organization/public/tree/standard_common.jsx b/pc4mobx/organization/public/tree/standard_common.jsx deleted file mode 100644 index db3dbc7..0000000 --- a/pc4mobx/organization/public/tree/standard_common.jsx +++ /dev/null @@ -1,26 +0,0 @@ -import { Component } from "react"; - -import './node.less' - - -export default class StandardCommon extends Component { - - render() { - const {empName,job,label,onDuty,prepared} = this.props.data; - return ( -
-
- -
{empName}
{label}/{job}
-
-
- 编制： {prepared} - 在岗： {onDuty} -
- -
- ) - } - -} - diff --git a/pc4mobx/organization/public/tree/standard_job.jsx b/pc4mobx/organization/public/tree/standard_job.jsx deleted file mode 100644 index 031c942..0000000 --- a/pc4mobx/organization/public/tree/standard_job.jsx +++ /dev/null @@ -1,26 +0,0 @@ -import { Component } from "react"; - -import './node.less' - -export default class StandardJob extends Component { - render() { - const { prepared,onDuty,part,send } = this.props.data; - return ( -
- 岗位职责 -
-
- 编制： {prepared} - 在岗： {onDuty} -
-
- 兼职： {part} - 派遣： {send} -
-
-
- ) - } - -} - diff --git a/pc4mobx/organization/public/tree/standard_node.jsx b/pc4mobx/organization/public/tree/standard_node.jsx deleted file mode 100644 index 08a4157..0000000 --- a/pc4mobx/organization/public/tree/standard_node.jsx +++ /dev/null @@ -1,36 +0,0 @@ -import { Component } from "react"; - -import './node.less' -import StandardCommon from './standard_common'; -import StandardJob from './standard_job'; -import StandardPerson from './standard_person'; - -import SliderPage from '../../components/tree/side.js' - - -export default class StandardNode extends Component { - - - - render() { - - const {data} = this.props; - const { empname, job, label, onduty, prepared, nodeType, icon } = data; - let colorValue = nodeType == 0 ? "deepskyblue" : ((nodeType == 1 || nodeType == 2) ? "green" : "blue") - let style = { - backgroundColor: colorValue - } - - return ( -
-
- -

{label}

-
- {(nodeType == 0 || nodeType == 1 || nodeType == 2) ? : - (nodeType == 3 ? : )} -
- ) - } - -} diff --git a/pc4mobx/organization/public/tree/standard_person.jsx b/pc4mobx/organization/public/tree/standard_person.jsx deleted file mode 100644 index 44a4a7e..0000000 --- a/pc4mobx/organization/public/tree/standard_person.jsx +++ /dev/null @@ -1,25 +0,0 @@ -import { Component } from "react"; - -import './node.less' - - -export default class StandardPerson extends Component { - - render() { - const {tel,job,address} = this.props.data; - return ( -
-
- -
{tel}
{job}
-
-
- {address} -
- -
- ) - } - -} - diff --git a/pc4mobx/organization/stores/index.js b/pc4mobx/organization/stores/index.js index 0fe47d4..e0d8271 100644 --- a/pc4mobx/organization/stores/index.js +++ b/pc4mobx/organization/stores/index.js @@ -1,5 +1,3 @@ -import { SimpleOrgStore } from "./tree/simple_org"; -import { StandardOrgStore } from "./tree/standard_org"; import { RankSchemeStore } from "./rankscheme"; import { JobLevelStore } from "./joblevel"; import { JobGradeStore } from "./jobgrade"; @@ -32,8 +30,6 @@ import {PersonnelResumeStore} from './personnelResume' module.exports = { - simpleOrgStore: new SimpleOrgStore(), - standardOrgStore: new StandardOrgStore(), rankScheme: new RankSchemeStore(), jobLevel: new JobLevelStore(), jobGrade: new JobGradeStore(), diff --git a/pc4mobx/organization/stores/tree/simple_org.js b/pc4mobx/organization/stores/tree/simple_org.js deleted file mode 100644 index 7bf8dc5..0000000 --- a/pc4mobx/organization/stores/tree/simple_org.js +++ /dev/null @@ -1,148 +0,0 @@ -import { observable, action, toJS } from 'mobx'; -import { message } from 'antd'; -import { WeaForm, WeaLogView } from 'comsMobx'; -import { WeaLocaleProvider } from 'ecCom'; - -import * as API from '../../apis'; // 引入API接口文件 - -const getLabel = WeaLocaleProvider.getLabel; - -export class SimpleOrgStore { - @observable form = new WeaForm(); // new 一个form - @observable condition = []; // 存储后台得到的form数据 - @observable loading = true; // 页面初始化的loading状态：数据加载成功前后前使用 - @observable hasRight = true; // 判断用户是有权限查看当前页面： 没有权限渲染无权限页面，有权限渲染数据 - @observable data = {}; //组织架构数据 - @observable horizontal = false; // true：横向 false：纵向 - @observable collapsable = true; // true：可折叠 false：不可折叠 - @observable expandAll = true; // true: 全部展开 false：全部折叠 - @observable labelClassName = 'bg-white'; - @observable treeType = 'simple'; - @observable scale = 1; - - @action // 初始化操作： 一般用来初始化获取后台数据 - doInit = () => { - this.getBaseForm(); - this.getSimpleOrg(); - } - - @action // 获得组织架构数据 - getSimpleOrg = (params) => { - API.getSimpleOrganizationDatas(params).then(action(result => { - this.loading = false; - // this.hasRight = result.hasRight; - // if (result.hasRight) { - // this.data = result.data; - // } - this.data = result.data; - })); - setTimeout(function(){ - this.loading = false; - },2000) - } - - - @action - getBaseForm = () => { - this.condition = [{ - "colSpan": 2, - "conditionType": "DATEPICKER", - 'rules': 'required|string', - 'hide': false, // 隐藏 - "domkey": [ - "datasDate" - ], - "fieldcol": 12, - "label": "数据日期", - "labelcol": 6, - "value": "2022-01-21", - "viewAttr": 2 - },{ - "colSpan": 2, - "conditionType": "SELECT", - 'rules': 'required|string', - 'hide': false, - "domkey": [ - "dimension" - ], - "fieldcol": 12, - "label": "维度", - "options": [ - { - "key": "1", - "selected": false, - "showname": "行政维度", - },{ - "key": "2", - "selected": false, - "showname": "公司维度", - }], - "labelcol": 6, - "value": "行政维度", - "viewAttr": 2 - },{ - "colSpan": 2, - "conditionType": "SELECT", - 'rules': 'required|string', - 'hide': false, - "domkey": [ - "node" - ], - "fieldcol": 12, - "label": "根节点", - "options": [ - { - "key": "1", - "selected": false, - "showname": "集团", - },{ - "key": "2", - "selected": false, - "showname": "部门", - }], - "labelcol": 6, - "value": "集团", - "viewAttr": 2 - },{ - "colSpan": 2, - "conditionType": "SELECT", - 'rules': 'required|string', - 'hide': false, - "domkey": [ - "hierarchy" - ], - "fieldcol": 12, - "label": "显示层级", - "options": [ - { - "key": "1", - "selected": false, - "showname": "一级", - },{ - "key": "2", - "selected": false, - "showname": "二级", - }], - "labelcol": 6, - "value": "一级", - "viewAttr": 2 - },{ - "colSpan": 2, - "conditionType": "CHECKBOX", - 'rules': 'required|string', - 'hide': false, - "domkey": [ - "visiable" - ], - "fieldcol": 12, - "label": "显示虚拟组织", - "labelcol": 6, - "value": "true", - "viewAttr": 2 - }] - - this.form.initFormFields(this.condition); - - } - -} \ No newline at end of file diff --git a/pc4mobx/organization/stores/tree/standard_org.js b/pc4mobx/organization/stores/tree/standard_org.js deleted file mode 100644 index b41da5f..0000000 --- a/pc4mobx/organization/stores/tree/standard_org.js +++ /dev/null @@ -1,156 +0,0 @@ -import { observable, action, toJS } from 'mobx'; -import { message } from 'antd'; -import { WeaForm, WeaLogView } from 'comsMobx'; -import { WeaLocaleProvider } from 'ecCom'; -import moment from "moment"; - - -import * as API from '../../apis'; // 引入API接口文件 - -const getLabel = WeaLocaleProvider.getLabel; - -export class StandardOrgStore { - @observable form = new WeaForm(); // new 一个form - @observable condition = []; // 存储后台得到的form数据 - @observable loading = true; // 页面初始化的loading状态：数据加载成功前后前使用 - @observable hasRight = true; // 判断用户是有权限查看当前页面： 没有权限渲染无权限页面，有权限渲染数据 - @observable data = {}; //组织架构数据 - @observable horizontal = false; // true：横向 false：纵向 - @observable collapsable = true; // true：可折叠 false：不可折叠 - @observable expandAll = true; // true: 全部展开 false：全部折叠 - @observable labelClassName = 'bg-white'; - @observable treeType = 'standard'; - @observable visible = true; //侧边栏显示 - @observable scale = 1; //缩放比例 - - - @action // 初始化操作： 一般用来初始化获取后台数据 - doInit = () => { - this.getBaseForm(); - this.getStandardOrg(); - } - - @action // 获得组织架构数据 - getStandardOrg = (params) => { - API.getStandardOrganizationDatas(params).then(action(result => { - this.loading = false; - // this.hasRight = result.hasRight; - // if (result.hasRight) { - // this.data = result.data; - // } - if (result.api_status) { - this.data = result.data; - } - })); - setTimeout(function () { - this.loading = false - }, 2000) - - } - - - - @action - getBaseForm = () => { - this.condition = [{ - "colSpan": 2, - "conditionType": "DATEPICKER", - 'rules': 'required|string', - 'hide': false, // 隐藏 - "domkey": [ - "datasDate" - ], - "fieldcol": 12, - "label": "数据日期", - "labelcol": 6, - "value": "2022-01-21", - "viewAttr": 2 - }, { - "colSpan": 2, - "conditionType": "SELECT", - 'rules': 'required|string', - 'hide': false, - "domkey": [ - "dimension" - ], - "fieldcol": 12, - "label": "维度", - "options": [ - { - "key": "1", - "selected": false, - "showname": "行政维度", - }, { - "key": "2", - "selected": false, - "showname": "公司维度", - }], - "labelcol": 6, - "value": "行政维度", - "viewAttr": 2 - }, { - "colSpan": 2, - "conditionType": "SELECT", - 'rules': 'required|string', - 'hide': false, - "domkey": [ - "node" - ], - "fieldcol": 12, - "label": "根节点", - "options": [ - { - "key": "1", - "selected": false, - "showname": "集团", - }, { - "key": "2", - "selected": false, - "showname": "部门", - }], - "labelcol": 6, - "value": "集团", - "viewAttr": 2 - }, { - "colSpan": 2, - "conditionType": "SELECT", - 'rules': 'required|string', - 'hide': false, - "domkey": [ - "hierarchy" - ], - "fieldcol": 12, - "label": "显示层级", - "options": [ - { - "key": "1", - "selected": false, - "showname": "一级", - }, { - "key": "2", - "selected": false, - "showname": "二级", - }], - "labelcol": 6, - "value": "一级", - "viewAttr": 2 - }, { - "colSpan": 2, - "conditionType": "CHECKBOX", - 'rules': 'required|string', - 'hide': false, - "domkey": [ - "visiable" - ], - "fieldcol": 12, - "label": "显示虚拟组织", - "labelcol": 6, - "value": "true", - "viewAttr": 2 - }] - - this.form.initFormFields(this.condition); - - } - -} \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 8dd306a..bf6762a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,7 +15,6 @@ "noImplicitThis": true, "noImplicitAny": true, "strictNullChecks": true, - "suppressImplicitAnyIndexErrors": true, "noUnusedLocals": true, "experimentalDecorators": true, },