aldehyde 0.2.214 → 0.2.215

package/src/aldehyde/tmpl/interface.tsx

@@ -17,6 +17,49 @@ export type ActTableViewModel = "table" | "verticalList" | "horizontalList";
 
 export type ControlHolderType = "table" | "descriptions";
 export type PageType = "modal" | "drawer" |"card"| "routing" |"blank";
+
+export interface ReportTableProps {
+  tableProps?: {
+    size?: "small" | "middle" | "large";
+    clickDisplayTotal?: boolean;
+    scrollY?: number;
+  };
+  leftFixedCols?:number;
+  serverKey?: string;
+  maxSelectedRows?: number;
+  selectedRows?: SelectedRow[];
+  columns: any[];
+  onChangeRowSelection?: (
+      selectedRows: SelectedRow[],
+      selectedDatas: DtmplData[],
+      allRowKeys: string[]
+  ) => void;
+  queryKey: QueryKey;
+}
+export interface QueryTableProps extends ReportTableProps{
+  viewModels?: ActTableViewModel[];
+  // defaultPageSize?: number;
+  pageInfo: {
+    pageNo: number;
+    pageSize: number;
+  };
+  primaryColumn?: ColumnConfig;
+  onChangePage: (pageNo: number, pageSize: number) => void;
+  hiddenRowCodes?: string[];
+  viewModel?: string;
+  columnConfigs?: FieldConfig[];
+  summaryConfigs?: {
+    id: string;
+    aggFunc: "sum" | "avg" | "groupIsum" | "groupIavg";
+  }[];
+  subtotalXColumn?: { id: string }[];
+  subtotalYColumn?: { id: string }[];
+  groupIColumns?: { id: string; title: string; sourceId: string }[]; // 组间合计key
+  doSearch?: (params: object) => void;
+  sortColumnData?: string[];
+}
+
+
 export interface TmplBase {
   id?: string;
   title?: string;
@@ -28,7 +71,7 @@ export interface OrderableTmplBase extends TmplBase {
 }
 
 export interface FieldBase extends OrderableTmplBase {
-  colNum?: number;
+  colSpan?: number;
   mstrucId?: string;
   defaultValue?: string;
   value?: string;
@@ -142,7 +185,7 @@ export interface Level2Menu extends MenuBase {
   disabled?: boolean;
   hiddenOnDisabled?: boolean;
   defaultCriteriaValue?: object;
-  pageType: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树"|"导入";
+  pageType: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树"|"导入"|"报表";
   programAuths?: ProgramAuth[];
   linkTarget?: HTMLAttributeAnchorTarget;
 }
@@ -164,10 +207,12 @@ export interface CriteriaConfig extends FieldConfig {}
 
 export interface ColumnConfig extends FieldConfig {
   statColType?: StatColType;
+  rowSpan?:number;
   colWidth?: number;
   colFixed?: "left" | "right" | boolean;
   valueAlign?: "left" | "right" | "center";
   id: string;
+  upperColumnTitle?:string,
 }
 
 export type CodeSource = "new" | "listop" | "listop-new" | undefined;
@@ -441,6 +486,14 @@ export interface DtmplData {
   fieldMap?: object;
   arrayMap?: object; //Map<number,DtmplData[]>
 }
+export interface GridLayout{
+  rowSpan?:number,
+  colSpan?:number;
+}
+
+export interface LtmplData extends DtmplData{
+  layout:GridLayout[];
+}
 
 export interface PageInfo {
   pageNo: number;
@@ -448,12 +501,12 @@ export interface PageInfo {
   virtualEndPageNo?: number;
 }
 
-export interface LtmplData {
-  entities: DtmplData[];
-  pageInfo: PageInfo;
-  queryKey: string;
-  isEndList: boolean;
-}
+// export interface LtmplData {
+//   entities: DtmplData[];
+//   pageInfo: PageInfo;
+//   queryKey: string;
+//   isEndList: boolean;
+// }
 
 export interface UserInfo {
   id: string;
@@ -481,6 +534,13 @@ export interface QueryData {
   pageInfo: PageInfo;
 }
 
+export interface ReportData {
+  entities: LtmplData[];
+  key: string;
+  columnConfigs: ColumnConfig[];
+  rowGrids:object;
+}
+
 export interface EControlProps extends ControlBaseProps {
   onChange?: (value: any) => void;
   min?: string;
@@ -607,7 +667,7 @@ export interface BlockType {
   disabled?: boolean; // 是否禁用
   hiddenOnDisabled?: boolean; // 是否隐藏
   customPath?: string; // 自定义页面路径
-  pageType?: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树"|"导入"; // 页面类型
+  pageType?: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树"|"导入"|"报表"; // 页面类型
   defaultCriteriaValue?: { [key: string]: string }; // 一些组件参数
   linkTarget?: HTMLAttributeAnchorTarget; // 页面跳转方式
   items?: BlockType[];