From 638e110797e11c01281d58eaf80061febbeb84f9 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Tue, 28 Mar 2023 14:50:41 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=8D=A1=E7=89=87?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2formlabel=E5=92=8Cvalue=E9=87=8D=E5=A4=8D?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/resource/FormItem.js | 4 +++-
pc4mobx/organization/style/card.less | 17 ++++++++++++-----
2 files changed, 15 insertions(+), 6 deletions(-)
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/style/card.less b/pc4mobx/organization/style/card.less
index 1e5ba3f..32624a4 100644
--- a/pc4mobx/organization/style/card.less
+++ b/pc4mobx/organization/style/card.less
@@ -134,17 +134,24 @@
div{
width: 33.3%;
height: 40px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ display: flex;
span:first-child{
color: #999999;
- width: 80px;
- display: inline-block;
+ height: inherit;
+ flex: 1;
text-align: right;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
span:last-child{
margin-left: 20px;
+ height: 40px;
+ vertical-align: top;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ flex: 4;
}
}
}
From bc38036b336f89cb389b69eabe67e49769bef77b Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Thu, 4 May 2023 15:13:48 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=81=AB=E7=8B=90=E6=B5=8F=E8=A7=88?=
=?UTF-8?q?=E5=99=A8=E6=A0=B7=E5=BC=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/organization/style/index.less | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pc4mobx/organization/style/index.less b/pc4mobx/organization/style/index.less
index deb176d..962a0d0 100644
--- a/pc4mobx/organization/style/index.less
+++ b/pc4mobx/organization/style/index.less
@@ -26,7 +26,9 @@ body {
body,
html {
height: 100%;
- overflow: scroll !important
+ overflow: scroll !important;
+ scrollbar-width: none; //火狐滚动条处理
+
}
::-webkit-scrollbar {
From 34202c6758193c87964e9bfbd1794c92c3715235 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Thu, 25 May 2023 13:45:26 +0800
Subject: [PATCH 3/4] test
---
pc4mobx/organization/style/index.less | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pc4mobx/organization/style/index.less b/pc4mobx/organization/style/index.less
index 962a0d0..35ab4ac 100644
--- a/pc4mobx/organization/style/index.less
+++ b/pc4mobx/organization/style/index.less
@@ -22,6 +22,7 @@ body {
color: #333333;
}
+
#container,
body,
html {
@@ -35,8 +36,10 @@ html {
width: 0px;
height: 0px;
background-color: transparent;
+ display: none;
}
+
//列表滚动条
.wea-new-table {
::-webkit-scrollbar {
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 4/4] =?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 (
-