aldehyde 0.2.196 → 0.2.197

package/lib/layout/MainPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MainPage.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout/MainPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,OAAO,cAAc,CAAC;AACtB,OAAO,kBAAkB,CAAC;;AAmU1B,wBAAoC"}
+{"version":3,"file":"MainPage.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout/MainPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,OAAO,cAAc,CAAC;AACtB,OAAO,kBAAkB,CAAC;;AAkU1B,wBAAoC"}

package/lib/layout/MainPage.js

@@ -233,7 +233,6 @@ class MainPage extends React.PureComponent {
                     this.findBlockTitle(currentBlockId) },
                 React.createElement(Layout, null,
                     React.createElement(Sider, { theme: "light", style: {
-                            // background: '#0f4da1',
                             overflow: "auto",
                             height: "100vh",
                             position: "fixed",

package/lib/layout/MainPage.js.map

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

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

@@ -4,6 +4,7 @@ import "antd/dist/reset.css";
 import { LocaleContext } from "../../locale/LocaleProvider";
 interface ResetPasswordProps {
     serverKey?: string;
+    showUserName?: boolean;
 }
 interface ResetPasswordState {
     showPopover?: boolean;

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,CAAC;AAC1B,OAAO,EAQL,YAAY,EACb,MAAM,MAAM,CAAC;AAEd,OAAO,qBAAqB,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,UAAU,kBAAkB;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,kBAAkB;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,cAAM,aAAc,SAAQ,KAAK,CAAC,aAAa,CAC7C,kBAAkB,EAClB,kBAAkB,CACnB;IACC,KAAK;;;;MAIH;IACF,OAAO,qCAAmC;IAC1C,MAAM,CAAC,WAAW;;;;;;;;OAAiB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAE3C,iBAAiB;IAQvB,YAAY,iCAwBV;IAEF,iBAAiB,aAuBf;IAEF,OAAO,0BAgGL;IAEF,MAAM;CA4BP;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,CAAC;AAC1B,OAAO,EAQL,YAAY,EACb,MAAM,MAAM,CAAC;AAEd,OAAO,qBAAqB,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,UAAU,kBAAkB;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAC,OAAO,CAAC;CACvB;AAED,UAAU,kBAAkB;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,cAAM,aAAc,SAAQ,KAAK,CAAC,aAAa,CAC7C,kBAAkB,EAClB,kBAAkB,CACnB;IACC,KAAK;;;;MAIH;IACF,OAAO,qCAAmC;IAC1C,MAAM,CAAC,WAAW;;;;;;;;OAAiB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAE3C,iBAAiB;IAQvB,YAAY,iCAsCV;IAEF,iBAAiB,aAuBf;IAEF,OAAO,0BA6GL;IAEF,MAAM;CA4BP;AAED,eAAe,aAAa,CAAC"}

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import React from "react";
 import { message, Button, Popover, Col, Form, Input, Row, } from "antd";
-import { LockOutlined } from "@ant-design/icons";
+import { LockOutlined, UserOutlined } from "@ant-design/icons";
 import "antd/dist/reset.css";
 import HCserviceV3 from "../../tmpl/hcservice-v3";
 import { LocaleContext } from "../../locale/LocaleProvider";
@@ -28,11 +28,20 @@ class ResetPassword extends React.PureComponent {
                 loading: true,
             });
             const { pubkey } = this.state;
-            const { serverKey } = this.props;
-            let res = yield HCserviceV3.resetPassword(serverKey, values.oldPassword, values.newPassword, pubkey);
+            const { serverKey, showUserName } = this.props;
+            let res = null;
+            if (showUserName) {
+                res = yield HCserviceV3.resetPassword2(serverKey, values.userName, values.oldPassword, values.newPassword, pubkey);
+            }
+            else {
+                res = yield HCserviceV3.resetPassword(serverKey, values.oldPassword, values.newPassword, pubkey);
+            }
             if (res.status == "success") {
                 message.info(translate("${密码已重置,请重新登录}"));
                 HCserviceV3.logout();
+                this.setState({
+                    showPopover: false,
+                });
             }
             this.setState({
                 loading: false,
@@ -65,10 +74,15 @@ class ResetPassword extends React.PureComponent {
         };
         this.getForm = () => {
             const { loading } = this.state;
+            const { showUserName } = this.props;
             const { translate } = this.context;
             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 },
+                        showUserName ? React.createElement(Form.Item, { label: translate("${用户名}"), name: "userName", rules: [
+                                { required: true, message: translate("${请输入}${用户名}") },
+                            ] },
+                            React.createElement(Input, { placeholder: translate("${用户名}"), prefix: React.createElement(UserOutlined, { className: "site-form-item-icon" }) })) : "",
                         React.createElement(Form.Item, { label: translate("${原密码}"), name: "oldPassword", rules: [
                                 { required: true, message: translate("${请输入}${原密码}") },
                             ] },

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

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

package/lib/login/login.d.ts

@@ -9,8 +9,6 @@ interface LoginProps {
     autoSaveUser?: boolean;
 }
 interface LoginState {
-    username?: string;
-    password?: string;
     loading?: boolean;
     needKaptcha?: boolean;
     kaptchaImg?: string;
@@ -21,8 +19,6 @@ interface LoginState {
 }
 declare class Login extends React.PureComponent<LoginProps, LoginState> {
     state: {
-        username: string;
-        password: string;
         loading: boolean;
         needKaptcha: boolean;
         kaptchaImg: any;

package/lib/login/login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/login/login.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAC3C,OAAO,aAAa,CAAC;AACrB,OAAO,EAAgC,YAAY,EAAC,MAAM,MAAM,CAAC;AAOjE,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAKvD,UAAU,UAAU;IAChB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,UAAU,UAAU;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,OAAO,CAAC;CAC7B;AAED,cAAM,KAAM,SAAQ,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC;IAC3D,KAAK;;;;;;;;;;MAUH;IACF,OAAO,qCAAmC;IAC1C,MAAM,CAAC,WAAW;;;;;;;;OAAiB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAEjD,iBAAiB,sBAWf;IAEF,eAAe,sBAgBb;IAEF,YAAY,sBAiCV;IAEF,aAAa,uBASX;IAEF,aAAa,gCAGX;IAEF,MAAM;CA0HT;AAED,eAAe,KAAK,CAAC"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/login/login.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAC3C,OAAO,aAAa,CAAC;AACrB,OAAO,EAAgC,YAAY,EAAC,MAAM,MAAM,CAAC;AAOjE,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAKvD,UAAU,UAAU;IAChB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,UAAU,UAAU;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,OAAO,CAAC;CAC7B;AAED,cAAM,KAAM,SAAQ,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC;IAC3D,KAAK;;;;;;;;MAQH;IACF,OAAO,qCAAmC;IAC1C,MAAM,CAAC,WAAW;;;;;;;;OAAiB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAEjD,iBAAiB,sBAWf;IAEF,eAAe,sBAgBb;IAEF,YAAY,sBAiCV;IAEF,aAAa,uBASX;IAEF,aAAa,gCAGX;IAEF,MAAM;CA0HT;AAED,eAAe,KAAK,CAAC"}

package/lib/login/login.js

@@ -20,8 +20,6 @@ class Login extends React.PureComponent {
     constructor() {
         super(...arguments);
         this.state = {
-            username: "",
-            password: "",
             loading: true,
             needKaptcha: false,
             kaptchaImg: null,
@@ -141,7 +139,7 @@ class Login extends React.PureComponent {
                 React.createElement(Form.Item, { style: { marginBottom: 0 } },
                     React.createElement(Row, { gutter: 8 },
                         React.createElement(Col, { span: 6, offset: 18 },
-                            React.createElement(ResetPassword, null))))),
+                            React.createElement(ResetPassword, { showUserName: true }))))),
             showSlideVertify ? (React.createElement("div", { style: { width: "100%", height: "100%", background: "white" } },
                 React.createElement(Vertify, { onSuccess: () => this.setState({ vertify: true, showSlideVertify: false }, () => this.handleSubmit()), onFail: () => this.setState({ vertify: false, showSlideVertify: true }) }))) : (React.createElement(React.Fragment, null))));
     }

package/lib/login/login.js.map

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

package/lib/login2/LoginPage.js

@@ -42,7 +42,7 @@ const LoginPage = () => {
                 } }),
             React.createElement(Row, null,
                 React.createElement(Col, { span: 6, offset: 18 },
-                    React.createElement(ResetPassword, null))))));
+                    React.createElement(ResetPassword, { showUserName: true }))))));
 };
 export default LoginPage;
 //# sourceMappingURL=LoginPage.js.map

