aldehyde 0.1.86 → 0.2.2

package/src/aldehyde/controls/rfield/index.css

@@ -1,4 +1,4 @@
-
-.buttons {
-  max-width: 300px;
-}
+
+.buttons {
+  max-width: 300px;
+}

package/src/aldehyde/controls/rfield/index.tsx

@@ -153,7 +153,7 @@ export default class Rfield extends React.PureComponent<RfieldProps, RfieldState
                 </Popover> : null
             }
             {buttons && buttons.includes('detail') ?
-                <ModalDtmplView key={'mdv'} visible={showDtmplView} onCancel={this.hiddenDtmplView}
+                <ModalDtmplView key={'mdv'} open={showDtmplView} onCancel={this.hiddenDtmplView}
                                 sourceId={fieldConfig.id}
                                 code={openCode}> </ModalDtmplView> : ""}
             </Space>

package/src/aldehyde/controls/signature/index.tsx

@@ -10,7 +10,7 @@ interface SignatureProps extends VEControlProps {
 }
 
 interface SignatureState {
-    modalVisible: boolean,
+    modalOpen: boolean,
     molFileLoaded: boolean,
     trimmedDataURL:any,
 }
@@ -23,7 +23,7 @@ export default class Signature extends React.PureComponent<SignatureProps, Signa
     }
 
     state = {
-        modalVisible: false,
+        modalOpen: false,
         molFileLoaded: false,
         molFile: undefined,
         trimmedDataURL:undefined,
@@ -76,7 +76,7 @@ export default class Signature extends React.PureComponent<SignatureProps, Signa
         // console.log('data data:', value);
         this.triggerChange(value);
         this.setState({
-            modalVisible: false,
+            modalOpen: false,
             trimmedDataURL:value,
         })
     }
@@ -93,12 +93,12 @@ export default class Signature extends React.PureComponent<SignatureProps, Signa
         this.signCanvas.clear();
         this.signCanvas.fromDataURL(this.state.trimmedDataURL);
         this.setState({
-            modalVisible: true
+            modalOpen: true
         })
     }
     onCancel = () => {
         this.setState({
-            modalVisible: false,
+            modalOpen: false,
         })
     }
     onClear=()=>{
@@ -125,7 +125,7 @@ export default class Signature extends React.PureComponent<SignatureProps, Signa
 
                 <Modal
                     closable={false}
-                    visible={this.state.modalVisible}
+                    open={this.state.modalOpen}
                     forceRender={true}
                     centered
                     style={{maxWidth: 'calc(100vw - 62px)', maxHeight: 'calc(100vw - 50px)'}}

package/src/aldehyde/controls/view-control.tsx

@@ -9,14 +9,13 @@ import Steps from "./steps";
 import Units from './../units';
 import FileView from '../controls/file-view';
 import Rfield from "./rfield";
-import moment from "moment";
+import dayjs from "dayjs";
 import Progress from './progress'
 import ColorPicker from "./color-picker";
 import EllipsisText from './text/ellipsis-text'
 import {ProgramConfig} from "../index";
 import SqlCodeEditor from "./code-editor/sql-code-editor";
-//import ChemStruc from "./chemstruc/graph";
-// import HtmlEditor from "../HtmlEditor/tinymce";
+
 const Loading = <Spin tip="Loading...">
     <Alert
         message="正在加载数据。。。"
@@ -87,7 +86,7 @@ function renderControl(fieldConfig: FieldConfig, fieldValue: any,pHolderType:Con
         case 'time-HH':
         case 'time-mm':
         case 'time':
-            viewControl = <span className="infoStyle">{value ? moment(value).format(Units.getMomentFormat(itemType)) : undefined}</span>
+            viewControl = <span className="infoStyle">{value ? dayjs(value).format(Units.getDayjsFormat(itemType)) : undefined}</span>
             break;
         case 'daterange-YY':
         case 'daterange-M1':

package/src/aldehyde/detail/edit/dtmpl-edit-page.tsx

@@ -10,7 +10,7 @@ import Action from "../../controls/action";
 interface ModalEditorProps extends DtmplBaseProps {
     height?: any,
     width?:number,
-    visible: boolean,
+    open: boolean,
     onOk: (code: string) => void,
     onCancel: () => void,
     pageType:PageType;
@@ -55,7 +55,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
 
     async componentDidMount() {
-        if(this.props.visible){
+        if(this.props.open){
             await this.loadConfigData();
         }
     }
@@ -81,7 +81,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
 
     loadConfigData = async () => {
-        const { sourceId,visible,code} = this.props;
+        const { sourceId,open,code} = this.props;
         this.setState({
             loading: true,
         })
@@ -114,8 +114,8 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
 
     loadData = async (dtmplConfig:DtmplConfig ) => {
-        const { sourceId, code,defaultDtmplData,visible} = this.props;
-        if(!visible){
+        const { sourceId, code,defaultDtmplData,open} = this.props;
+        if(!open){
             return;
         }
         if (code) {
@@ -186,11 +186,11 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
 
     render() {
-        const {height, onOk, onCancel, code, sourceId,  visible,mainCode,width,pageType,placement,maxColsOnRow} = this.props
+        const {height, onOk, onCancel, code, sourceId,  open,mainCode,width,pageType,placement,maxColsOnRow} = this.props
         const {dtmplConfig,id,dtmplData} = this.state;
 
         return (<> {pageType=='modal'? <Modal
-            visible={visible}
+            open={open}
             width={width}
             title={dtmplConfig ? dtmplConfig.title : ""}
             bodyStyle={{height: height, overflow: 'auto'}}
@@ -199,7 +199,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
             onCancel={onCancel}
             footer={this.getFooter()}
         >
-            {visible} <div onClick={this.onClickBody}>
+            {open} <div onClick={this.onClickBody}>
                 <DtmplForm mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
                            onFinish={onOk} maxColsOnRow={maxColsOnRow}
                            showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange}  />
@@ -211,7 +211,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
                 closable={true}
                 mask={false}
                 onClose={onCancel}
-                visible={visible}
+                open={open}
                 width={width}
                 style={{
                     maxWidth: 1960,

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

@@ -210,7 +210,7 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
                 <SubmitButtonBar serial={serial} dtmplConfig={dtmplConfig} doSubmit={this.doSubmit}  formRef={this.formRef}></SubmitButtonBar>
                 <CqueryButtonBar  dtmplConfig={dtmplConfig} mainCode={code}></CqueryButtonBar>
                 <PostResult
-                    visible={showPostResult}
+                    open={showPostResult}
                     addOrUpdate={addOrUpdate=='copy' ? 'add' : addOrUpdate}
                     resultStatus={"success"}
                     goList={this.goList}

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/form/form-Item-group.tsx

@@ -1,12 +1,10 @@
 import React, {RefObject} from 'react'
 import {Col, Form, Row} from 'antd'
-import 'moment/locale/zh-cn';
 import {FieldConfig} from "../tmpl/interface";
 import EntryControl from "../controls/entry-control";
 import Units from '../units'
 import {FormInstance} from "antd/lib/form/hooks/useForm";
 
-
 const FormItem = Form.Item
 
 export interface FieldGroupProps {

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,
                         })}}