aldehyde 0.2.236 → 0.2.238

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

@@ -50,13 +50,15 @@ const ReportTable=(props:ReportTableProps)=> {
                 let dataSource: object[] = [];
                 if (reportData.entities) {
                     reportData.entities.forEach((item, index) => {
-                        let row = {
-                            key: item.code,
-                            code: item.code, //增加code,为了删除操作
-                            ...item.fieldMap,
-                            index,
-                        };
-                        dataSource.push(row);
+                        if (item) {
+                            let row = {
+                                key: item.code,
+                                code: item.code, //增加code,为了删除操作
+                                ...item.fieldMap,
+                                index,
+                            };
+                            dataSource.push(row);
+                        }
                     });
                 }
 

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

@@ -246,6 +246,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
             (actions && actions.length > 0) || (jumps && jumps.length > 0) || (fileExports && fileExports.length>0)) {
             displayCriteriaCard = true;
         }
+       // debugger
         return (
             // <Card
             //     // title={<SelectedRowsCard value={selectedRows} onChange={this.changeRowSelection}></SelectedRowsCard>}
@@ -258,7 +259,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
                 <CriteriaForm serverKey={serverKey} selectedRows={selectedRows} selectedDatas={selectedDatas} ltmplConfig={selectConfig}
                               data={criteriaData}
                               doSearch={this.doSearch} loading={loading}/>
-                <QueryTable serverKey={serverKey} maxSelectedRows={maxSelectedRows} selectedRows={selectedRows}
+                <QueryTable serverKey={serverKey} maxSelectedRows={maxSelectedRows?maxSelectedRows:selectConfig.maxSelectedRows} selectedRows={selectedRows}
                             primaryColumn={selectConfig.primaryColumn}
                             columns={columns}
                             pageInfo={{pageNo,

package/src/aldehyde/table/selected-rows-card.tsx

@@ -7,6 +7,7 @@ import { LocaleContext } from "../locale/LocaleProvider";
 interface SelectedRowsCardProps {
   value: SelectedRow[];
   onChange?: (value: SelectedRow[]) => void;
+  message?: string;
 }
 
 interface SelectedRowsCardStat {}
@@ -66,6 +67,8 @@ class SelectedRowsCard extends React.PureComponent<
         <h3>
           {translate("${查询点选}:")}
           {this.renderTag()}
+          {this.props.message}
+          {}
         </h3>
       </div>
     );

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -685,6 +685,26 @@ export default class HcserviceV3 {
     return res;
   }
 
+  static async doPostRequest(serverKey: string, url:string,params?:object) {
+    let res = await Super.super({
+      url,
+      serverKey,
+      method: "POST",
+      data: { ...params },
+    });
+    return res;
+  }
+
+  static async doGetRequest(serverKey: string, url:string,params?:object) {
+    let res = await Super.super({
+      url,
+      serverKey,
+      method: "GET",
+      query: { ...params },
+    });
+    return res;
+  }
+
 
   static async postActions(
     serverKey: string,

package/src/aldehyde/tmpl/interface.tsx

@@ -1,6 +1,6 @@
 import { MenuProps } from "antd/lib/menu";
 import { FormInstance } from "antd";
-import React, { HTMLAttributeAnchorTarget, RefObject } from "react";
+import React, {HTMLAttributeAnchorTarget, ReactDOM, RefObject} from "react";
 import { ButtonShape, ButtonType } from "antd/lib/button";
 
 export type ViewOrEdit = "view" | "edit";
@@ -16,8 +16,18 @@ export type StatColType = "fact" | "dimension";
 export type ActTableViewModel = "table" | "verticalList" | "horizontalList";
 
 export type ControlHolderType = "table" | "descriptions";
+
 export type PageType = "modal" | "drawer" |"card"| "routing" |"blank";
 
+export type CustomButtonType = "request_refresh" | "show_window" |"do_event";
+
+export interface CustomButtonConfig{
+  getRequestUrl?:(customButton: CustomButton, records?: DtmplData[])=>string;
+  doAction?:(customButton: CustomButton, records: DtmplData[])=>void;
+  getCurrentPage?:(customButton: CustomButton, records: DtmplData[])=>any;
+}
+
+
 export interface ReportTableProps {
   tableProps?: {
     size?: "small" | "middle" | "large";
@@ -39,7 +49,6 @@ export interface ReportTableProps {
 }
 export interface QueryTableProps extends ReportTableProps{
   viewModels?: ActTableViewModel[];
-  // defaultPageSize?: number;
   pageInfo: {
     pageNo: number;
     pageSize: number;
@@ -57,7 +66,7 @@ export interface QueryTableProps extends ReportTableProps{
   groupIColumns?: { id: string; title: string; sourceId: string }[]; // 组间合计key
   doSearch?: (params: object) => void;
   sortColumnData?: string[];
-  queryTotal?:()=> any; //暂时无用
+  queryTotal?:()=> any;//暂时无用
 }
 
 export interface AggregateVO {
@@ -131,7 +140,7 @@ export interface CustomButton extends ButtonConfig {
    path:string;
    params:string;
    requestMethod:string;
-   doType:string;
+   doType:CustomButtonType;
    windowPosition:'under-table'|'above-table'|'modal-window'|'left-drawer'|'right-drawer';
    windowHeight:string;
    windowWidth:string;
@@ -418,6 +427,8 @@ export interface SelectConfig extends TmplBase {
   scrollY?:number;
   directShowTotal?: boolean;
   leftFixedCols?: number;
+  minSelectRows?: number;
+  maxSelectRows?: number;
   onCriteriaValuesChange?: (
     changedValues,
     allValues: DtmplData,
@@ -567,6 +578,7 @@ export interface QueryData {
   touchEnd: boolean;
   key: string;
   pageInfo: PageInfo;
+  beforeSelectedRows:number;
 }
 
 export interface ReportData {
@@ -612,6 +624,7 @@ export interface RouterCompProps {
   navigate?: any;
   params: any;
   searchParams: any;
+  // routeMode?:'multiple'|'single';
 }
 
 export interface TmplBaseProps {

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

@@ -12,6 +12,7 @@ const { Text, Title } = Typography;
 
 interface ActTreeProps {
   ttmplConfig: TtmplConfig;
+  top:number,
 }
 
 interface ActTreeState {
@@ -29,7 +30,7 @@ export default class ActTree extends React.PureComponent<
   ActTreeProps,
   ActTreeState
 > {
-  static defaultProps = {};
+  static defaultProps = {top:66};
   state = {
     ttmplNodeConfig: undefined,
     recordCode: undefined,
@@ -137,8 +138,9 @@ export default class ActTree extends React.PureComponent<
   };
 
   render() {
-    const {} = this.props;
-    const { translate } = this.context;
+    const {top} = this.props;
+    const { translate,siderCollapsed } = this.context;
+
 
     const {
       ttmplNodeConfig,
@@ -162,9 +164,9 @@ export default class ActTree extends React.PureComponent<
             height: "90vh",
             position: "fixed",
             left: 0,
-            top: 66,
+            top: top,
             bottom: 0,
-            marginLeft: 210,
+            marginLeft: siderCollapsed?10:210,
           }}
         >
           <TmplTree

package/src/aldehyde/units/index.tsx

@@ -1,6 +1,6 @@
 // import React from 'react'
 import {
-  CriteriaConfig,
+  CriteriaConfig, CustomButtonConfig,
   DtmplConfig,
   DtmplData,
   DtmplFormProps,
@@ -18,6 +18,10 @@ let storageKeyPrefix = undefined;
 
 const CUSTOM_PAGE_MAP = {};
 
+let MENU_MAP = {};
+
+const CustomButtonConfig_Map={}
+
 const CUSTOM_VIEW_CONTROL_MAP = {};
 
 const AppDtmplConfigFuncMap = {};
@@ -30,6 +34,8 @@ const extendServerMap = {};
 
 let antdUseToken = undefined;
 
+// let siderCollapsed:boolean = true;
+
 export default {
   setAntdUseToken(antdUseToken_) {
     antdUseToken = antdUseToken_;
@@ -46,6 +52,26 @@ export default {
     AppDtmplConfigFuncMap[key] = func;
   },
 
+  // setSiderCollapsed(collapsed){
+  //   siderCollapsed=collapsed;
+  // },
+  //
+  // isSiderCollapsed(){
+  //   return siderCollapsed;
+  // },
+
+
+  setMenuMap(menuMap){
+    MENU_MAP=menuMap;
+  },
+  mapMenu(menuId){
+    if(menuId=='home'){
+      return "首页"
+    }
+    return MENU_MAP[menuId];
+  },
+
+
   getAppDtmplConfig(
     dtmplConfig: DtmplConfig,
     dtmplData: DtmplData,
@@ -70,6 +96,19 @@ export default {
     return dtmplConfig;
   },
 
+  setCustomButtonConfig(
+      key: string,
+      config : CustomButtonConfig
+  ) {
+    CustomButtonConfig_Map[key] = config;
+  },
+
+  getCustomButtonConfig(
+      key: string
+  ) {
+   return CustomButtonConfig_Map[key];
+  },
+
   setAppCtmplConfigFunc(
     key: string,
     func: (ltmplConfig: SelectConfig, data: Object) => SelectConfig