aldehyde 0.2.19 → 0.2.21

package/lib/welcome/quick-entrance.d.ts

@@ -1,20 +1,20 @@
-import React from 'react';
-import { CardProps } from 'antd';
-import 'antd/dist/reset.css';
-import { Level2Menu } from "../tmpl/interface";
-interface QuickEntranceProps extends CardProps {
-}
-interface QuickEntranceState {
-    l2Menus: Level2Menu[];
-}
-declare class QuickEntrance extends React.PureComponent<QuickEntranceProps, QuickEntranceState> {
-    state: {
-        l2Menus: any;
-    };
-    intervals: any[];
-    componentDidMount(): Promise<void>;
-    componentWillUnmount(): void;
-    render(): JSX.Element;
-}
-export default QuickEntrance;
+import React from 'react';
+import { CardProps } from 'antd';
+import 'antd/dist/reset.css';
+import { Level2Menu } from "../tmpl/interface";
+interface QuickEntranceProps extends CardProps {
+}
+interface QuickEntranceState {
+    l2Menus?: Level2Menu[];
+}
+declare class QuickEntrance extends React.PureComponent<QuickEntranceProps, QuickEntranceState> {
+    state: {
+        l2Menus: any;
+    };
+    intervals: any[];
+    componentDidMount(): Promise<void>;
+    componentWillUnmount(): void;
+    render(): JSX.Element;
+}
+export default QuickEntrance;
 //# sourceMappingURL=quick-entrance.d.ts.map

package/lib/welcome/quick-entrance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quick-entrance.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/quick-entrance.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAoC,SAAS,EAAC,MAAM,MAAM,CAAA;AAEjE,OAAO,qBAAqB,CAAC;AAG7B,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAE7C,UAAU,kBAAmB,SAAQ,SAAS;CAC7C;AAED,UAAU,kBAAkB;IACxB,OAAO,EAAC,UAAU,EAAE,CAAA;CACvB;AAED,cAAM,aAAc,SAAQ,KAAK,CAAC,aAAa,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACnF,KAAK;;MAEJ;IACD,SAAS,EAAC,GAAG,EAAE,CAAI;IACb,iBAAiB;IAoBvB,oBAAoB,IAAI,IAAI;IAU5B,MAAM;CAwBT;AAED,eAAe,aAAa,CAAA"}
+{"version":3,"file":"quick-entrance.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/quick-entrance.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAoC,SAAS,EAAC,MAAM,MAAM,CAAA;AAEjE,OAAO,qBAAqB,CAAC;AAG7B,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAE7C,UAAU,kBAAmB,SAAQ,SAAS;CAC7C;AAED,UAAU,kBAAkB;IACxB,OAAO,CAAC,EAAC,UAAU,EAAE,CAAA;CACxB;AAED,cAAM,aAAc,SAAQ,KAAK,CAAC,aAAa,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACnF,KAAK;;MAEJ;IACD,SAAS,EAAC,GAAG,EAAE,CAAI;IACb,iBAAiB;IAoBvB,oBAAoB,IAAI,IAAI;IAU5B,MAAM;CAwBT;AAED,eAAe,aAAa,CAAA"}

package/lib/welcome/quick-entrance.js

