aldehyde 0.2.20 → 0.2.21

package/lib/layout/menu/menu-2layers.js

@@ -1,71 +1,70 @@
-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 { Menu } from 'antd';
-import MenuRender from './menu-render';
-import { withRouter } from 'react-router-dom';
-class Menu2layers extends React.PureComponent {
-    constructor(props) {
-        super(props);
-        this.handleOpen = (openKeys) => {
-            if (openKeys && openKeys.length > 1) {
-                openKeys.splice(0, 1);
-            }
-            this.setState({
-                openKeys
-            });
-        };
-        this.state = {
-            openKeys: [],
-        };
-    }
-    componentDidMount() {
-        const { currentL2MenuId, blockMenu, collapsed } = this.props;
-        const { openKeys } = this.state;
-        let openKey = blockMenu ? MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId) : undefined;
-        if (openKey && openKeys.length < 1) {
-            this.setState({
-                openKeys: [openKey.toString()]
-            });
-        }
-    }
-    componentDidUpdate(prevProps) {
-        const { currentL2MenuId, blockMenu, collapsed } = this.props;
-        let { currentL2MenuId: preMenuId, blockMenu: preBlockMenu } = prevProps;
-        const { openKeys } = this.state;
-        if (!preBlockMenu || !blockMenu || blockMenu.id != preBlockMenu.id) {
-            //console.log('currentL2MenuId:',currentL2MenuId);
-            let openKey = blockMenu ? MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId) : undefined;
-            if (openKey) {
-                this.setState({
-                    openKeys: [openKey],
-                });
-            }
-        }
-        else {
-            let openKey = blockMenu ? MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId) : undefined;
-            let preOpenKey = blockMenu ? MenuRender.findOpenId(preBlockMenu.l1Menus, preMenuId) : undefined;
-            if ((!preOpenKey && openKey) || (openKey && openKey != preOpenKey)) {
-                this.setState({
-                    openKeys: [openKey],
-                });
-            }
-        }
-    }
-    render() {
-        const _a = this.props, { blockMenu, collapsed, currentL2MenuId, basePath } = _a, other = __rest(_a, ["blockMenu", "collapsed", "currentL2MenuId", "basePath"]);
-        const { openKeys } = this.state;
-        return (React.createElement(Menu, Object.assign({}, other, { onOpenChange: this.handleOpen, selectedKeys: currentL2MenuId ? [currentL2MenuId.toString()] : undefined, openKeys: !collapsed ? openKeys : undefined }), blockMenu ? MenuRender.renderL1Menu(blockMenu.l1Menus, undefined, basePath) : ""));
-    }
-}
-export default withRouter(Menu2layers);
+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 { Menu } from 'antd';
+import MenuRender from './menu-render';
+class Menu2layers extends React.PureComponent {
+    constructor(props) {
+        super(props);
+        this.handleOpen = (openKeys) => {
+            if (openKeys && openKeys.length > 1) {
+                openKeys.splice(0, 1);
+            }
+            this.setState({
+                openKeys
+            });
+        };
+        this.state = {
+            openKeys: [],
+        };
+    }
+    componentDidMount() {
+        const { currentL2MenuId, blockMenu, collapsed } = this.props;
+        const { openKeys } = this.state;
+        let openKey = blockMenu ? MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId) : undefined;
+        if (openKey && openKeys.length < 1) {
+            this.setState({
+                openKeys: [openKey.toString()]
+            });
+        }
+    }
+    componentDidUpdate(prevProps) {
+        const { currentL2MenuId, blockMenu, collapsed } = this.props;
+        let { currentL2MenuId: preMenuId, blockMenu: preBlockMenu } = prevProps;
+        const { openKeys } = this.state;
+        if (!preBlockMenu || !blockMenu || blockMenu.id != preBlockMenu.id) {
+            //console.log('currentL2MenuId:',currentL2MenuId);
+            let openKey = blockMenu ? MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId) : undefined;
+            if (openKey) {
+                this.setState({
+                    openKeys: [openKey],
+                });
+            }
+        }
+        else {
+            let openKey = blockMenu ? MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId) : undefined;
+            let preOpenKey = blockMenu ? MenuRender.findOpenId(preBlockMenu.l1Menus, preMenuId) : undefined;
+            if ((!preOpenKey && openKey) || (openKey && openKey != preOpenKey)) {
+                this.setState({
+                    openKeys: [openKey],
+                });
+            }
+        }
+    }
+    render() {
+        const _a = this.props, { blockMenu, collapsed, currentL2MenuId, basePath } = _a, other = __rest(_a, ["blockMenu", "collapsed", "currentL2MenuId", "basePath"]);
+        const { openKeys } = this.state;
+        return (React.createElement(Menu, Object.assign({}, other, { onOpenChange: this.handleOpen, selectedKeys: currentL2MenuId ? [currentL2MenuId.toString()] : undefined, openKeys: !collapsed ? openKeys : undefined }), blockMenu ? MenuRender.renderL1Menu(blockMenu.l1Menus, undefined, basePath) : ""));
+    }
+}
+export default Menu2layers;
 //# sourceMappingURL=menu-2layers.js.map

