aldehyde 0.2.350 → 0.2.352

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

@@ -14,10 +14,11 @@ import { arrayMoveImmutable } from "array-move";
 import { LocaleContext } from "../locale/LocaleProvider";
 import { init, merge, statistic } from "../utils/dsu";
 import VerticalList from "../list/vertical-list";
+import CardList from "../list/card-list";
 import SummaryBuilder from "./column/summary-builder";
-import {Button, Card, Descriptions, message, Statistic, Table} from "antd";
+import { Button, Card, Descriptions, message, Statistic, Table } from "antd";
 import Units from "../units";
-import {DownOutlined, UpOutlined} from "@ant-design/icons";
+import { DownOutlined, UpOutlined } from "@ant-design/icons";
 import ResizableTable from "./resizable-table";
 
 const SortableItem = SortableElement((props) => (
@@ -38,8 +39,8 @@ interface QueryTableStat {
   loading?: boolean;
   touchEnd?: boolean;
   aggregateVO?: AggregateVO;
-  beforeSelectedRows?:number;
-  aggregateShowSize?:number;
+  beforeSelectedRows?: number;
+  aggregateShowSize?: number;
 }
 
 class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
@@ -58,11 +59,12 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     selectedRows: [],
     viewModels: ["table"],
     summaryConfigs: [],
-    rowTotalCols:4,
-    defaultShowTotalCols:7,
+    rowTotalCols: 4,
+    defaultShowTotalCols: 7,
+    cardListConfig: {}
   };
 
-  defaultAggregateShowSize=7;
+  defaultAggregateShowSize = 7;
 
   state = {
     queryDataCache: undefined,
@@ -71,15 +73,15 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     loading: true,
     touchEnd: undefined,
     aggregateVO: undefined,
-    beforeSelectedRows:undefined,
-    aggregateShowSize:undefined,
+    beforeSelectedRows: undefined,
+    aggregateShowSize: undefined,
   };
 
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
 
   async componentDidMount() {
-    const { queryKey, pageInfo,defaultShowTotalCols,rowTotalCols } = this.props;
+    const { queryKey, pageInfo, defaultShowTotalCols, rowTotalCols } = this.props;
     if (queryKey) {
       await this.loadData(queryKey.key, pageInfo);
       this.setState({
@@ -94,7 +96,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
 
   async componentDidUpdate(prevProps) {
     const { queryKey: preQueryKey, pageInfo: prePageInfo } = prevProps;
-    const { queryKey, pageInfo ,sourceId} = this.props;
+    const { queryKey, pageInfo, sourceId } = this.props;
 
     if (queryKey) {
 
@@ -201,7 +203,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
           pageInfo,
         });
         this.setState({
-          beforeSelectedRows:queryData.beforeSelectedRows,
+          beforeSelectedRows: queryData.beforeSelectedRows,
           dataSource,
           virtualEndPageNo: pageInfo.virtualEndPageNo,
           queryDataCache: queryCache,
@@ -220,7 +222,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
 
   pageTo = async (pageNo: number, pageSize: number) => {
     const { onChangePage } = this.props;
-   // const { virtualEndPageNo } = this.state;
+    // const { virtualEndPageNo } = this.state;
     // let pageInfo = {
     //   pageNo,
     //   pageSize: pageSize ? pageSize : 10,
@@ -232,15 +234,15 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
   };
 
   queryTotal = async () => {
-    const { queryKey, serverKey,queryTotal } = this.props;
-    const {aggregateVO:stateAggregateVO}=this.state;
+    const { queryKey, serverKey, queryTotal } = this.props;
+    const { aggregateVO: stateAggregateVO } = this.state;
     let aggregateVO;
-    if(stateAggregateVO && stateAggregateVO.queryKey==queryKey.key){
+    if (stateAggregateVO && stateAggregateVO.queryKey == queryKey.key) {
       return false;
-    }else{
-      if(queryTotal){
-        aggregateVO= await queryTotal();
-      }else{
+    } else {
+      if (queryTotal) {
+        aggregateVO = await queryTotal();
+      } else {
         aggregateVO = await HcserviceV3.requestQueryAggregates(serverKey, queryKey.key);
       }
       this.setState({
@@ -257,7 +259,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       maxSelectedRows,
       primaryColumn,
     } = this.props;
-    let { dataSource,beforeSelectedRows } = this.state;
+    let { dataSource, beforeSelectedRows } = this.state;
     let selectedRowKeys = [];
 
     for (let row of selectedRows) {
@@ -270,17 +272,17 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       }
     }
 
-    let tmplMax=maxSelectedRows?maxSelectedRows:0;
-    if(beforeSelectedRows>0){
-      tmplMax=tmplMax-beforeSelectedRows;
+    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("${已选超}") );
+    if (beforeSelectedRows > 0 && tmplMax <= 0) {
+      message.warning(translate("${已选超}"));
       return null;
     }
 
@@ -290,8 +292,8 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       type: maxSelectedRows == 1 ? "radio" : "checkbox",
       selectedRowKeys,
       onChange: (selectedRowKeys, selectedRows) => {
-        if(tmplMax > 0 && selectedRowKeys.length > tmplMax){
-          message.error(translate("${最多只能选择}") + " : "+ tmplMax);
+        if (tmplMax > 0 && selectedRowKeys.length > tmplMax) {
+          message.error(translate("${最多只能选择}") + " : " + tmplMax);
           return;
         }
         let selectedRows_: SelectedRow[] = [];
@@ -341,17 +343,17 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     return { rowSpan: 0 };
     // return {};
   }
-   sort_serial_number = new Date().getTime();
+  sort_serial_number = new Date().getTime();
 
   onChange(pagination, filters, sorter, extra) {
     console.log("params", pagination, filters, sorter, extra);
     if (extra.action === "sort") {
       let new_sort_serial_number = new Date().getTime();
-      if(new_sort_serial_number - this.sort_serial_number < 2000){
+      if (new_sort_serial_number - this.sort_serial_number < 2000) {
         const { translate } = this.context;
         message.warning(translate("${系统忙，请稍后再试}"));
         return;
-      }else{
+      } else {
         this.sort_serial_number = new_sort_serial_number;
       }
 
@@ -361,11 +363,11 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       );
       if (sorter.order === "ascend") {
         Object.assign(extParams, {
-          sortColIds: [ sorter.field + "_" + "asc"],
+          sortColIds: [sorter.field + "_" + "asc"],
         });
       } else if (sorter.order === "descend") {
         Object.assign(extParams, {
-          sortColIds: [ sorter.field + "_" + "desc"],
+          sortColIds: [sorter.field + "_" + "desc"],
         });
       } else {
         Object.assign(extParams, {
@@ -378,7 +380,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
 
   render() {
     const {
-      pageInfo,queryKey,
+      pageInfo, queryKey,
       columns,
       viewModels,
       summaryConfigs,
@@ -386,42 +388,30 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       tableProps,
       groupIColumns,
       hiddenRowCodes,
-    columnConfigs,
-    serverKey,rowTotalCols,
+      columnConfigs,
+      serverKey, rowTotalCols,
+      cardListConfig
     } = this.props;
     //debugger
-    const { touchEnd, aggregateVO, loading, virtualEndPageNo,dataSource,aggregateShowSize } = this.state;
-
-    const isProSumarryTable = Boolean(subtotalXColumn );
+    const { touchEnd, aggregateVO, loading, virtualEndPageNo, dataSource, aggregateShowSize } = this.state;
+    const isProSumarryTable = Boolean(subtotalXColumn);
     const { translate } = this.context;
     const {
       proSummaryTableColumns,
       proSummaryTableData,
-    } =SummaryBuilder.handleProSummaryTable({
-      subtotalXColumn,columns,data:this.getUnHidenDataSource(),
-      translate,groupIColumns
-    });
-
-    let current_cols = isProSumarryTable
-      ? proSummaryTableColumns
-      : columns
-      ? columns
-      : [];
-    console.log(current_cols);
+    } = SummaryBuilder.handleProSummaryTable({ subtotalXColumn, columns, data: this.getUnHidenDataSource(), translate, groupIColumns });
+    let current_cols = isProSumarryTable ? proSummaryTableColumns : columns ? columns : [];
     let table_x = 20;
-    current_cols.forEach((c) => {
-      table_x = table_x + (c.width ? c.width : 140);
-    });
-
-    let dat=this.getUnHidenDataSource();
-    const originData = isProSumarryTable
-      ? proSummaryTableData
-      : dat;
-
-    let summary=(pageData1) => {
-      return SummaryBuilder.summary({translate,summaryConfigs,
-        pageData: dat,columns,
-        rowSelection:this.getRowSelection(),groupIColumns});
+    current_cols.forEach((c) => { table_x = table_x + (c.width ? c.width : 140); });
+    let dat = this.getUnHidenDataSource();
+    const originData = isProSumarryTable ? proSummaryTableData : dat;
+
+    let summary = (pageData1) => {
+      return SummaryBuilder.summary({
+        translate, summaryConfigs,
+        pageData: dat, columns,
+        rowSelection: this.getRowSelection(), groupIColumns
+      });
     }
 
     console.log("%crender data: ", "color: red", originData);
@@ -429,11 +419,9 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
 
     const washOriginData = originData.map((i, idx) => {
       const data = {};
-
       current_cols.forEach((col) => {
         data[col["dataIndex"]] = i[col["dataIndex"]];
       });
-
       data["1"] = idx;
       return data;
     });
@@ -489,59 +477,61 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     // 给 col 添加 mergeRowInCol
     current_cols.forEach(
       (col, colIdx) =>
-        (col.onCell = (_, rowIdx) =>
-          this.mergeRowInCol(_, rowIdx, colIdx, mergeMp, current_cols.length))
+      (col.onCell = (_, rowIdx) =>
+        this.mergeRowInCol(_, rowIdx, colIdx, mergeMp, current_cols.length))
     );
-   let aggregateItems=[];
-    if(aggregateVO && aggregateVO.aggregates ){
-        if(aggregateShowSize<aggregateVO.aggregates.length){
-          aggregateVO.aggregates.forEach(av=>{
-          if(aggregateItems.length==aggregateShowSize){
-            aggregateItems.push({key: "opt",
-              label:  <Button icon={<DownOutlined />} type={'link'} onClick={()=>{
-                this.setState({aggregateShowSize:aggregateVO.aggregates.length})
+    let aggregateItems = [];
+    if (aggregateVO && aggregateVO.aggregates) {
+      if (aggregateShowSize < aggregateVO.aggregates.length) {
+        aggregateVO.aggregates.forEach(av => {
+          if (aggregateItems.length == aggregateShowSize) {
+            aggregateItems.push({
+              key: "opt",
+              label: <Button icon={<DownOutlined />} type={'link'} onClick={() => {
+                this.setState({ aggregateShowSize: aggregateVO.aggregates.length })
               }}>{translate("${展开}")}</Button>,
               children: null
               // <div style={{fontSize:24}}>{av.value}</div>
             })
-          }else if(aggregateItems.length<aggregateShowSize){
-            aggregateItems.push({key: av.fieldId,
-              label:  <div style={{fontSize:14}}>{translate("${"+av.fieldTitle+"}") }</div>,
-              children: <Statistic  valueStyle={{fontSize:16}} value={av.value?av.value:0} />
-              // <div style={{fontSize:24}}>{av.value}</div>
-            })
-          }
-          })
-        }else{
-          aggregateVO.aggregates.forEach(av=> {
+          } else if (aggregateItems.length < aggregateShowSize) {
             aggregateItems.push({
               key: av.fieldId,
-              label: <div style={{fontSize: 14}}>{translate("${"+av.fieldTitle+"}") }</div>,
-              children: <Statistic valueStyle={{fontSize:16}}  value={av.value ? av.value : 0}/>
-            })
-          });
-          if(this.defaultAggregateShowSize < aggregateVO.aggregates.length){
-            aggregateItems.push({key: "opt",
-              label:  <Button icon={<UpOutlined />} type={'link'} onClick={()=>{
-                this.setState({aggregateShowSize:this.defaultAggregateShowSize})
-              }}>{translate("${收起}")}</Button>,
-              children: null
+              label: <div style={{ fontSize: 14 }}>{translate("${" + av.fieldTitle + "}")}</div>,
+              children: <Statistic valueStyle={{ fontSize: 16 }} value={av.value ? av.value : 0} />
               // <div style={{fontSize:24}}>{av.value}</div>
             })
           }
+        })
+      } else {
+        aggregateVO.aggregates.forEach(av => {
+          aggregateItems.push({
+            key: av.fieldId,
+            label: <div style={{ fontSize: 14 }}>{translate("${" + av.fieldTitle + "}")}</div>,
+            children: <Statistic valueStyle={{ fontSize: 16 }} value={av.value ? av.value : 0} />
+          })
+        });
+        if (this.defaultAggregateShowSize < aggregateVO.aggregates.length) {
+          aggregateItems.push({
+            key: "opt",
+            label: <Button icon={<UpOutlined />} type={'link'} onClick={() => {
+              this.setState({ aggregateShowSize: this.defaultAggregateShowSize })
+            }}>{translate("${收起}")}</Button>,
+            children: null
+            // <div style={{fontSize:24}}>{av.value}</div>
+          })
         }
-
+      }
     }
 
     return (
       <>
-        {aggregateVO && aggregateVO.aggregates && aggregateVO.aggregates.length>0 ?
-            <Card variant="borderless" styles={{body:{paddingLeft:10,paddingTop:4,paddingBottom:4,paddingRight:10}}}>
-          <Descriptions
+        {aggregateVO && aggregateVO.aggregates && aggregateVO.aggregates.length > 0 ?
+          <Card variant="borderless" styles={{ body: { paddingLeft: 10, paddingTop: 4, paddingBottom: 4, paddingRight: 10 } }}>
+            <Descriptions
               column={rowTotalCols} colon={false}
               items={aggregateItems}
-          />
-        </Card>:null}
+            />
+          </Card> : null}
         {/*{viewModels.includes("table") ? (*/}
         {/*  <Table*/}
         {/*    size={tableProps.size ? tableProps.size : undefined}*/}
@@ -573,51 +563,62 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
         {/*  ""*/}
         {/*)}*/}
         {viewModels.includes("table") ? (
-            <ResizableTable
-                size={tableProps.size ? tableProps.size : undefined}
-                rowSelection={this.getRowSelection()}
-                columns={current_cols}
-                dataSource={originData}
-                scroll={
-                  tableProps.scrollY == -1 || tableProps.scrollY == 0
-                      ? null
-                      : {
-                        y: tableProps.scrollY,
-                        x: table_x,
-                      }
+          <ResizableTable
+            size={tableProps.size ? tableProps.size : undefined}
+            rowSelection={this.getRowSelection()}
+            columns={current_cols}
+            dataSource={originData}
+            scroll={
+              tableProps.scrollY == -1 || tableProps.scrollY == 0
+                ? null
+                : {
+                  y: tableProps.scrollY,
+                  x: table_x,
                 }
-                bordered
-                pagination={false}
-                style={{ display: columns ? "block" : "none" }}
-                summary={summary}
-                loading={loading}
-                components={{
-                  body: {
-                    wrapper: this.DraggableContainer,
-                    row: this.DraggableBodyRow,
-                  },
-                }}
-                onChange={this.onChange.bind(this)}
-            ></ResizableTable>
+            }
+            bordered
+            pagination={false}
+            style={{ display: columns ? "block" : "none" }}
+            summary={summary}
+            loading={loading}
+            components={{
+              body: {
+                wrapper: this.DraggableContainer,
+                row: this.DraggableBodyRow,
+              },
+            }}
+            onChange={this.onChange.bind(this)}
+          />
         ) : (
-            ""
+          ""
         )}
-        <Pagination key={queryKey? queryKey.key:Units.getReactKey()}
+        {viewModels.includes("verticalList") ? (
+          <VerticalList hiddenRowCodes={hiddenRowCodes}
+            dataSource={dataSource}
+            columnConfigs={columnConfigs}
+            serverKey={serverKey}
+            columns={columns} />
+        ) : (
+          ""
+        )}
+        {/* showType */}
+        {viewModels.includes("cardList") ? (
+          <CardList
+            cardListConfig={cardListConfig}
+            columns={columns}
+            dataSource={dataSource}
+            sourceId={this.props.sourceId}
+          />
+        ) : (
+          ""
+        )}
+        <Pagination key={queryKey ? queryKey.key : Units.getReactKey()}
           touchEnd={touchEnd}
           pageInfo={{ ...pageInfo, virtualEndPageNo }}
           pageTo={this.pageTo}
           queryTotal={this.queryTotal}
           total={aggregateVO?.count}
         />
-        {viewModels.includes("verticalList") ? (
-            <VerticalList hiddenRowCodes={hiddenRowCodes}
-          dataSource={dataSource}
-          columnConfigs={columnConfigs}
-          serverKey={serverKey}
-          columns={columns}/>
-        ) : (
-          ""
-        )}
       </>
     );
   }

package/src/aldehyde/tmpl/interface.tsx

@@ -13,7 +13,7 @@ export type BeforeExeConfirm = "default" | "danger" | "none";
 
 export type StatColType = "fact" | "dimension";
 
-export type ActTableViewModel = "table" | "verticalList" | "horizontalList";
+export type ActTableViewModel = "table" | "verticalList" | "horizontalList" | "cardList";
 
 export type ControlHolderType = "table" | "descriptions";
 
@@ -47,6 +47,22 @@ export interface ReportTableProps {
   ) => void;
   queryKey: QueryKey;
 }
+
+export interface CardListConfig {
+  primaryColumn?: ColumnConfig;
+  primaryColumnLabel?: ColumnConfig;
+  secondColumn?: ColumnConfig;
+  secondColumnLabel?: ColumnConfig;
+  mainPicture?: ColumnConfig;
+  mainPictureLabel?: ColumnConfig;
+  labelColumn?: ColumnConfig;
+  cardShowCols?: ColumnConfig[];
+  rowCardCount?: number;
+  buttons?: string[];
+  customViewPagePath?: string;
+  mainCode?: string;
+}
+
 export interface QueryTableProps extends ReportTableProps {
   viewModels?: ActTableViewModel[];
   pageInfo: {
@@ -70,6 +86,7 @@ export interface QueryTableProps extends ReportTableProps {
   queryTotal?: () => any;//暂时无用
   defaultShowTotalCols?: number;
   rowTotalCols?: number;
+  cardListConfig?: CardListConfig;
 }
 
 export interface AggregateVO {
@@ -328,7 +345,7 @@ export interface FieldGroupConfig extends OrderableTmplBase {
   classAddConfigs?: ClassAddConfig[];
   defaultCriteriaValue?: object;
   deleteData?: boolean;
-  viewModel?: "table" | "verticalList";
+  viewModel?: "table" | "verticalList" | "cardList";
   addOrEditType?: "singleCol" | "doubleCol" | "tableRow";
   batchAddFileField?: FieldConfig;
   addRowPosition?: "begin" | "end";
@@ -418,6 +435,7 @@ export interface FieldConfig extends FieldBase {
   colWidth?: number;
   exceptCodes?: string[];
   relDeduplication?: boolean;
+  preview?: boolean; // 图片组件预览配置
 }
 
 export interface ActionRenderProps {
@@ -557,6 +575,15 @@ export interface LtmplConfig extends SelectConfig {
   displayTotal?: boolean;
   rowTotalCols?: number;
   defaultShowTotalCols?: number;
+  showType?: "table" | "verticalList" | "cardList";
+  primaryColumnLabel?: ColumnConfig;
+  secondColumn?: ColumnConfig;
+  secondColumnLabel?: ColumnConfig;
+  mainPicture?: ColumnConfig;
+  mainPictureLabel?: ColumnConfig;
+  labelColumn?: ColumnConfig;
+  cardShowCols?: ColumnConfig[];
+  rowCardCount?: number;
 }
 
 export interface EnumItem {

package/src/aldehyde/welcome/HCWelcome.js

@@ -276,7 +276,8 @@ import { useParams } from "react-router-dom";
 //   }
 // }
 
-const HCWelcome = () => {
+const HCWelcome = (props) => {
+  const { layoutRootPath } = props;
   const { programCode } = useParams();
   if (programCode) Units.setProgramCode(programCode);
 
@@ -308,7 +309,7 @@ const HCWelcome = () => {
           <QuickEntrance></QuickEntrance>
         </div>
       </div>
-      <img src={WelcomeBg} alt="" width="100%" height="100%" />
+      {["v2", "v5"].includes(layoutRootPath) ? <img src={WelcomeBg} alt="" width="100%" height="100%" /> : ""}
     </>
   );
 };