aldehyde 0.2.235 → 0.2.237

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

@@ -1,11 +1,10 @@
 import React from "react";
-import Table from "./control-table-x-axis-wrapper";
 import "./index.css";
 import {
   DtmplData,
   PageInfo,
   QueryData,
-  SelectedRow, QueryTableProps
+  SelectedRow, QueryTableProps, AggregateVO
 } from "../tmpl/interface";
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import Pagination from "./pagination";
@@ -16,6 +15,7 @@ import { LocaleContext } from "../locale/LocaleProvider";
 import { init, merge, statistic } from "../utils/dsu";
 import VerticalList from "../list/vertical-list";
 import SummaryBuilder from "./column/summary-builder";
+import {Card, Descriptions, message, Space, Statistic, Table} from "antd";
 
 const SortableItem = SortableElement((props) => (
   <tr className="sortable-item-hover" {...props} />
@@ -34,7 +34,8 @@ interface QueryTableStat {
   dataSource?: object[];
   loading?: boolean;
   touchEnd?: boolean;
-  total?: number;
+  aggregateVO?: AggregateVO;
+  beforeSelectedRows?:number;
 }
 
 class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
@@ -61,7 +62,8 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     dataSource: undefined,
     loading: true,
     touchEnd: undefined,
-    total: undefined,
+    aggregateVO: undefined,
+    beforeSelectedRows:undefined,
   };
 
   static contextType = LocaleContext;
@@ -81,7 +83,8 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
   async componentDidUpdate(prevProps) {
     const { queryKey: preQueryKey, pageInfo: prePageInfo } = prevProps;
     const { queryKey, pageInfo } = this.props;
-    const { total } = this.state;
+   // const { aggregateVO } = this.state;
+    //debugger
     if (queryKey) {
       if (preQueryKey?.key != queryKey.key) {
         await this.loadData(queryKey.key, pageInfo, true);
@@ -143,7 +146,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     let queryCache: Map<string, CacheData>;
     if (cleanCache || !queryDataCache) {
       queryCache = new Map<string, CacheData>();
-      this.setState({ total: undefined });
+      this.setState({ aggregateVO: undefined });
     } else {
       queryCache = queryDataCache;
     }
@@ -186,6 +189,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
           pageInfo,
         });
         this.setState({
+          beforeSelectedRows:queryData.beforeSelectedRows,
           dataSource,
           virtualEndPageNo: pageInfo.virtualEndPageNo,
           queryDataCache: queryCache,
@@ -216,10 +220,15 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
   };
 
   queryTotal = async () => {
-    const { queryKey, serverKey } = this.props;
-    let total = await HcserviceV3.requestQueryCount(serverKey, queryKey.key);
+    const { queryKey, serverKey,queryTotal } = this.props;
+    let aggregateVO;
+    if(queryTotal){
+      aggregateVO= await queryTotal();
+    }else{
+      aggregateVO = await HcserviceV3.requestQueryAggregates(serverKey, queryKey.key);
+    }
     this.setState({
-      total,
+      aggregateVO,
     });
   };
 
@@ -231,7 +240,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       maxSelectedRows,
       primaryColumn,
     } = this.props;
-    let { dataSource } = this.state;
+    let { dataSource,beforeSelectedRows } = this.state;
     let selectedRowKeys = [];
 
     for (let row of selectedRows) {
@@ -243,14 +252,50 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
         allRowKeys.push(d.code);
       }
     }
-    if (maxSelectedRows == -1) {
+
+    let tmplMax=maxSelectedRows?maxSelectedRows:0;
+    if(beforeSelectedRows>0){
+      tmplMax=tmplMax-beforeSelectedRows;
+    }
+    const { translate } = this.context;
+
+    if (tmplMax <= -1) {
+      return null;
+    }
+
+    if (beforeSelectedRows>0 && tmplMax<=0) {
+      message.warning(translate("${已选超}") );
       return null;
     }
+
     const rowSelection: TableRowSelection<any> = {
+
       fixed: true,
       type: maxSelectedRows == 1 ? "radio" : "checkbox",
       selectedRowKeys,
       onChange: (selectedRowKeys, selectedRows) => {
+
+        if(tmplMax > 0 && selectedRowKeys.length > tmplMax){
+
+          message.error(translate("${最多只能选择}") + " : "+ tmplMax);
+          // message.error({
+          //     //type: 'error',
+          //     content: translate("${最多只能选择}") + " : "+ tmplMax,
+          //     style: {
+          //       zIndex: 12000,
+          //     },
+          //   duration:5
+          //   });
+
+          // messageApi.open({
+          //   type: 'error',
+          //   content: translate("${最多只能选择}") + " : "+ tmplMax,
+          //   style: {
+          //     zIndex: 2000,
+          //   },
+          // });
+          return;
+        }
         let selectedRows_: SelectedRow[] = [];
         let selectedDatas: DtmplData[] = [];
         let titleColId = primaryColumn?.id;
@@ -349,7 +394,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     serverKey,
     } = this.props;
     //debugger
-    const { touchEnd, total, loading, virtualEndPageNo,dataSource } = this.state;
+    const { touchEnd, aggregateVO, loading, virtualEndPageNo,dataSource } = this.state;
 
     const isProSumarryTable = Boolean(subtotalXColumn );
     const { translate } = this.context;
@@ -443,7 +488,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       }
     }
     const mergeMp = statistic();
-    console.log("统计结果", mergeMp);
+    //console.log("统计结果", mergeMp);
 
     // 给 col 添加 mergeRowInCol
     current_cols.forEach(
@@ -451,9 +496,34 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
         (col.onCell = (_, rowIdx) =>
           this.mergeRowInCol(_, rowIdx, colIdx, mergeMp, current_cols.length))
     );
+   let aggregateItems=[];
+    if(aggregateVO && aggregateVO.aggregates){
+      aggregateVO.aggregates.forEach(av=>{
+        aggregateItems.push({key: av.fieldId,
+          label:  <div style={{fontSize:14}}>{av.fieldTitle}</div>,
+          children: <Statistic value={av.value?av.value:0} />
+        // <div style={{fontSize:24}}>{av.value}</div>
+        })
+      })
+    }
 
     return (
       <>
+        {/*{aggregateVO && aggregateVO.aggregates && aggregateVO.aggregates.length>0?<Card styles={{body:{padding:2}}}>*/}
+        {/*  <Space size={"large"} style={{marginLeft:50}}>*/}
+        {/*    {*/}
+        {/*      aggregateVO.aggregates.map(av=>{*/}
+        {/*        return <Statistic title={av.fieldTitle} value={av.value} />*/}
+        {/*      })}*/}
+        {/*  </Space>*/}
+        {/*</Card>:null}*/}
+        {aggregateVO && aggregateVO.aggregates && aggregateVO.aggregates.length>0 ?
+            <Card variant="borderless" styles={{body:{paddingLeft:10,paddingTop:4,paddingBottom:4,paddingRight:10}}}>
+          <Descriptions
+              column={6}
+              items={aggregateItems}
+          />
+        </Card>:null}
         {viewModels.includes("table") ? (
           <Table
             size={tableProps.size ? tableProps.size : undefined}
@@ -489,7 +559,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
           pageInfo={{ ...pageInfo, virtualEndPageNo }}
           pageTo={this.pageTo}
           queryTotal={this.queryTotal}
-          total={total}
+          total={aggregateVO?.count}
         />
         {viewModels.includes("verticalList") ? (
             <VerticalList hiddenRowCodes={hiddenRowCodes}

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

@@ -755,9 +755,8 @@ class RelationTable extends React.PureComponent<
           tip={fieldGroupConfig.tip}
           id={parentId + fieldGroupConfig.id}
           className={`hoverable`}
-          headStyle={{ background: "#f2f4f5" }}
+          styles={{header:{ background: "#f2f4f5" },body:{ padding: "6px" }}}
           loading={loading}
-          bodyStyle={{ padding: "6px" }}
           //暂时注释掉，后续要支持配置。
           //extra={<Input.Search onSearch={this.searchValue} allowClear placeholder=""/>}
         >

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/table/stat/restat.tsx

@@ -4,7 +4,6 @@ import {
   Card,
   Form as AntdForm,
   FormInstance,
-  Popconfirm,
   Popover,
   Space,
   Tooltip,
@@ -16,7 +15,7 @@ import FormItemGroup from "../../form/form-Item-group";
 import HcserviceV3 from "../../tmpl/hcservice-v3";
 import { LocaleContext } from "../../locale/LocaleProvider";
 interface RestatProps {
-  onfinish: () => void;
+  onfinish: (value) => void;
   fields: FieldConfig[];
   value?: object;
   serverKey?: string;
@@ -46,7 +45,7 @@ class Restat extends React.PureComponent<RestatProps, RestatStat> {
     this.setState({
       loading: false,
     });
-    onfinish();
+    onfinish(val);
   };
 
   render() {

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

@@ -57,21 +57,29 @@ export default class HcserviceV3 {
         filePath.contentType = this.getFileSuffixFrom(filePath.fileName);
       } else {
         let jsonValue = this.getJsonValue(value);
-        if (jsonValue) {
-
-          filePath.path = this.getFileUrl(serverKey, jsonValue.base?.path);
-          filePath.iconPath = jsonValue.icon?.path ? this.getFileUrl(serverKey, jsonValue.icon?.path) : null;
-          filePath.fileName = jsonValue.fileName ? jsonValue.fileName : this.getFileNameFrom(jsonValue.base?.path);
-          filePath.contentType = this.getFileSuffixFrom(filePath.fileName);
-          filePath.valid = jsonValue.valid;
-          filePath.baseType=jsonValue.base?.type;
-          filePath.basePath=jsonValue.base?.path;
-        }
+        filePath=this.toFilePathObject(jsonValue,serverKey);
       }
+    }else if(value.base){
+      filePath=this.toFilePathObject(value,serverKey);
     }
     return filePath;
   }
 
+  static toFilePathObject(jsonValue,serverKey:string){
+    let filePath:any={};
+    if (jsonValue) {
+      filePath.path = this.getFileUrl(serverKey, jsonValue.base?.path);
+      filePath.iconPath = jsonValue.icon?.path ? this.getFileUrl(serverKey, jsonValue.icon?.path) : null;
+      filePath.fileName = jsonValue.fileName ? jsonValue.fileName : this.getFileNameFrom(jsonValue.base?.path);
+      filePath.contentType = this.getFileSuffixFrom(filePath.fileName);
+      filePath.valid = jsonValue.valid;
+      filePath.baseType=jsonValue.base?.type;
+      filePath.basePath=jsonValue.base?.path;
+      return filePath;
+    }
+    return null;
+  }
+
   static async requestEnumWithPath(serverKey: string, mstrucIds, path) {
     if (mstrucIds.length > 0) {
       let res = await Super.super({
@@ -667,23 +675,36 @@ export default class HcserviceV3 {
     }
   }
 
-  static async requestQueryCount(serverKey: string, queryKey: string) {
+  static async requestQueryAggregates(serverKey: string, queryKey: string) {
     let res = await Super.super({
       url: `/v3/ltmpl/query/count`,
       serverKey,
       method: "GET",
       query: { queryKey },
     });
-    return res.count;
+    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 requestFile(path) {
-  //     let res = await Super.super({
-  //         url:  Units.joinPath("/v3/files/", path),
-  //         method: "GET"
-  //     });
-  //     return res;
-  // }
 
   static async postActions(
     serverKey: string,
@@ -863,13 +884,28 @@ export default class HcserviceV3 {
     Units.openFile(path, fileName, toolbar);
   }
 
-  static getFileUrl(serverKey: string, path) {
+  static getFileUrl(serverKey: string, path:string) {
     const hydrocarbonToken = Units.hydrocarbonToken(
       Units.programCode(serverKey)
     );
-    let url =
-      Units.joinPath(Units.api(serverKey), Units.joinPath("/v3/files", path)) +
+    let root;
+    let url;
+    //判断是否为全URL
+    if(path?.startsWith("http") || path?.startsWith("HTTP")){
+      root=path;
+      if(path.indexOf("?")>0){
+        url = root +
+            `&@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
+      }else{
+        url = root +
+            `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
+      }
+    }else{
+      root=Units.joinPath(Units.api(serverKey), Units.joinPath("/v3/files", path));
+      url = root +
       `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
+    }
+
     let encodeUri = encodeURI(url);
     return encodeUri;
   }

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,6 +66,19 @@ export interface QueryTableProps extends ReportTableProps{
   groupIColumns?: { id: string; title: string; sourceId: string }[]; // 组间合计key
   doSearch?: (params: object) => void;
   sortColumnData?: string[];
+  queryTotal?:()=> any;//暂时无用
+}
+
+export interface AggregateVO {
+  queryKey?: string;
+  aggregates?: AggregateValue[];
+  count?: number;
+}
+
+export interface AggregateValue {
+  fieldTitle?: string;
+  fieldId?: string;
+  value?: number;
 }
 
 
@@ -118,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;
@@ -304,6 +326,8 @@ export interface DtmplConfig extends TmplBase {
   editAction?: ActionConfig;
   actions?: ActionConfig[];
   viewActions?: ActionConfig[];
+  viewRactions?:RActionConfig[];
+  editRactions?:RActionConfig[];
   premises?: FieldConfig[];
   groups?: FieldGroupConfig[];
   buttonPosition?: ButtonPosition;
@@ -389,6 +413,8 @@ export interface SelectConfig extends TmplBase {
   defaultPageSize: number;
   buttons: ButtonName[];
   builtInButtons: BuiltInButtonName[];
+  defShowCriteriaCount:number;
+  defShowRowActionCount:number;
   columns: ColumnConfig[];
   criterias: CriteriaConfig[];
   defaultCriteriaValue?: object;
@@ -401,6 +427,8 @@ export interface SelectConfig extends TmplBase {
   scrollY?:number;
   directShowTotal?: boolean;
   leftFixedCols?: number;
+  minSelectRows?: number;
+  maxSelectRows?: number;
   onCriteriaValuesChange?: (
     changedValues,
     allValues: DtmplData,
@@ -550,6 +578,7 @@ export interface QueryData {
   touchEnd: boolean;
   key: string;
   pageInfo: PageInfo;
+  beforeSelectedRows:number;
 }
 
 export interface ReportData {
@@ -595,6 +624,7 @@ export interface RouterCompProps {
   navigate?: any;
   params: any;
   searchParams: any;
+  // routeMode?:'multiple'|'single';
 }
 
 export interface TmplBaseProps {
@@ -655,6 +685,9 @@ export interface FileLoadInfo {
 }
 
 export interface FileValue {
+  uid?:string,
+  url?:string,
+  status?:string,
   valid: FileValueValid;
   fileKey?: string;
   fileName?: string;

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/tree/tree-utils.tsx

@@ -88,7 +88,7 @@ export default class TreeUtils {
                 newExpandeds.push(d.key);
             }
             if(expandedKeys){
-                newExpandeds.push(expandedKeys)
+                newExpandeds.push(...expandedKeys)
             };
 
             return {

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