package/lib/layout/menu/menu-2layers.js.map

@@ -1 +1 @@
-{"version":3,"file":"menu-2layers.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"menu-2layers.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":"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"}

package/lib/layout/menu/menu-render.d.ts

@@ -1,9 +1,9 @@
-import { Level1Menu, Level2Menu } from "../../tmpl/interface";
-declare const _default: {
-    renderL1Menu(menus: Level1Menu[], target: any, basePath?: string): JSX.Element[];
-    getRoutePath(menu: Level2Menu, basePath: any, defaultCriteriaData: any): string;
-    renderL2Menu(menus: Level2Menu[], target: any, basePath?: string): JSX.Element[];
-    findOpenId(l1Menus: Level1Menu[], currentL2MenuId: string): string;
-};
-export default _default;
+import { Level1Menu, Level2Menu } from "../../tmpl/interface";
+declare const _default: {
+    renderL1Menu(menus: Level1Menu[], target: any, basePath?: string): JSX.Element[];
+    getRoutePath(menu: Level2Menu, basePath: any, defaultCriteriaData: any): string;
+    renderL2Menu(menus: Level2Menu[], target: any, basePath?: string): JSX.Element[];
+    findOpenId(l1Menus: Level1Menu[], currentL2MenuId: string): string;
+};
+export default _default;
 //# sourceMappingURL=menu-render.d.ts.map

package/lib/layout/menu/menu-render.js

@@ -1,75 +1,75 @@
-import { Menu } from "antd";
-import React from "react";
-import { NavLink } from 'react-router-dom';
-import Units from "../../units";
-const { SubMenu } = Menu;
-export default {
-    renderL1Menu(menus, target, basePath = "") {
-        return menus.map((item) => {
-            if (item.l2Menus) {
-                return React.createElement(SubMenu, { title: item.title, key: item.id }, this.renderL2Menu(item.l2Menus, target, basePath));
-            }
-        });
-    },
-    getRoutePath(menu, basePath, defaultCriteriaData) {
-        if (menu) {
-            let pageType = menu.pageType;
-            let routePath = 'act-table';
-            let codeSource = '';
-            switch (pageType) {
-                case "列表":
-                    routePath = 'act-table';
-                    break;
-                case "添加":
-                    routePath = 'detail-edit';
-                    codeSource = '&codeSource=new';
-                    break;
-                case "编辑":
-                    routePath = 'detail-edit';
-                    codeSource = '&codeSource=listop';
-                    break;
-                case "编辑或添加":
-                    routePath = 'detail-edit';
-                    codeSource = '&codeSource=listop-new';
-                    break;
-                case "详情":
-                    routePath = 'detail-view';
-                    codeSource = '&codeSource=listop';
-                    break;
-            }
-            return `${basePath}/${menu.id}/${routePath}?menuId=${menu.id}${codeSource}${defaultCriteriaData}`;
-        }
-        return null;
-    },
-    renderL2Menu(menus, target, basePath = "") {
-        return menus.map((item) => {
-            let delimiter = "/";
-            let customPath = item.customPath;
-            if (customPath) {
-                if (customPath.startsWith('/') || customPath.startsWith('\\')) {
-                    delimiter = "";
-                }
-            }
-            let defaultCriteriaData = "";
-            if (item.defaultCriteriaValue) {
-                defaultCriteriaData = '&' + Units.transQueryParamsToStr(item.defaultCriteriaValue);
-            }
-            let path = customPath ? `${basePath}/page-${item.id}${delimiter}${customPath}?menuId=${item.id}` : this.getRoutePath(item, basePath, defaultCriteriaData);
-            return React.createElement(Menu.Item, { key: item.id },
-                React.createElement(NavLink, { to: path, target: target }, item.title));
-        });
-    },
-    findOpenId(l1Menus, currentL2MenuId) {
-        let openL2MenuId = undefined;
-        for (const menul1 of l1Menus) {
-            for (const menul2 of menul1.l2Menus) {
-                if (menul2.id == currentL2MenuId) {
-                    openL2MenuId = menul1.id;
-                    return openL2MenuId;
-                }
-            }
-        }
-        return openL2MenuId;
-    }
-};
+import { Menu } from "antd";
+import React from "react";
+import { NavLink } from 'react-router-dom';
+import Units from "../../units";
+const { SubMenu } = Menu;
+export default {
+    renderL1Menu(menus, target, basePath = "") {
+        return menus.map((item) => {
+            if (item.l2Menus) {
+                return React.createElement(SubMenu, { title: item.title, key: item.id }, this.renderL2Menu(item.l2Menus, target, basePath));
+            }
+        });
+    },
+    getRoutePath(menu, basePath, defaultCriteriaData) {
+        if (menu) {
+            let pageType = menu.pageType;
+            let routePath = 'act-table';
+            let codeSource = '';
+            switch (pageType) {
+                case "列表":
+                    routePath = 'act-table';
+                    break;
+                case "添加":
+                    routePath = 'detail-edit';
+                    codeSource = '&codeSource=new';
+                    break;
+                case "编辑":
+                    routePath = 'detail-edit';
+                    codeSource = '&codeSource=listop';
+                    break;
+                case "编辑或添加":
+                    routePath = 'detail-edit';
+                    codeSource = '&codeSource=listop-new';
+                    break;
+                case "详情":
+                    routePath = 'detail-view';
+                    codeSource = '&codeSource=listop';
+                    break;
+            }
+            return `${basePath}/${menu.id}/${routePath}?menuId=${menu.id}${codeSource}${defaultCriteriaData}`;
+        }
+        return null;
+    },
+    renderL2Menu(menus, target, basePath = "") {
+        return menus.map((item) => {
+            let delimiter = "/";
+            let customPath = item.customPath;
+            if (customPath) {
+                if (customPath.startsWith('/') || customPath.startsWith('\\')) {
+                    delimiter = "";
+                }
+            }
+            let defaultCriteriaData = "";
+            if (item.defaultCriteriaValue) {
+                defaultCriteriaData = '&' + Units.transQueryParamsToStr(item.defaultCriteriaValue);
+            }
+            let path = customPath ? `${basePath}/page/${item.id}${delimiter}${customPath}?menuId=${item.id}` : this.getRoutePath(item, basePath, defaultCriteriaData);
+            return React.createElement(Menu.Item, { key: item.id },
+                React.createElement(NavLink, { to: path, target: target }, item.title));
+        });
+    },
+    findOpenId(l1Menus, currentL2MenuId) {
+        let openL2MenuId = undefined;
+        for (const menul1 of l1Menus) {
+            for (const menul2 of menul1.l2Menus) {
+                if (menul2.id == currentL2MenuId) {
+                    openL2MenuId = menul1.id;
+                    return openL2MenuId;
+                }
+            }
+        }
+        return openL2MenuId;
+    }
+};
 //# sourceMappingURL=menu-render.js.map

package/lib/layout/menu/reset-password.d.ts

@@ -1,25 +1,25 @@
-import React from 'react';
-import { FormInstance } from 'antd';
-import 'antd/dist/reset.css';
-interface ResetPasswordProps {
-}
-interface ResetPasswordState {
-    showPopover: boolean;
-    pubkey: string;
-    loading: boolean;
-}
-declare class ResetPassword extends React.PureComponent<ResetPasswordProps, ResetPasswordState> {
-    state: {
-        showPopover: boolean;
-        pubkey: any;
-        loading: boolean;
-    };
-    formRef: React.RefObject<FormInstance<any>>;
-    componentDidMount(): Promise<void>;
-    handleSubmit: (values: any) => Promise<void>;
-    handleBlurCapture: () => void;
-    getForm: () => JSX.Element;
-    render(): JSX.Element;
-}
-export default ResetPassword;
+import React from 'react';
+import { FormInstance } from 'antd';
+import 'antd/dist/reset.css';
+interface ResetPasswordProps {
+}
+interface ResetPasswordState {
+    showPopover?: boolean;
+    pubkey?: string;
+    loading?: boolean;
+}
+declare class ResetPassword extends React.PureComponent<ResetPasswordProps, ResetPasswordState> {
+    state: {
+        showPopover: boolean;
+        pubkey: any;
+        loading: boolean;
+    };
+    formRef: React.RefObject<FormInstance<any>>;
+    componentDidMount(): Promise<void>;
+    handleSubmit: (values: any) => Promise<void>;
+    handleBlurCapture: () => void;
+    getForm: () => JSX.Element;
+    render(): JSX.Element;
+}
+export default ResetPassword;
 //# sourceMappingURL=reset-password.d.ts.map

package/lib/layout/menu/reset-password.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reset-password.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/reset-password.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAagB,YAAY,EAClC,MAAM,MAAM,CAAC;AAEd,OAAO,qBAAqB,CAAC;AAG7B,UAAU,kBAAkB;CAE3B;AAGD,UAAU,kBAAkB;IACxB,WAAW,EAAC,OAAO,CAAC;IACpB,MAAM,EAAC,MAAM,CAAC;IACd,OAAO,EAAC,OAAO,CAAA;CAClB;AAGD,cAAM,aAAc,SAAQ,KAAK,CAAC,aAAa,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACnF,KAAK;;;;MAIJ;IACD,OAAO,qCAAmC;IAEpC,iBAAiB;IASvB,YAAY,iCAiBX;IAED,iBAAiB,aAkBhB;IAED,OAAO,oBAyEN;IAID,MAAM;CAcT;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"reset-password.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/reset-password.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAagB,YAAY,EAClC,MAAM,MAAM,CAAC;AAEd,OAAO,qBAAqB,CAAC;AAG7B,UAAU,kBAAkB;CAE3B;AAGD,UAAU,kBAAkB;IACxB,WAAW,CAAC,EAAC,OAAO,CAAC;IACrB,MAAM,CAAC,EAAC,MAAM,CAAC;IACf,OAAO,CAAC,EAAC,OAAO,CAAA;CACnB;AAGD,cAAM,aAAc,SAAQ,KAAK,CAAC,aAAa,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACnF,KAAK;;;;MAIJ;IACD,OAAO,qCAAmC;IAEpC,iBAAiB;IASvB,YAAY,iCAiBX;IAED,iBAAiB,aAkBhB;IAED,OAAO,oBAyEN;IAID,MAAM;CAcT;AAED,eAAe,aAAa,CAAC"}