@@ -1,79 +1,79 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-import React from 'react';
-import { Badge, Button, Card, Space } from 'antd';
-import { CodeTwoTone } from '@ant-design/icons';
-import 'antd/dist/reset.css';
-import HcserviceV3 from "../tmpl/hcservice-v3";
-import HCDataSource from '../tmpl/hc-data-source';
-class QuickEntrance extends React.PureComponent {
-    constructor() {
-        super(...arguments);
-        this.state = {
-            l2Menus: undefined
-        };
-        this.intervals = [];
-    }
-    componentDidMount() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let l2Menus = yield HCDataSource.quickEntranceMenus();
-            for (const item of l2Menus) {
-                if (item.displayTotal == true) {
-                    let i = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-                        let count = yield HcserviceV3.requestLtmplCount(item.id);
-                        item.count = count;
-                        this.setState({});
-                    }), 180000);
-                    this.intervals.push(i);
-                    let count = yield HcserviceV3.requestLtmplCount(item.id);
-                    item.count = count;
-                    this.setState({});
-                }
-            }
-            this.setState({
-                l2Menus
-            });
-        });
-    }
-    componentWillUnmount() {
-        if (this.intervals.length > 0) {
-            for (let i of this.intervals) {
-                //console.log('快捷入口移除定时任务');
-                clearInterval(i);
-            }
-        }
-        this.intervals = [];
-    }
-    render() {
-        const _a = this.props, { title } = _a, other = __rest(_a, ["title"]);
-        const { l2Menus } = this.state;
-        let faceplateL2MenuComp = [];
-        l2Menus && l2Menus.forEach((l2Menu) => {
-            let comp = React.createElement(Badge, { key: l2Menu.id, count: l2Menu.count },
-                React.createElement(Button, { shape: "round", icon: React.createElement(CodeTwoTone, null), href: `#/${l2Menu.id}/act-table?menuId=${l2Menu.id}`, size: 'large' }, l2Menu.title));
-            faceplateL2MenuComp.push(comp);
-        });
-        return (React.createElement(Card, Object.assign({}, other),
-            React.createElement(Space, { size: [16, 16], wrap: true }, faceplateL2MenuComp)));
-    }
-}
-export default QuickEntrance;
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import React from 'react';
+import { Badge, Button, Card, Space } from 'antd';
+import { CodeTwoTone } from '@ant-design/icons';
+import 'antd/dist/reset.css';
+import HcserviceV3 from "../tmpl/hcservice-v3";
+import HCDataSource from '../tmpl/hc-data-source';
+class QuickEntrance extends React.PureComponent {
+    constructor() {
+        super(...arguments);
+        this.state = {
+            l2Menus: undefined
+        };
+        this.intervals = [];
+    }
+    componentDidMount() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let l2Menus = yield HCDataSource.quickEntranceMenus();
+            for (const item of l2Menus) {
+                if (item.displayTotal == true) {
+                    let i = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+                        let count = yield HcserviceV3.requestLtmplCount(item.id);
+                        item.count = count;
+                        this.setState({});
+                    }), 180000);
+                    this.intervals.push(i);
+                    let count = yield HcserviceV3.requestLtmplCount(item.id);
+                    item.count = count;
+                    this.setState({});
+                }
+            }
+            this.setState({
+                l2Menus
+            });
+        });
+    }
+    componentWillUnmount() {
+        if (this.intervals.length > 0) {
+            for (let i of this.intervals) {
+                //console.log('快捷入口移除定时任务');
+                clearInterval(i);
+            }
+        }
+        this.intervals = [];
+    }
+    render() {
+        const _a = this.props, { title } = _a, other = __rest(_a, ["title"]);
+        const { l2Menus } = this.state;
+        let faceplateL2MenuComp = [];
+        l2Menus && l2Menus.forEach((l2Menu) => {
+            let comp = React.createElement(Badge, { key: l2Menu.id, count: l2Menu.count },
+                React.createElement(Button, { shape: "round", icon: React.createElement(CodeTwoTone, null), href: `#/${l2Menu.id}/act-table?menuId=${l2Menu.id}`, size: 'large' }, l2Menu.title));
+            faceplateL2MenuComp.push(comp);
+        });
+        return (React.createElement(Card, Object.assign({}, other),
+            React.createElement(Space, { size: [16, 16], wrap: true }, faceplateL2MenuComp)));
+    }
+}
+export default QuickEntrance;
 //# sourceMappingURL=quick-entrance.js.map

package/lib/welcome/workbench.d.ts

