aldehyde 0.2.481 → 0.2.483

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

@@ -158,24 +158,6 @@ class RelationTable extends React.PureComponent<
         return dataSource;
     };
 
-    isDisabled = (record: DtmplData, item: FieldConfig) => {
-        if (!item.rowEditType) {
-            return false;
-        }
-        let isNew: boolean = record.editStatus && record.editStatus == "new";
-        let type = item.rowEditType;
-        if (type == "editable") {
-            return false;
-        } else if (type == "readonly") {
-            return true;
-        } else if (type == "editonly" && !isNew) {
-            return false;
-        } else if (type == "addonly" && isNew) {
-            return false;
-        }
-        return true;
-    }
-
     buildColumns = () => {
         const { viewOrEdit, fieldGroupConfig, serverKey, parentFormInstance } = this.props;
         const {
@@ -211,7 +193,7 @@ class RelationTable extends React.PureComponent<
                 }
                 item.baseCriteria = {
                     ...item.baseCriteria,
-                    "secondCriterion": parentFormInstance.getFieldValue(item.relValueField.id)
+                    "secondCriterion": parentFormInstance?.getFieldValue?.(item.relValueField.id)
                 };
                 item.configChanged = true;
             }
@@ -224,8 +206,9 @@ class RelationTable extends React.PureComponent<
                         initialValue={record[item.id]}>
                         <EntryControl
                             serverKey={serverKey}
-                            fieldConfig={{ ...item, disabled: this.isDisabled(record, item) }}
+                            fieldConfig={{ ...item }}
                             value={record[item.id]}
+                            editStatus={record.editStatus}
                         /></FormItem> :
                     <ViewControl
                         serverKey={serverKey}
@@ -857,6 +840,8 @@ class RelationTable extends React.PureComponent<
                                 addOrEditType == "tableRow" ?
                                     <>
                                         <Button
+                                            styles={{ root: { marginBottom: "10px" } }}
+                                            disabled={buttonDisabled}
                                             onClick={() => this.addNewRow(undefined)}>{translate("${添加一行}")}</Button>
                                         {batchAddFileField ?
                                             <EntryControl value={uploadingFiles} onChange={this.uploadFiles}
@@ -918,7 +903,7 @@ class RelationTable extends React.PureComponent<
                                 ""
                             )}
                             {fieldGroupConfig.min && (!value || value.length <= 0) ? (
-                                <Text style={{ color: "red" }}>
+                                <Text style={{ color: "red", display: 'inline-block', marginBottom: "10px" }}>
                                     {translate("${请选择或添加}")}
                                     {translate("${" + fieldGroupConfig.title + "}")}
                                 </Text>

package/src/aldehyde/tmpl/hc-data-source.tsx

@@ -369,6 +369,14 @@ HCDataSource.getEnums = function (mstrucId: string): EnumItem[] {
   return enumMap.get(mstrucId);
 };
 
+// 获取枚举，缓存没有则请求
+HCDataSource.getSelectEnums = async function (serverKey: string, mstrucId: string): Promise<EnumItem[]> {
+  if (!enumMap.has(mstrucId)) {
+    await loadEnum(serverKey, [mstrucId]);
+  }
+  return enumMap.get(mstrucId);
+};
+
 HCDataSource.getEnumsValueMap = function (
   mstrucId: string
 ): Map<string, string> {

package/src/aldehyde/tmpl/interface.tsx

@@ -63,6 +63,8 @@ export interface CardListConfig {
   buttons?: string[];
   customViewPagePath?: string;
   mainCode?: string;
+  notDisplayFieldName?: boolean;
+  colNumOnRow?: number;
 }
 
 export interface QueryTableProps extends ReportTableProps {
@@ -459,6 +461,7 @@ export interface FieldConfig extends FieldBase {
   defaultDtmplData?: DtmplData;
   optionCodeColId?: string;
   sortable?: boolean;
+  pageSortable?: boolean; // 页内排序
   itemBreakLine?: boolean;
   configChanged?: boolean;
   rowEditType?: "editable" | "readonly" | "editonly" | "addonly";
@@ -635,6 +638,8 @@ export interface LtmplConfig extends SelectConfig {
     mainPictureLabel?: ColumnConfig;
     labelColumn?: ColumnConfig;
     cardShowCols?: ColumnConfig[];
+    notDisplayFieldName?: boolean;
+    colNumOnRow?: number; // 卡片展示字段每行列数
   };
   rowCardCount?: number;
   defaultDtmplData?: DtmplData;