aldehyde 0.2.309 → 0.2.311

package/src/aldehyde/login2/login.tsx

@@ -1,34 +1,44 @@
-import {Button, Col, Form, Input, Row} from "antd";
+import { Button, Col, Form, Input, Row } from "antd";
 import React, { useEffect, useState } from "react";
 import HCserviceV3 from "../tmpl/hcservice-v3";
 import { useLocale } from "../locale/useLocale";
 import { useParams } from "react-router-dom";
 import Units from "../units";
-import {SafetyCertificateOutlined} from "@ant-design/icons";
+import { SafetyCertificateOutlined } from "@ant-design/icons";
 import { useSessionStorageState } from 'ahooks';
-import {KeepAliveTab} from "../hooks/use-tabs";
+import { KeepAliveTab } from "../hooks/use-tabs";
+
 type LoginPropType = {
   onFinish?: (token: string) => void;
   title?: any;
   programCode?: string;
   autoSaveUser?: boolean;
+  version?: string;
+  style?: { [key: string]: any };
 };
 
 type FormType = {
   username: string;
   password: string;
-  kaptchaText:string;
+  kaptchaText: string;
 };
 
+const defStyle = {
+  input: { borderRadius: "50px", background: "#EEF3FB" },
+  kaptcha: { borderRadius: "30px", background: "#EEF3FB" },
+  button: { shape: "round" }
+}
+
 const Login = (props: LoginPropType) => {
+  const { version = "v2", style = defStyle } = props;
   // locale
   const { translate } = useLocale();
   const [keepAliveTabs, setKeepAliveTabs] = useSessionStorageState<KeepAliveTab[]>('keepAliveTabs', {
-        defaultValue: [],
-    });
+    defaultValue: [],
+  });
 
   useEffect(() => {
-    localStorage.setItem("version", "v2");
+    localStorage.setItem("version", version);
   }, []);
 
   const { programCode: routeProgramCode } = useParams();
@@ -36,17 +46,17 @@ const Login = (props: LoginPropType) => {
     if (routeProgramCode === undefined) return;
     Units.setProgramCode(routeProgramCode);
   }, [routeProgramCode]);
-    const [loading, setLoading] = useState<boolean>(false);
-    const [needKaptcha, setNeedKaptcha] = useState<boolean>(false);
-    const [kaptchaImg, setKaptchaImg] = useState<string>(null);
-    const [kaptchaToken, setKaptchaToken] = useState<string>(null);
+  const [loading, setLoading] = useState<boolean>(false);
+  const [needKaptcha, setNeedKaptcha] = useState<boolean>(false);
+  const [kaptchaImg, setKaptchaImg] = useState<string>(null);
+  const [kaptchaToken, setKaptchaToken] = useState<string>(null);
 