@@ -1,20 +1,20 @@
-import React from 'react';
-import { CardProps } from 'antd';
-import 'antd/dist/reset.css';
-import { Level2Menu } from "../tmpl/interface";
-interface WorkbenchProps extends CardProps {
-}
-interface WorkbenchState {
-    l2Menus: Level2Menu[];
-}
-declare class Workbench extends React.PureComponent<WorkbenchProps, WorkbenchState> {
-    state: {
-        l2Menus: any;
-    };
-    intervals: any[];
-    componentDidMount(): Promise<void>;
-    componentWillUnmount(): void;
-    render(): JSX.Element;
-}
-export default Workbench;
+import React from 'react';
+import { CardProps } from 'antd';
+import 'antd/dist/reset.css';
+import { Level2Menu } from "../tmpl/interface";
+interface WorkbenchProps extends CardProps {
+}
+interface WorkbenchState {
+    l2Menus?: Level2Menu[];
+}
+declare class Workbench extends React.PureComponent<WorkbenchProps, WorkbenchState> {
+    state: {
+        l2Menus: any;
+    };
+    intervals: any[];
+    componentDidMount(): Promise<void>;
+    componentWillUnmount(): void;
+    render(): JSX.Element;
+}
+export default Workbench;
 //# sourceMappingURL=workbench.d.ts.map

package/lib/welcome/workbench.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workbench.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/workbench.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAgC,SAAS,EAAC,MAAM,MAAM,CAAA;AAE7D,OAAO,qBAAqB,CAAC;AAG7B,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAE7C,UAAU,cAAe,SAAQ,SAAS;CACzC;AAED,UAAU,cAAc;IACpB,OAAO,EAAE,UAAU,EAAE,CAAA;CACxB;AAED,cAAM,SAAU,SAAQ,KAAK,CAAC,aAAa,CAAC,cAAc,EAAE,cAAc,CAAC;IACvE,KAAK;;MAEJ;IACD,SAAS,EAAE,GAAG,EAAE,CAAM;IAEhB,iBAAiB;IAkBvB,oBAAoB,IAAI,IAAI;IAU5B,MAAM;CAwBT;AAED,eAAe,SAAS,CAAA"}
+{"version":3,"file":"workbench.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/workbench.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAgC,SAAS,EAAC,MAAM,MAAM,CAAA;AAE7D,OAAO,qBAAqB,CAAC;AAG7B,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAE7C,UAAU,cAAe,SAAQ,SAAS;CACzC;AAED,UAAU,cAAc;IACpB,OAAO,CAAC,EAAE,UAAU,EAAE,CAAA;CACzB;AAED,cAAM,SAAU,SAAQ,KAAK,CAAC,aAAa,CAAC,cAAc,EAAE,cAAc,CAAC;IACvE,KAAK;;MAEJ;IACD,SAAS,EAAE,GAAG,EAAE,CAAM;IAEhB,iBAAiB;IAkBvB,oBAAoB,IAAI,IAAI;IAU5B,MAAM;CAwBT;AAED,eAAe,SAAS,CAAA"}

package/lib/welcome/workbench.js

