aldehyde 0.2.342 → 0.2.345

package/src/aldehyde/controls/select/index.tsx

@@ -1,9 +1,9 @@
 import * as React from "react";
-import {Checkbox, Input, Radio, Select as AntdSelect} from "antd";
+import { Checkbox, Input, Radio, Select as AntdSelect } from "antd";
 import {
     EControlProps,
 } from "../../tmpl/interface";
-import {LocaleContext} from "../../locale/LocaleProvider";
+import { LocaleContext } from "../../locale/LocaleProvider";
 import HCDataSource from "../../tmpl/hc-data-source";
 import translate from "../../locale/translate";
 import Steps from "../steps";
@@ -39,44 +39,44 @@ export default class Select extends React.PureComponent<
 
     }
 
-    getValue=()=>{
-        const {value,fieldConfig}=this.props;
+    getValue = () => {
+        const { value, fieldConfig } = this.props;
         let fieldValue = value && value != ""
             ? typeof value == "string"
-                ? value.indexOf("@,@")>0 ?value.split("@,@"):value.split(",")
+                ? value.indexOf("@,@") > 0 ? value.split("@,@") : value.split(",")
                 : value
             : undefined;
-        let fieldValue2=[];
+        let fieldValue2 = [];
         //再去掉 @E@
-        if(fieldValue && Array.isArray(fieldValue)){
-            for(let v of fieldValue){
-                if(v.includes('@E@')){
+        if (fieldValue && Array.isArray(fieldValue)) {
+            for (let v of fieldValue) {
+                if (v.includes('@E@')) {
                     fieldValue2.push(v[1]);
-                }else{
+                } else {
                     fieldValue2.push(v);
                 }
             }
-        }else{
-            fieldValue2=fieldValue;
+        } else {
+            fieldValue2 = fieldValue;
         }
 
         //把code替换为name
-        let fieldValue3=[];
-        if(fieldValue2){
-            let valueMap= HCDataSource.getEnumsValueMap(fieldConfig.mstrucId);
-            if(valueMap){
-                for(let v of fieldValue2){
-                  let t= valueMap.get(v);
-                  if(t){
-                      fieldValue3.push(t) ;
-                  }else{
-                      fieldValue3.push(v) ;
-                  }
+        let fieldValue3 = [];
+        if (fieldValue2) {
+            let valueMap = HCDataSource.getEnumsValueMap(fieldConfig.mstrucId);
+            if (valueMap) {
+                for (let v of fieldValue2) {
+                    let t = valueMap.get(v);
+                    if (t) {
+                        fieldValue3.push(t);
+                    } else {
+                        fieldValue3.push(v);
+                    }
                 }
             }
-        }else{
-           fieldValue3=fieldValue2;
-       }
+        } else {
+            fieldValue3 = fieldValue2;
+        }
         // let fieldValue4=[];
         // if(fieldValue3){
         //     for(let v of fieldValue3){
@@ -91,6 +91,7 @@ export default class Select extends React.PureComponent<
     }
 
     getOptions = (mstrucId, needOrder = false, valueIsId = false) => {
+        const { fieldConfig } = this.props;
         const options = [];
         const items = HCDataSource.getEnums(mstrucId);
         if (items) {
@@ -106,6 +107,9 @@ export default class Select extends React.PureComponent<
                 });
             });
         }
+        if (fieldConfig.relDeduplication && fieldConfig.exceptCodes?.length) {
+            return options.filter(item => !fieldConfig.exceptCodes.includes(item.value));
+        }
         return options;
     }
 
@@ -147,7 +151,7 @@ export default class Select extends React.PureComponent<
                         showSearch={true}
                         optionFilterProp={"label"}
                         options={this.getOptions(fieldConfig.mstrucId, true)}
-                        //optionRender={this.optionRender}
+                    //optionRender={this.optionRender}
                     ></AntdSelect>
                 );
                 break;
@@ -164,7 +168,7 @@ export default class Select extends React.PureComponent<
                         showSearch
                         optionFilterProp={"label"}
                         options={this.getOptions(fieldConfig.mstrucId, true)}
-                        //optionRender={optionRender}
+                    //optionRender={optionRender}
                     ></AntdSelect>
                 );
                 break;
@@ -185,7 +189,7 @@ export default class Select extends React.PureComponent<
                         {...antdControlProps}
                         options={this.getOptions(fieldConfig.mstrucId, true)}
                         value={
-                            this.getValue()?this.getValue()[0]:undefined
+                            this.getValue() ? this.getValue()[0] : undefined
                         }
                     />
                 );