package/lib/login2/LoginPage.js.map

@@ -1 +1 @@
-{"version":3,"file":"LoginPage.js","sourceRoot":"","sources":["../../../../src/aldehyde/login2/LoginPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,UAAU,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAClD,OAAO,KAAK,MAAM,UAAU,CAAC;AAC7B,OAAO,EAAS,GAAG,EAAE,GAAG,EAAC,MAAM,MAAM,CAAC;AACtC,OAAO,aAAa,MAAM,+BAA+B,CAAC;AAE1D,MAAM,SAAS,GAAG,GAAG,EAAE;IACrB,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAElC,OAAO,CACL,6BACE,KAAK,EAAE;YACL,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,MAAM;YACd,sBAAsB;YACtB,QAAQ,EAAE,UAAU;YACpB,UAAU,EAAE,OAAO,UAAU,GAAG;YAChC,cAAc,EAAE,OAAO;YACvB,OAAO,EAAE,MAAM;YACf,aAAa,EAAE,aAAa;YAC5B,cAAc,EAAE,YAAY;YAC5B,UAAU,EAAE,QAAQ;SACrB;QAED,6BACE,KAAK,EAAE;gBACL,KAAK,EAAE,OAAO;gBACd,mBAAmB;gBACnB,UAAU,EAAE,6CAA6C;gBACzD,SAAS,EAAE,oCAAoC;gBAC/C,WAAW,EAAE,KAAK;gBAClB,OAAO,EAAE,MAAM;gBACf,WAAW,EAAE,KAAK;aACnB;YAED,6BACE,KAAK,EAAE;oBACL,UAAU,EAAE,GAAG;oBACf,QAAQ,EAAE,MAAM;oBAChB,KAAK,EAAE,SAAS;oBAChB,YAAY,EAAE,EAAE;iBACjB,IAEA,SAAS,CAAC,QAAQ,CAAC,CAChB;YACN,oBAAC,KAAK,IACJ,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;oBAClB,YAAY,CAAC,KAAK,EAAE,CAAC;oBACrB,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC;oBAC7B,KAAK,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;gBACnC,CAAC,GACM;YACP,oBAAC,GAAG;gBACA,oBAAC,GAAG,IAAC,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE;oBAAE,oBAAC,aAAa,OAAiB,CAAM,CAC7D,CACJ,CACF,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"LoginPage.js","sourceRoot":"","sources":["../../../../src/aldehyde/login2/LoginPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,UAAU,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAClD,OAAO,KAAK,MAAM,UAAU,CAAC;AAC7B,OAAO,EAAS,GAAG,EAAE,GAAG,EAAC,MAAM,MAAM,CAAC;AACtC,OAAO,aAAa,MAAM,+BAA+B,CAAC;AAE1D,MAAM,SAAS,GAAG,GAAG,EAAE;IACrB,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAElC,OAAO,CACL,6BACE,KAAK,EAAE;YACL,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,MAAM;YACd,sBAAsB;YACtB,QAAQ,EAAE,UAAU;YACpB,UAAU,EAAE,OAAO,UAAU,GAAG;YAChC,cAAc,EAAE,OAAO;YACvB,OAAO,EAAE,MAAM;YACf,aAAa,EAAE,aAAa;YAC5B,cAAc,EAAE,YAAY;YAC5B,UAAU,EAAE,QAAQ;SACrB;QAED,6BACE,KAAK,EAAE;gBACL,KAAK,EAAE,OAAO;gBACd,mBAAmB;gBACnB,UAAU,EAAE,6CAA6C;gBACzD,SAAS,EAAE,oCAAoC;gBAC/C,WAAW,EAAE,KAAK;gBAClB,OAAO,EAAE,MAAM;gBACf,WAAW,EAAE,KAAK;aACnB;YAED,6BACE,KAAK,EAAE;oBACL,UAAU,EAAE,GAAG;oBACf,QAAQ,EAAE,MAAM;oBAChB,KAAK,EAAE,SAAS;oBAChB,YAAY,EAAE,EAAE;iBACjB,IAEA,SAAS,CAAC,QAAQ,CAAC,CAChB;YACN,oBAAC,KAAK,IACJ,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;oBAClB,YAAY,CAAC,KAAK,EAAE,CAAC;oBACrB,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC;oBAC7B,KAAK,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;gBACnC,CAAC,GACM;YACP,oBAAC,GAAG;gBACA,oBAAC,GAAG,IAAC,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE;oBAAE,oBAAC,aAAa,IAAC,YAAY,EAAE,IAAI,GAAkB,CAAM,CACjF,CACJ,CACF,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/lib/tmpl/hcservice-v3.d.ts

@@ -68,6 +68,7 @@ export default class HcserviceV3 {
     static logout(): Promise<void>;
     static logout2(): Promise<any>;
     static resetPassword(serverKey: string, oPassword: string, nPassword: string, pubkey: any): Promise<any>;
+    static resetPassword2(serverKey: string, userName: string, oPassword: string, nPassword: string, pubkey: any): Promise<any>;
     static getContextSourceConfig(): Promise<any>;
     static getContextSourceValue(): Promise<any>;
     static login(json: any, kaptchaToken: any, kaptchaText: any, pubkey: any, programCode?: string, serverKey?: string): Promise<{

package/lib/tmpl/hcservice-v3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hcservice-v3.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/hcservice-v3.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"hcservice-v3.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/hcservice-v3.tsx"],"names":[],"mappings":"AAKA,OAAO,iBAAiB,CAAC;AAKzB,OAAO,EACL,UAAU,EAAE,cAAc,EAC1B,WAAW,EACX,iBAAiB,EACjB,QAAQ,EACR,WAAW,EACZ,MAAM,aAAa,CAAC;AAQrB,MAAM,CAAC,OAAO,OAAO,WAAW;WACjB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,KAAA,EAAE,IAAI,EAAE,MAAM;IAQnE,MAAM,CAAC,YAAY,qBAQlB;IAED,MAAM,CAAE,UAAU,CAAC,KAAK,KAAA,EAAC,SAAS,KAAA;WA+BrB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,KAAA,EAAE,IAAI,KAAA;WAetD,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,KAAA;WAK1C,kBAAkB,CAC7B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM;WAYD,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;WAWtD,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;WAW1D,qBAAqB,CAChC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM;WAYN,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,KAAA;WAW/C,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;WAWtD,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,KAAA;WAWhD,oBAAoB,CAC/B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,KAAA;WAaC,oBAAoB,CAC/B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,SAAS,KAAA;WAYE,oBAAoB,CAC/B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,SAAS,KAAA;WAWE,0BAA0B,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,SAAS,KAAA;WAYE,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;WAW7C,0BAA0B,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,SAAS,KAAA,EACT,GAAG,KAAA;WAeQ,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,KAAA;WAqB9D,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,KAAA;WAc5D,uBAAuB,CAClC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,KAAA;WAeO,sBAAsB,CACjC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,KAAA,EACJ,SAAS,KAAA,EACT,GAAG,KAAA;WAwBQ,gBAAgB,CAC3B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,KAAA,EACJ,SAAS,KAAA;WAYE,YAAY,CACvB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,KAAA;WAYO,sBAAsB,CACjC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,KAAA,EACJ,SAAS,KAAA;WAYE,oBAAoB,CAC/B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,KAAA,EACJ,SAAS,KAAA;WAYE,0BAA0B,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,KAAA,EACR,IAAI,KAAA,EACJ,SAAS,KAAA;WAYE,mBAAmB,CAC9B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,WAAW,KAAA,EACX,OAAO,KAAA,EACP,GAAG,KAAA;;;;WA8CQ,aAAa,CACxB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,WAAW,KAAA,EACX,OAAO,KAAA;;;;WAYI,mBAAmB,CAC9B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,WAAW,KAAA,EACX,OAAO,KAAA;;;;IAYT,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,KAAA;WA0BhC,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,KAAA,EAAE,SAAS,KAAA;WAW7D,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,KAAA;WAiC7C,gBAAgB,CAC3B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ;IAWpB,MAAM,CAAC,sBAAsB,CAAC,YAAY,EAAE,WAAW,EAAE;WAqB5C,UAAU,CACrB,SAAS,EAAE,MAAM,EACjB,QAAQ,KAAA,EACR,YAAY,EAAE,WAAW,EAAE,EAC3B,QAAQ,CAAC,KAAA;WAME,YAAY,CACvB,SAAS,EAAE,MAAM,EACjB,QAAQ,KAAA,EACR,KAAK,EAAE,MAAM,EAAE,EACf,QAAQ,CAAC,KAAA;WAsBE,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;WAkBrD,WAAW,CACtB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,WAAW,EAAE,EAC3B,aAAa,CAAC,EAAE,MAAM;WAkCX,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,KAAK;WAe1D,qBAAqB,CAChC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,KAAA,EACR,KAAK,EAAE,MAAM,EAAE;WAcJ,MAAM,CACjB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,YAAY,CAAC,KAAA,EACb,WAAW,CAAC,KAAA;WA+BD,SAAS,CACpB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,UAAU,EACtB,SAAS,CAAC,EAAE,MAAM;IAkBpB,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,KAAA;IAYvC,MAAM,CAAC,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAKjC,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,KAAA,EAAE,OAAO,KAAA;IAOhD,MAAM,CAAC,eAAe,CAAC,IAAI,KAAA;IAS3B,MAAM,CAAC,iBAAiB,CAAC,QAAQ,KAAA;IAYjC,MAAM,CAAC,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA,EAAE,OAAO,KAAA;IAK1C,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,KAAA;WAuB5B,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,KAAA;WA2BnC,aAAa,CACxB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,iBAAiB,CAAC;WAahB,qBAAqB;WAUrB,gBAAgB,CAAC,QAAQ,EAAE,MAAM;WAWjC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;WAc/C,MAAM;WASN,OAAO;WAOP,aAAa,CACxB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,MAAM,KAAA;WAiBK,cAAc,CACvB,SAAS,EAAE,MAAM,EAAC,QAAQ,EAAC,MAAM,EACjC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,MAAM,KAAA;WAkBG,sBAAsB;WAYtB,qBAAqB;WAQrB,KAAK,CAChB,IAAI,KAAA,EACJ,YAAY,KAAA,EACZ,WAAW,KAAA,EACX,MAAM,KAAA,EACN,WAAW,CAAC,EAAE,MAAM,EACpB,SAAS,CAAC,EAAE,MAAM;;;;WAgCP,UAAU,CAAC,IAAI,KAAA;WAkBf,eAAe,CAAC,WAAW,CAAC,EAAE,MAAM;WAapC,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;WAcrD,OAAO,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM;WA0BvD,eAAe;WASf,MAAM;WASN,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM;WAW7B,SAAS,CAAC,IAAI,KAAA,EAAE,SAAS,CAAC,EAAE,MAAM;WAWlC,iBAAiB,CAAC,iBAAiB,KAAA;CA6CjD"}

package/lib/tmpl/hcservice-v3.js

@@ -822,6 +822,23 @@ class HcserviceV3 {
             return res;
         });
     }
