Commit 8b6603d0 authored by zhangwenshuai's avatar zhangwenshuai

fix bug

parent a6ce9192
...@@ -238,17 +238,18 @@ const Cell = (props: CellProps) => { ...@@ -238,17 +238,18 @@ const Cell = (props: CellProps) => {
const style: any = {}; const style: any = {};
const { dynamicCellConfigDTO } = columnData || {}; const { dynamicCellConfigDTO } = columnData || {};
// 不可编辑状态(无编辑权限、列只读、行锁定、单元格只读)
const disabled =
!cellEditable ||
readOnlyFlag ||
record.isLocked ||
(dynamicCellConfigDTO && dynamicCellConfigDTO.readonlyFlag);
transferColumn.disabled = disabled;
const detail = ( const detail = (
<div <div
className={s.detailCell} className={s.detailCell}
onClick={() => { onClick={() => {
// 不可编辑状态(无编辑权限、列只读、行锁定、单元格只读) if (disabled) {
if (
!cellEditable ||
readOnlyFlag ||
record.isLocked ||
(dynamicCellConfigDTO && dynamicCellConfigDTO.readonlyFlag)
) {
return false; return false;
} }
// 获取当前节点的选中状态 // 获取当前节点的选中状态
......
...@@ -5,7 +5,8 @@ import s from './index.less'; ...@@ -5,7 +5,8 @@ import s from './index.less';
import IconFont from '@/submodule/components/IconFont'; import IconFont from '@/submodule/components/IconFont';
export const ApolloTextLinkDetail = (props: any) => { export const ApolloTextLinkDetail = (props: any) => {
const { value, origin, formatter, changeEdit, columnConfig } = props; const { value, origin, formatter, changeEdit, columnConfig, componentAttr } = props;
const { disabled } = componentAttr;
const newValue = formatter ? formatter(value) : value; const newValue = formatter ? formatter(value) : value;
if (!newValue) return null; if (!newValue) return null;
// 以逗号分隔 // 以逗号分隔
...@@ -123,7 +124,7 @@ export const ApolloTextLinkDetail = (props: any) => { ...@@ -123,7 +124,7 @@ export const ApolloTextLinkDetail = (props: any) => {
)} )}
</div> </div>
</div> </div>
{origin !== 'detailForm' && ( {origin !== 'detailForm' && !disabled && (
<div <div
className={s.moreBtn} className={s.moreBtn}
onClick={() => { onClick={() => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment