aldehyde 0.2.480 → 0.2.481

package/src/aldehyde/layout/menu/message-bar.less

@@ -1,74 +1,74 @@
-.ripple-dot .ant-badge-count {
-    overflow: revert;
-    box-shadow: none;
-    padding: 0 4px;
-
-    .ant-scroll-number-only {
-        display: flex;
-        align-items: center;
-        height: 100%;
-    }
-
-    .ant-scroll-number-only-unit {
-        display: block;
-        height: 100%;
-        line-height: 12px;
-    }
-
-    bdi {
-        display: flex;
-    }
-}
-
-.ripple-dot .ant-badge-count::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    border-radius: 50%;
-    background: radial-gradient(circle,
-            var(--ant-color-error-hover) 0%,
-            var(--ant-color-error-hover) 30%,
-            transparent 70%);
-    transform: scale(1);
-    opacity: 1;
-    animation: ping 1s cubic-bezier(0.1, 0.8, 0.2, 1) infinite;
-    will-change: transform, opacity;
-    z-index: -1;
-}
-
-.ripple-dot .ant-badge-count::after {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    border-radius: 50%;
-    background: radial-gradient(circle,
-            var(--ant-color-error-hover) 0%,
-            transparent 50%);
-    transform: scale(1);
-    opacity: 0.8;
-    animation: ping 1s 0.5s cubic-bezier(0.1, 0.8, 0.2, 1) infinite;
-    will-change: transform, opacity;
-    z-index: -1;
-}
-
-@keyframes ping {
-    0% {
-        transform: scale(1);
-        opacity: 0.9;
-    }
-
-    70% {
-        opacity: 0.6;
-    }
-
-    100% {
-        transform: scale(2.4);
-        opacity: 0.2;
-    }
+.ripple-dot .ant-badge-count {
+    overflow: revert;
+    box-shadow: none;
+    padding: 0 4px;
+
+    .ant-scroll-number-only {
+        display: flex;
+        align-items: center;
+        height: 100%;
+    }
+
+    .ant-scroll-number-only-unit {
+        display: block;
+        height: 100%;
+        line-height: 12px;
+    }
+
+    bdi {
+        display: flex;
+    }
+}
+
+.ripple-dot .ant-badge-count::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    background: radial-gradient(circle,
+            var(--ant-color-error-hover) 0%,
+            var(--ant-color-error-hover) 30%,
+            transparent 70%);
+    transform: scale(1);
+    opacity: 1;
+    animation: ping 1s cubic-bezier(0.1, 0.8, 0.2, 1) infinite;
+    will-change: transform, opacity;
+    z-index: -1;
+}
+
+.ripple-dot .ant-badge-count::after {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    background: radial-gradient(circle,
+            var(--ant-color-error-hover) 0%,
+            transparent 50%);
+    transform: scale(1);
+    opacity: 0.8;
+    animation: ping 1s 0.5s cubic-bezier(0.1, 0.8, 0.2, 1) infinite;
+    will-change: transform, opacity;
+    z-index: -1;
+}
+
+@keyframes ping {
+    0% {
+        transform: scale(1);
+        opacity: 0.9;
+    }
+
+    70% {
+        opacity: 0.6;
+    }
+
+    100% {
+        transform: scale(2.4);
+        opacity: 0.2;
+    }
 }

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

