aldehyde 0.1.86 → 0.2.1

package/src/aldehyde/detail/edit/modal-row-edit.tsx

@@ -5,7 +5,7 @@ import FieldGroupForm from '../../form/field-group-form';
 
 interface ModalRowEditorProps {
     height?: any,
-    visible: boolean,
+    open: boolean,
     onOk: (value: DtmplData) => void,
     onCancel: () => void,
     fieldGroupConfig: FieldGroupConfig,
@@ -49,10 +49,10 @@ export default class ModalRowEdit extends React.PureComponent<ModalRowEditorProp
     }
 
     render() {
-        const {height, onOk, onCancel, fieldGroupConfig, visible, dtmplData} = this.props
+        const {height, onOk, onCancel, fieldGroupConfig, open, dtmplData} = this.props
         const {} = this.state;
         return <Modal
-            visible={visible}
+            open={open}
             width={1150}
             title={this.getTitle()}
             bodyStyle={{overflow: 'auto'}}

package/src/aldehyde/detail/edit/post-result/index.tsx

@@ -6,7 +6,7 @@ import {ResultStatusType} from "antd/lib/result";
 interface PostResultProps {
     title?: ReactNode,
     subtitle?: ReactNode,
-    visible: boolean,
+    open: boolean,
     jumpTypes: SaveJumpType[],
     addOrUpdate: AddOrUpdate,
     resultStatus?: ResultStatusType,
@@ -17,11 +17,11 @@ interface PostResultProps {
 
 const PostResult: React.FC<PostResultProps> = ({resultStatus='success',...props}) => {
 
-    const {title, visible, subtitle, goAdd, goEdit, goList, jumpTypes, addOrUpdate} = props;
+    const {title, open, subtitle, goAdd, goEdit, goList, jumpTypes, addOrUpdate} = props;
     return (
         <Modal
             title={title ? title : "保存提示"}
-            visible={visible}
+            open={open}
             closable={false}
             destroyOnClose
             footer={[]}

package/src/aldehyde/detail/edit/row-editor.tsx

@@ -15,7 +15,7 @@ interface RowEditorProps {
 }
 
 interface RowEditorState {
-    popoverVisible: boolean,
+    popoverOpen: boolean,
 }
 
 export default class RowEditor extends React.PureComponent<RowEditorProps, RowEditorState> {
@@ -25,7 +25,7 @@ export default class RowEditor extends React.PureComponent<RowEditorProps, RowEd
         disabled:false,
     }
     state = {
-        popoverVisible: false,
+        popoverOpen: false,
     }
 
     async componentDidMount() {
@@ -43,7 +43,7 @@ export default class RowEditor extends React.PureComponent<RowEditorProps, RowEd
 
     onOk = (value,hidden:boolean=true) => {
         if(hidden){
-            this.setState({popoverVisible:false});
+            this.setState({popoverOpen:false});
         }
 
        this.props.onOk(value);
@@ -51,12 +51,12 @@ export default class RowEditor extends React.PureComponent<RowEditorProps, RowEd
 
 
     render() {
-        const {popoverVisible}=this.state;
+        const {popoverOpen}=this.state;
         const { disabled, buttonIcon, buttonTitle, tooltipTitle, fieldGroupConfig, dtmplData,buttonStyle} = this.props;
-        return <Popover  destroyTooltipOnHide={true} placement="leftBottom" visible={popoverVisible}
+        return <Popover  destroyTooltipOnHide={true} placement="leftBottom" open={popoverOpen}
                         content={<RowEditCard fieldGroupConfig={fieldGroupConfig} dtmplData={dtmplData}
                                               onCancel={()=>{
-                                                  this.setState({popoverVisible:false});}
+                                                  this.setState({popoverOpen:false});}
                                               }   onOk={this.onOk}></RowEditCard>} trigger="click">
             <Tooltip placement="left" title={tooltipTitle}>
                 <Button
@@ -66,7 +66,7 @@ export default class RowEditor extends React.PureComponent<RowEditorProps, RowEd
                     icon={buttonIcon}
                     size="small"
                     onClick={() => {
-                        this.setState({popoverVisible:!popoverVisible});
+                        this.setState({popoverOpen:!popoverOpen});
                     }}
                 >{buttonTitle?buttonTitle:""}</Button></Tooltip></Popover>
     }

package/src/aldehyde/detail/view/act-dtmpl-view.tsx

@@ -17,7 +17,7 @@ export interface ActDtmplViewStat {
     loading: boolean,
     dtmplConfig: DtmplConfig,
     premisesTitle: string,
-    snapshotVisible: boolean,
+    snapshotOpen: boolean,
     layout: object,
     refreshCode: string,
 };
@@ -31,7 +31,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
     state = {
         loading: true,
         dtmplConfig: undefined,
-        snapshotVisible: false,
+        snapshotOpen: false,
         premisesTitle: "默认字段",
         layout: {
             labelCol: {span: 8},
@@ -62,7 +62,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
     showSnapshot = () => {
 
         this.setState({
-                snapshotVisible: true,
+                snapshotOpen: true,
             }
         )
 
@@ -71,7 +71,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
     onSnapshotClose = () => {
 
         this.setState({
-                snapshotVisible: false,
+                snapshotOpen: false,
             }
         )
 
@@ -84,7 +84,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
 
     render() {
         const {showRightNav, rightBarPositionRight, code,  sourceId,goDtmpl} = this.props;
-        const {dtmplConfig, premisesTitle, loading, layout, snapshotVisible,refreshCode} = this.state;
+        const {dtmplConfig, premisesTitle, loading, layout, snapshotOpen,refreshCode} = this.state;
         const buttons = dtmplConfig ? dtmplConfig.buttons : undefined;
         const premises = dtmplConfig ? dtmplConfig.premises : undefined;
         let showRightNav_ = showRightNav;
@@ -120,7 +120,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
                             ><ReloadOutlined/></Button>
                             <SnapshotTimeline dtmplConfig={dtmplConfig} code={code} onClose={this.onSnapshotClose}
                                               showSnapshot={this.toSnapshot} sourceId={sourceId}
-                                              visible={snapshotVisible}></SnapshotTimeline>
+                                              open={snapshotOpen}></SnapshotTimeline>
                         </div>
                     </h3>
                 </Card>

package/src/aldehyde/detail/view/dtmpl-view.tsx

@@ -33,7 +33,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
     state = {
         loading: true,
         id:'dtmplView'+Units.getRandomNum(6),
-        snapshotVisible: false,
+        snapshotOpen: false,
         dtmplData: undefined,
         premisesTitle: "默认字段",
         layout: {
@@ -112,7 +112,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
 
     render() {
         const {showRightNav, rightBarPositionRight, code,  sourceId,dtmplConfig} = this.props;
-        const {premisesTitle, loading, dtmplData, layout, snapshotVisible,id} = this.state;
+        const {premisesTitle, loading, dtmplData, layout, snapshotOpen,id} = this.state;
         const premises = dtmplConfig ? dtmplConfig.premises : undefined;
 
         return (

package/src/aldehyde/detail/view/modal-dtmpl-view.tsx

@@ -5,6 +5,7 @@ import ActDtmplView, {ActDtmplViewProps} from "./act-dtmpl-view";
 import Scrollbars from 'react-custom-scrollbars';
 interface ModalDtmplViewProps extends AntdModalProps, ActDtmplViewProps{
     height:any,
+    onCancel:()=>any,
 }
 
 interface ModalDtmplViewState {
@@ -33,11 +34,11 @@ export default class ModalDtmplView extends React.PureComponent<ModalDtmplViewPr
 
     render() {
         // console.log('antdModalProps:',this.antdModalProps);
-        const {height,onOk,onCancel,code,style,sourceId,visible} = this.props
+        const {height,onOk,onCancel,code,style,sourceId,open} = this.props
         //console.log('antdModalProps code :',code);
-        //const {code} = this.state;
+        //const {code} = this.state;o
         return <Modal
-            visible={visible}
+            open={open}
             title={"查看"}
             // style={style}
             width={'1250px'}

package/src/aldehyde/detail/view/snapshot-timeline.tsx

@@ -11,7 +11,7 @@ export interface SnapshotTimelineProps {
     code: string;
     showSnapshot?: (id: number) => void;
     onClose: () => void;
-    visible: boolean;
+    open: boolean;
     dtmplConfig: DtmplConfig;
 };
 
@@ -35,9 +35,9 @@ class SnapshotTimeline extends React.PureComponent<SnapshotTimelineProps, Snapsh
     }
 
     async componentDidUpdate(prevProps) {
-        const {visible} = this.props;
+        const {open} = this.props;
         const {list} = this.state;
-        if (visible && !list) {
+        if (open && !list) {
             this.loadData();
         }
     }
@@ -90,7 +90,7 @@ class SnapshotTimeline extends React.PureComponent<SnapshotTimelineProps, Snapsh
     }
 
     render() {
-        const {visible, onClose, dtmplConfig, sourceId,  code} = this.props;
+        const {open, onClose, dtmplConfig, sourceId,  code} = this.props;
         const {list, current} = this.state;
         return (
             <>
@@ -98,7 +98,7 @@ class SnapshotTimeline extends React.PureComponent<SnapshotTimelineProps, Snapsh
                     title="快照列表"
                     closable={true}
                     onClose={onClose}
-                    visible={visible}
+                    open={open}
                     width={350}
                 >
                     {list && list.length > 0 ? <Timeline mode="alternate">
@@ -111,7 +111,7 @@ class SnapshotTimeline extends React.PureComponent<SnapshotTimelineProps, Snapsh
                     closable={true}
                     mask={false}
                     onClose={onClose}
-                    visible={visible}
+                    open={open}
                     width={'calc(100% - 380px)'}
                     style={{
                         maxWidth: 1960,

package/src/aldehyde/form/criteria-form.tsx

@@ -19,14 +19,14 @@ export interface CriteriaFormProps {
     doJump?: (jumpId: string) => void;
     doCQuery?: (cqueryId: string) => void;
     hiddenCriteriaIds?: string[];
-    visible?: boolean;
+    open?: boolean;
     loading: boolean;
     mainCode?: string;
 };
 
 const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
 
-    const {ltmplConfig, doSearch, doAction, doJump, doDelete, selectedRows, data, visible, loading, selectedDatas, doCQuery} = props;
+    const {ltmplConfig, doSearch, doAction, doJump, doDelete, selectedRows, data, open, loading, selectedDatas, doCQuery} = props;
     let [form] = AntdForm.useForm();
     // @ts-ignore
     let {buttons, actions, jumps, cQuerys, criterias, drillingParams, columns} = ltmplConfig;
@@ -169,7 +169,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
     return (
         <AntdForm form={form} name="control-hooks" initialValues={initialValues} layout="inline"
                   onFinish={searchSubmit} style={{width: '100%'}}>
-            {buttons.includes("drilling") && visible && (drillingParams.length > 0 || hasDimension()) ?
+            {buttons.includes("drilling") && open && (drillingParams.length > 0 || hasDimension()) ?
                 <Collapse style={{width: '100%'}} defaultActiveKey={['1']}>
                     <Panel header="设置-数据上钻" key="1">
                         <Row>
@@ -184,7 +184,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
                 </Collapse> : ""}
             <Card
                 className="hoverable"
-                style={{display: visible ? "block" : "none", width: '100%'}}
+                style={{display: open ? "block" : "none", width: '100%'}}
                 headStyle={{background: "#f2f4f5"}}
                 loading={loading}>
                 <Row>
@@ -223,7 +223,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
 }
 CriteriaForm.defaultProps = {
     hiddenCriteriaIds: [],
-    visible: true,
+    open: true,
 }
 export default CriteriaForm;
 

package/src/aldehyde/import/excel-import.tsx

@@ -5,7 +5,6 @@ import Super from "../tmpl/superagent"
 import Units from "../units"
 import './index.css'
 import {LtmplConfig} from "../tmpl/interface";
-import moment from "moment";
 import HCDataSource from "../tmpl/hc-data-source";
 
 const CheckboxGroup = Checkbox.Group;
@@ -25,7 +24,7 @@ interface ExcelImportStat {
     statusMsg:string;
     importStatus:string,
     showLogLevelList: LogLevel[],
-    logSetterVisible:boolean,
+    logSetterOpen:boolean,
     logs:any[];
     importFile:any,
     logSerialId:string,
@@ -42,7 +41,7 @@ export default class ExcelImport extends React.PureComponent<ExcelImportProps, E
         logs:[],
         percent:0,
         statusMsg:undefined,
-        logSetterVisible:false,
+        logSetterOpen:false,
         showLogLevelList:[...logLevelList],
         logSerialId:undefined,
         ltmplConfig:undefined,
@@ -177,17 +176,17 @@ export default class ExcelImport extends React.PureComponent<ExcelImportProps, E
         const {inputMaxMsgCount}=this.state
         this.setState({
             maxMsgCount:inputMaxMsgCount,
-            logSetterVisible:false,
+            logSetterOpen:false,
         })
         message.success("设置成功！")
     }
-    changeLogSetterVisible = visible => {
-        this.setState({ logSetterVisible:visible });
+    changeLogSetterOpen = open => {
+        this.setState({ logSetterOpen:open });
       };
 
 
     render(){
-        const { ltmplConfig,importFile,maxMsgCount ,percent,importStatus,showLogLevelList,logSetterVisible,logs} = this.state;
+        const { ltmplConfig,importFile,maxMsgCount ,percent,importStatus,showLogLevelList,logSetterOpen,logs} = this.state;
 
         let showLogs=[];
 
@@ -289,9 +288,9 @@ export default class ExcelImport extends React.PureComponent<ExcelImportProps, E
                                                     title="日志设置"
                                                     trigger="click" 
                                                     placement="top" 
-                                                    visible={logSetterVisible}
+                                                    open={logSetterOpen}
                                                     overlayStyle={{width:350}}
-                                                    onVisibleChange={this.changeLogSetterVisible}
+                                                    onOpenChange={this.changeLogSetterOpen}
                                                     >
                                                     <Button title="日志设置" type="primary" size="small">
                                                         <SettingOutlined />

package/src/aldehyde/import/template-builder.js

@@ -395,7 +395,7 @@ export default class ModelImport extends React.Component{
                             content={content} 
                             placement="bottomRight" 
                             trigger="click" 
-                            visible={visible} 
+                            open={visible}
                             onVisibleChange={this.handleVisibleChange}>
                             <Button 
                                 className="hoverbig" 

package/src/aldehyde/layout/menu/l2menu-message-bar.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import {Badge, Avatar, Dropdown, Menu} from 'antd'
 import {MessageTwoTone,BellOutlined} from '@ant-design/icons';
-import 'antd/dist/antd.css';
+import 'antd/dist/reset.css';
 import {Level2Menu} from "../../tmpl/interface";
 import HcserviceV3 from '../../tmpl/hcservice-v3'
 import {NavLink} from 'react-router-dom';

package/src/aldehyde/layout/menu/l2menu-quick-bar.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import {Badge, Avatar, Dropdown, Menu, Timeline, Drawer, Space,Button} from 'antd'
 import {MessageTwoTone,AppstoreOutlined} from '@ant-design/icons';
-import 'antd/dist/antd.css';
+import 'antd/dist/reset.css';
 import {Level2Menu} from "../../tmpl/interface";
 // import HcserviceV3 from '../../tmpl/hcservice-v3'
 import HCDataSource from '../../tmpl/hc-data-source'
@@ -111,7 +111,7 @@ class L2MenuQuickBar extends React.PureComponent<L2MenuQuickBarProps, L2MenuQuic
                     closable={true}
                     mask={false}
                     onClose={this.closeDrawer}
-                    visible={showDraw}
+                    open={showDraw}
                     width={'calc(100% - 280px)'}
                     style={{
                         maxWidth: 1960,

package/src/aldehyde/layout/menu/reset-password.tsx

@@ -15,7 +15,7 @@ import {
     Input, Row, Space, FormInstance
 } from 'antd';
 import {KeyOutlined,LockOutlined,ClearOutlined} from '@ant-design/icons';
-import 'antd/dist/antd.css';
+import 'antd/dist/reset.css';
 import HCserviceV3 from "../../tmpl/hcservice-v3";
 
 interface ResetPasswordProps {
@@ -167,7 +167,7 @@ class ResetPassword extends React.PureComponent<ResetPasswordProps, ResetPasswor
         const {showPopover,loading} = this.state;
         return (
             <>
-                <Popover destroyTooltipOnHide={true} visible={showPopover} overlayStyle={{maxWidth: '400px'}} title={'修改密码'} placement="leftBottom" trigger="click"
+                <Popover destroyTooltipOnHide={true} open={showPopover} overlayStyle={{maxWidth: '400px'}} title={'修改密码'} placement="leftBottom" trigger="click"
                          content={this.getForm()}
                 ><span onClick={()=>{
                     this.setState({

package/src/aldehyde/layout/menu/userinfo-bar.tsx

@@ -43,7 +43,7 @@ class UserInfoBar extends React.PureComponent<UserInfoBarProps, UserInfoBarState
                     closable={true}
                     mask={false}
                     onClose={this.closeDrawer}
-                    visible={showDraw}
+                    open={showDraw}
                     width={'calc(100% - 280px)'}
                     style={{
                         maxWidth: 1960,

package/src/aldehyde/module/criteria-page.tsx1

@@ -149,7 +149,7 @@ class CriteriaPage extends React.PureComponent<CriteriaPageProps, CriteriaPageSt
                              sourceId={sourceId} criteriaData={criteriaData}
                              ltmplConfig={ltmplConfigRes.ltmplConfig}/>
                 {buttons.includes('detail') ?
-                    <ModalDtmplView visible={showDtmplView} onCancel={()=>{
+                    <ModalDtmplView open={showDtmplView} onCancel={()=>{
                     this.setState({
                         showDtmplView:false,
                     })}
@@ -157,7 +157,7 @@ class CriteriaPage extends React.PureComponent<CriteriaPageProps, CriteriaPageSt
                                     sourceId={sourceId}
                                     code={selectedCode}> </ModalDtmplView> : ""}
                 {buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd') ?
-                    <ModalDtmplEdit visible={showDtmplEdit} onCancel={()=>{
+                    <ModalDtmplEdit open={showDtmplEdit} onCancel={()=>{
                         this.setState({
                             showDtmplEdit:false,
                         })}}

package/src/aldehyde/module/dtmpl-view-page.tsx

@@ -48,7 +48,7 @@ class DtmplViewPage extends React.PureComponent<DtmplViewPageProps, DtmplViewPag
         const { sourceId,code,mainCode} = this.props;
             return <>
                 <ActDtmplView goDtmpl={this.goDtmpl} sourceId={sourceId} code={code} mainCode={mainCode}></ActDtmplView>
-                    <DtmplEditPage visible={showDtmplEdit} onCancel={()=>{
+                    <DtmplEditPage open={showDtmplEdit} onCancel={()=>{
                         this.setState({
                             showDtmplEdit:false,
                         })}}

package/src/aldehyde/module/ltmpl-page.tsx

@@ -185,7 +185,7 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
                              sourceId={sourceId} criteriaData={criteriaData}
                              ltmplConfig={ltmplConfigRes.ltmplConfig} />
                 {buttons.includes('detail') ?
-                    <ModalDtmplView visible={showDtmplView} onCancel={()=>{
+                    <ModalDtmplView open={showDtmplView} onCancel={()=>{
                     this.setState({
                         showDtmplView:false,
                     })}
@@ -193,7 +193,7 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
                                     sourceId={sourceId}
                                     code={selectedCode}> </ModalDtmplView> : ""}
                 {buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd') ?
-                    <DtmplEditPage visible={showDtmplEdit} onCancel={()=>{
+                    <DtmplEditPage open={showDtmplEdit} onCancel={()=>{
                         this.setState({
                             showDtmplEdit:false,
                         })}}
@@ -208,7 +208,7 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
                     closable={true}
                     mask={false}
                     onClose={this.closeDrawer}
-                    visible={showDraw}
+                    open={showDraw}
                     width={'calc(100% - 280px)'}
                     style={{
                         maxWidth: 1960,

package/src/aldehyde/table/act-table.tsx

@@ -43,7 +43,7 @@ import ColumnSelector from './column/column-selector';
 import ExportFrame from '../exportor/export-frame';
 import {SortableHandle} from 'react-sortable-hoc';
 import L2ActTable from "./l2-act-table";
-import StatViewL2Chart from '../chart/statview-l2-chart'
+//import StatViewL2Chart from '../chart/statview-l2-chart'
 import Action from '../controls/action'
 import Restat from "./stat/restat"
 import ActionUtils from '../controls/action/utils'
@@ -90,7 +90,6 @@ interface ActTableStat {
     viewModels?: ActTableViewModel[];
     showL2ActTable: boolean;
     showL2Chart: boolean;
-    // drillingPopoverVisible:boolean;
 };
 
 class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
@@ -110,7 +109,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         disabledColIds: undefined,
         showL2ActTable: false,
         showL2Chart: false,
-        //drillingPopoverVisible:false,
     }
 
     static defaultProps = {
@@ -689,12 +687,13 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         }
         return (
             <>
-                {buttons.includes("showChart") && showL2Chart ? <div>
-                    <StatViewL2Chart queryKey={queryKey.key} ltmplConfig={ltmplConfig} hiddenColIds={hiddenColIds}
-                                     hiddenRowCodes={hiddenRowCodes}/>
-                    {/*<Divider dashed style={{borderTopColor: "#40a9ff",}} plain></Divider>*/}
-                </div> : ""
-                }
+                {/*暂时不支持L2chart 后续用echart*/}
+                {/*{buttons.includes("showChart") && showL2Chart ? <div>*/}
+                {/*    <StatViewL2Chart queryKey={queryKey.key} ltmplConfig={ltmplConfig} hiddenColIds={hiddenColIds}*/}
+                {/*                     hiddenRowCodes={hiddenRowCodes}/>*/}
+                {/*    /!*<Divider dashed style={{borderTopColor: "#40a9ff",}} plain></Divider>*!/*/}
+                {/*</div> : ""*/}
+                {/*}*/}
                 {buttons.includes("analysis") && showL2ActTable ? <div>
                     <L2ActTable innerQueryKey={queryKey.key} sourceId={sourceId}/>
                     <Divider dashed style={{borderTopColor: "#40a9ff",}} plain></Divider>

package/src/aldehyde/table/modal-select-table.tsx

@@ -13,7 +13,7 @@ import SelectedRowsCard from './selected-rows-card'
 
 interface ModelSelectTableProps {
     maxSelectedRows: number,
-    visible: boolean,
+    open: boolean,
     sourceId: string,
     mainCode:string,
     exceptCodes?: string[],
@@ -66,8 +66,8 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
     }
 
     async componentDidMount() {
-        const { sourceId, visible} = this.props;
-        if (sourceId && visible) {
+        const { sourceId, open} = this.props;
+        if (sourceId && open) {
             await this.loadData(await this.loadConfig(), {});
         }
     }
@@ -119,11 +119,11 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
     }
 
     async componentDidUpdate(prevProps) {
-        const {exceptCodes, visible} = this.props;
+        const {exceptCodes, open} = this.props;
         const {selectConfig, criteriaData, queryKey, loading} = this.state;
-        const {exceptCodes: preExceptCodes, visible: preVisible} = prevProps;
+        const {exceptCodes: preExceptCodes, open: preOpen} = prevProps;
         let config = selectConfig;
-        if (visible) {
+        if (open) {
             if (!config) {
                 config = await this.loadConfig();
             }
@@ -205,7 +205,7 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
 
 
     render() {
-        let {visible, maxSelectedRows} = this.props;
+        let {open, maxSelectedRows} = this.props;
         let {queryKey, columns, selectConfig, criteriaData, loading, selectedRows} = this.state;
 
         if (!selectConfig) {
@@ -223,7 +223,7 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
 
         return (
             <Modal
-                visible={visible}
+                open={open}
                 title={<SelectedRowsCard value={selectedRows} onChange={this.changeRowSelection}></SelectedRowsCard>}
                 style={{maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)'}}
                 width={'1250px'}

package/src/aldehyde/table/relation-table.tsx

@@ -559,22 +559,22 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         </div>
                     </CollapseCard>
                     {buttons.includes('detail') ?
-                        <ModalDtmplView mainCode={mainCode1}  visible={showDtmplView} onCancel={this.hiddenEntityView}
+                        <ModalDtmplView mainCode={mainCode1}  open={showDtmplView} onCancel={this.hiddenEntityView}
                                         sourceId={fieldGroupConfig.id}
                                         code={selectedCode}> </ModalDtmplView> : ""}
                     {buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd') ?
-                        <DtmplEditPage mainCode={mainCode1} visible={showDtmplEdit} onCancel={this.hiddenEntityEdit}
+                        <DtmplEditPage mainCode={mainCode1} open={showDtmplEdit} onCancel={this.hiddenEntityEdit}
                                        sourceId={fieldGroupConfig.id}
                                        code={selectedCode}
                                        onOk={selectedCode ? this.handleDtmplEdit : this.handleDtmplAdd} />
                         : ""}
                     {/*{buttons.includes('rowEdit') || buttons.includes('rowAdd') ?*/}
-                    {/*    <ModalRowEdit visible={showRowEdit} onCancel={this.hiddenRowEdit}*/}
+                    {/*    <ModalRowEdit open={showRowEdit} onCancel={this.hiddenRowEdit}*/}
                     {/*                  onOk={this.handleRowEdit} dtmplData={selectedDtmplData}*/}
                     {/*                  fieldGroupConfig={fieldGroupConfig}> </ModalRowEdit>*/}
                     {/*    : ""}*/}
                     {buttons.includes('selectAdd') ?
-                        <ModelSelectTable maxSelectedRows={fieldGroupConfig.max} visible={showSelectTable}
+                        <ModelSelectTable maxSelectedRows={fieldGroupConfig.max} open={showSelectTable}
                                           onOK={this.select} onCancel={() => {
                             this.setState({showSelectTable: false})
                         }} exceptCodes={exceptCodes} mainCode={mainCode1}

package/src/aldehyde/table/select-table.tsx

@@ -118,7 +118,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
     async componentDidUpdate(prevProps) {
         const {} = this.props;
         const {selectConfig, criteriaData, queryKey, loading} = this.state;
-        const {exceptCodes: preExceptCodes, visible: preVisible} = prevProps;
+        const {exceptCodes: preExceptCodes, open: preOpen} = prevProps;
         let config = selectConfig;
         //if (visible) {
         if (!config) {