@@ -1,78 +1,78 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-import React from 'react';
-import { Button, Card, Space, Statistic } from 'antd';
-import { RocketTwoTone } from '@ant-design/icons';
-import 'antd/dist/reset.css';
-import HcserviceV3 from "../tmpl/hcservice-v3";
-import HCDataSource from '../tmpl/hc-data-source';
-class Workbench extends React.PureComponent {
-    constructor() {
-        super(...arguments);
-        this.state = {
-            l2Menus: undefined
-        };
-        this.intervals = [];
-    }
-    componentDidMount() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let l2Menus = yield HCDataSource.workbenchMenus();
-            for (const item of l2Menus) {
-                let i = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-                    let count = yield HcserviceV3.requestLtmplCount(item.id);
-                    item.count = count;
-                    this.setState({});
-                }), 180000);
-                this.intervals.push(i);
-                let count = yield HcserviceV3.requestLtmplCount(item.id);
-                item.count = count;
-                this.setState({});
-            }
-            this.setState({
-                l2Menus
-            });
-        });
-    }
-    componentWillUnmount() {
-        if (this.intervals.length > 0) {
-            for (let i of this.intervals) {
-                console.log('workbanch移除定时任务');
-                clearInterval(i);
-            }
-        }
-        this.intervals = [];
-    }
-    render() {
-        const _a = this.props, { title } = _a, other = __rest(_a, ["title"]);
-        const { l2Menus } = this.state;
-        let faceplateStatisticL2MenusComp = [];
-        l2Menus && l2Menus.forEach((l2Menu) => {
-            let comp = (React.createElement(Card, { size: 'small', key: l2Menu.id },
-                React.createElement(Statistic, { prefix: React.createElement(RocketTwoTone, null), title: l2Menu.title, value: l2Menu.count }),
-                React.createElement(Button, { style: { marginTop: 12 }, href: `#/${l2Menu.id}/act-table?menuId=${l2Menu.id}` }, "\u67E5\u770B")));
-            faceplateStatisticL2MenusComp.push(comp);
-        });
-        return (React.createElement(Card, Object.assign({ size: 'small' }, other, { title: title ? title : '工作台' }),
-            React.createElement(Space, { size: [16, 16], wrap: true }, faceplateStatisticL2MenusComp)));
-    }
-}
-export default Workbench;
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import React from 'react';
+import { Button, Card, Space, Statistic } from 'antd';
+import { RocketTwoTone } from '@ant-design/icons';
+import 'antd/dist/reset.css';
+import HcserviceV3 from "../tmpl/hcservice-v3";
+import HCDataSource from '../tmpl/hc-data-source';
+class Workbench extends React.PureComponent {
+    constructor() {
+        super(...arguments);
+        this.state = {
+            l2Menus: undefined
+        };
+        this.intervals = [];
+    }
+    componentDidMount() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let l2Menus = yield HCDataSource.workbenchMenus();
+            for (const item of l2Menus) {
+                let i = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+                    let count = yield HcserviceV3.requestLtmplCount(item.id);
+                    item.count = count;
+                    this.setState({});
+                }), 180000);
+                this.intervals.push(i);
+                let count = yield HcserviceV3.requestLtmplCount(item.id);
+                item.count = count;
+                this.setState({});
+            }
+            this.setState({
+                l2Menus
+            });
+        });
+    }
+    componentWillUnmount() {
+        if (this.intervals.length > 0) {
+            for (let i of this.intervals) {
+                console.log('workbanch移除定时任务');
+                clearInterval(i);
+            }
+        }
+        this.intervals = [];
+    }
+    render() {
+        const _a = this.props, { title } = _a, other = __rest(_a, ["title"]);
+        const { l2Menus } = this.state;
+        let faceplateStatisticL2MenusComp = [];
+        l2Menus && l2Menus.forEach((l2Menu) => {
+            let comp = (React.createElement(Card, { size: 'small', key: l2Menu.id },
+                React.createElement(Statistic, { prefix: React.createElement(RocketTwoTone, null), title: l2Menu.title, value: l2Menu.count }),
+                React.createElement(Button, { style: { marginTop: 12 }, href: `#/${l2Menu.id}/act-table?menuId=${l2Menu.id}` }, "\u67E5\u770B")));
+            faceplateStatisticL2MenusComp.push(comp);
+        });
+        return (React.createElement(Card, Object.assign({ size: 'small' }, other, { title: title ? title : '工作台' }),
+            React.createElement(Space, { size: [16, 16], wrap: true }, faceplateStatisticL2MenusComp)));
+    }
+}
+export default Workbench;
 //# sourceMappingURL=workbench.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aldehyde",
-  "version": "0.2.19",
+  "version": "0.2.21",
   "author": "cosmicparticle",
   "main": "lib/index.js",
   "module": "src/aldehyde/index.txs",
@@ -49,14 +49,16 @@
     "express": "^4.17.1",
     "fs-extra": "^7.0.0",
     "griffith": "^1.10.0",
+    "html-to-draftjs": "^1.5.0",
     "http-proxy-middleware": "^2.0.1",
     "identity-obj-proxy": "^3.0.0",
     "immutability-helper": "^3.0.0",
     "jquery": "^3.1.1",
-    "jsencrypt": "3.2.1",
+    "jsencrypt": "^3.2.1",
     "jsonp": "^0.2.1",
     "jsonschema": "^1.4.0",
-    "ketcher-react": "2.7.2",
+    "ketcher-core": "^2.7.2",
+    "ketcher-react": "^2.7.2",
     "leaflet": "^1.6.0",
     "less": "^2.7.3",
     "loadable-components": "^2.2.3",