package/src/aldehyde/form/dtmpl-form.tsx

@@ -34,7 +34,7 @@ interface DtmplFormStat {
   appDtmplConfig?: DtmplConfig;
   embedForm?: object;
   embedRefValue?: object;
-  editingGroups?:string[];
+  editingGroups?: string[];
 }
 
 export default class DtmplForm extends React.PureComponent<
@@ -52,7 +52,7 @@ export default class DtmplForm extends React.PureComponent<
     appDtmplConfig: undefined,
     embedForm: {},
     embedRefValue: {},
-    editingGroups:[],
+    editingGroups: [],
   };
   static defaultPorps = {
     maxCols: 2,
@@ -125,16 +125,16 @@ export default class DtmplForm extends React.PureComponent<
     const { translate } = this.context;
     message.info(translate("${已刷新}!"));
   };
-  onGroupEditing=(groupCode,editing:boolean)=>{
+  onGroupEditing = (groupCode, editing: boolean) => {
 
-    const {editingGroups}=this.state;
-    let arr=[...editingGroups];
+    const { editingGroups } = this.state;
+    let arr = [...editingGroups];
     if (editing) {
       arr.push(groupCode);
-    }else{
+    } else {
       arr = editingGroups.filter(item => item !== groupCode);
     }
-    this.setState({editingGroups:arr});
+    this.setState({ editingGroups: arr });
   }
 
   onGroupChange = (
@@ -176,18 +176,18 @@ export default class DtmplForm extends React.PureComponent<
     });
     if (res.status === "success") {
       this.props.onFinish(res.code);
-    }else{
+    } else {
       this.props.onFinish(false);
     }
   };
 
   onSubmit = async (values: any) => {
-    const { dtmplConfig,dtmplData } = this.props;
+    const { dtmplConfig, dtmplData } = this.props;
     const {
       currentDtmplData,
       appDtmplConfig,
       embedForm,
-      embedRefValue,editingGroups
+      embedRefValue, editingGroups
     } = this.state;
 
     if (editingGroups.length > 0) {
@@ -196,8 +196,8 @@ export default class DtmplForm extends React.PureComponent<
       return;
     }
 
-    if(dtmplData){
-      dtmplData.fieldMap={...values}
+    if (dtmplData) {
+      dtmplData.fieldMap = { ...values }
     }
 
     let resultCode = undefined;
@@ -270,6 +270,7 @@ export default class DtmplForm extends React.PureComponent<
       formRef,
       serverKey,
       showRightNav,
+      valueFieldMap
     } = this.props;
     const { loading, embedForm } = this.state;
     let groups: FieldGroupConfig[] = [];
@@ -297,7 +298,7 @@ export default class DtmplForm extends React.PureComponent<
         if (item.embedType == "列表") {
           return (
             <Card
-              styles={{body:{ padding: 0 }}}
+              styles={{ body: { padding: 0 } }}
               variant={"borderless"}
               style={{ width: showRightNav ? "90%" : "100%" }}
             >
@@ -323,7 +324,7 @@ export default class DtmplForm extends React.PureComponent<
               id={parentId + item.id}
               className="hoverable"
               loading={loading}
-              styles={{body:{ padding: "6px" },header:{ background: "#f2f4f5" }}}
+              styles={{ body: { padding: "6px" }, header: { background: "#f2f4f5" } }}
             >
               <DtmplViewCard
                 showHeader={false}
@@ -352,11 +353,11 @@ export default class DtmplForm extends React.PureComponent<
               id={parentId + item.id}
               className="hoverable"
               loading={loading}
-              styles={{body:{ padding: "6px" },header:{ background: "#f2f4f5" }}}
+              styles={{ body: { padding: "6px" }, header: { background: "#f2f4f5" } }}
             >
               <EmbedDtmplEditPage
                 ref={embedForm[item.id]}
-                onFinish={(code:any) => {
+                onFinish={(code: any) => {
                   this.onEmbedPageFinish(item, code);
                 }}
                 codeSource={codeSource}
@@ -386,8 +387,8 @@ export default class DtmplForm extends React.PureComponent<
               value={data}
               parentFormInstance={formRef?.current}
               viewOrEdit={item.readOnly ? "view" : "edit"}
-              onEditing={(editing)=>{
-                this.onGroupEditing(item.id,editing);
+              onEditing={(editing) => {
+                this.onGroupEditing(item.id, editing);
               }}
               onChange={this.onGroupChange}
             />
@@ -404,22 +405,23 @@ export default class DtmplForm extends React.PureComponent<
             id={parentId + item.id}
             className="hoverable"
             loading={loading}
-            styles={{body:{ padding: "6px" },header:{ background: "#f2f4f5" }}}
+            styles={{ body: { padding: "6px" }, header: { background: "#f2f4f5" } }}
           >
-            {item.readOnly?<FieldViewGroup fields={item ? item.fields : undefined}
-                                           dataCode={dtmplData ? dtmplData.code:null}
-                                           serverKey={serverKey}
-                                           valueMap={dtmplData ? dtmplData.fieldMap : undefined}
-                />:
-            <FormItemGroup layout={HcserviceV3.isForeignLanguageMode()?"vertical":"horizontal"}
+            {item.readOnly ? <FieldViewGroup fields={item ? item.fields : undefined}
+              dataCode={dtmplData ? dtmplData.code : null}
               serverKey={serverKey}
-              formRef={formRef}
-              mainCode={mainCode}
-              maxColsOnRow={maxColsOnRow}
-              fields={item ? item.fields : undefined}
-              dataCode={dtmplData ? dtmplData.code : undefined}
               valueMap={dtmplData ? dtmplData.fieldMap : undefined}
-            ></FormItemGroup>}
+            /> :
+              <FormItemGroup layout={HcserviceV3.isForeignLanguageMode() ? "vertical" : "horizontal"}
+                serverKey={serverKey}
+                formRef={formRef}
+                mainCode={mainCode}
+                maxColsOnRow={maxColsOnRow}
+                fields={item ? item.fields : undefined}
+                dataCode={dtmplData ? dtmplData.code : undefined}
+                valueMap={dtmplData ? dtmplData.fieldMap : undefined}
+                valueFieldMap={valueFieldMap}
+              />}
           </CollapseCard>
         );
       }
@@ -447,7 +449,7 @@ export default class DtmplForm extends React.PureComponent<
       );
     }
     if (onValuesChange) {
-      onValuesChange();
+      onValuesChange(changedValues, allValues);
     }
   };
 
@@ -459,7 +461,7 @@ export default class DtmplForm extends React.PureComponent<
       code,
       parentId,
       showHeader,
-      serverKey,dtmplData,
+      serverKey, dtmplData,
     } = this.props;
     const { currentDtmplData, appDtmplConfig } = this.state;
     const { translate } = this.context;
@@ -507,13 +509,13 @@ export default class DtmplForm extends React.PureComponent<
           </Card>
         ) : null}
         <AntdForm
