Merge pull request 'bug' (#15) from feature/cl into dev

Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/15

pc4mobx/organization/components/company/company.js

@@ -1,7 +1,7 @@
 /**
  * @Author: 程亮
  * @Date: 2022-05-18 16:23:32
- * @LastEditTime: 2022-10-26 15:53:23
+ * @LastEditTime: 2022-11-08 18:39:26
  * @Description: 
  * @FilePath: /trunk/src4js/pc4mobx/organization/components/company/company.js
  */
@@ -26,7 +26,7 @@ import {
     Button,
     message,
     Switch,
-    Menu, Dropdown, Icon
+    Menu, Dropdown, Icon,Tooltip
 } from 'antd'
 import {
     WeaSwitch,
@@ -322,10 +322,12 @@ export default class Company extends React.Component {
                 }
             };
             if (c.dataIndex == 'compName') {
+                c.className = "wea-table-indent"
                 c.render = function (text, record) {
                     return <a onClick={() => {
-                        window.open(`/spa/organization/static/index.html#/main/organization/companyExtend/${record.id}`, "_blank")
-                    }}>{text}</a>
+                            window.open(`/spa/organization/static/index.html#/main/organization/companyExtend/${record.id}`, "_blank")
+                        }}>{text}</a>
+                
                 }
             }
             if (c.dataIndex == 'operate') {

pc4mobx/organization/components/department/department.js

@@ -1,7 +1,7 @@
 /**
  * @Author: 程亮
  * @Date: 2022-06-02 09:19:37
- * @LastEditTime: 2022-10-26 15:53:37
+ * @LastEditTime: 2022-11-08 18:40:46
  * @Description: 
  * @FilePath: /trunk/src4js/pc4mobx/organization/components/department/department.js
  */
@@ -351,6 +351,7 @@ export default class Department extends React.Component {
                 }
             };
             if (c.dataIndex == 'deptName') {
+                c.className = "wea-table-indent"
                 c.render = function (text, record) {
                     return <a href='javascript:void(0);' onClick={() => {
                         window.open(`/spa/organization/static/index.html#/main/organization/departmentExtend/${record.id}`, "_blank")

pc4mobx/organization/components/fieldDefinedSet/FieldDef.js

@@ -103,9 +103,7 @@ export default class FieldDef extends Component {
             //     }
             // }
         }
-
         const rMenu = [...rightMenu, ...store.getBasicMenus(this.props.logSmallType, this.props.targetId)]
-
         return (
             <div className={classes} ref={dom => { this.tabDom = dom }}>
                 <WeaRightMenu ecId={`${this && this.props && this.props.ecId || ''}_WeaRightMenu@43qdk8`} datas={rMenu}>

pc4mobx/organization/components/fieldDefinedSet/FieldDefined.js

@@ -137,13 +137,6 @@ export default class FieldDefined extends Component {
 				dropMenuDatas: menus
 			};
 		let logType;
-		if (selectedTreeNodeInfo) {
-			if (selectedTreeNodeInfo.viewAttr == 1) {
-				logType = 'HRM_ENGINE_RESOURCEFIELDDEFINED';
-			} else {
-				logType = 'HRM_ENGINE_RESOURCEFIELDDEFINED_DETAIL';
-			}
-		}
 		let children = [];
 		
 		if (hasRight === false) {

pc4mobx/organization/components/newImport/index.js

@@ -31,7 +31,7 @@ export default class newImport extends React.Component {
     constructor(props) {
         super(props);
         this.state = ({
-            title: '基础数据导入',
+            title: '数据导入',
 
         })
     }

pc4mobx/organization/stores/fieldDefined.js

@@ -1,7 +1,7 @@
 /**
  * @Author: 程亮
  * @Date: 2022-06-09 10:16:00
- * @LastEditTime: 2022-09-16 11:49:18
+ * @LastEditTime: 2022-11-08 16:43:10
  * @Description: 
  * @FilePath: /trunk/src4js/pc4mobx/organization/stores/fieldDefined.js
  */
@@ -300,19 +300,16 @@ export class FieldDefinedStore extends HrmBaseStore {
 		}];
 
 		//人员卡片字段定义-添加【允许个人修改】列
-		// if (this.moduleName === 'resourcefielddefined') {
-		// 	if (this.isJobTreeNode) {//【工作信息】列表不添加【允许个人修改】列
-		// 	} else {
-		// 		columns.push({
-		// 			title: getLabel(510359, '允许个人修改'),
-		// 			dataIndex: 'isModify',
-		// 			key: 'isModify',
-		// 			checkType: 'checkbox',
-		// 			colSpan: 1,
-		// 			width: '11%'
-		// 		});
-		// 	}
-		// }
+		if (this.moduleName === 'resourcefielddefined') {
+			columns.push({
+				title: getLabel(510359, '允许个人修改'),
+				dataIndex: 'isModify',
+				key: 'isModify',
+				checkType: 'checkbox',
+				colSpan: 1,
+				width: '11%'
+			});
+		}
 		// this.encryptEnable && columns.push({
 		// 	title: getLabel('526997', '加密设置'),
 		// 	dataIndex: 'canEncrypt',

pc4mobx/organization/style/common.less

@@ -89,3 +89,9 @@
     }
   }
 
+  //表格列省略样式
+  .wea-table-indent {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;overflow: hidden;
+  }