@@ -75,14 +77,14 @@
     "react-dnd-html5-backend": "^16.0.1",
     "react-document-title": "^2.0.3",
     "react-dom": "^18.2.0",
-    "react-draft-wysiwyg": "^1.14.7",
+    "react-draft-wysiwyg": "^1.15.0",
     "react-error-overlay": "^6.0.10",
     "react-file-viewer": "^1.2.1",
     "react-highlight-words": "^0.16.0",
     "react-load-script": "^0.0.6",
     "react-loadable": "^5.5.0",
     "react-markdown": "^8.0.4",
-    "react-router-dom": "^4.3.1",
+    "react-router-dom": "^6.10.0",
     "react-signature-canvas": "^1.0.5",
     "react-sortable-hoc": "^2.0.0",
     "react-transition-group": "^4.4.2",
@@ -97,6 +99,7 @@
     "superagent": "^4.0.0",
     "superagent-jsonp": "^0.2.1",
     "three": "^0.134.0",
+    "typescript": "^5.0.3",
     "url": "^0.11.0",
     "url-loader": "^4.1.1",
     "use-resize-observer": "^7.0.0",
@@ -139,7 +142,7 @@
     "@loadable/component": "^5.15.0",
     "@loadable/server": "^5.15.0",
     "@loadable/webpack-plugin": "^5.15.0",
-    "@svgr/webpack": "2.4.1",
+    "@svgr/webpack": "^2.4.1",
     "@types/webpack": "^5.28.0",
     "autoprefixer": "^10.4.2",
     "babel-core": "^7.0.0-bridge.0",
@@ -179,7 +182,6 @@
     "rimraf": "^3.0.2",
     "style-loader": "^3.3.1",
     "ts-loader": "^9.2.6",
-    "typescript": "4.5.4",
     "webpack": "^5.75.0",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-cli": "^4.9.1",
@@ -192,8 +194,6 @@
     "yarn": "^1.22.17"
   },
   "peerDependencies": {
-    "antd": ">=5.0.0",
-    "react": ">=17.0.0",
-    "react-dom": ">=17.0.0"
+    "antd": ">=5.0.0"
   }
 }

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

@@ -2,7 +2,7 @@ import * as React from 'react'
 import {RefObject} from 'react'
 import {Button, Checkbox as AntdCheckbox, Popconfirm, Popover,Tooltip} from 'antd'
 import './index.css'
-import {ActionConfig, Comparator, DtmplData} from "../../tmpl/interface";
+import {ActionConfig, DtmplData} from "../../tmpl/interface";
 import {FormInstance} from "antd/lib/form/hooks/useForm";
 import FieldsEditCard from "../../detail/edit/fields-edit-card"
 import {SizeType} from "antd/lib/config-provider/SizeContext";
@@ -10,7 +10,6 @@ import ActionUtils from './utils';
 import Icon from '../../icon';
 import {ButtonType} from "antd/lib/button";
 
-const CheckboxGroup = AntdCheckbox.Group;
 export  type ActionButtonIconType = 'icon' | 'icon-title' | 'title'
 export  type ActionButtonType = 'primary-block' | 'dashed' | 'primary'
 export  type ActionButtonHiddenType = 'hidden' | 'disabled'
@@ -29,7 +28,7 @@ interface ActionProps {
 };
 
 interface ActionState {
-    popoverOpen: boolean,
+    popoverOpen?: boolean,
 
 };
 

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