-            layout={HcserviceV3.isForeignLanguageMode()?"vertical":"horizontal"}
+          layout={HcserviceV3.isForeignLanguageMode() ? "vertical" : "horizontal"}
           scrollToFirstError={true}
           labelWrap={true}
           ref={formRef}
           name="control-hooks"
           onValuesChange={this.onValuesChange}
-          onFinishFailed={()=>this.props.onFinish(false)}
+          onFinishFailed={() => this.props.onFinish(false)}
           onFinish={this.onSubmit}
         >
           <AntdForm.Item hidden={true} name={"actionId"}></AntdForm.Item>
@@ -527,7 +529,7 @@ export default class DtmplForm extends React.PureComponent<
             key={this.premisestitle}
             id={parentId + premises[0].id}
             className="hoverable"
-            styles={{header:{background: "#f2f4f5"}}}
+            styles={{ header: { background: "#f2f4f5" } }}
           >
             <FieldViewGroup serverKey={serverKey} fields={premises} />
           </CollapseCard>

package/src/aldehyde/form/form-Item-group.tsx

@@ -1,5 +1,5 @@
-import React, { RefObject } from "react";
-import { Col, Form, Row } from "antd";
+import React, { RefObject, useState, useMemo } from "react";
+import { Col, Form, Row, Popconfirm } from "antd";
 import { FieldConfig } from "../tmpl/interface";
 import EntryControl from "../controls/entry-control";
 import Units from "../units";
@@ -10,6 +10,48 @@ import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
 
 const FormItem = Form.Item;
 
