aldehyde 0.2.194 → 0.2.195

package/src/aldehyde/login/login.tsx

@@ -1,248 +1,256 @@
-import React, { CSSProperties } from "react";
+import React, {CSSProperties} from "react";
 import "./index.css";
-import { Button, Col, Form, Input, Row, FormInstance } from "antd";
+import {Button, Col, Form, Input, Row, FormInstance} from "antd";
 import {
-  LockOutlined,
-  SafetyCertificateOutlined,
-  UserOutlined,
+    LockOutlined,
+    SafetyCertificateOutlined,
+    UserOutlined,
 } from "@ant-design/icons";
 import HCserviceV3 from "../tmpl/hcservice-v3";
-import { LocaleContext } from "../locale/LocaleProvider";
+import {LocaleContext} from "../locale/LocaleProvider";
 import Vertify from "./vertify/index";
 import Units from "../units";
+import ResetPassword from "../layout/menu/reset-password";
 
 interface LoginProps {
-  onFinish: (token: string) => void;
-  title?: any;
-  programCode?: string;
-  autoSaveUser?: boolean;
+    onFinish: (token: string) => void;
+    title?: any;
+    programCode?: string;
+    autoSaveUser?: boolean;
 }
 
 interface LoginState {
-  username?: string;
-  password?: string;
-  loading?: boolean;
-  needKaptcha?: boolean;
-  kaptchaImg?: string;
-  kaptchaToken?: string;
-  pubkey?: string;
-  vertify: boolean;
-  showSlideVertify: boolean;
+    username?: string;
+    password?: string;
+    loading?: boolean;
+    needKaptcha?: boolean;
+    kaptchaImg?: string;
+    kaptchaToken?: string;
+    pubkey?: string;
+    vertify: boolean;
+    showSlideVertify: boolean;
 }
 
 class Login extends React.PureComponent<LoginProps, LoginState> {
-  state = {
-    username: "",
-    password: "",
-    loading: true,
-    needKaptcha: false,
-    kaptchaImg: null,
-    kaptchaToken: null,
-    pubkey: undefined,
-    vertify: false,
-    showSlideVertify: false,
-  };
-  formRef = React.createRef<FormInstance>();
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  componentDidMount = async () => {
-    const { programCode } = this.props;
-    localStorage.setItem("version", "v1");
-
-    if (programCode) Units.setProgramCode(programCode);
-    window.removeEventListener("keydown", this.handleKeyDown);
-    let pubkey = await HCserviceV3.getRasPubkey(null, programCode);
-    this.setState({
-      pubkey,
-      loading: false,
-    });
-  };
-
-  getKaptchaToken = async () => {
-    const { programCode } = this.props;
-    let res = await HCserviceV3.getKaptchaToken(programCode);
-    if (res) {
-      let kaptchaImg;
-      if (res.img && res.img.indexOf("data:") == 0) {
-        kaptchaImg = res.img;
-      } else {
-        kaptchaImg = `data:image/png;base64,${res.img}`;
-      }
-      this.setState({
-        kaptchaImg,
-        kaptchaToken: res.kaptchaToken,
-        needKaptcha: true,
-      });
-    }
-  };
-
-  handleSubmit = async () => {
-    this.setState({
-      loading: true,
-    });
-    let { kaptchaToken, pubkey, needKaptcha, vertify } = this.state;
-
-    await this.formRef.current
-      .validateFields()
-      .then(async (values) => {
-        // if (needKaptcha && !vertify)
-        //   return this.setState({ showSlideVertify: false });
-
-        const { programCode } = this.props;
-        let json = { username: values.username, password: values.password };
-        let res = await HCserviceV3.login(
-          json,
-          kaptchaToken,
-          values.kaptchaText,
-          pubkey,
-          programCode
-        );
-        if (res.status === "success") {
-          this.props.onFinish(res.token);
-        } else if (res.status === "error") {
-          this.setState({ needKaptcha: true, vertify: false });
-          await this.getKaptchaToken();
+    state = {
+        username: "",
+        password: "",
+        loading: true,
+        needKaptcha: false,
+        kaptchaImg: null,
+        kaptchaToken: null,
+        pubkey: undefined,
+        vertify: false,
+        showSlideVertify: false,
+    };
+    formRef = React.createRef<FormInstance>();
+    static contextType = LocaleContext;
+    context: React.ContextType<typeof LocaleContext>;
+
+    componentDidMount = async () => {
+        const {programCode} = this.props;
+        localStorage.setItem("version", "v1");
+
+        if (programCode) Units.setProgramCode(programCode);
+        window.removeEventListener("keydown", this.handleKeyDown);
+        let pubkey = await HCserviceV3.getRasPubkey(null, programCode);
+        this.setState({
+            pubkey,
+            loading: false,
+        });
+    };
+
+    getKaptchaToken = async () => {
+        const {programCode} = this.props;
+        let res = await HCserviceV3.getKaptchaToken(programCode);
+        if (res) {
+            let kaptchaImg;
+            if (res.img && res.img.indexOf("data:") == 0) {
+                kaptchaImg = res.img;
+            } else {
+                kaptchaImg = `data:image/png;base64,${res.img}`;
+            }
+            this.setState({
+                kaptchaImg,
+                kaptchaToken: res.kaptchaToken,
+                needKaptcha: true,
+            });
+        }
+    };
+
+    handleSubmit = async () => {
+        this.setState({
+            loading: true,
+        });
+        let {kaptchaToken, pubkey, needKaptcha, vertify} = this.state;
+
+        await this.formRef.current
+            .validateFields()
+            .then(async (values) => {
+                // if (needKaptcha && !vertify)
+                //   return this.setState({ showSlideVertify: false });
+
+                const {programCode} = this.props;
+                let json = {username: values.username, password: values.password};
+                let res = await HCserviceV3.login(
+                    json,
+                    kaptchaToken,
+                    values.kaptchaText,
+                    pubkey,
+                    programCode
+                );
+                if (res.status === "success") {
+                    this.props.onFinish(res.token);
+                } else if (res.status === "error") {
+                    this.setState({needKaptcha: true, vertify: false});
+                    await this.getKaptchaToken();
+                }
+            })
+            .catch((errorInfo) => {
+            });
+        this.setState({
+            loading: false,
+        });
+    };
+
+    handleKeyDown = (event) => {
+        //按下enter键，触发login事件
+        switch (event.keyCode) {
+            case 13:
+                this.handleSubmit();
+                break;
+            default:
+                break;
         }
-      })
-      .catch((errorInfo) => {});
-    this.setState({
-      loading: false,
-    });
-  };
-
-  handleKeyDown = (event) => {
-    //按下enter键，触发login事件
-    switch (event.keyCode) {
-      case 13:
-        this.handleSubmit();
-        break;
-      default:
-        break;
+    };
+
+    changeKaptcha = async (event) => {
+        //切换验证码
+        await this.getKaptchaToken();
+    };
+
+    render() {
+        const {loading, needKaptcha, kaptchaImg, showSlideVertify} = this.state;
+
+        const {autoSaveUser = true} = this.props;
+
+        const {translate} = this.context;
+        return (
+            <>
+                    <Form
+                        style={{width: 350}}
+                        ref={this.formRef}
+                        name="normal_login"
+                        initialValues={{remember: true}}
+                    >
+                        {this.props.title}
+                        <Form.Item
+                            name="username"
+                            rules={[
+                                {required: true, message: translate("${请输入}${用户名}!")},
+                                {
+                                    max: 30,
+                                    min: 0,
+                                    message: translate("${请输入}${0-30个字符}!"),
+                                },
+                            ]}
+                        >
+                            <Input
+                                prefix={<UserOutlined className="site-form-item-icon"/>}
+                                placeholder={translate("${用户名}")}
+                                autoComplete={autoSaveUser ? "on" : "off"}
+                            />
+                        </Form.Item>
+                        <Form.Item
+                            name="password"
+                            rules={[
+                                {required: true, message: translate("${请输入}${密码}!")},
+                            ]}
+                        >
+                            <Input
+                                style={
+                                    autoSaveUser
+                                        ? {}
+                                        : ({"-webkit-text-security": "disc"} as CSSProperties)
+                                }
+                                type={autoSaveUser ? "password" : "text"}
+                                placeholder={translate("${密码}")}
+                                onKeyDown={this.handleKeyDown}
+                                autoComplete={autoSaveUser ? "on" : "off"}
+                                prefix={<LockOutlined className="site-form-item-icon"/>}
+                            />
+                        </Form.Item>
+                        {needKaptcha ? (
+                            <Row gutter={8}>
+                                <Col span={12}>
+                                    <Form.Item
+                                        name="kaptchaText"
+                                        rules={[
+                                            {
+                                                required: true,
+                                                message: translate("${请输入}${验证码}!"),
+                                            },
+                                        ]}
+                                    >
+                                        <Input
+                                            prefix={
+                                                <SafetyCertificateOutlined className="site-form-item-icon"/>
+                                            }
+                                            placeholder={translate("${验证码}")}
+                                            onKeyDown={this.handleKeyDown}
+                                        />
+                                    </Form.Item>
+                                </Col>
+                                <Col span={12}>
+                                    <img
+                                        style={{cursor: "pointer"}}
+                                        height={30}
+                                        width={90}
+                                        title={translate("${点击刷新}")}
+                                        onClick={this.changeKaptcha}
+                                        src={kaptchaImg}
+                                    ></img>
+                                </Col>
+                            </Row>
+                        ) : (
+                            ""
+                        )}
+                        <Form.Item>
+                            <Button
+                                type="primary"
+                                style={{width: "100%"}}
+                                loading={loading}
+                                onClick={this.handleSubmit}
+                            >
+                                {translate("${登录}")}
+                            </Button>
+                        </Form.Item>
+                        <Form.Item style={{marginBottom:0}}>
+                            <Row gutter={8}>
+                                <Col span={6} offset={18}><ResetPassword></ResetPassword></Col>
+                            </Row>
+                        </Form.Item>
+                    </Form>
+
+                {showSlideVertify ? (
+                    <div style={{width: "100%", height: "100%", background: "white"}}>
+                        <Vertify
+                            onSuccess={() =>
+                                this.setState({vertify: true, showSlideVertify: false}, () =>
+                                    this.handleSubmit()
+                                )
+                            }
+                            onFail={() =>
+                                this.setState({vertify: false, showSlideVertify: true})
+                            }
+                        ></Vertify>
+                    </div>
+                ) : (
+                    <></>
+                )}
+            </>
+        );
     }
-  };
-
-  changeKaptcha = async (event) => {
-    //切换验证码
-    await this.getKaptchaToken();
-  };
-
-  render() {
-    const { loading, needKaptcha, kaptchaImg, showSlideVertify } = this.state;
-
-    const { autoSaveUser = true } = this.props;
-
-    const { translate } = this.context;
-    return (
-      <>
-        <Form
-          style={{ width: 350 }}
-          ref={this.formRef}
-          name="normal_login"
-          initialValues={{ remember: true }}
-        >
-          {this.props.title}
-          <Form.Item
-            name="username"
-            rules={[
-              { required: true, message: translate("${请输入}${用户名}!") },
-              {
-                max: 30,
-                min: 0,
-                message: translate("${请输入}${0-30个字符}!"),
-              },
-            ]}
-          >
-            <Input
-              prefix={<UserOutlined className="site-form-item-icon" />}
-              placeholder={translate("${用户名}")}
-              autoComplete={autoSaveUser ? "on" : "off"}
-            />
-          </Form.Item>
-          <Form.Item
-            name="password"
-            rules={[
-              { required: true, message: translate("${请输入}${密码}!") },
-            ]}
-          >
-            <Input
-              style={
-                autoSaveUser
-                  ? {}
-                  : ({ "-webkit-text-security": "disc" } as CSSProperties)
-              }
-              type={autoSaveUser ? "password" : "text"}
-              placeholder={translate("${密码}")}
-              onKeyDown={this.handleKeyDown}
-              autoComplete={autoSaveUser ? "on" : "off"}
-              prefix={<LockOutlined className="site-form-item-icon" />}
-            />
-          </Form.Item>
-          {needKaptcha ? (
-            <Row gutter={8}>
-              <Col span={12}>
-                <Form.Item
-                  name="kaptchaText"
-                  rules={[
-                    {
-                      required: true,
-                      message: translate("${请输入}${验证码}!"),
-                    },
-                  ]}
-                >
-                  <Input
-                    prefix={
-                      <SafetyCertificateOutlined className="site-form-item-icon" />
-                    }
-                    placeholder={translate("${验证码}")}
-                    onKeyDown={this.handleKeyDown}
-                  />
-                </Form.Item>
-              </Col>
-              <Col span={12}>
-                <img
-                  style={{ cursor: "pointer" }}
-                  height={30}
-                  width={90}
-                  title={translate("${点击刷新}")}
-                  onClick={this.changeKaptcha}
-                  src={kaptchaImg}
-                ></img>
-              </Col>
-            </Row>
-          ) : (
-            ""
-          )}
-          <Form.Item>
-            <Button
-              type="primary"
-              style={{ width: "100%" }}
-              loading={loading}
-              onClick={this.handleSubmit}
-            >
-              {translate("${登录}")}
-            </Button>
-          </Form.Item>
-        </Form>
-        {showSlideVertify ? (
-          <div style={{ width: "100%", height: "100%", background: "white" }}>
-            <Vertify
-              onSuccess={() =>
-                this.setState({ vertify: true, showSlideVertify: false }, () =>
-                  this.handleSubmit()
-                )
-              }
-              onFail={() =>
-                this.setState({ vertify: false, showSlideVertify: true })
-              }
-            ></Vertify>
-          </div>
-        ) : (
-          <></>
-        )}
-      </>
-    );
-  }
 }
 
 export default Login;

package/src/aldehyde/login2/LoginPage.tsx

@@ -4,6 +4,8 @@ import LoginBgPng from "./img/login-bg.png";
 import { useLocale } from "../locale/useLocale";
 import HCDataSource from "../tmpl/hc-data-source";
 import Units from "../units";
+import {Button, Col, Row} from "antd";
+import ResetPassword from "../layout/menu/reset-password";
 
 const LoginPage = () => {
   const { translate } = useLocale();
@@ -51,6 +53,9 @@ const LoginPage = () => {
             Units.setHydrocarbonToken(token);
           }}
         ></Login>
+          <Row>
+              <Col span={6} offset={18}><ResetPassword></ResetPassword></Col>
+          </Row>
       </div>
     </div>
   );

package/src/aldehyde/table/act-table.tsx

@@ -699,15 +699,26 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             {ltmplConfig.rowFileButtons &&
             ltmplConfig.rowFileButtons.length > 0
                 ? ltmplConfig.rowFileButtons.map((openFileButton) => {
-                  return (
-                      <NewinFileView
-                        title={openFileButton.title}
-                        filePath={HCService.toFilePath(record[openFileButton.fieldId], serverKey)}
-                          serverKey={serverKey}
-                          key={openFileButton.id}
-                          //size={"small"}
-                      />
-                  );
+                  let v= record[openFileButton.fieldId];
+                  if(v){
+                    if(v instanceof Array){
+                      v=v[0];
+                    }
+                    if(v.includes("@R@")>0){
+                      v=v.split("@R@")[1];
+                    }
+                    return (
+                        <NewinFileView
+                            title={openFileButton.title}
+                            filePath={HCService.toFilePath(v, serverKey)}
+                            serverKey={serverKey}
+                            key={openFileButton.id}
+                            //size={"small"}
+                        />
+                    );
+                  }else{
+                    return "";
+                  }
                 })
                 : ""}
             {buttons.includes("singleDelete") &&

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

@@ -42,7 +42,6 @@ export default class HcserviceV3 {
   }
 
   static  toFilePath(value,serverKey) {
-    debugger
     if (!value) {
       return null;
     }
@@ -1034,10 +1033,16 @@ export default class HcserviceV3 {
       },
       method: "GET",
     });
-    // if (res.status === 'success') {
-    //     successHandle(res.token);
-    // }
-    return res;
+    if(res.passwordState){
+      if(res.passwordState=="expiry"){
+        message.warning(translate("${"+res.message+"}"), 10);
+      }else if(res.passwordState=="expiried"){
+        message.error(translate("${"+res.message+"}"), 10)
+      }else if(res.passwordState=="restricted"){
+        message.error(translate("${"+res.message+"}"), 15)
+      }
+    }
+    return {status:res.status,token:res.token};
   }
 
   static async setContext(json) {

package/src/aldehyde/tmpl/tmpl-config-analysis.tsx

@@ -130,7 +130,6 @@ TmplConfigAnalysis.currentL1 = function(config: string, format: string) {
         date = date.startOf("second");
         return date.format("YYYY-MM-DD HH:mm:ss");
     }
-    debugger
     return date.format(format);
   } else {
     return null;