aldehyde 0.2.313 → 0.2.315

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

@@ -4,14 +4,14 @@ import LoginBgPng from "./img/login-bg.png";
 import { useLocale } from "../locale/useLocale";
 import HCDataSource from "../tmpl/hc-data-source";
 import ProgramConfig from "../units";
-import { Col, Row} from "antd";
+import { Col, Row } from "antd";
 import ResetPassword from "../layout/menu/reset-password";
-import {SafetyCertificateTwoTone} from '@ant-design/icons'
+import { SafetyCertificateTwoTone } from '@ant-design/icons'
 type LoginPageProps = {
-    programName?: string;
-    copyright?: string;
+  programName?: string;
+  copyright?: string;
 };
-const LoginPage = (props:LoginPageProps) => {
+const LoginPage = (props: LoginPageProps) => {
 
   const { translate } = useLocale();
 
@@ -40,51 +40,50 @@ const LoginPage = (props:LoginPageProps) => {
           aspectRatio: "1/1",
         }}
       >
-
-          <div
-              style={{
-                  fontWeight: 600,
-                  fontSize: "30px",
-                  color: "#222222",
-                  marginBottom: 10,
-              }}
-          >
-              {translate("${欢迎,登录}")}
-          </div>
-          <div
-              style={{
-                  fontWeight: 600,
-                  fontSize: "24px",
-                  color: "#222222",
-                  marginBottom: 40,
-              }}
-          >{props.programName=="Aldehyde"?"":
-              <><SafetyCertificateTwoTone />
-              {props.programName?translate("${" + props.programName + "}"): translate("${" + ProgramConfig.programName() + "}")}
+        <div
+          style={{
+            fontWeight: 600,
+            fontSize: "30px",
+            color: "#222222",
+            marginBottom: 10,
+          }}
+        >
+          {translate("${欢迎,登录}")}
+        </div>
+        <div
+          style={{
+            fontWeight: 600,
+            fontSize: "24px",
+            color: "#222222",
+            marginBottom: 40,
+          }}
+        >{props.programName == "Aldehyde" ? "" :
+          <><SafetyCertificateTwoTone />
+            {props.programName ? translate("${" + props.programName + "}") : translate("${" + ProgramConfig.programName() + "}")}
           </>}
-          </div>
+        </div>
         <Login
           onFinish={(token) => {
             HCDataSource.clear();
             window.location.hash = "/v2/home";
-              ProgramConfig.setHydrocarbonToken(token);
+            ProgramConfig.setHydrocarbonToken(token);
           }}
         ></Login>
-          <Row>
-              <Col span={6} offset={18}><ResetPassword showUserName={true}></ResetPassword></Col>
-          </Row>
+        <Row>
+          <Col span={6} offset={18}><ResetPassword showUserName={true}></ResetPassword></Col>
+        </Row>
+        {props.copyright ?
           <div
-              style={{
-                  fontWeight: 600,
-                  fontSize: "14px",
-                  color: "#999",
-                  marginTop: 40,
-              }}
-          ><Row>
-              <Col>{"Copyright ◎ 2025" + (props.copyright?props.copyright:"浙江恩赫控股集团有限公司")}</Col>
-          </Row>
-
-          </div>
+            style={{
+              fontWeight: 600,
+              fontSize: "14px",
+              color: "#999",
+              marginTop: 40,
+            }}
+          >
+            {"Copyright ◎ 2025" + (props.copyright || "")}
+          </div> : ""
+        }
       </div>
     </div>
   );

package/src/aldehyde/login3/index.less

@@ -9,6 +9,7 @@
     flex-direction: row-reverse;
     justify-content: flex-start;
     align-items: center;
+    overflow: hidden;
 
     .login-logo-img {
         position: absolute;
@@ -62,7 +63,7 @@
 
         .login-form {
             padding: 40px;
-            min-height: 442px;
+            min-height: 350px;
             position: relative;
 
             .ant-input::placeholder {
@@ -95,8 +96,7 @@
                 font-weight: 600;
                 font-size: 14px;
                 color: #ffffff;
-                position: absolute;
-                bottom: 40px;
+                margin-top: 40px;
             }
         }
 

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

@@ -54,9 +54,11 @@ const LoginPage = (props: LoginPageProps) => {
           <div className="reset-password">
             <ResetPassword showUserName={true} />
           </div>
-          <div className="login-copyright">
-            {"Copyright ◎ 2025" + (props.copyright ? props.copyright : "浙江恩赫控股集团有限公司")}
-          </div>
+          {props.copyright ?
+            <div className="login-copyright">
+              {"Copyright ◎ 2025" + (props.copyright || "")}
+            </div> : ""
+          }
         </div>
       </div>
     </div >

package/src/aldehyde/lowcode-components/base-map/index.tsx

@@ -159,6 +159,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 自定义弹窗渲染
     const customizeTooltipConfig = (config) => {
         const { title, width, height, padding, backgroundColor, backgroundImage, content } = config;
+        let titleText = title.text;
         return {
             padding: 0,
             borderWidth: 0,
@@ -167,10 +168,11 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             formatter: (params) => {
                 const itemData = params.data.itemData;
                 const dom = document.createElement("div");
+                if (title.titleType === "d1") { titleText = itemData?.value?.[title.titleType] || ""; }
                 const bgImg = `background-image: url(${backgroundImage});background-size: 100% 100%;background-repeat: no-repeat;background-position: center;`;
                 dom.style = `width:${width}px;height:${height}px;${backgroundImage ? bgImg : `background:${backgroundColor}`}`;
                 dom.innerHTML = `<div style="padding:${padding}px;width:100%;height:100%">
-                    ${title?.text ? `<div style="width:100%;margin-bottom:4px; font-size: ${title.fontSize}px; color: ${title.color}; text-align: ${title.position}">${title?.text}</div>` : ""}
+                    ${title?.text ? `<div style="width:100%;margin-bottom:4px; font-size: ${title.fontSize}px; color: ${title.color}; text-align: ${title.position}">${titleText}</div>` : ""}
                     ${content?.value?.map(r => itemData?.config?.[r] && `<div style="width:100%;display:flex;justify-content:space-between;align-items:center; font-size: ${content.fontSize}px; color: ${content.color};">
                         <div style="width:60%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">${itemData?.config?.[r] || ""}</div>
                         <div style="width:40%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;text-align:right">${itemData?.value?.[r] || ""}</div>

package/src/aldehyde/lowcode-components/effectScatter-map/index.tsx

@@ -185,6 +185,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 自定义弹窗渲染
     const customizeTooltipConfig = (config) => {
         const { title, width, height, padding, backgroundColor, backgroundImage, content } = config;
+        let titleText = title.text;
         return {
             padding: 0,
             borderWidth: 0,
@@ -193,10 +194,11 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             formatter: (params) => {
                 const itemData = params.data.itemData;
                 const dom = document.createElement("div");
+                if (title.titleType === "d1") { titleText = itemData?.value?.[title.titleType]; }
                 const bgImg = `background-image: url(${backgroundImage});background-size: 100% 100%;background-repeat: no-repeat;background-position: center;`;
                 dom.style = `width:${width}px;height:${height}px;${backgroundImage ? bgImg : `background:${backgroundColor}`}`;
                 dom.innerHTML = `<div style="padding:${padding}px;width:100%;height:100%">
-                    ${title?.text ? `<div style="width:100%;margin-bottom:4px; font-size: ${title.fontSize}px; color: ${title.color}; text-align: ${title.position}">${title?.text}</div>` : ""}
+                    ${title?.text ? `<div style="width:100%;margin-bottom:4px; font-size: ${title.fontSize}px; color: ${title.color}; text-align: ${title.position}">${titleText}</div>` : ""}
                     ${content?.value?.map(r => itemData?.config?.[r] && `<div style="width:100%;display:flex;justify-content:space-between;align-items:center; font-size: ${content.fontSize}px; color: ${content.color};">
                         <div style="width:60%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">${itemData?.config?.[r] || ""}</div>
                         <div style="width:40%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;text-align:right">${itemData?.value?.[r] || ""}</div>

package/src/aldehyde/lowcode-components/effectScatter-map-3d/index.tsx

@@ -281,6 +281,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 自定义弹窗渲染
     const customizeTooltipConfig = (config) => {
         const { title, width, height, padding, backgroundColor, backgroundImage, content } = config;
+        let titleText = title.text;
         return {
             padding: 0,
             borderWidth: 0,
@@ -289,10 +290,11 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             formatter: (params) => {
                 const itemData = params.data.itemData;
                 const dom = document.createElement("div");
+                if (title.titleType === "d1") { titleText = itemData?.value?.[title.titleType]; }
                 const bgImg = `background-image: url(${backgroundImage});background-size: 100% 100%;background-repeat: no-repeat;background-position: center;`;
                 dom.style = `width:${width}px;height:${height}px;${backgroundImage ? bgImg : `background:${backgroundColor}`}`;
                 dom.innerHTML = `<div style="padding:${padding}px;width:100%;height:100%">
-                    ${title?.text ? `<div style="width:100%;margin-bottom:4px; font-size: ${title.fontSize}px; color: ${title.color}; text-align: ${title.position}">${title?.text}</div>` : ""}
+                    ${title?.text ? `<div style="width:100%;margin-bottom:4px; font-size: ${title.fontSize}px; color: ${title.color}; text-align: ${title.position}">${titleText}</div>` : ""}
                     ${content?.value?.map(r => itemData?.config?.[r] && `<div style="width:100%;display:flex;justify-content:space-between;align-items:center; font-size: ${content.fontSize}px; color: ${content.color};">
                         <div style="width:60%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">${itemData?.config?.[r] || ""}</div>
                         <div style="width:40%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;text-align:right">${itemData?.value?.[r] || ""}</div>

package/src/aldehyde/lowcode-components/index.ts

@@ -49,6 +49,7 @@ import StrokeAnimation from "./stroke-animation";
 import EffectScatterMap3D from "./effectScatter-map-3d";
 import BaseButton from "./base-button";
 import BaseTabs from "./base-tabs";
+import PlaceholderComponent from "./placeholder-component";
 
 
 type CompoundedComponent = {
@@ -102,7 +103,8 @@ type CompoundedComponent = {
     StrokeAnimation?: typeof StrokeAnimation,
     EffectScatterMap3D?: typeof EffectScatterMap3D,
     BaseButton?: typeof BaseButton,
-    BaseTabs?: typeof BaseTabs
+    BaseTabs?: typeof BaseTabs,
+    PlaceholderComponent?: typeof PlaceholderComponent
 };
 
 const LowcodeComponents: CompoundedComponent = {
@@ -114,7 +116,8 @@ const LowcodeComponents: CompoundedComponent = {
     Decoration1, Decoration2, Decoration3, Decoration4, Decoration5,
     Decoration6, Decoration7, Decoration8, Decoration9, Decoration10, Decoration11,
     BaseTable, TextScroller, CapsuleBarChart, CircularProgressChart, ActTable, ProgressChart,
-    LineBarChart, Column3dChart, StrokeAnimation, EffectScatterMap3D, BaseButton, BaseTabs
+    LineBarChart, Column3dChart, StrokeAnimation, EffectScatterMap3D, BaseButton, BaseTabs,
+    PlaceholderComponent
 };
 
 export default LowcodeComponents;

package/src/aldehyde/lowcode-components/lowcode-view/component/assets.ts

@@ -50,6 +50,7 @@ import StrokeAnimation from "../../stroke-animation";
 import EffectScatterMap3D from "../../effectScatter-map-3d";
 import BaseButton from "../../base-button";
 import BaseTabs from "../../base-tabs";
+import PlaceholderComponent from "../../placeholder-component";
 
 interface ComponentItemConfig {
     baseInfo: BaseInfoType, // 基础信息
@@ -435,5 +436,12 @@ export const compsConfig: { [key: string]: ComponentItemConfig } = {
             compName: "选项卡",
             compKey: "BaseTabs"
         }
+    },
+    PlaceholderComponent: {
+        componentNode: PlaceholderComponent,
+        baseInfo: {
+            compName: "占位组件",
+            compKey: "PlaceholderComponent"
+        }
     }
 };

package/src/aldehyde/lowcode-components/placeholder-component/index.tsx

@@ -0,0 +1,57 @@
+
+import React, { ForwardedRef, forwardRef, useMemo, useImperativeHandle, useState } from 'react';
+import Units from "../../units/index";
+import { useLocale } from "../../locale/useLocale";
+
+const defStyle = {
+    color: '#9a9a9a',
+    height: '100%',
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center',
+    border: '1px solid #9a9a9a',
+};
+
+export interface ComponentProps {
+    style: { key: string },
+    isDesignMode?: boolean; // 是否编辑模式
+}
+
+export interface CompImageonentRef {
+    updateConfig: (newConfig: ComponentProps) => void;
+}
+
+const PlaceholderComponent = forwardRef((props: ComponentProps, ref: ForwardedRef<CompImageonentRef>) => {
+    const { isDesignMode } = props;
+    const { translate } = useLocale();
+    const [key, setKey] = useState<string>(props.style?.key);
+
+
+    useImperativeHandle(ref, () => ({
+        updateConfig: (newConfig) => setKey(newConfig.style?.key),
+    }));
+
+
+    const renderComponent = useMemo(() => {
+        const temComponent = Units.getCustomComponent(key);
+        if (temComponent) {
+            return React.createElement(temComponent);
+        }
+        return <div style={defStyle}>{translate("${没有找到自定义组件}")}</div>;
+    }, [key]);
+
+    return (
+        <div style={{ width: '100%', height: '100%' }}>
+            {isDesignMode || !key ?
+                <div style={defStyle}>
+                    <div>{translate("${占位组件}")}</div>
+                </div> :
+                <div style={{ width: '100%', height: '100%', overflow: "auto" }}>
+                    {renderComponent}
+                </div>
+            }
+        </div>
+    );
+});
+
+export default PlaceholderComponent;

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

@@ -12,7 +12,7 @@ const { Text, Title } = Typography;
 
 interface ActTreeProps {
   ttmplConfig: TtmplConfig;
-  top:number,
+  top: number,
 }
 
 interface ActTreeState {
@@ -30,7 +30,7 @@ export default class ActTree extends React.PureComponent<
   ActTreeProps,
   ActTreeState
 > {
-  static defaultProps = {top:66};
+  static defaultProps = { top: 66 };
   state = {
     ttmplNodeConfig: undefined,
     recordCode: undefined,
@@ -124,8 +124,8 @@ export default class ActTree extends React.PureComponent<
     this.showCard(title, sourceId, mainCode, recordCode, false, true, null);
   };
 
-   onDelete = async (sourceId: string, recordCode?: string) => {
-   await HcserviceV3.deleteByCode(null, sourceId, [recordCode]);
+  onDelete = async (sourceId: string, recordCode?: string) => {
+    await HcserviceV3.deleteByCode(null, sourceId, [recordCode]);
   };
 
   onAddSub = (
@@ -138,8 +138,8 @@ export default class ActTree extends React.PureComponent<
   };
 
   render() {
-    const {top} = this.props;
-    const { translate,siderCollapsed } = this.context;
+    const { top } = this.props;
+    const { translate, siderCollapsed } = this.context;
 
 
     const {
@@ -161,12 +161,7 @@ export default class ActTree extends React.PureComponent<
           width={300}
           theme={"light"}
           style={{
-            height: "90vh",
-            position: "fixed",
-            left: 0,
-            top: top,
-            bottom: 0,
-            marginLeft: siderCollapsed?10:210,
+            height: `calc(100vh - ${top}px)`,
           }}
         >
           <TmplTree
@@ -180,7 +175,7 @@ export default class ActTree extends React.PureComponent<
             ref={this.refTmplTree}
           ></TmplTree>
         </Sider>
-        <Layout style={{ marginLeft: 322, backgroundColor: "#fff" }}>
+        <Layout style={{ marginLeft: 22, backgroundColor: "#fff" }}>
           <Content style={{ overflow: "initial" }}>
             {showEdit ? (
               <DtmplEditCard

package/src/aldehyde/units/index.tsx

@@ -14,7 +14,7 @@ import { ProgramConfig } from "../index";
 import { CriteriaFormProps } from "../form/criteria-form";
 import ControlTypeSupportor from "../tmpl/control-type-supportor";
 import HcserviceV3 from "../tmpl/hcservice-v3";
-import {UserInfo} from "../tmpl/interface";
+import { UserInfo } from "../tmpl/interface";
 
 let storageKeyPrefix = undefined;
 
@@ -24,7 +24,7 @@ let MENU_MAP = {};
 
 let MENU_ID_ICON_MAP = {};
 
-const CustomButtonConfig_Map={}
+const CustomButtonConfig_Map = {}
 
 const CUSTOM_VIEW_CONTROL_MAP = {};
 
@@ -40,6 +40,8 @@ const extendServerMap = {};
 
 let antdUseToken = undefined;
 
+const CUSTOM_COMPONENT_MAP = {};
+
 // let siderCollapsed:boolean = true;
 
 export default {
@@ -59,18 +61,18 @@ export default {
   },
 
 
-  setMenuIconMap(menuIconMap){
-    MENU_ID_ICON_MAP=menuIconMap;
+  setMenuIconMap(menuIconMap) {
+    MENU_ID_ICON_MAP = menuIconMap;
   },
-  mapMenuIcon(menuId){
+  mapMenuIcon(menuId) {
     return MENU_ID_ICON_MAP[menuId];
   },
 
-  setMenuMap(menuMap){
-    MENU_MAP=menuMap;
+  setMenuMap(menuMap) {
+    MENU_MAP = menuMap;
   },
-  mapMenu(menuId){
-    if(menuId=='home'){
+  mapMenu(menuId) {
+    if (menuId == 'home') {
       return "首页"
     }
     return MENU_MAP[menuId];
@@ -102,16 +104,16 @@ export default {
   },
 
   setCustomButtonConfig(
-      key: string,
-      config : CustomButtonConfig
+    key: string,
+    config: CustomButtonConfig
   ) {
     CustomButtonConfig_Map[key] = config;
   },
 
   getCustomButtonConfig(
-      key: string
+    key: string
   ) {
-   return CustomButtonConfig_Map[key];
+    return CustomButtonConfig_Map[key];
   },
 
   setAppCtmplConfigFunc(
@@ -133,14 +135,14 @@ export default {
           criteriaData,
           props
         );
-      }else{
-          //用内置的
-          return TmplConfigAnalysis.buildInCtmplConfig(
-              ltmplConfig,
-              criteriaData,
-              props
-          );
-        }
+      } else {
+        //用内置的
+        return TmplConfigAnalysis.buildInCtmplConfig(
+          ltmplConfig,
+          criteriaData,
+          props
+        );
+      }
     }
     return ltmplConfig;
   },
@@ -302,23 +304,23 @@ export default {
     }
     return hydrocarbonToken;
   },
-  setServerHydrocarbonToken(serverkey: string,token:string) {
+  setServerHydrocarbonToken(serverkey: string, token: string) {
     if (serverkey && token) {
       window.sessionStorage.setItem(serverkey + "hydrocarbonToken", token);
     }
     this.setHydrocarbonToken(token, serverkey);
   },
-  serverHydrocarbonToken(serverKey:string) {
+  serverHydrocarbonToken(serverKey: string) {
     let hydrocarbonToken = window.sessionStorage.getItem(
-        serverKey + "hydrocarbonToken"
+      serverKey + "hydrocarbonToken"
     );
     if (!hydrocarbonToken) {
       hydrocarbonToken = window.localStorage.getItem(
-          serverKey + "hydrocarbonToken"
+        serverKey + "hydrocarbonToken"
       );
     }
     if (!hydrocarbonToken) {
-        hydrocarbonToken = this.hydrocarbonToken();
+      hydrocarbonToken = this.hydrocarbonToken();
     }
     return hydrocarbonToken;
   },
@@ -590,14 +592,14 @@ export default {
       value.length > 200
         ? "350px"
         : value.length > 150
-        ? "300px"
-        : value.length > 100
-        ? "250px"
-        : value.length > 50
-        ? "200px"
-        : value.length >= 20
-        ? "160px"
-        : "80px";
+          ? "300px"
+          : value.length > 100
+            ? "250px"
+            : value.length > 50
+              ? "200px"
+              : value.length >= 20
+                ? "160px"
+                : "80px";
     //let min_value_length = value.length > 20 ? '160px' : '80px';
     style.minWidth = min_value_length;
     return style;
@@ -732,23 +734,23 @@ export default {
           if (!obj[name]) {
             obj[name] = [];
           }
-          let pvalue=decodeURIComponent(res[1]);
+          let pvalue = decodeURIComponent(res[1]);
           obj[name].push(
-              this.configParamTrans(
-                  pvalue,
-                this.getItemType(name, pvalue, ltmplConfig)
-              )
+            this.configParamTrans(
+              pvalue,
+              this.getItemType(name, pvalue, ltmplConfig)
+            )
           );
         } else {
           const res = arr2[i].split("=");
           const name = res[0];
           if (name) {
-            let pvalue=decodeURIComponent(res[1]);
+            let pvalue = decodeURIComponent(res[1]);
             obj[name] =
               this.configParamTrans(
-                  pvalue,
+                pvalue,
                 this.getItemType(name, pvalue, ltmplConfig)
-            );
+              );
           }
         }
       }
@@ -764,14 +766,14 @@ export default {
   configParamTrans(value: string, itemType: string) {
     if (value && value.startsWith && value.startsWith("$$current")) {
       return TmplConfigAnalysis.current(value, this.getDayjsFormat(itemType));
-    }else if (value && value.startsWith("$$user.code")) {
-     let userInfo:UserInfo =this.getCurrentUserInfo();
-     if (userInfo) {
-       return userInfo.id+"@R@";
-     }else{
-       return null;
-     }
-    }else{
+    } else if (value && value.startsWith("$$user.code")) {
+      let userInfo: UserInfo = this.getCurrentUserInfo();
+      if (userInfo) {
+        return userInfo.id + "@R@";
+      } else {
+        return null;
+      }
+    } else {
       return value;
     }
 
@@ -860,10 +862,10 @@ export default {
     return item.extType
       ? item.extType
       : item.msExtType
-      ? item.msExtType
-      : item.msType
-      ? item.msType
-      : item.type;
+        ? item.msExtType
+        : item.msType
+          ? item.msType
+          : item.type;
   },
   isEmpty(obj) {
     if (!obj) {
@@ -1056,13 +1058,27 @@ export default {
     this.setSessionProgramCode(programCode);
   },
   getReactKey() {
-  return new Date().getTime().toString();
+    return new Date().getTime().toString();
   },
-  async getUserInfo(programCode?:string, token?:string) {
-      currentUser = await HcserviceV3.getUser(programCode,token);
-      return currentUser;
+  async getUserInfo(programCode?: string, token?: string) {
+    currentUser = await HcserviceV3.getUser(programCode, token);
+    return currentUser;
   },
   getCurrentUserInfo() {
     return currentUser;
+  },
+  // 低代码拖拽页面-自定义组件
+  setCustomComponent(key_: string, name: object) {
+    let key = key_;
+    if (!key) {
+      return;
+    }
+    CUSTOM_COMPONENT_MAP[key] = name;
+  },
+  getCustomComponent(key: string) {
+    if (!key) {
+      return null;
+    }
+    return CUSTOM_COMPONENT_MAP[key];
   }
 };