aldehyde 0.2.304 → 0.2.305

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

@@ -1228,8 +1228,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                     ></div>
                 ) : null}
                       <h3 >
-                  {" "}
-                        <p style={{position:"relative",float: "left",marginBottom:"4px"}}> {!title
+                        <p className="act-table-title" style={{position:"relative",float: "left",marginBottom:"4px"}}> {!title
                             ? translate("${" + ltmplConfig.title + "}")
                             : typeof title == "string"
                                 ? translate("${" + title + "}")

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

@@ -21,7 +21,7 @@ import {
 import "./index.css";
 import {
     ClassAddConfig,
-    DtmplData,
+    DtmplData, FieldConfig,
     FieldGroupConfig,
     SelectedRow,
     ViewOrEdit,
@@ -141,6 +141,7 @@ class RelationTable extends React.PureComponent<
                 if (flag) {
                     let row = {
                         key: item.code,
+                        editStatus:item.editStatus,
                         relationLabel: item.relationLabel,
                         code: item.code, //增加code,为了删除操作
                         ...item.fieldMap,
@@ -153,6 +154,24 @@ 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 {
@@ -192,9 +211,7 @@ class RelationTable extends React.PureComponent<
                 item.configChanged = true;
             }
             column["render"] = (text, record) => {
-
                 return (editings.indexOf(record.code) >= 0 ?
-
                         <FormItem style={{margin: 0}}
                                   name={record.code + "_" + item.id}
                                   key={record.code + "_" + item.id}
@@ -202,8 +219,7 @@ class RelationTable extends React.PureComponent<
                                   initialValue={record[item.id]}>
                             <EntryControl
                                 serverKey={serverKey}
-                                //holderType={"table"}
-                                fieldConfig={item}
+                                fieldConfig={{...item,disabled:this.isDisabled(record,item)}}
                                 value={record[item.id]}
                             /></FormItem> :
                         <ViewControl
@@ -425,8 +441,6 @@ class RelationTable extends React.PureComponent<
         });
     };
 
-    editRow = (record) => {
-    };
     delete = async (record) => {
         const {value, fieldGroupConfig, onChange, serverKey} = this.props;
         const {editings} = this.state;
@@ -649,11 +663,17 @@ class RelationTable extends React.PureComponent<
         let editingCodes = [...editings];
         let i = 0;
         for (let f of fieldMaps) {
+
             let newData: DtmplData = {};
+            newData.editStatus="new";
             newData.code = Date.now() + "" + i++;
             newData.relationLabel = fieldGroupConfig.relationNames[0]
             newData.fieldMap = f;
-            datas.unshift(newData);
+            if(fieldGroupConfig.addRowPosition && fieldGroupConfig.addRowPosition==='end'){
+                datas.push(newData);
+            }else{
+                datas.unshift(newData);
+            }
             editingCodes.push(newData.code);
         }
 

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

@@ -89,7 +89,7 @@ const ResizableTable = props => {
         }
     }
 
-    return <Table components={components}  columns={columns}  {...other}   />;
+    return <Table components={components}  columns={columns}  {...other}   size="small" />;
 }
 
 export default ResizableTable;

package/src/aldehyde/tmpl/interface.tsx

@@ -329,6 +329,7 @@ export interface FieldGroupConfig extends OrderableTmplBase {
   viewModel?: "table" | "verticalList";
   addOrEditType?: "singleCol" | "doubleCol" | "tableRow";
   batchAddFileField?: FieldConfig;
+  addRowPosition?:"begin"|"end";
 }
 
 export type SaveJumpType = "list" | "add" | "edit";
@@ -410,6 +411,7 @@ export interface FieldConfig extends FieldBase {
   sortable?: boolean;
   itemBreakLine?: boolean;
   configChanged?: boolean;
+  rowEditType?:"editable"|"readonly"|"editonly"|"addonly";
 }
 
 export interface ActionRenderProps {