@@ -1,255 +1,255 @@
-import React from "react";
-import {
-  message,
-  Button,
-  Popover,
-  Col,
-  Form,
-  Input,
-  Row,
-  FormInstance,
-} from "antd";
-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 {
-  showPopover?: boolean;
-  pubkey?: string;
-  loading?: boolean;
-}
-
-class ResetPassword extends React.PureComponent<
-  ResetPasswordProps,
-  ResetPasswordState
-> {
-  state = {
-    showPopover: false,
-    pubkey: undefined,
-    loading: false,
-  };
-  formRef = React.createRef<FormInstance>();
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  async componentDidMount() {
-    const { serverKey } = this.props;
-    let pubkey = await HCserviceV3.getRasPubkey(serverKey);
-    this.setState({
-      pubkey,
-    });
-  }
-
-  handleSubmit = async (values) => {
-    const { translate } = this.context;
-
-    this.setState({
-      loading: true,
-    });
-    const { pubkey } = this.state;
-
-    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
-      );
-    }
-
-    if (res.status == "success") {
-      message.info(translate("${密码已重置,请重新登录}"));
-      HCserviceV3.logout();
-      this.setState({
-        showPopover: false,
-      });
-    }
-
-    this.setState({
-      loading: false,
-    });
-  };
-
-  handleBlurCapture = () => {
-    const { translate } = this.context;
-    //判断新密码和确认密码相同
-    //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: [translate("${两次密码输入不一致}!")],
-        },
-      ]);
-    } else {
-      this.formRef.current.setFields([
-        {
-          name: "reNewPassword",
-          value: reNewPassword,
-          errors: [],
-        },
-      ]);
-    }
-  };
-
-  getForm = () => {
-    const { loading } = this.state;
-    const {showUserName}=this.props;
-    const { translate } = this.context;
-    return (
-      <Row justify="center" align="middle">
-        <Col>
-          <Form
-            style={{ width: 350 }}
-            ref={this.formRef}
-            name="normal_login"
-            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"
-              rules={[
-                { required: true, message: translate("${请输入}${原密码}") },
-              ]}
-            >
-              <Input.Password
-                placeholder={translate("${密码}")}
-                prefix={<LockOutlined className="site-form-item-icon" />}
-              />
-            </Form.Item>
-            <Form.Item
-              label={translate("${新设密码}")}
-              name="newPassword"
-              rules={[
-                { required: true, message: translate("${请输入}${新密码}!") },
-              ]}
-            >
-              <Input.Password
-                placeholder={translate("${新设密码}")}
-                onBlurCapture={this.handleBlurCapture}
-                prefix={<LockOutlined className="site-form-item-icon" />}
-              />
-            </Form.Item>
-            <Form.Item
-              label={translate("${确认密码}")}
-              name="reNewPassword"
-              rules={[
-                { required: true, message: translate("${请输入}${确认密码}") },
-                ({ getFieldValue }) => ({
-                  validator(_, value) {
-                    if (!value || getFieldValue("newPassword") === value) {
-                      return Promise.resolve();
-                    }
-                    return Promise.reject(
-                      new Error(translate("${两次密码输入不一致}!"))
-                    );
-                  },
-                }),
-              ]}
-            >
-              <Input.Password
-                placeholder={translate("${确认密码}")}
-                //onBlurCapture={this.handleBlurCapture}
-                prefix={<LockOutlined className="site-form-item-icon" />}
-              />
-            </Form.Item>
-
-            <Form.Item>
-              <Row align="middle" gutter={32}>
-                <Col span={12}>
-                  {/*<Space style={{alignContent:"right"}} key={3} size={[8, 16]}>*/}
-                  {/*    <Button type="primary">确定</Button>*/}
-                  {/*    <Button >取消</Button>*/}
-                  {/*</Space>*/}
-                  <Button
-                    style={{ width: "100%" }}
-                    type="primary"
-                    loading={loading}
-                    onClick={() => this.formRef.current.submit()}
-                  >
-                    {translate("${确定}")}
-                  </Button>
-                </Col>
-                <Col span={12}>
-                  <Button
-                    style={{ width: "100%" }}
-                    onClick={() => {
-                      this.setState({
-                        showPopover: false,
-                      });
-                    }}
-                  >
-                    {translate("${取消}")}
-                  </Button>
-                </Col>
-              </Row>
-            </Form.Item>
-          </Form>
-        </Col>
-      </Row>
-    );
-  };
-
-  render() {
-    const { showPopover, loading } = this.state;
-    const { translate } = this.context;
-    return (
-      <>
-        <Popover
-          destroyTooltipOnHide={true}
-          open={showPopover}
-          overlayStyle={{ maxWidth: "400px" }}
-          title={translate("${修改密码}")}
-          placement="leftBottom"
-          trigger="click"
-          content={this.getForm()}
-        >
-          <Button type={"link"}
-            onClick={() => {
-              this.setState({
-                showPopover: !showPopover,
-              });
-            }}
-          >
-           {translate("${修改密码}")}
-          </Button>
-          {/*<KeyOutlined />*/}
-        </Popover>
-      </>
-    );
-  }
-}
-
-export default ResetPassword;
+import React from "react";
+import {
+  message,
+  Button,
+  Popover,
+  Col,
+  Form,
+  Input,
+  Row,
+  FormInstance,
+} from "antd";
+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 {
+  showPopover?: boolean;
+  pubkey?: string;
+  loading?: boolean;
+}
+
+class ResetPassword extends React.PureComponent<
+  ResetPasswordProps,
+  ResetPasswordState
+> {
+  state = {
+    showPopover: false,
+    pubkey: undefined,
+    loading: false,
+  };
+  formRef = React.createRef<FormInstance>();
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  async componentDidMount() {
+    const { serverKey } = this.props;
+    let pubkey = await HCserviceV3.getRasPubkey(serverKey);
+    this.setState({
+      pubkey,
+    });
+  }
+
+  handleSubmit = async (values) => {
+    const { translate } = this.context;
+
+    this.setState({
+      loading: true,
+    });
+    const { pubkey } = this.state;
+
+    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
+      );
+    }
+
+    if (res.status == "success") {
+      message.info(translate("${密码已重置,请重新登录}"));
+      HCserviceV3.logout();
+      this.setState({
+        showPopover: false,
+      });
+    }
+
+    this.setState({
+      loading: false,
+    });
+  };
+
+  handleBlurCapture = () => {
+    const { translate } = this.context;
+    //判断新密码和确认密码相同
+    //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: [translate("${两次密码输入不一致}!")],
+        },
+      ]);
+    } else {
+      this.formRef.current.setFields([
+        {
+          name: "reNewPassword",
+          value: reNewPassword,
+          errors: [],
+        },
+      ]);
+    }
+  };
+
+  getForm = () => {
+    const { loading } = this.state;
+    const {showUserName}=this.props;
+    const { translate } = this.context;
+    return (
+      <Row justify="center" align="middle">
+        <Col>
+          <Form
+            style={{ width: 350 }}
+            ref={this.formRef}
+            name="normal_login"
+            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"
+              rules={[
+                { required: true, message: translate("${请输入}${原密码}") },
+              ]}
+            >
+              <Input.Password
+                placeholder={translate("${密码}")}
+                prefix={<LockOutlined className="site-form-item-icon" />}
+              />
+            </Form.Item>
+            <Form.Item
+              label={translate("${新设密码}")}
+              name="newPassword"
+              rules={[
+                { required: true, message: translate("${请输入}${新密码}!") },
+              ]}
+            >
+              <Input.Password
+                placeholder={translate("${新设密码}")}
+                onBlurCapture={this.handleBlurCapture}
+                prefix={<LockOutlined className="site-form-item-icon" />}
+              />
+            </Form.Item>
+            <Form.Item
+              label={translate("${确认密码}")}
+              name="reNewPassword"
+              rules={[
+                { required: true, message: translate("${请输入}${确认密码}") },
+                ({ getFieldValue }) => ({
+                  validator(_, value) {
+                    if (!value || getFieldValue("newPassword") === value) {
+                      return Promise.resolve();
+                    }
+                    return Promise.reject(
+                      new Error(translate("${两次密码输入不一致}!"))
+                    );
+                  },
+                }),
+              ]}
+            >
+              <Input.Password
+                placeholder={translate("${确认密码}")}
+                //onBlurCapture={this.handleBlurCapture}
+                prefix={<LockOutlined className="site-form-item-icon" />}
+              />
+            </Form.Item>
+
+            <Form.Item>
+              <Row align="middle" gutter={32}>
+                <Col span={12}>
+                  {/*<Space style={{alignContent:"right"}} key={3} size={[8, 16]}>*/}
+                  {/*    <Button type="primary">确定</Button>*/}
+                  {/*    <Button >取消</Button>*/}
+                  {/*</Space>*/}
+                  <Button
+                    style={{ width: "100%" }}
+                    type="primary"
+                    loading={loading}
+                    onClick={() => this.formRef.current.submit()}
+                  >
+                    {translate("${确定}")}
+                  </Button>
+                </Col>
+                <Col span={12}>
+                  <Button
+                    style={{ width: "100%" }}
+                    onClick={() => {
+                      this.setState({
+                        showPopover: false,
+                      });
+                    }}
+                  >
+                    {translate("${取消}")}
+                  </Button>
+                </Col>
+              </Row>
+            </Form.Item>
+          </Form>
+        </Col>
+      </Row>
+    );
+  };
+
+  render() {
+    const { showPopover, loading } = this.state;
+    const { translate } = this.context;
+    return (
+      <>
+        <Popover
+          destroyTooltipOnHide={true}
+          open={showPopover}
+          overlayStyle={{ maxWidth: "400px" }}
+          title={translate("${修改密码}")}
+          placement="leftBottom"
+          trigger="click"
+          content={this.getForm()}
+        >
+          <Button type={"link"}
+            onClick={() => {
+              this.setState({
+                showPopover: !showPopover,
+              });
+            }}
+          >
+           {translate("${修改密码}")}
+          </Button>
+          {/*<KeyOutlined />*/}
+        </Popover>
+      </>
+    );
+  }
+}
+
+export default ResetPassword;