package/lib/layout/menu/reset-password.js

@@ -1,114 +1,114 @@
-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());
-    });
-};
-import React from 'react';
-import { message, Button, Popover, Col, Form, Input, Row } from 'antd';
-import { KeyOutlined, LockOutlined } from '@ant-design/icons';
-import 'antd/dist/reset.css';
-import HCserviceV3 from "../../tmpl/hcservice-v3";
-class ResetPassword extends React.PureComponent {
-    constructor() {
-        super(...arguments);
-        this.state = {
-            showPopover: false,
-            pubkey: undefined,
-            loading: false,
-        };
-        this.formRef = React.createRef();
-        this.handleSubmit = (values) => __awaiter(this, void 0, void 0, function* () {
-            this.setState({
-                loading: true
-            });
-            let { pubkey } = this.state;
-            let res = yield HCserviceV3.resetPassword(values.oldPassword, values.newPassword, pubkey);
-            if (res.status == 'success') {
-                message.info("密码已重置,请重新登录");
-                HCserviceV3.logout();
-            }
-            this.setState({
-                loading: false
-            });
-        });
-        this.handleBlurCapture = () => {
-            //判断新密码和确认密码相同
-            //console.log("this.formRef.current.getFieldValue('newPassword')",this.formRef.current.getFieldValue('newPassword')) ;
-            let newPassword = this.formRef.current.getFieldValue('newPassword');
-            let reNewPassword = this.formRef.current.getFieldValue('reNewPassword');
-            if (newPassword && reNewPassword && newPassword != reNewPassword) {
-                this.formRef.current.setFields([{
-                        name: 'reNewPassword',
-                        value: reNewPassword,
-                        errors: ['两次密码输入不一致！']
-                    }]);
-            }
-            else {
-                this.formRef.current.setFields([{
-                        name: 'reNewPassword',
-                        value: reNewPassword,
-                        errors: []
-                    }]);
-            }
-        };
-        this.getForm = () => {
-            const { loading } = this.state;
-            return React.createElement(Row, { justify: "center", align: "middle" },
-                React.createElement(Col, null,
-                    React.createElement(Form, { style: { width: 350 }, ref: this.formRef, name: "normal_login", className: "login-form", onFinish: this.handleSubmit },
-                        React.createElement(Form.Item, { label: "原密码", name: "oldPassword", rules: [{ required: true, message: '请输入原密码!' }] },
-                            React.createElement(Input.Password, { placeholder: "\u5BC6\u7801", prefix: React.createElement(LockOutlined, { className: "site-form-item-icon" }) })),
-                        React.createElement(Form.Item, { label: "新设密码", name: "newPassword", rules: [{ required: true, message: '请输入新密码!' }] },
-                            React.createElement(Input.Password, { placeholder: "\u65B0\u8BBE\u5BC6\u7801", onBlurCapture: this.handleBlurCapture, prefix: React.createElement(LockOutlined, { className: "site-form-item-icon" }) })),
-                        React.createElement(Form.Item, { label: "确认密码", name: "reNewPassword", rules: [{ required: true, message: '请输入确认密码!' },
-                                ({ getFieldValue }) => ({
-                                    validator(_, value) {
-                                        if (!value || getFieldValue('newPassword') === value) {
-                                            return Promise.resolve();
-                                        }
-                                        return Promise.reject(new Error('两次密码输入不一致!'));
-                                    },
-                                }),] },
-                            React.createElement(Input.Password, { placeholder: "\u786E\u8BA4\u5BC6\u7801", 
-                                //onBlurCapture={this.handleBlurCapture}
-                                prefix: React.createElement(LockOutlined, { className: "site-form-item-icon" }) })),
-                        React.createElement(Form.Item, null,
-                            React.createElement(Row, { align: "middle", gutter: 32 },
-                                React.createElement(Col, { span: 12 },
-                                    React.createElement(Button, { style: { width: '100%' }, type: "primary", loading: loading, onClick: () => this.formRef.current.submit() }, "\u786E\u5B9A")),
-                                React.createElement(Col, { span: 12 },
-                                    React.createElement(Button, { style: { width: '100%' }, onClick: () => {
-                                            this.setState({
-                                                showPopover: false
-                                            });
-                                        } }, "\u53D6\u6D88")))))));
-        };
-    }
-    componentDidMount() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let pubkey = yield HCserviceV3.getRasPubkey();
-            this.setState({
-                pubkey
-            });
-        });
-    }
-    render() {
-        const { showPopover, loading } = this.state;
-        return (React.createElement(React.Fragment, null,
-            React.createElement(Popover, { destroyTooltipOnHide: true, open: showPopover, overlayStyle: { maxWidth: '400px' }, title: '修改密码', placement: "leftBottom", trigger: "click", content: this.getForm() },
-                React.createElement("span", { onClick: () => {
-                        this.setState({
-                            showPopover: !showPopover
-                        });
-                    } },
-                    " ",
-                    React.createElement(KeyOutlined, null),
-                    "\u4FEE\u6539\u5BC6\u7801"))));
-    }
-}
-export default ResetPassword;
+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());
+    });
+};
+import React from 'react';
+import { message, Button, Popover, Col, Form, Input, Row } from 'antd';
+import { KeyOutlined, LockOutlined } from '@ant-design/icons';
+import 'antd/dist/reset.css';
+import HCserviceV3 from "../../tmpl/hcservice-v3";
+class ResetPassword extends React.PureComponent {
+    constructor() {
+        super(...arguments);
+        this.state = {
+            showPopover: false,
+            pubkey: undefined,
+            loading: false,
+        };
+        this.formRef = React.createRef();
+        this.handleSubmit = (values) => __awaiter(this, void 0, void 0, function* () {
+            this.setState({
+                loading: true
+            });
+            let { pubkey } = this.state;
+            let res = yield HCserviceV3.resetPassword(values.oldPassword, values.newPassword, pubkey);
+            if (res.status == 'success') {
+                message.info("密码已重置,请重新登录");
+                HCserviceV3.logout();
+            }
+            this.setState({
+                loading: false
+            });
+        });
+        this.handleBlurCapture = () => {
+            //判断新密码和确认密码相同
+            //console.log("this.formRef.current.getFieldValue('newPassword')",this.formRef.current.getFieldValue('newPassword')) ;
+            let newPassword = this.formRef.current.getFieldValue('newPassword');
+            let reNewPassword = this.formRef.current.getFieldValue('reNewPassword');
+            if (newPassword && reNewPassword && newPassword != reNewPassword) {
+                this.formRef.current.setFields([{
+                        name: 'reNewPassword',
+                        value: reNewPassword,
+                        errors: ['两次密码输入不一致！']
+                    }]);
+            }
+            else {
+                this.formRef.current.setFields([{
+                        name: 'reNewPassword',
+                        value: reNewPassword,
+                        errors: []
+                    }]);
+            }
+        };
+        this.getForm = () => {
+            const { loading } = this.state;
+            return React.createElement(Row, { justify: "center", align: "middle" },
+                React.createElement(Col, null,
+                    React.createElement(Form, { style: { width: 350 }, ref: this.formRef, name: "normal_login", className: "login-form", onFinish: this.handleSubmit },
+                        React.createElement(Form.Item, { label: "原密码", name: "oldPassword", rules: [{ required: true, message: '请输入原密码!' }] },
+                            React.createElement(Input.Password, { placeholder: "\u5BC6\u7801", prefix: React.createElement(LockOutlined, { className: "site-form-item-icon" }) })),
+                        React.createElement(Form.Item, { label: "新设密码", name: "newPassword", rules: [{ required: true, message: '请输入新密码!' }] },
+                            React.createElement(Input.Password, { placeholder: "\u65B0\u8BBE\u5BC6\u7801", onBlurCapture: this.handleBlurCapture, prefix: React.createElement(LockOutlined, { className: "site-form-item-icon" }) })),
+                        React.createElement(Form.Item, { label: "确认密码", name: "reNewPassword", rules: [{ required: true, message: '请输入确认密码!' },
+                                ({ getFieldValue }) => ({
+                                    validator(_, value) {
+                                        if (!value || getFieldValue('newPassword') === value) {
+                                            return Promise.resolve();
+                                        }
+                                        return Promise.reject(new Error('两次密码输入不一致!'));
+                                    },
+                                }),] },
+                            React.createElement(Input.Password, { placeholder: "\u786E\u8BA4\u5BC6\u7801", 
+                                //onBlurCapture={this.handleBlurCapture}
+                                prefix: React.createElement(LockOutlined, { className: "site-form-item-icon" }) })),
+                        React.createElement(Form.Item, null,
+                            React.createElement(Row, { align: "middle", gutter: 32 },
+                                React.createElement(Col, { span: 12 },
+                                    React.createElement(Button, { style: { width: '100%' }, type: "primary", loading: loading, onClick: () => this.formRef.current.submit() }, "\u786E\u5B9A")),
+                                React.createElement(Col, { span: 12 },
+                                    React.createElement(Button, { style: { width: '100%' }, onClick: () => {
+                                            this.setState({
+                                                showPopover: false
+                                            });
+                                        } }, "\u53D6\u6D88")))))));
+        };
+    }
+    componentDidMount() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let pubkey = yield HCserviceV3.getRasPubkey();
+            this.setState({
+                pubkey
+            });
+        });
+    }
+    render() {
+        const { showPopover, loading } = this.state;
+        return (React.createElement(React.Fragment, null,
+            React.createElement(Popover, { destroyTooltipOnHide: true, open: showPopover, overlayStyle: { maxWidth: '400px' }, title: '修改密码', placement: "leftBottom", trigger: "click", content: this.getForm() },
+                React.createElement("span", { onClick: () => {
+                        this.setState({
+                            showPopover: !showPopover
+                        });
+                    } },
+                    " ",
+                    React.createElement(KeyOutlined, null),
+                    "\u4FEE\u6539\u5BC6\u7801"))));
+    }
+}
+export default ResetPassword;
 //# sourceMappingURL=reset-password.js.map