+    static resetPassword2(serverKey, userName, oPassword, nPassword, pubkey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let oldPassword = EncryptUtils.rsaEncrypt(oPassword, pubkey);
+            let newPassword = EncryptUtils.rsaEncrypt(nPassword, pubkey);
+            let res = yield Super.super({
+                url: "/v3/auth/password2",
+                serverKey,
+                query: {
+                    userName,
+                    oldPassword,
+                    newPassword,
+                },
+                method: "POST",
+            });
+            return res;
+        });
+    }
     static getContextSourceConfig() {
         return __awaiter(this, void 0, void 0, function* () {
             let res = yield Super.super({

package/lib/tmpl/hcservice-v3.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aldehyde",
-  "version": "0.2.196",
+  "version": "0.2.197",
   "author": "cosmicparticle",
   "main": "lib/index.js",
   "module": "src/aldehyde/index.txs",

package/src/aldehyde/layout/MainPage.tsx

@@ -280,7 +280,6 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
             <Sider
               theme={"light"}
               style={{
-                // background: '#0f4da1',
                 overflow: "auto",
                 height: "100vh",
                 position: "fixed",

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

@@ -9,13 +9,14 @@ import {
   Row,
   FormInstance,
 } from "antd";
-import { LockOutlined } from "@ant-design/icons";
+import {LockOutlined, UserOutlined} from "@ant-design/icons";
 import "antd/dist/reset.css";
 import HCserviceV3 from "../../tmpl/hcservice-v3";
 import { LocaleContext } from "../../locale/LocaleProvider";
 
 interface ResetPasswordProps {
   serverKey?: string;
+  showUserName?:boolean;
 }
 
 interface ResetPasswordState {
@@ -53,17 +54,31 @@ class ResetPassword extends React.PureComponent<
     });
     const { pubkey } = this.state;
 
-    const { serverKey } = this.props;
+    const { serverKey,showUserName } = this.props;
+
+    let res =null;
+    if(showUserName){
+      res=await HCserviceV3.resetPassword2(
+          serverKey,values.userName,
+          values.oldPassword,
+          values.newPassword,
+          pubkey
+      );
+    }else{
+      res=await HCserviceV3.resetPassword(
+          serverKey,
+          values.oldPassword,
+          values.newPassword,
+          pubkey
+      );
+    }
 
-    let res = await HCserviceV3.resetPassword(
-      serverKey,
-      values.oldPassword,
-      values.newPassword,
-      pubkey
-    );
     if (res.status == "success") {
       message.info(translate("${密码已重置,请重新登录}"));
       HCserviceV3.logout();
+      this.setState({
+        showPopover: false,
+      });
     }
 
     this.setState({
@@ -98,6 +113,7 @@ class ResetPassword extends React.PureComponent<
 
   getForm = () => {
     const { loading } = this.state;
+    const {showUserName}=this.props;
     const { translate } = this.context;
     return (
       <Row justify="center" align="middle">
@@ -109,6 +125,18 @@ class ResetPassword extends React.PureComponent<
             className="login-form"
             onFinish={this.handleSubmit}
           >
+            {showUserName? <Form.Item
+                label={translate("${用户名}")}
+                name="userName"
+                rules={[
+                  { required: true, message: translate("${请输入}${用户名}") },
+                ]}
+            >
+              <Input
+                  placeholder={translate("${用户名}")}
+                  prefix={<UserOutlined className="site-form-item-icon" />}
+              />
+            </Form.Item>:""}
             <Form.Item
               label={translate("${原密码}")}
               name="oldPassword"

package/src/aldehyde/login/login.tsx

@@ -20,8 +20,6 @@ interface LoginProps {
 }
 
 interface LoginState {
-    username?: string;
-    password?: string;
     loading?: boolean;
     needKaptcha?: boolean;
     kaptchaImg?: string;
@@ -33,8 +31,6 @@ interface LoginState {
 
 class Login extends React.PureComponent<LoginProps, LoginState> {
     state = {
-        username: "",
-        password: "",
         loading: true,
         needKaptcha: false,
         kaptchaImg: null,
@@ -227,7 +223,7 @@ class Login extends React.PureComponent<LoginProps, LoginState> {
                         </Form.Item>
                         <Form.Item style={{marginBottom:0}}>
                             <Row gutter={8}>
-                                <Col span={6} offset={18}><ResetPassword></ResetPassword></Col>
+                                <Col span={6} offset={18}><ResetPassword showUserName={true}></ResetPassword></Col>
                             </Row>
                         </Form.Item>
                     </Form>

package/src/aldehyde/login2/LoginPage.tsx

@@ -54,7 +54,7 @@ const LoginPage = () => {
           }}
         ></Login>
           <Row>
-              <Col span={6} offset={18}><ResetPassword></ResetPassword></Col>
+              <Col span={6} offset={18}><ResetPassword showUserName={true}></ResetPassword></Col>
           </Row>
       </div>
     </div>

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -987,6 +987,28 @@ export default class HcserviceV3 {
     return res;
   }
 
+  static async resetPassword2(
+      serverKey: string,userName:string,
+      oPassword: string,
+      nPassword: string,
+      pubkey
+  ) {
+    let oldPassword = EncryptUtils.rsaEncrypt(oPassword, pubkey);
+    let newPassword = EncryptUtils.rsaEncrypt(nPassword, pubkey);
+    let res = await Super.super({
+      url: "/v3/auth/password2",
+      serverKey,
+      query: {
+        userName,
+        oldPassword,
+        newPassword,
+      },
+      method: "POST",
+    });
+
+    return res;
+  }
+
   static async getContextSourceConfig() {
     let res = await Super.super({
       url: "/v3/context-source-config",