aldehyde 0.2.342 → 0.2.345

package/src/aldehyde/module/dtmpl-edit-page.tsx

@@ -46,6 +46,7 @@ interface ModalEditorState {
   loading?: boolean;
   serial?: number;
   dtmplData?: DtmplData;
+  valueFieldMap?: { [key: string]: any }
 }
 
 export default class DtmplEditPage extends React.PureComponent<
@@ -84,6 +85,7 @@ export default class DtmplEditPage extends React.PureComponent<
     loading: false,
     serial: 1,
     dtmplData: undefined,
+    valueFieldMap: {}
   };
 
   async componentDidMount() {
@@ -134,6 +136,7 @@ export default class DtmplEditPage extends React.PureComponent<
         addTmplId
       );
     }
+    this.handleRelValueField(dtmplConfig);
     // 直接复制
     if (dtmplConfig?.entity && dtmplConfig?.entity?.code == code) {
       let dtmplData = dtmplConfig.entity;
@@ -265,10 +268,41 @@ export default class DtmplEditPage extends React.PureComponent<
     setTimeout(() => this.onValuesChange(), 300);
   };
 
-  onValuesChange = () => {
-    this.setState({
-      serial: this.state.serial + 1,
-    });
+  /**
+   * 处理表单关联项
+   * 匹配关联项的字段，实现值更新关联字段值变化
+   */
+  handleRelValueField = (dtmplConfig: DtmplConfig) => {
+    const { groups } = dtmplConfig;
+    const valueFieldMap = groups.reduce((total, item) => {
+      if (item.fields) {
+        item.fields.forEach(field => {
+          if (field.relValueField) {
+            const temArr = total[field.relValueField.id] || [];
+            const isItem = temArr.find(r => r.id === item.id);
+            if (!isItem) {
+              total[field.relValueField.id] = [...temArr, item];
+            }
+          }
+        })
+      }
+      return total;
+    }, {});
+    this.setState({ valueFieldMap });
+  };
+
+  onValuesChange = (changedValues?: any, allValues?: any) => {
+    const { dtmplData, valueFieldMap } = this.state;
+    const changeValKey = Object.keys(changedValues || {})[0];
+    if (changeValKey && valueFieldMap[changeValKey]) {
+      // 处理关联字段值变化, 表单值变化，处理关联字段值为空
+      const temArrayMap = valueFieldMap[changeValKey].reduce((total, item) => {
+        total[item.id] = [];
+        return total;
+      }, {});
+      this.setState({ dtmplData: { ...dtmplData, fieldMap: allValues, arrayMap: { ...dtmplData.arrayMap, ...temArrayMap } } });
+    }
+    this.setState({ serial: this.state.serial + 1 });
   };
 
   doSubmit = (actionId?: number, codes?: string[], params?: object) => {
@@ -357,7 +391,7 @@ export default class DtmplEditPage extends React.PureComponent<
       title,
       serverKey, parentFormInstance
     } = this.props;
-    const { dtmplConfig, id, dtmplData } = this.state;
+    const { dtmplConfig, id, dtmplData, valueFieldMap } = this.state;
 
     let title1 = title ? title : dtmplConfig ? dtmplConfig.title : "";
     const { translate } = this.context;
@@ -395,6 +429,7 @@ export default class DtmplEditPage extends React.PureComponent<
                   dtmplData={dtmplData}
                   onValuesChange={this.onValuesChange}
                   parentFormInstance={parentFormInstance}
+                  valueFieldMap={valueFieldMap}
                 />
               </div>
             </Scrollbars>}
@@ -433,6 +468,7 @@ export default class DtmplEditPage extends React.PureComponent<
               dtmplData={dtmplData}
               onValuesChange={this.onValuesChange}
               parentFormInstance={parentFormInstance}
+              valueFieldMap={valueFieldMap}
             />
           </Drawer>
         ) : (
@@ -450,6 +486,7 @@ export default class DtmplEditPage extends React.PureComponent<
               dtmplData={dtmplData}
               onValuesChange={this.onValuesChange}
               parentFormInstance={parentFormInstance}
+              valueFieldMap={valueFieldMap}
             />
           </Card>
         )}

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

@@ -811,11 +811,31 @@ class RelationTable extends React.PureComponent<
         }
     }
 
+    // 处理fieldConfig，添加exceptCodes
+    handleFieldConfig = () => {
+        const { fieldGroupConfig, value } = this.props;
+        const fields = fieldGroupConfig.fields.map(field => {
+            if (!field || !value || !field.relDeduplication) {
+                return field;
+            }
+            const exceptCodes = value.map(item => {
+                let val = item.fieldMap[field.id];
+                if (val?.includes("@R@")) {
+                    return val.split("@R@")[0];
+                }
+                return val;
+            }).filter(Boolean);
+            return { ...field, exceptCodes };
+        });
+        return { ...fieldGroupConfig, fields };
+    }
+
     buildButtons = () => {
         const { fieldGroupConfig, viewOrEdit, value, serverKey } = this.props;
         const { translate } = this.context;
         const { buttons, disabled, addOrEditType, batchAddFileField } = fieldGroupConfig;
         const { uploadingFiles } = this.state;
+        const temFieldGroupConfig = this.handleFieldConfig();
 
         const buttonDisabled: boolean = disabled
             ? disabled
@@ -842,9 +862,9 @@ class RelationTable extends React.PureComponent<
                                         disabled={buttonDisabled}
                                         buttonStyle={{ marginBottom: 10 }}
                                         buttonTitle={translate("${新建一行}")}
-                                        fieldGroupConfig={fieldGroupConfig}
+                                        fieldGroupConfig={temFieldGroupConfig}
                                         onOk={this.handleColData}
-                                    ></PopoverEditor>
+                                    />
                             ) : (
                                 ""
                             )}

package/src/aldehyde/tmpl/interface.tsx

@@ -116,8 +116,8 @@ export interface DtmplFormProps extends DtmplBaseProps {
   showConfirm?: boolean;
   showHeader?: boolean;
   onFinish: (code: string | boolean) => void;
-  onValuesChange?: () => void;
-
+  onValuesChange?: (changedValues, allValues: DtmplData) => void;
+  valueFieldMap?: { [key: string]: any } // 表单关联项
 }
 
 export interface CQueryConfig extends OrderableTmplBase {
@@ -416,6 +416,8 @@ export interface FieldConfig extends FieldBase {
   configChanged?: boolean;
   rowEditType?: "editable" | "readonly" | "editonly" | "addonly";
   colWidth?: number;
+  exceptCodes?: string[];
+  relDeduplication?: boolean;
 }
 
 export interface ActionRenderProps {