多语言修复

多语言设置
8 changed files with 101 additions and 369 deletions
--- a/dist.zip
+++ b/dist.zip
--- a/src/components/drawer/index.jsx
+++ b/src/components/drawer/index.jsx
@ -8,8 +8,6 @@ import {
  Table,
  Spin,
  Checkbox,
-  Row,
-  Col,
 } from 'antd';
 import { OrgChartComponent } from '@/components/orgChart';
 import * as d3 from 'd3';
@ -35,9 +33,6 @@ export default class DrawerComponents extends React.Component {
      columns: [],
      spinning: true,
      showJob: false,
-      defaultTypeValue: ['isBelongTo'],
-      defaultStatusValue: [0, 1, 2, 3],
-      disabled: false,
    };
  }

@ -75,7 +70,7 @@ export default class DrawerComponents extends React.Component {
  }

  //获取数据
-  getDeatilDatas(params, type = 'chart', showJob = '1') {
+  getDeatilDatas(params, type = 'chart', showJob = '0') {
    this.setState({ spinning: true, data: [], dataSource: [] });
    d3.json(
      '/api/bs/hrmorganization/orgchart/getDepartmentDetail?' +
@ -309,19 +304,22 @@ export default class DrawerComponents extends React.Component {
                        : './img/default_avator.png'
                    }" style="width: 58px; height: 58px; border-radius: 50%; margin-top: 16px;margin-left: -6px;z-index:999" />
                </div>
-                <div style="display: inline-block;width: 55%;height:100%">
+                <div style="display: inline-block; margin-left: 6px;width: 55%;height:100%">
                    <div style='display:flex;align-items:center;height: 25px;line-height: 25px;margin-top:2px'>
-                        <div style="font-weight: bold;font-size: 14px;ont-family: Microsoft YaHei-Bold, Microsoft YaHei;color: #333333;">
-                        ${d.data.fname}
-                        <span style='color: red;'>(${d.data.accountType})</span>
-                        </div>
+                        <div style="font-weight: bold;font-size: 15px;ont-family: Microsoft YaHei-Bold, Microsoft YaHei;color: #333333;">${
+                          d.data.fname
+                        }</div>
                    </div>
-                    <div style="font-size: 13px;margin-top: 5px;font-family: Microsoft YaHei-Regular, Microsoft YaHei;font-weight: 400;color: #333333;display: flex;height: 25px;line-height: 25px;">
+                    <div style="font-size: 13px;font-family: Microsoft YaHei-Regular, Microsoft YaHei;font-weight: 400;color: #333333;display: flex;line-height: 25px;">
                        <span>${getLabel(547324, labelData)}: ${
        d.data.companyWorkYear
      } ${getLabel(547526, labelData)}</span>
                    </div>
-
+                     <div style="font-size: 13px;font-family: Microsoft YaHei-Regular, Microsoft YaHei;font-weight: 400;color: #333333;display: flex;line-height: 25px;">
+                        <span>${getLabel(547333, labelData)}: ${
+        d.data.jobName
+      }</span>
+                    </div>
                </div>
                </div>
             </div>`;
@ -329,78 +327,22 @@ export default class DrawerComponents extends React.Component {
  };

  showDrawer = (params) => {
-    const { defaultStatusValue, defaultTypeValue } = this.state;
-    params = {
-      ...params,
-      typeValue: defaultTypeValue.join(','),
-      statusValue: defaultStatusValue.join(','),
-    };
    this.getDeatilDatas(params, 'chart', '0');
    this.setState({ open: true, params: params });
  };

  onClose = () => {
-    this.setState({
-      open: false,
-      detailType: 'chart',
-      showJob: false,
-      defaultStatusValue: [0, 1, 2, 3],
-      defaultTypeValue: ['isBelongTo'],
-      disabled: false,
-    });
+    this.setState({ open: false, detailType: 'chart', showJob: false });
  };

  changeDetail = () => {
-    const { detailType, params, defaultTypeValue, defaultStatusValue } =
-      this.state;
-    const newParam = {
-      ...params,
-      typeValue: defaultTypeValue.join(','),
-      statusValue: defaultStatusValue.join(','),
-    };
+    const { detailType, params } = this.state;
    let type = detailType == 'chart' ? 'table' : 'chart';
-    const showJob = this.state.showJob ? '1' : '0';
+    const showJob = '0';
    this.setState({
      detailType: type,
    });
-    this.getDeatilDatas(newParam, type, showJob);
-  };
-
-  onStatusChange = (checkedValues) => {
-    const { labelData } = this.props;
-    if (checkedValues.length === 0) {
-      return message.error(`${getLabel(547728, labelData)}`, 2);
-    }
-    this.setState({
-      defaultStatusValue: checkedValues,
-    });
-    const { defaultTypeValue, params, detailType } = this.state;
-    const showJob = this.state.showJob ? '1' : '0';
-    const nParam = {
-      ...params,
-      statusValue: checkedValues.join(','),
-      typeValue: defaultTypeValue.join(','),
-    };
-    this.getDeatilDatas(nParam, detailType, showJob);
-  };
-
-  onTypeChange = (checkedValues) => {
-    const { labelData } = this.props;
-    if (this.state.showJob) {
-      return message.error(`${getLabel(547729, labelData)}`, 2);
-    }
-    this.setState({
-      defaultTypeValue: checkedValues,
-      disabled: checkedValues.includes('isManager') ? true : false,
-    });
-    const { defaultStatusValue, params, detailType } = this.state;
-    const showJob = this.state.showJob ? '1' : '0';
-    const nParam = {
-      ...params,
-      statusValue: defaultStatusValue.join(','),
-      typeValue: checkedValues.join(','),
-    };
-    this.getDeatilDatas(nParam, detailType, showJob);
+    this.getDeatilDatas(params, type, showJob);
  };

  render() {
@ -413,30 +355,11 @@ export default class DrawerComponents extends React.Component {
      columns,
      spinning,
      showJob,
-      defaultStatusValue,
-      defaultTypeValue,
-      disabled,
    } = this.state;
    let arr = [];

    const { labelData } = this.props;

-    const optionsType = [
-      { label: `${getLabel(547715, labelData)}`, value: 'isManager' },
-      { label: `${getLabel(547716, labelData)}`, value: 'isBelongTo' },
-    ];
-
-    const optionsStatus = [
-      { label: `${getLabel(547718, labelData)}`, value: 0 },
-      { label: `${getLabel(547719, labelData)}`, value: 1 },
-      { label: `${getLabel(547720, labelData)}`, value: 2 },
-      { label: `${getLabel(547721, labelData)}`, value: 3 },
-      { label: `${getLabel(547722, labelData)}`, value: 4 },
-      { label: `${getLabel(547723, labelData)}`, value: 5 },
-      { label: `${getLabel(547724, labelData)}`, value: 6 },
-      { label: `${getLabel(547725, labelData)}`, value: 7 },
-    ];
-
    if (detailType == 'chart') {
      arr.push({ label: `${getLabel(547315, labelData)}`, key: '1' });
      //arr.push({ label: '导出PDF', key: '2' });
@ -449,7 +372,7 @@ export default class DrawerComponents extends React.Component {
    return (
      <Drawer
        title={getLabel(547321, labelData)}
-        width={1200}
+        width={1100}
        onClose={this.onClose}
        open={open}
        bodyStyle={{
@ -457,30 +380,6 @@ export default class DrawerComponents extends React.Component {
        }}
        extra={
          <Space>
-            {detailType == 'chart' && params && params.fclass == '0' && (
-              <Checkbox
-                style={{ marginTop: '5px', marginLeft: 100 }}
-                checked={showJob}
-                disabled={disabled}
-                onChange={(e) => {
-                  this.setState({
-                    showJob: e.target.checked,
-                  });
-                  const newParam = {
-                    ...params,
-                    statusValue: defaultStatusValue.join(','),
-                    typeValue: defaultTypeValue.join(','),
-                  };
-                  this.getDeatilDatas(
-                    newParam,
-                    detailType,
-                    e.target.checked ? '1' : '0',
-                  );
-                }}
-              >
-                {getLabel(547447, labelData)}
-              </Checkbox>
-            )}
            <Dropdown overlay={menu}>
              <Button type="primary">{getLabel(547314, labelData)}</Button>
            </Dropdown>
@ -490,29 +389,6 @@ export default class DrawerComponents extends React.Component {
          </Space>
        }
      >
-        <>
-          {detailType == 'chart' && (
-            <Row style={{ margin: '20px 20px 0px 20px' }}>
-              <Col span={2}>{getLabel(547714, labelData)}：</Col>
-              <Col span={22}>
-                <Checkbox.Group
-                  options={optionsType}
-                  value={defaultTypeValue}
-                  onChange={this.onTypeChange}
-                />
-              </Col>
-            </Row>
-          )}
-          <Row style={{ margin: '10px 20px 10px 20px' }}>
-            <Col span={2}>{getLabel(547717, labelData)}：</Col>
-            <Col span={22}>
-              <Checkbox.Group
-                options={optionsStatus}
-                value={defaultStatusValue}
-                onChange={this.onStatusChange}
-              />
-            </Col>
-          </Row>
        {detailType == 'chart' ? (
          <div className="svg-container">
            <Spin
@ -551,7 +427,6 @@ export default class DrawerComponents extends React.Component {
            />
          </div>
        )}
-        </>
      </Drawer>
    );
  }
--- a/src/components/timeline/index.jsx
+++ b/src/components/timeline/index.jsx
@ -7,12 +7,10 @@
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 */
 import React from 'react';
-import { Timeline, Drawer, Popconfirm, message } from 'antd';
+import { Timeline, Drawer } from 'antd';
 import styles from './index.less';
 import leftTreeShow from './img/leftTree-show.png';
 import leftHide from './img/leftTree-hide.png';
-import { CloseCircleOutlined } from '@ant-design/icons';
-import { getLabel } from '../../util/i18n.js';

 export default class TimeLine extends React.Component {
  constructor(props) {
@ -37,21 +35,6 @@ export default class TimeLine extends React.Component {
    this.props.onClick(data);
  }

-  handleDelete(key) {
-    const { labelData } = this.props;
-    let api = `/api/bs/hrmorganization/orgchart/versionDelete?versionId=${key}`;
-    fetch(api)
-      .then((res) => res.json())
-      .then((data) => {
-        if (data.api_status) {
-          message.success(`${getLabel(547484, labelData)}`, 2, 3);
-          window.location.reload(true);
-        } else {
-          message.error(`${getLabel(547483, labelData)}`, 2, 3);
-        }
-      });
-  }
-
  componentDidMount() {
    this.searchTimeLines(this.props.url);
  }
@ -73,8 +56,6 @@ export default class TimeLine extends React.Component {
  };

  render() {
-    const { labelData } = this.props;
-
    let showStyle = {};
    let positionStyle = {};
    if (this.state.open) {
@ -108,30 +89,14 @@ export default class TimeLine extends React.Component {
              return (
                <Timeline.Item
                  key={item.key}
+                  onClick={this.handleLineClick.bind(this, item)}
                  className={styles.timeline}
                  color={item.color}
-                >
-                  <div
-                    className={styles.title}
                  style={{
                    color: item.color == 'blue' ? '#1890ff' : 'dimgray',
                  }}
-                    onClick={this.handleLineClick.bind(this, item)}
                >
-                    {item.title}
-                  </div>
-                  {item.key != 0 && (
-                    <Popconfirm
-                      title={`${getLabel(547491, labelData)}[${item.title}]?`}
-                      onConfirm={this.handleDelete.bind(this, item.key)}
-                      okText={getLabel(547319, labelData)}
-                      cancelText={getLabel(547318, labelData)}
-                    >
-                      <div className={styles.delete}>
-                        <CloseCircleOutlined />
-                      </div>
-                    </Popconfirm>
-                  )}
+                  <div>{item.title}</div>
                  <div className={styles.time}>{item.time}</div>
                </Timeline.Item>
              );
--- a/src/components/timeline/index.less
+++ b/src/components/timeline/index.less
@ -15,25 +15,21 @@
    cursor: pointer;
  }

-  // .timeline .title:hover {
-  //   color: #1890ff;
-  // }
+  .timeline :hover {
+    color: #1890ff;
+  }

  .time {
    color: dimgray;
  }
-
-  .delete :hover {
-    color: red;
-  }
 }

 .leftRightLayoutBtn {
  width: 18px;
  height: 60px;
-  position: fixed;
+  position: absolute;
  top: 50%;
-  // margin-top: -30px;
+  margin-top: -30px;
  z-index: 101;
  cursor: pointer;
 }
--- a/src/components/topBar/index.jsx
+++ b/src/components/topBar/index.jsx
@ -22,7 +22,7 @@ const { TextArea } = Input;
 import moment from 'moment';
 import 'moment/locale/zh-cn';
 import locale from 'antd/lib/date-picker/locale/zh_CN';
-import { HomeOutlined, FolderOutlined } from '@ant-design/icons';
+import { HomeOutlined } from '@ant-design/icons';
 moment.locale('zh-cn');
 import { getLabel } from '../../util/i18n.js';
 import { SmileOutlined } from '@ant-design/icons';
@ -45,8 +45,6 @@ export class TopBar extends React.Component {
      open: false,
      confirmLoading: false,
      description: '',
-      timelineId: '0',
-      treeKey: 1,
    };
  }

@ -59,29 +57,10 @@ export class TopBar extends React.Component {
    this.setState({ requestData });
  }

-  handleTreeData(treeData = [], timelineId) {
-    this.setState({
-      rootTreeData: treeData,
-      timelineId: timelineId,
-      treeKey: this.state.treeKey + 1,
-    });
-  }
-
  onChange = (e) => {
    this.setState({ description: e.target.value });
  };

-  generateKey = (
-    length = 5,
-    chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789',
-  ) => {
-    let result = '';
-    for (let i = 0; i < length; i++) {
-      result += chars.charAt(Math.floor(Math.random() * chars.length));
-    }
-    return result;
-  };
-
  /**
   * 弹窗确认
   */
@ -138,9 +117,6 @@ export class TopBar extends React.Component {
          }
          arr.map((item, index) => {
            item.icon = <HomeOutlined />;
-            if (item.type == 2) {
-              item.icon = <FolderOutlined />;
-            }
          });
          this.setState({
            rootTreeData: arr,
@ -159,14 +135,11 @@ export class TopBar extends React.Component {
      const { id } = treeNode;
      setTimeout(() => {
        const { fclass } = this.state.requestData;
-        const { timelineId } = this.state;
        let api =
          '/api/bs/hrmorganization/orgchart/getSubCompanyTree?subcompany=' +
          id +
          '&fclass=' +
-          fclass +
-          '&id=' +
-          timelineId;
+          fclass;
        this.getNodeTreeNode(api);
        resolve(undefined);
      }, 500);
@ -219,8 +192,7 @@ export class TopBar extends React.Component {

  render() {
    const { disabled, type, labelData } = this.props;
-    const { rootTreeData, open, confirmLoading, treeExpandedKeys, treeKey } =
-      this.state;
+    const { rootTreeData, open, confirmLoading, treeExpandedKeys } = this.state;

    return (
      <div className={style.topbarWrapper}>
@ -257,11 +229,9 @@ export class TopBar extends React.Component {
              ))}
            </Select>
          </Col>
-
-          <Col span={8}>
+          <Col span={6}>
            {getLabel(547294, labelData)}：
            <TreeSelect
-              key={treeKey}
              treeDataSimpleMode
              allowClear
              style={{ width: '65%' }}
@ -274,7 +244,7 @@ export class TopBar extends React.Component {
              treeIcon
            />
          </Col>
-          <Col span={5}>
+          <Col span={6}>
            <Checkbox
              style={{ marginTop: '5px', marginLeft: 100 }}
              checked={this.state.requestData.hidedept == '1'}
@ -296,7 +266,7 @@ export class TopBar extends React.Component {
              />
            </Tooltip>
          </Col>
-          <Col span={5}>
+          <Col span={6}>
            {getLabel(547299, labelData)}：
            <Select
              defaultValue="3"
@ -334,19 +304,15 @@ export class TopBar extends React.Component {
              />
            </Tooltip>
          </Col>
-
-          <Col span={10}>
-            {this.state.requestData.fclass == '0' && (
-              <span>
+          <Col span={16}>
            <Button
              type="primary"
              style={{ marginRight: '10px' }}
-                  disabled={disabled}
              onClick={() => {
-                    this.setState({ open: true });
+                this.props.onSearch(this.state.requestData);
              }}
            >
-                  {getLabel(547305, labelData)}
+              {getLabel(547307, labelData)}
            </Button>
            <Button
              type="primary"
@ -366,19 +332,6 @@ export class TopBar extends React.Component {
            >
              {getLabel(547313, labelData)}
            </Button>
-              </span>
-            )}
-
-            <Button
-              type="primary"
-              style={{ marginRight: '10px' }}
-              onClick={() => {
-                this.props.onSearch(this.state.requestData);
-              }}
-            >
-              {getLabel(547307, labelData)}
-            </Button>
-
            <Dropdown overlay={this.menu}>
              <Button type="primary">{getLabel(547314, labelData)}</Button>
            </Dropdown>
--- a/src/pages/company.jsx
+++ b/src/pages/company.jsx
@ -76,10 +76,9 @@ export default function companyPage() {
          '/api/bs/hrmorganization/orgchart/asyncCompanyData' +
          qs.stringify(request, { addQueryPrefix: true });
      } else {
-        let request = { ...topbar.state.requestData, ids: idsStr };
        api =
-          '/api/bs/hrmorganization/orgchart/asyncCompanyData' +
-          qs.stringify(request, { addQueryPrefix: true });
+          '/api/bs/hrmorganization/orgchart/asyncCompanyData?fclass=0&fisvitual=0&id=0&root=0&ids=' +
+          idsStr;
      }
      fetch(api)
        .then((res) => res.json())
@ -165,8 +164,8 @@ export default function companyPage() {
    let fclass = topbar.state.requestData.fclass;
    let statisticsStyle = fclass == 0 ? 'block' : 'none';
    if (d.data.ftype == 0) {
-      return `<div style="text-align: center;">
-          <div style="display: inline-block;  margin-left: 5px;">
+      return `<div>
+          <div style="display: inline-block; text-align: center; margin-left: 5px;">
            <div style="
              font-size: 24px;
              font-family: Microsoft YaHei-Bold, Microsoft YaHei;
@ -186,11 +185,10 @@ export default function companyPage() {
          </div>
          <div style="width: 144px;height: 80px;top: 35px;position: relative;font-weight: 400;font-size: 14px;
            font-family: Microsoft YaHei-Regular, Microsoft YaHei;color: #333333;text-align: center;"> 
-             <div class="tooltip">
-                <div class="tooltitle"> ${d.data.fname} </div>
-                <div class="tooltiptext">${d.data.fname}</div>
-            </div>
-
+            <div title=${
+              d.data.fname
+            } style="width: 110px;margin: 0 auto;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;-o-text-overflow:ellipsis;
+            line-height: 18px;word-break: break-all;">${d.data.fname}</div>
            <div style="display: ${statisticsStyle}">
                <span style="color:red">${d.data.staffNum}</span> /
                <span style="color:green">${d.data.onJobNum}</span>
@ -208,11 +206,8 @@ export default function companyPage() {
          </div>
          <div style="width: 144px;height: 80px;top: 35px;position: relative;font-weight: 400;font-size: 14px;
            font-family: Microsoft YaHei-Regular, Microsoft YaHei;color: #333333;text-align: center;"> 
-            <div class="tooltip">
-                <div class="tooltitle"> ${d.data.fname} </div>
-                <div class="tooltiptext">${d.data.fname}</div>
-            </div>
-            
+            <div style="width: 110px;margin: 0 auto;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;
+            line-height: 18px;word-break: break-all;">${d.data.fname}</div>
            <div style="display: ${statisticsStyle}">
              <span style="color:red">${d.data.staffNum}</span> /
              <span style="color:green">${d.data.onJobNum}</span>
@ -351,10 +346,6 @@ export default function companyPage() {
   */
  const handleExport = (type) => {
    if (type == 'png') {
-      const hiddenElements = document.querySelectorAll('.tooltitle');
-      const hiddenElementsArray = Array.from(hiddenElements);
-      // 从 DOM 中移除隐藏内容
-      hiddenElementsArray.forEach((el) => (el.style.display = 'none'));
      orgChart && orgChart.exportImg({ full: true });
    } else {
      orgChart && downloadPdf(orgChart);
@ -375,8 +366,6 @@ export default function companyPage() {
      hidedept: '0',
    };
    topbar.handleFormChange({ ...resetParams });
-    //根节点初始化
-    topbar.handleTreeData([], timeline.id);
    topbar.getNodeTreeNode(
      `/api/bs/hrmorganization/orgchart/getSubCompanyTree?fclass=${fclass}&id=${timeline.id}`,
      false,
@ -490,14 +479,6 @@ export default function companyPage() {
          onZoomIn={(progressBtn) => handleZoomIn(progressBtn)}
          onZoomBehavior={(value) => handleZoomBehavior(value)}
        />
-        <TimeLine
-          ref={(r) => (timeLine = r)}
-          onClick={(timeline) => {
-            timeLineSearch(timeline);
-          }}
-          url={'/api/bs/hrmorganization/orgchart/timeLines?fclass=0'}
-          labelData={labelData}
-        />
        <Spin size="large" spinning={spinning}>
          <OrgChartComponent
            setChart={(chart) => (orgChart = chart)}
--- a/src/pages/index.less
+++ b/src/pages/index.less
@ -114,44 +114,6 @@
 }

 .ant-drawer-body {
-  padding: 0;
+  padding: 0px;
  overflow: hidden;
 }
-
-.tooltip {
-  position: relative;
-  display: inline-block;
-  cursor: pointer;
-  width: 110px;
-  margin: 0 auto;
-  line-height: 18px;
-  word-break: break-all;
-}
-
-.tooltip .tooltitle {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-
-.tooltip .tooltiptext {
-  visibility: hidden;
-  width: 144px;
-  background-color: #555;
-  color: #fff;
-  text-align: center;
-  border-radius: 6px;
-  padding: 5px 0;
-  position: absolute;
-  z-index: 1;
-  bottom: 125%;
-  left: 39%;
-  margin-left: -60px;
-  opacity: 0;
-  transition: opacity 0.3s;
-}
-
-.tooltip:hover .tooltiptext {
-  visibility: visible;
-  opacity: 1;
-}
--- a/src/pages/user.jsx
+++ b/src/pages/user.jsx
@ -99,7 +99,7 @@ export default function userPage() {
  // 获取数据
  useEffect(() => {
    document.cookie =
-      'ecology_JSessionid=aaaLiDqzA0rZHgPBdxGez; JSESSIONID=aaaLiDqzA0rZHgPBdxGez; Systemlanguid=7; languageidweaver=7; loginuuids=1; loginidweaver=sysadmin; __randcode__=7b9b3b9b-a780-4d6a-b8d5-22d0f8aaf11a';
+      'ecology_JSessionid=aaandPcwzDCbpb6Ci0Jaz; JSESSIONID=aaandPcwzDCbpb6Ci0Jaz; Systemlanguid=7; loginidweaver=sysadmin; loginuuids=1; languageidweaver=8; __randcode__=4fb17586-6f53-4658-92b1-9edc9831cc02';
    d3.json(
      '/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0',
    ).then((data) => {
Author	SHA1	Message	Date
Chengliang	646fbe1354	多语言修复	10 months ago
Chengliang	b0c5004b26	多语言设置	10 months ago