From bd5db8d4c00e38b7a400e5d3773cfd228f5c8102 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Thu, 10 Nov 2022 18:50:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{columnPermission.js => columnSetting.js} | 0 .../customItem.js | 8 ++-- .../defineShowItems.js | 14 +++---- .../index.js | 38 +++++++++---------- .../permissionItem.js | 14 +++---- pc4mobx/organization/index.js | 4 +- pc4mobx/organization/public/i18n.js | 4 ++ .../{columnPermission.js => columnSetting.js} | 5 +-- pc4mobx/organization/stores/index.js | 4 +- 9 files changed, 47 insertions(+), 44 deletions(-) rename pc4mobx/organization/apis/{columnPermission.js => columnSetting.js} (100%) rename pc4mobx/organization/components/{columnPermission/components => columnSetting}/customItem.js (69%) rename pc4mobx/organization/components/{columnPermission/components => columnSetting}/defineShowItems.js (74%) rename pc4mobx/organization/components/{columnPermission => columnSetting}/index.js (73%) rename pc4mobx/organization/components/{columnPermission/components => columnSetting}/permissionItem.js (83%) rename pc4mobx/organization/stores/{columnPermission.js => columnSetting.js} (99%) diff --git a/pc4mobx/organization/apis/columnPermission.js b/pc4mobx/organization/apis/columnSetting.js similarity index 100% rename from pc4mobx/organization/apis/columnPermission.js rename to pc4mobx/organization/apis/columnSetting.js diff --git a/pc4mobx/organization/components/columnPermission/components/customItem.js b/pc4mobx/organization/components/columnSetting/customItem.js similarity index 69% rename from pc4mobx/organization/components/columnPermission/components/customItem.js rename to pc4mobx/organization/components/columnSetting/customItem.js index a89510a..53826d0 100644 --- a/pc4mobx/organization/components/columnPermission/components/customItem.js +++ b/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 (
{ - 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 ( columnPermission.setTableEditDatas(e)} + onChange={e => columnSetting.setTableEditDatas(e)} onRowSelect={(sRowKeys, rows, dataIndex, selectedDatas) => this.onRowSelect(sRowKeys, rows, dataIndex, selectedDatas)} /> ); diff --git a/pc4mobx/organization/components/columnPermission/index.js b/pc4mobx/organization/components/columnSetting/index.js similarity index 73% rename from pc4mobx/organization/components/columnPermission/index.js rename to pc4mobx/organization/components/columnSetting/index.js index a11e828..457db61 100644 --- a/pc4mobx/organization/components/columnPermission/index.js +++ b/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 { > } 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 {
); - } + } } -export default ColumnPermission; +export default ColumnSetting; diff --git a/pc4mobx/organization/components/columnPermission/components/permissionItem.js b/pc4mobx/organization/components/columnSetting/permissionItem.js similarity index 83% rename from pc4mobx/organization/components/columnPermission/components/permissionItem.js rename to pc4mobx/organization/components/columnSetting/permissionItem.js index a2d3687..13207cf 100644 --- a/pc4mobx/organization/components/columnPermission/components/permissionItem.js +++ b/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 (
- + ); diff --git a/pc4mobx/organization/public/i18n.js b/pc4mobx/organization/public/i18n.js index c2affda..ad482c6 100644 --- a/pc4mobx/organization/public/i18n.js +++ b/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, '权限组'), diff --git a/pc4mobx/organization/stores/columnPermission.js b/pc4mobx/organization/stores/columnSetting.js similarity index 99% rename from pc4mobx/organization/stores/columnPermission.js rename to pc4mobx/organization/stores/columnSetting.js index 59c8fed..b9c1622 100644 --- a/pc4mobx/organization/stores/columnPermission.js +++ b/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") { diff --git a/pc4mobx/organization/stores/index.js b/pc4mobx/organization/stores/index.js index d43c62b..32418fb 100644 --- a/pc4mobx/organization/stores/index.js +++ b/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(), };