-    // form
+  // form
   const [form] = Form.useForm<FormType>();
   const submit = async () => {
-      setKeepAliveTabs([]);
+    setKeepAliveTabs([]);
     try {
-      const { username, password,kaptchaText } = await form.validateFields();
+      const { username, password, kaptchaText } = await form.validateFields();
 
       setLoading(true);
       const { programCode, onFinish } = props;
@@ -56,16 +66,16 @@ const Login = (props: LoginPropType) => {
       );
       const res = await HCserviceV3.login(
         { username, password },
-          kaptchaToken,
-          kaptchaText,
+        kaptchaToken,
+        kaptchaText,
         pubkey,
         programCode ? programCode : routeProgramCode
       );
       if (res.status === "success") {
         onFinish(res.token);
-      }else if (res.status === "error") {
-          setNeedKaptcha(true);
-          await getKaptchaToken();
+      } else if (res.status === "error") {
+        setNeedKaptcha(true);
+        await getKaptchaToken();
       }
       setLoading(false);
     } catch (err) {
@@ -73,31 +83,31 @@ const Login = (props: LoginPropType) => {
     }
   };
 
-    const handleKeyDown = (event) => {
-        //按下enter键，触发login事件
-        switch (event.keyCode) {
-            case 13:
-                submit();
-                break;
-            default:
-                break;
-        }
-    };
+  const handleKeyDown = (event) => {
+    //按下enter键，触发login事件
+    switch (event.keyCode) {
+      case 13:
+        submit();
+        break;
+      default:
+        break;
+    }
+  };
 
-    const  getKaptchaToken = async () => {
+  const getKaptchaToken = async () => {
 
-        let res = await HCserviceV3.getKaptchaToken(routeProgramCode);
-        if (res) {
-            let kaptchaImg;
-            if (res.img && res.img.indexOf("data:") == 0) {
-                kaptchaImg = res.img;
-            } else {
-                kaptchaImg = `data:image/png;base64,${res.img}`;
-            }
-            setKaptchaImg(kaptchaImg);
-            setKaptchaToken(res.kaptchaToken);
-        }
-    };
+    let res = await HCserviceV3.getKaptchaToken(routeProgramCode);
+    if (res) {
+      let kaptchaImg;
+      if (res.img && res.img.indexOf("data:") == 0) {
+        kaptchaImg = res.img;
+      } else {
+        kaptchaImg = `data:image/png;base64,${res.img}`;
+      }
+      setKaptchaImg(kaptchaImg);
+      setKaptchaToken(res.kaptchaToken);
+    }
+  };
 
   // button
   return (
@@ -115,11 +125,10 @@ const Login = (props: LoginPropType) => {
         <Input
           placeholder={translate("请输入用户名")}
           style={{
-            borderRadius: "50px",
-            background: "#EEF3FB",
             height: "50px",
             fontSize: "15px",
             lineHeight: "15px",
+            ...style.input
           }}
         />
       </Form.Item>
@@ -132,70 +141,59 @@ const Login = (props: LoginPropType) => {
           placeholder={translate("请输入密码")}
           onKeyDown={handleKeyDown}
           style={{
-            borderRadius: "50px",
-            background: "#EEF3FB",
             height: "50px",
             fontSize: "15px",
             lineHeight: "15px",
+            ...style.input
           }}
         />
       </Form.Item>
       {needKaptcha ? (
-          <Row gutter={8}>
-            <Col span={16}>
-              <Form.Item
-                  style={{
-                      borderRadius: "50px",
-                      background: "#EEF3FB",
-                      height: "50px",
-                      fontSize: "15px",
-                      lineHeight: "15px",
-                  }}
-                  name="kaptchaText"
-                  rules={[
-                    {
-                      required: true,
-                      message: translate("${请输入}${验证码}!"),
-                    },
-                  ]}
-              >
-                <Input
-                    style={{
-                        borderRadius: "50px",
-                        background: "#EEF3FB",
-                        height: "50px",
-                        fontSize: "15px",
-                        lineHeight: "15px",
-                    }}
-                    onKeyDown={handleKeyDown}
-                    prefix={
-                      <SafetyCertificateOutlined className="site-form-item-icon" />
-                    }
-                    placeholder={translate("${验证码}")}
-                    //onKeyDown={this.handleKeyDown}
-                />
-              </Form.Item>
-            </Col>
-            <Col span={8}>
-              <img
-                  style={{
-                      borderRadius: "30px",
-                      background: "#EEF3FB",
-                      height: "50px",
-                      fontSize: "15px",
-                      lineHeight: "15px",
-                      cursor: "pointer"
-                  }}
-                  // height={50}
-                  width={110}
-                  title={translate("${点击刷新}")}
-                  onClick={getKaptchaToken}
-                  src={kaptchaImg}
-              ></img>
-            </Col>
-          </Row>
+        <Row gutter={8}>
+          <Col span={16}>
+            <Form.Item
+              name="kaptchaText"
+              rules={[
+                {
+                  required: true,
+                  message: translate("${请输入}${验证码}!"),
+                },
+              ]}
+            >
+              <Input
+                style={{
+                  height: "50px",
+                  fontSize: "15px",
+                  lineHeight: "15px",
+                  ...style.input
+                }}
+                onKeyDown={handleKeyDown}
+                prefix={
+                  <SafetyCertificateOutlined className="site-form-item-icon" />
+                }
+                placeholder={translate("${验证码}")}
+              //onKeyDown={this.handleKeyDown}
+              />
+            </Form.Item>
+          </Col>
+          <Col span={8}>
+            <img
+              style={{
+                height: "50px",
+                fontSize: "15px",
+                lineHeight: "15px",
+                cursor: "pointer",
+                width: "100%",
+                ...style.kaptcha
+              }}
+              title={translate("${点击刷新}")}
+              onClick={getKaptchaToken}
+              src={kaptchaImg}
+            />
+          </Col>
+        </Row>
       ) : (
-          ""
+        ""
       )}
 
       <Form.Item wrapperCol={{ span: 24 }}>
@@ -210,6 +208,7 @@ const Login = (props: LoginPropType) => {
             fontSize: "15px",
             lineHeight: "15px",
           }}
+          {...style.button}
         >
           {translate("登录")}
         </Button>

package/src/aldehyde/login3/index.less

@@ -0,0 +1,104 @@
+.login-page {
+    width: 100%;
+    height: 100%;
+    min-height: 640px;
+    position: relative;
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    display: flex;
+    flex-direction: row-reverse;
+    justify-content: flex-start;
+    align-items: center;
+
+    .login-logo-img {
+        position: absolute;
+        top: 20%;
+        left: 5%;
+        z-index: 1;
+        width: 40%;
+        min-width: 600px;
+        max-width: 1000px;
+    }
+
+    .login-content {
+        width: 500px;
+        background: linear-gradient(0deg, #FFFFFF 65%, #DFEDFF);
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+        margin-right: 5%;
+        z-index: 9;
+
+        .login-logo {
+            width: 100%;
+            padding: 0 40px;
+
+            .login-logo-text,
+            .login-logo-text-sub {
+                font-size: 28px;
+                padding: 12px 0 20px;
+                font-family: YouSheBiaoTiHei;
+                text-align: justify;
+                font-style: normal;
+                text-transform: none;
+                background-image: linear-gradient(180deg, #FFFFFF 0%, #90DEFF 100%);
+                /* 可以调整方向和颜色 */
+                /* 2. 关键: 将背景裁剪到文字形状 */
+                -webkit-background-clip: text;
+                /* 对于 Webkit 内核浏览器 (如 Safari, 老版Chrome) */
+                background-clip: text;
+                /* 标准属性 */
+                /* 3. 关键: 将文字颜色设置为透明，以显示背景渐变 */
+                -webkit-text-fill-color: transparent;
+                /* 对于 Webkit 内核浏览器 */
+                color: transparent;
+                /* 标准属性，但注意某些环境下可能需 -webkit-text-fill-color 配合 */
+            }
+
+            .login-logo-text-sub {
+                font-size: 32px;
+                padding-top: 0;
+            }
+        }
+
+        .login-form {
+            padding: 40px;
+            min-height: 442px;
+            position: relative;
+
+            .ant-input::placeholder {
+                color: #9FCFF8;
+            }
+
+            .ant-input-password-icon {
+                color: #ffffff;
+            }
+
+            // 解决输入框自动填充时背景颜色变白的问题
+            input:-webkit-autofill,
+            input:-webkit-autofill:hover,
+            input:-webkit-autofill:focus,
+            input:-webkit-autofill:active {
+                transition: all 5000s ease-in-out 0s;
+                transition-property: background-color, color;
+            }
+
+            .reset-password {
+                width: 100%;
+                text-align: center;
+
+                .ant-btn-variant-link {
+                    color: #9FCFF8;
+                }
+            }
+
+            .login-copyright {
+                font-weight: 600;
+                font-size: 14px;
+                color: #ffffff;
+                position: absolute;
+                bottom: 40px;
+            }
+        }
+
+    }
+}

package/src/aldehyde/login3/login-page.tsx

@@ -0,0 +1,66 @@
+import React from "react";
+import Login from "../login2/login";
+import LoginBgPng from "./img/login-bg.png";
+import LoginContentBgPng from "./img/login-content-bg.png";
+import logoPng from "./img/logo.png";
+import { useLocale } from "../locale/useLocale";
+import HCDataSource from "../tmpl/hc-data-source";
+import ProgramConfig from "../units";
+import ResetPassword from "../layout/menu/reset-password";
+import "./index.less";
+
+type LoginPageProps = {
+  programName?: string;
+  copyright?: string;
+};
+
+const LoginPage = (props: LoginPageProps) => {
+
+  const { translate } = useLocale();
+
+  return (
+    <div
+      className="login-page"
+      style={{ backgroundImage: `url(${LoginBgPng})` }}
+    >
+      <img src={logoPng} alt="" className="login-logo-img" />
+      <div className="login-content" style={{ backgroundImage: `url(${LoginContentBgPng})` }} >
+        <div className="login-logo">
+          <div className="login-logo-text">
+            {translate("${欢迎,登录}")}
+          </div>
+          <div className="login-logo-text-sub">
+            {props.programName == "Aldehyde" ? "" :
+              <>
+                {props.programName ? translate("${" + props.programName + "}") : translate("${" + ProgramConfig.programName() + "}")}
+              </>
+            }
+          </div>
+        </div>
+        <div className="login-form">
+          <Login
+            onFinish={(token) => {
+              HCDataSource.clear();
+              window.location.hash = "/v3/home";
+              ProgramConfig.setHydrocarbonToken(token);
+            }}
+            version="v3"
+            style={{
+              input: { background: "#00132B", borderColor: "#155b82", color: "#ffffff" },
+              kaptcha: { background: "#00132B", borderRadius: "6px" },
+              button: { shape: "default" }
+            }}
+          />
+          <div className="reset-password">
+            <ResetPassword showUserName={true} />
+          </div>
+          <div className="login-copyright">
+            {"Copyright ◎ 2025" + (props.copyright ? props.copyright : "浙江恩赫控股集团有限公司")}
+          </div>
+        </div>
+      </div>
+    </div >
+  );
+};
+
+export default LoginPage;

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

@@ -524,7 +524,11 @@ class RelationTable extends React.PureComponent<
 
         //追加
         if (value) {
-            selectdDatas.unshift(...value);
+            if(fieldGroupConfig.addRowPosition && fieldGroupConfig.addRowPosition==='end'){
+                selectdDatas.push(...value);
+            }else{
+                selectdDatas.unshift(...value);
+            }
         }
 
         onChange(fieldGroupConfig, selectdDatas);
@@ -603,7 +607,11 @@ class RelationTable extends React.PureComponent<
             }
         }
         if (isAdd) {
-            datas.unshift(dtmplData);
+            if(fieldGroupConfig.addRowPosition && fieldGroupConfig.addRowPosition==='end'){
+                datas.push(dtmplData);
+            }else{
+                datas.unshift(dtmplData);
+            }
         }
         onChange(fieldGroupConfig, datas);
     };

package/src/aldehyde/tmpl/control-type-supportor.tsx

@@ -45,6 +45,7 @@ SupportInputTypes.add('yes-no-switch');
 SupportInputTypes.add('caselect');
 SupportInputTypes.add('relation');
 SupportInputTypes.add('file');
+SupportInputTypes.add('direct-file');
 SupportInputTypes.add('picture');
 SupportInputTypes.add('chemstruc');
 SupportInputTypes.add('sql-code-editor');

package/lib/lowcode-components/lowcode-view/component/screen-fit/index.less

@@ -1,13 +0,0 @@
-.react-screen-box {
-  background-size: 100% 100%;
-  width: 100%;
-  height: 100%;
-
-  .screen-wrapper {
-    transition-property: all;
-    transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-    transition-duration: 300ms;
-    position: relative;
-    transform-origin: left top;
-  }
-}