Merge pull request '文件路径修改' (#19) from feature/cl into dev

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

pc4mobx/organization/components/columnSetting/customItem.js

@@ -2,7 +2,7 @@ import React, { Component } from "react";
 import { WeaTableEdit } from "ecCom";
 import { inject, observer } from "mobx-react";
 
-@inject("columnPermission")
+@inject("columnSetting")
 @observer
 class CustomItem extends Component {
   componentDidMount() {
@@ -10,12 +10,12 @@ class CustomItem extends Component {
   }
 
   init = () => {
-    const { columnPermission } = this.props;
-    columnPermission.loadTabThreeRelatedData();
+    const { columnSetting } = this.props;
+    columnSetting.loadTabThreeRelatedData();
   };
 
   render() {
-    const { columnPermission } = this.props, { tableEditConfig, refreshMainTabComponent } = columnPermission;
+    const { columnSetting } = this.props, { tableEditConfig, refreshMainTabComponent } = columnSetting;
     return (
       <div>
         <WeaTableEdit

pc4mobx/organization/components/columnSetting/defineShowItems.js

@@ -5,7 +5,7 @@ import * as mobx from "mobx";
 
 const toJS = mobx.toJS;
 
-@inject("columnPermission")
+@inject("columnSetting")
 @observer
 export default class DefineShowItems extends Component {
   constructor(props) {
@@ -17,20 +17,20 @@ export default class DefineShowItems extends Component {
   }
 
   init = () => {
-    const { columnPermission } = this.props;
-    columnPermission.loadTabTwoRelatedData();
+    const { columnSetting } = this.props;
+    columnSetting.loadTabTwoRelatedData();
   };
 
   onRowSelect = (sRowKeys, rows, dataIndex, selectedDatas) => {
-    const { columnPermission } = this.props;
+    const { columnSetting } = this.props;
     if (dataIndex === undefined || selectedDatas === undefined) {
       return;
     }
-    columnPermission.setEnableRows(selectedDatas.isused);
+    columnSetting.setEnableRows(selectedDatas.isused);
   };
 
   render() {
-    const { columnPermission } = this.props, { tabTwoRelatedData } = columnPermission;
+    const { columnSetting } = this.props, { tabTwoRelatedData } = columnSetting;
     const { datas, columns, selectedData, loading } = tabTwoRelatedData;
     return (
       <WeaTableEdit
@@ -42,7 +42,7 @@ export default class DefineShowItems extends Component {
         datas={toJS(datas)}
         copyFilterProps={["id"]}
         selectedData={!loading && toJS(selectedData)}
-        onChange={e => columnPermission.setTableEditDatas(e)}
+        onChange={e => columnSetting.setTableEditDatas(e)}
         onRowSelect={(sRowKeys, rows, dataIndex, selectedDatas) => this.onRowSelect(sRowKeys, rows, dataIndex, selectedDatas)}
       />
     );

pc4mobx/organization/components/columnSetting/index.js

@@ -2,22 +2,22 @@ import React, { Component } from "react";
 import { WeaRightMenu, WeaTab, WeaTop } from "ecCom";
 import { inject, observer } from "mobx-react";
 import { Button } from "antd";
-import PermissionItem from "./components/permissionItem";
-import DefineShowItems from "./components/defineShowItems";
-import CustomItem from "./components/customItem";
+import PermissionItem from "./permissionItem";
+import DefineShowItems from "./defineShowItems";
+import CustomItem from "./customItem";
 import { i18n } from "../../public/i18n";
 import { renderNoright } from "../../util";
 
-@inject("columnPermission")
+@inject("columnSetting")
 @observer
-class ColumnPermission extends Component {
+class ColumnSetting extends Component {
   componentDidMount() {
     this.init();
   }
 
   init = () => {
-    const { columnPermission } = this.props;
-    columnPermission.getRight();
+    const { columnSetting } = this.props;
+    columnSetting.getRight();
   };
 
   getTopMenuBtns = () => {
@@ -40,24 +40,24 @@ class ColumnPermission extends Component {
       title: i18n.label.defineShowItems()
     }, {
       key: "1",
-      title: i18n.label.permissionManagement()
+      title: i18n.label.columnPermission()
     }, {
       key: "2",
-      title: i18n.label.custom()
+      title: i18n.label.columnCustom()
     }];
   };
   save = () => {
-    const { columnPermission } = this.props;
-    const { selectedKey } = columnPermission;
+    const { columnSetting } = this.props;
+    const { selectedKey } = columnSetting;
     selectedKey === "0" ?
-      columnPermission.userDefineCardItemSave() :
+      columnSetting.userDefineCardItemSave() :
       selectedKey === "1" ?
-        columnPermission.columnPermissionSave() : columnPermission.saveCustomFiled();
+        columnSetting.columnPermissionSave() : columnSetting.saveCustomFiled();
   };
 
   render() {
-    const { columnPermission } = this.props;
-    const { selectedKey, authorized } = columnPermission;
+    const { columnSetting } = this.props;
+    const { selectedKey, authorized } = columnSetting;
     if (!authorized) {
       return renderNoright();
     }
@@ -74,7 +74,7 @@ class ColumnPermission extends Component {
         >
           <WeaTop
             ecId={`${this && this.props && this.props.ecId || ""}_WeaTop@bj98s7`}
-            title={i18n.label.cardView()}
+            title={i18n.label.cardColumnSet()}
             icon={<i className="icon-coms-hrm"/>}
             iconBgcolor="#217346"
             loading={true}
@@ -88,7 +88,7 @@ class ColumnPermission extends Component {
             selectedKey={selectedKey}
             datas={this.getTabName()}
             keyParam="key"
-            onChange={(key) => columnPermission.setSelectedKey(key)}
+            onChange={(key) => columnSetting.setSelectedKey(key)}
           />
           {
             selectedKey === "0" ?
@@ -100,7 +100,7 @@ class ColumnPermission extends Component {
         </WeaRightMenu>
       </div>
     );
-  }
+  }  
 }
 
-export default ColumnPermission;
+export default ColumnSetting;

pc4mobx/organization/components/columnSetting/permissionItem.js

@@ -6,7 +6,7 @@ import { toJS } from "mobx";
 
 const WeaTable = WeaTableNew.WeaTable;
 
-@inject("columnPermission")
+@inject("columnSetting")
 @observer
 class PermissionItem extends Component {
   componentDidMount() {
@@ -14,12 +14,12 @@ class PermissionItem extends Component {
   }
 
   init = () => {
-    const { columnPermission } = this.props;
-    columnPermission.loadTabOneRelatedData();
+    const { columnSetting } = this.props;
+    columnSetting.loadTabOneRelatedData();
   };
   changeSaveParams = (record, value, dataIndex) => {
-    const { columnPermission } = this.props;
-    const list = _.isEmpty(columnPermission.columnsPermissionData) ? toJS(columnPermission.tableStore.datas) : columnPermission.columnsPermissionData;
+    const { columnSetting } = this.props;
+    const list = _.isEmpty(columnSetting.columnsPermissionData) ? toJS(columnSetting.tableStore.datas) : columnSetting.columnsPermissionData;
     const dataSource = _.map([...list], it => {
       if (record.id === it.id) {
         return {
@@ -29,7 +29,7 @@ class PermissionItem extends Component {
       }
       return { ...it };
     });
-    columnPermission.setColumnsPermissionData(dataSource);
+    columnSetting.setColumnsPermissionData(dataSource);
   };
   renderRenderColumns = columns => {
     columns.forEach((c, index) => {
@@ -69,7 +69,7 @@ class PermissionItem extends Component {
   };
 
   render() {
-    const { columnPermission } = this.props, { tableStore } = columnPermission;
+    const { columnSetting } = this.props, { tableStore } = columnSetting;
     return (
       <div>
         <WeaTable

pc4mobx/organization/index.js

@@ -33,7 +33,7 @@ import StaffWorkflowSet from "./components/staff/StaffWorkflowSet"
 import ResourceBasicInfo from "./components/resource/ResourceBasicInfo";
 import ResourceCard from "./components/resource/ResourceCard";
 import ManagerDetach from "./components/detach/ManagerDetach";
-import ColumnPermission from "./components/columnPermission";
+import ColumnSetting from "./components/columnSetting";
 
 import stores from "./stores";
 import "./style/index";
@@ -99,7 +99,7 @@ const Routes = (
     <Route key="resourceBasicInfo" path="resourceBasicInfo" component={ResourceBasicInfo} />
     <Route key="resourceCard" path="resourceCard/:id" component={ResourceCard} />
     <Route key="managerDetach" path="managerDetach" component={ManagerDetach} />
-    <Route key="columnPermission" path="columnPermission" component={ColumnPermission} />
+    <Route key="columnSetting" path="columnSetting" component={ColumnSetting} />
   </Route>
 );
 

pc4mobx/organization/public/i18n.js

@@ -168,6 +168,10 @@ export const i18n = {
 		mangerDetachName: () => getLabel(385936, '模块管理分权'),
 		newManagerDetach: () => getLabel(386246, '新建模块管理分权'),
 		editManagerDetach: () => getLabel(386247, '编辑模块管理分权'),
+		columnPermission:() => getLabel(386247, '栏目权限管理'),
+		columnCustom:() => getLabel(386247, '栏目功能定义'),
+		cardColumnSet:() => getLabel(386247, '人员卡片栏目设置'),
+		
 
 
 		authorizationGroup: () => getLabel(492, '权限组'),

pc4mobx/organization/stores/columnSetting.js

@@ -6,7 +6,7 @@ import { message } from "antd";
 import { WeaHelpfulTip, WeaInputLocale } from "ecCom";
 import { cloneDeep, has, indexOf, isEmpty, remove, uniq } from "lodash";
 import { i18n } from "../public/i18n";
-import * as Api from "../apis/columnPermission";
+import * as Api from "../apis/columnSetting";
 import { validDBKeys } from "../util";
 
 const getCurrentLabel = WeaInputLocale.getCurrentLabel;
@@ -14,7 +14,7 @@ const { TableStore } = WeaTableNew;
 
 const toJS = mobx.toJS;
 
-export class ColumnPermission extends HrmBaseStore {
+export class ColumnSetting extends HrmBaseStore {
   isDBKeyValid = true;
   getColumns = () => {
     return cloneDeep(this.fieldDefColumns());
@@ -587,7 +587,6 @@ export class ColumnPermission extends HrmBaseStore {
       if (this.selectedTreeNodeInfo != null)
         params.groupType = this.selectedTreeNodeInfo.key;
 
-      console.log('params',params);
       Api.saveFieldDefinedInfo(params).then(data => {
         if (data.status === "1") {
 

pc4mobx/organization/stores/index.js

@@ -27,7 +27,7 @@ import {ResourceBasicInfoStore} from "./reserouseBasicInfo";
 import {ImportDialogStore} from "./importDialog";
 import {ResourceCardStore} from "./resourceCard";
 import {ManagerDetachStore} from "./managerDetach";
-import {ColumnPermission} from './columnPermission';
+import {ColumnSetting} from './columnSetting';
 
 
 module.exports = {
@@ -60,5 +60,5 @@ module.exports = {
   importDialog: new ImportDialogStore(),
   resourceCard:new ResourceCardStore(),
   managerDetach: new ManagerDetachStore(),
-  columnPermission: new ColumnPermission(),
+  columnSetting: new ColumnSetting(),
 };