@@ -10,7 +10,7 @@ interface CascaderProps extends EControlProps{
 }
 
 interface CascaderState {
-    options:object[]
+    options?:object[]
 }
 
 export default class Cascader extends React.PureComponent<CascaderProps, CascaderState> {

package/src/aldehyde/controls/chemstruc/graph.tsx

@@ -15,8 +15,8 @@ interface ChemStrucProps extends VEControlProps {
 }
 
 interface ChemStrucState {
-    modalOpen: boolean,
-    molFileLoaded: boolean,
+    modalOpen?: boolean,
+    molFileLoaded?: boolean,
 }
 
 export default class ChemStruc extends React.PureComponent<ChemStrucProps, ChemStrucState> {

package/src/aldehyde/controls/collapse-card/index.tsx

@@ -9,7 +9,7 @@ interface CollapseCardProps extends CardProps {
 };
 
 interface CollapseCardState {
-    collapse: boolean
+    collapse?: boolean
 };
 export default class CollapseCard extends React.PureComponent<CollapseCardProps, CollapseCardState> {
 

package/src/aldehyde/controls/color-picker/index.tsx

@@ -10,7 +10,7 @@ interface PickerProps extends VEControlProps {
 }
 
 interface PickerState  {
-    displayColorPicker:boolean
+    displayColorPicker?:boolean
 }
 
 export default class CollapseCard extends React.PureComponent<PickerProps, PickerState> {

package/src/aldehyde/controls/cquery/cquick-button.tsx

@@ -14,7 +14,7 @@ interface CquickButtonProps extends ButtonProps{
 }
 
 interface CquickButtonState {
-    showDraw:boolean;
+    showDraw?:boolean;
 }
 
 const outlinedMap={

package/src/aldehyde/controls/entity-select/entity-select.tsx

@@ -1,13 +1,7 @@
 import * as React from 'react'
 import {Button, Col, Divider, Row, Select, Spin, Tag} from 'antd'
-import {
-    EControlProps,
-    LtmplConfig,
-    PageInfo,
-    QueryData,
-    QueryKey,
-} from "../../tmpl/interface";
-import {AlignLeftOutlined, EditOutlined, PlusOutlined, SearchOutlined,TableOutlined} from '@ant-design/icons';
+import {EControlProps, LtmplConfig, PageInfo, QueryData, QueryKey,} from "../../tmpl/interface";
+import {AlignLeftOutlined, EditOutlined, PlusOutlined, SearchOutlined, TableOutlined} from '@ant-design/icons';
 import debounce from 'lodash/debounce';
 import './index.css';
 import HcserviceV3 from "../../tmpl/hcservice-v3";
@@ -26,18 +20,18 @@ interface InnerEntitySelectProps extends EControlProps {
 };
 
 interface InnerEntitySelectState {
-    titleId: string,
-    optionCacheKey: string,
-    pageNo: number,
-    loading: boolean,
-    optionsCache:object;
-    codeLabel:object;
-    ltmplConfig: LtmplConfig,
-    showView: boolean,
-    drawCode: string,
-    showEdit: boolean,
-    showTable:boolean,
-    preMainCode:string,
+    titleId?: string,
+    optionCacheKey?: string,
+    pageNo?: number,
+    loading?: boolean,
+    optionsCache?:object;
+    codeLabel?:object;
+    ltmplConfig?: LtmplConfig,
+    showView?: boolean,
+    drawCode?: string,
+    showEdit?: boolean,
+    showTable?:boolean,
+    preMainCode?:string,
 };
 
 type OptionCache = {
@@ -341,6 +335,9 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
             /** 构建 dataSource **/
                 //构建过滤条件
             let criteriaData = {};
+            if (baseCriteria) {
+                criteriaData = {...baseCriteria}
+            }
             // let mainCode_ = mainCode;
             // if (baseCriteria) {
             //     criteriaData = {...baseCriteria}

package/src/aldehyde/controls/entity-select/lab-tree-select.tsx

@@ -9,7 +9,7 @@ interface LabTreeSelectProps extends EControlProps {
 };
 
 interface LabTreeSelectState {
-    treeData: object[],
+    treeData?: object[],
 };
 
 type LoadDataSource = {

package/src/aldehyde/controls/file-view/drawer-file-view.tsx

@@ -17,7 +17,7 @@ interface DrawerFileViewProps {
 };
 
 interface DrawerFileViewState {
-    drawerOpen: boolean,
+    drawerOpen?: boolean,
 
 };
 export default class DrawerFileView extends React.PureComponent<DrawerFileViewProps, DrawerFileViewState> {

package/src/aldehyde/controls/file-view/index.tsx

@@ -16,7 +16,7 @@ interface FileViewProps {
 };
 
 interface FileViewState {
-    urlData:string
+    urlData?:string
 
 };
 export default class FileView extends React.PureComponent<FileViewProps, FileViewState> {