+// 渲染表单项，如果有关联项，则在更改值时弹出确认框，否则直接更改值
+const RenderEntryControl = ({ fieldValue, item, props, translate, getMainCode, ...otherProps }) => {
+  const { mainCode, serverKey, dataCode, valueFieldMap } = props;
+  const { onChange } = otherProps;
+  const [isUpdateItem, setIsUpdateItem] = useState<boolean>(false);
+  const [value, setValue] = useState<any>(fieldValue);
+  const controlProps = { dataCode, serverKey, mainCode: getMainCode(item, mainCode), value: fieldValue, fieldConfig: item, ...otherProps };
+
+  const popconfirm = useMemo(() => {
+    if (!valueFieldMap) {
+      return { isPopconfirm: false };
+    }
+    const isPopconfirm = !!valueFieldMap[item.id];
+    const fieldNames = valueFieldMap[item.id]?.map(item => ` [${item.title}] `)?.join("、");
+    const title = `修改数据会同步删除关联项${fieldNames}的数据，确认修改`;
+    return { title, isPopconfirm };
+  }, [valueFieldMap]);
+  // 当前项有值且存在关联项，则更改值时弹出确认框，否则直接更改值
+  return value && popconfirm.isPopconfirm ? <Popconfirm
+    key="back"
+    placement="top"
+    title={translate("${" + popconfirm.title + "}?")}
+    onConfirm={() => {
+      onChange(value);
+      setIsUpdateItem(false);
+    }}
+    onCancel={() => setIsUpdateItem(false)}
+    okText={translate("${确定}")}
+    cancelText={translate("${取消}")}
+    open={isUpdateItem}
+  >
+    <EntryControl
+      {...controlProps}
+      onChange={(val) => {
+        setValue(val);
+        setIsUpdateItem(true);
+      }}
+    />
+  </Popconfirm> :
+    <EntryControl {...controlProps} />;
+};
+
 export interface FieldGroupProps {
   serverKey?: string;
   fields: FieldConfig[];
@@ -19,8 +61,9 @@ export interface FieldGroupProps {
   maxColsOnRow?: number;
   mainCode?: string;
   formRef?: RefObject<FormInstance>;
-  dataCode?:string,
-  layout?: "horizontal" | "vertical"
+  dataCode?: string,
+  layout?: "horizontal" | "vertical";
+  valueFieldMap?: { [key: string]: any } // 表单关联项配置
 }
 
 interface FieldGroupState {
@@ -79,41 +122,39 @@ export default class FormItemGroup extends React.PureComponent<
     return fieldConfig;
   };
   initFormItem = (fieldConfig: FieldConfig, fieldValue) => {
-    const { nameAttr, maxColsOnRow, mainCode, serverKey,dataCode,layout } = this.props;
+    const { nameAttr, maxColsOnRow, layout } = this.props;
     const { translate } = this.context;
     let item = this.getFieldConfig(fieldConfig);
 
-    let labelColSpan=24;
-    let wrapperColSpan=24;
-    if(layout==="vertical"){
-      labelColSpan=24;
-      wrapperColSpan=24;
-    }else {
-      labelColSpan= maxColsOnRow == 1 ?  6 : item.colSpan == 1 ?  6 :  3;
-      wrapperColSpan= maxColsOnRow == 1 ?  18 : item.colSpan == 1 ? 15 :  19 ;
+    let labelColSpan = 24;
+    let wrapperColSpan = 24;
+    if (layout === "vertical") {
+      labelColSpan = 24;
+      wrapperColSpan = 24;
+    } else {
+      labelColSpan = maxColsOnRow == 1 ? 6 : item.colSpan == 1 ? 6 : 3;
+      wrapperColSpan = maxColsOnRow == 1 ? 18 : item.colSpan == 1 ? 15 : 19;
     }
 
     return (
       <FormItem
         label={translate("${" + item.title + "}")}
         hidden={item.hidden}
-        name={fieldConfig.controlType=="field-history" ?undefined:item[nameAttr]}
+        name={fieldConfig.controlType == "field-history" ? undefined : item[nameAttr]}
         key={item.id}
-        labelCol={{ span: labelColSpan }
-        }
-        wrapperCol={
-         {span:wrapperColSpan}
-        }
-        tooltip={(!item.tip || item.tip=="")?undefined:item.tip}
+        labelCol={{ span: labelColSpan }}
+        wrapperCol={{ span: wrapperColSpan }}
+        tooltip={(!item.tip || item.tip == "") ? undefined : item.tip}
         initialValue={fieldValue}
         style={{ margin: 4 }}
-        rules={TmplConfigAnalysis.getRules(item,translate)}
+        rules={TmplConfigAnalysis.getRules(item, translate)}
       >
-        <EntryControl dataCode={dataCode}
-          serverKey={serverKey}
-          mainCode={this.getMainCode(item, mainCode)}
-          value={fieldValue}
-          fieldConfig={item}
+        <RenderEntryControl
+          fieldValue={fieldValue}
+          item={item}
+          props={this.props}
+          translate={translate}
+          getMainCode={this.getMainCode}
         />
       </FormItem>
     );
@@ -137,8 +178,8 @@ export default class FormItemGroup extends React.PureComponent<
           fieldValue || fieldValue == 0
             ? fieldValue
             : item.defaultValue
-            ? Units.configParamTrans(item.defaultValue,ControlTypeSupportor.getControlType(item,item.defaultValue))
-            : undefined;
+              ? Units.configParamTrans(item.defaultValue, ControlTypeSupportor.getControlType(item, item.defaultValue))
+              : undefined;
         let formItem = null;
         if (item.extControlType == "hidden") {
           formItem = (
@@ -181,7 +222,7 @@ export default class FormItemGroup extends React.PureComponent<
         colSpan = 2;
       }
       let col = (
-        <Col key={i} span={12 * colSpan } >
+        <Col key={i} span={12 * colSpan} >
           {formItemList[i]}
         </Col>
       );

package/src/aldehyde/index.tsx

@@ -112,6 +112,8 @@ import DatePicker from "./controls/date-picker";
 // const DatePicker = loadable(() =>
 //     import("./controls/date-picker"), {fallback: Loading});
 
+import ModalDtmplView from "./detail/view/modal-dtmpl-view"
+
 import ModelStrucV3 from "./tmpl/model-struc-v3";
 
 import TmplConfigAnalysis from "./tmpl/tmpl-config-analysis";
@@ -138,6 +140,8 @@ import ContextPage5 from "./layout5/page";
 
 
 import LowcodeComponents from "./lowcode-components";
+import DtmplViewModal from "./module/dtmpl-view-modal";
+import DtmplViewDrawer from './module/dtmpl-view-drawer';
 
 export {
   ActTable,
@@ -193,5 +197,7 @@ export {
   ContextPage3,
   LoginPage3,
   ContextPage4,
-  ContextPage5
+  ContextPage5,
+  DtmplViewModal,
+  DtmplViewDrawer,
 };

package/src/aldehyde/login3/index.less

@@ -1,6 +1,6 @@
 .login-page {
-    width: 100%;
-    height: 100%;
+    width: 100vw;
+    height: 100vh;
     min-height: 640px;
     position: relative;
     background-size: 100% 100%;
@@ -11,6 +11,40 @@
     align-items: center;
     overflow: hidden;
 
+    .head {
+        position: absolute;
+        top: 3%;
+        left: 1.5%;
+        display: flex;
+        align-items: center;
+
+        .head-text {
+            font-size: 42px;
+            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 配合 */
+        }
+
+        .head-logo {
+            width: 38px;
+            height: 38px;
+            margin-right: 16px;
+        }
+    }
+
     .login-logo-img {
         position: absolute;
         top: 20%;

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

@@ -11,11 +11,13 @@ import "./index.less";
 
 type LoginPageProps = {
   programName?: string;
+  programName_sub?: string;
   copyright?: string;
+  logo?: string;
 };
 
 const LoginPage = (props: LoginPageProps) => {
-
+  const { programName, programName_sub, logo, copyright } = props;
   const { translate } = useLocale();
 
   return (
@@ -23,6 +25,10 @@ const LoginPage = (props: LoginPageProps) => {
       className="login-page"
       style={{ backgroundImage: `url(${LoginBgPng})` }}
     >
+      <div className="head">
+        {logo ? <img className="head-logo" src={logo} alt="" /> : ""}
+        <span className="head-text">{programName || ProgramConfig.programName()}</span>
+      </div>
       <img src={logoPng} alt="" className="login-logo-img" />
       <div className="login-content" style={{ backgroundImage: `url(${LoginContentBgPng})` }} >
         <div className="login-logo">
@@ -30,11 +36,7 @@ const LoginPage = (props: LoginPageProps) => {
             {translate("${欢迎,登录}")}
           </div>
           <div className="login-logo-text-sub">
-            {props.programName == "Aldehyde" ? "" :
-              <>
-                {props.programName ? translate("${" + props.programName + "}") : translate("${" + ProgramConfig.programName() + "}")}
-              </>
-            }
+            {programName_sub ? translate("${" + programName_sub + "}") : translate("${" + ProgramConfig.programName_sub() + "}")}
           </div>
         </div>
         <div className="login-form">
@@ -54,9 +56,9 @@ const LoginPage = (props: LoginPageProps) => {
           <div className="reset-password">
             <ResetPassword showUserName={true} />
           </div>
-          {props.copyright ?
+          {copyright ?
             <div className="login-copyright">
-              {"Copyright ◎ 2025" + (props.copyright || "")}
+              {"Copyright ◎ 2025" + (copyright || "")}
             </div> : ""
           }
         </div>