aldehyde 0.2.220 → 0.2.221

package/src/aldehyde/list/vertical-list.tsx

@@ -0,0 +1,101 @@
+import React from "react";
+
+import { useLocale } from "../locale/useLocale";
+import {Card, Col, Descriptions, List, Row} from "antd";
+import ViewControl from "../controls/view-control";
+import {FieldConfig} from "../tmpl/interface";
+type VerticalListProps = {
+    hiddenRowCodes?: string[];
+    dataSource?: object[];
+    columnConfigs?: FieldConfig[];
+    serverKey:string;
+    columns: any[];
+};
+const VerticalList = (props:VerticalListProps) => {
+
+    const { translate } = useLocale();
+   const initViewList = (data) => {
+
+        const { columnConfigs, serverKey } = props;
+        const formItemList = [];
+        if (columnConfigs.length > 0) {
+            columnConfigs.forEach((item, index) => {
+                if (item.id != "10000" && item.id != "20000" && item.title != "操作") {
+                    const title = item.title;
+                    let fieldValue = data ? data[item.id] : undefined;
+                    if (title == "序号") {
+                        fieldValue = data.index;
+                    }
+                    //fieldValue 没有值时不能为null 要为 undefined。antd input所限制
+                    fieldValue = fieldValue
+                        ? fieldValue
+                        : item.defaultValue
+                            ? item.defaultValue
+                            : undefined;
+
+                    const formItem = (
+                        <Descriptions.Item
+                            label={translate("${" + item.title + "}")}
+                            key={index}
+                            className="labelcss"
+                        >
+                            <ViewControl
+                                serverKey={serverKey}
+                                holderType={"table"}
+                                value={fieldValue}
+                                fieldConfig={item}
+                            />
+                        </Descriptions.Item>
+                    );
+                    formItemList.push(formItem);
+                }
+            });
+        }
+        return formItemList;
+    };
+
+    const renderOpt=(item: unknown)=> {
+        const { columns } = props;
+        let actionCol=null;
+
+        columns?.forEach(col=>{
+            if(col["操作"]==1) {
+                actionCol=col;
+            }
+        });
+
+        return actionCol?.render(item,item);
+    }
+
+    const getUnHidenDataSource = () => {
+        const { hiddenRowCodes,dataSource } = props;
+        let ds: object[] = [];
+        if (dataSource) {
+            for (let d of dataSource) {
+                if (!hiddenRowCodes?.includes(d['code'])) {
+                    ds.push(d);
+                }
+            }
+        }
+        return ds;
+    };
+
+
+  return (<Card  styles={{body:{padding: "2px"}}} style={{marginTop:"6px"}} >
+          <List split={false}
+              dataSource={getUnHidenDataSource()}
+              renderItem={(item) => (
+                  <List.Item style={{padding: "6px"}} key={item["id"]} >
+                      <Card size={"small"} styles={{body:{padding: "4px"}}} style={{margin:"1px"}} extra={renderOpt(item)}>
+                          <Descriptions column={4}>
+                              {initViewList(item)}
+                          </Descriptions>
+                      </Card>
+                  </List.Item>
+              )}
+          />
+      </Card>
+  );
+};
+
+export default VerticalList;

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

@@ -1124,7 +1124,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             <Table loading={loading}></Table>
           ) : (tableType =="report"?<ReportTable
                       tableProps={{scrollY:ltmplConfig.scrollY,clickDisplayTotal:!ltmplConfig.directShowTotal}}
-                      serverKey={serverKey}
+                      serverKey={serverKey} hiddenColIds={hiddenColIds}
                       maxSelectedRows={this.checkBoxUseful() ? 1000 : -1}
                       columns={tableColumns}
                       selectedRows={selectedRows}  queryKey={queryKey}

package/src/aldehyde/table/column/column-builder.tsx

@@ -2,16 +2,12 @@ import React from "react";
 import {
   ActionRenderProps,
   ColumnConfig,
-  CustomButton,
-  DoEditParam,
   DtmplData,
-  JumpConfig,
   LtmplConfig,
-  ShowViewParam
 } from "../../tmpl/interface";
 import TableUnits from "../table-util";
 import SupportInputTypes from "../../tmpl/control-type-supportor";
-import {Button, Popconfirm, Space, theme, Tooltip} from "antd";
+import {Button, Popconfirm, Space, Tooltip} from "antd";
 import {SortableHandle} from "react-sortable-hoc";
 import {
   AlignLeftOutlined, CopyOutlined, DeleteOutlined,
@@ -42,6 +38,7 @@ interface ColumnBuilderProps extends ActionRenderProps{
 
 interface ReportColumnBuilderProps {
   columnConfigs: ColumnConfig[],
+    hiddenColIds?: string[],
   translate:(...strs: string[]) => string;
   leftFixedCols: number,
 }
@@ -68,8 +65,10 @@ export default {
 
     colConfigs.forEach((item) => {
       let column = {};
-      if (!hiddenColIds || !hiddenColIds.includes(item.id)) {
-        tableColumns.push(column);
+      if (hiddenColIds && hiddenColIds.includes(item.originalId) ) {
+        return
+      }else{
+          tableColumns.push(column);
       }
       column["title"] = item.title;
       column["dataIndex"] = item.id;
@@ -142,6 +141,7 @@ export default {
             </Tooltip>
         );
       } else if (item.title === "操作") {
+          column["操作"] = "1";
         column["fixed"] = "right";
         column["align"] = "center";
         column["width"] = item.colWidth ? item.colWidth : 160;
@@ -190,7 +190,7 @@ export default {
 
   buildReportTableColumns(props: ReportColumnBuilderProps) {
     const {
-      columnConfigs,translate,  leftFixedCols
+      columnConfigs,translate,  leftFixedCols,hiddenColIds
     } = props;
 
     let tableColumns = [];
@@ -200,9 +200,9 @@ export default {
     let currentDataColIndex = 0;
 
     colConfigs.forEach((item) => {
-      if(item.hidden){
-        return;
-      }
+        if (item.hidden || (hiddenColIds && hiddenColIds.includes(item.originalId)) ) {
+            return
+        }
       let column = {};
       if(item.upperColumnTitle){
        let parent;
@@ -291,7 +291,7 @@ export default {
 
     return undefined;
   },
-  renderAction(props:ActionRenderProps,  record:DtmplData,){
+  renderAction(props:ActionRenderProps,  record:DtmplData){
    const {ltmplConfig, showView,
         doEdit,
         doRAction,
@@ -515,11 +515,10 @@ export default {
               if (v.includes("@R@") > 0) {
                 v = v.split("@R@")[1];
               }
-              let HCService;
               return (
                   <NewinFileView
                       title={openFileButton.title}
-                      filePath={HCService.toFilePath(v, serverKey)}
+                      filePath={HcserviceV3.toFilePath(v, serverKey)}
                       serverKey={serverKey}
                       key={openFileButton.id}
                       //size={"small"}

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

@@ -6,7 +6,7 @@ import {
   DtmplData,
   PageInfo,
   QueryData,
-  SelectedRow,QueryTableProps
+  SelectedRow, QueryTableProps, ActionRenderProps, FieldConfig
 } from "../tmpl/interface";
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import Pagination from "./pagination";
@@ -17,6 +17,7 @@ import ViewControl from "../controls/view-control";
 import { LocaleContext } from "../locale/LocaleProvider";
 import { BigNumber } from "bignumber.js";
 import { init, merge, statistic } from "../utils/dsu";
+import VerticalList from "../list/vertical-list";
 
 const { Panel } = Collapse;
 const SortableItem = SortableElement((props) => (
@@ -203,6 +204,8 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     }
   };
 
+
+
   pageTo = async (pageNo: number, pageSize: number) => {
     const { onChangePage } = this.props;
     const { virtualEndPageNo } = this.state;
@@ -289,47 +292,6 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     return ds;
   };
 
-  initViewList = (data) => {
-    //console.log("data:",data);
-    const { translate } = this.context;
-    const { columns, columnConfigs, serverKey } = this.props;
-    const formItemList = [];
-    if (columnConfigs.length > 0) {
-      columnConfigs.forEach((item, index) => {
-        if (item.id != "10000" && item.id != "20000" && item.title != "操作") {
-          const title = item.title;
-          let fieldValue = data ? data[item.id] : undefined;
-          if (title == "序号") {
-            fieldValue = data.index;
-          }
-          //fieldValue 没有值时不能为null 要为 undefined。antd input所限制
-          fieldValue = fieldValue
-            ? fieldValue
-            : item.defaultValue
-            ? item.defaultValue
-            : undefined;
-          const fieldKey = item.id + Math.random() * 100;
-
-          const formItem = (
-            <Descriptions.Item
-              label={translate("${" + item.title + "}")}
-              key={index}
-              className="labelcss"
-            >
-              <ViewControl
-                serverKey={serverKey}
-                holderType={"table"}
-                value={fieldValue}
-                fieldConfig={item}
-              />
-            </Descriptions.Item>
-          );
-          formItemList.push(formItem);
-        }
-      });
-    }
-    return formItemList;
-  };
 
   getTableSummaryNumberValue(value: "" | string[]) {
     if (value === undefined || value === null) return 0;
@@ -1024,9 +986,12 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       subtotalYColumn,
       tableProps,
       groupIColumns,
+      hiddenRowCodes,
+    columnConfigs,
+    serverKey,
     } = this.props;
     //debugger
-    const { touchEnd, total, loading, virtualEndPageNo } = this.state;
+    const { touchEnd, total, loading, virtualEndPageNo,dataSource } = this.state;
     const { translate } = this.context;
 
     const isProSumarryTable = Boolean(subtotalXColumn || subtotalYColumn);
@@ -1348,26 +1313,19 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
           total={total}
         />
         {viewModels.includes("verticalList") ? (
-          <Card style={{ marginTop: "10px" }}>
-            <List
-              dataSource={this.getUnHidenDataSource()}
-              renderItem={(item) => (
-                <List.Item key={item["id"]}>
-                  <Card size={"small"} bodyStyle={{ padding: "4px" }}>
-                    <Descriptions column={4}>
-                      {this.initViewList(item)}
-                    </Descriptions>
-                  </Card>
-                </List.Item>
-              )}
-            />
-          </Card>
+            <VerticalList hiddenRowCodes={hiddenRowCodes}
+          dataSource={dataSource}
+          columnConfigs={columnConfigs}
+          serverKey={serverKey}
+          columns={columns}/>
         ) : (
           ""
         )}
       </>
     );
   }
+
+
 }
 
 export default QueryTable;

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

@@ -8,7 +8,7 @@ import {
   Row,
   Space,
   Tooltip,
-  Typography,Popconfirm,
+  Typography, Popconfirm, List, Card, Descriptions,
 } from "antd";
 import Table from "./control-table-x-axis-wrapper";
 import {
@@ -39,6 +39,7 @@ import RowEditor from "../detail/edit/row-editor";
 import Action from "../controls/action";
 import CountingTag from "../controls/counting-tag";
 import { LocaleContext } from "../locale/LocaleProvider";
+import VerticalList from "../list/vertical-list";
 
 const FormItem = Form.Item;
 const { Text } = Typography;
@@ -149,14 +150,12 @@ class RelationTable extends React.PureComponent<
   };
 
   buildColumns = () => {
-    const { viewOrEdit, value, fieldGroupConfig, serverKey } = this.props;
+    const { viewOrEdit, fieldGroupConfig, serverKey } = this.props;
     const {
-      title,
       buttons,
       fields,
       showRelationName,
       relationNames,
-      showRowNum,
       disabled,
       deleteData,
     } = fieldGroupConfig;
@@ -171,9 +170,6 @@ class RelationTable extends React.PureComponent<
       column["dataIndex"] = item.id;
       s++;
       let itemType = SupportInputTypes.getControlType(item, null);
-      // if (s == 1) {
-      //     TableUnits.sort(column, itemType, 'ascend');
-      // } else
       if (s < 12 && item.sortable) {
         TableUnits.sort(column, itemType);
       }
@@ -209,13 +205,13 @@ class RelationTable extends React.PureComponent<
     const rowEdit = buttons.includes("rowEdit");
     const dtmplEdit = buttons.includes("dtmplEdit");
     const deletable = buttons.includes("singleDelete");
-
     if (
       viewOrEdit == "edit" &&
       (viewable || rowEdit || dtmplEdit || deletable)
     ) {
       const actionColumn = {};
       columns.push(actionColumn);
+      actionColumn["操作"] = 1;
       actionColumn["title"] = translate("${操作}");
       actionColumn["fixed"] = "right";
       actionColumn["key"] = "action";
@@ -313,6 +309,7 @@ class RelationTable extends React.PureComponent<
     } else if (viewOrEdit == "view" && viewable) {
       const actionColumn = {};
       columns.push(actionColumn);
+      actionColumn["操作"] = 1;
       actionColumn["title"] = translate("${操作}");
       actionColumn["fixed"] = "right";
       actionColumn["key"] = "action";
@@ -496,11 +493,6 @@ class RelationTable extends React.PureComponent<
   handleDtmplEdit = async (code: string) => {
     const { value, fieldGroupConfig, onChange } = this.props;
     const {
-      title,
-      fields,
-      showRelationName,
-      relationNames,
-      showRowNum,
       serverKey,
     } = fieldGroupConfig;
     this.setState({
@@ -705,12 +697,6 @@ class RelationTable extends React.PureComponent<
     }
   };
 
-  // hiddenRowEdit = () => {
-  //     this.setState({
-  //         showRowEdit: false,
-  //     })
-  // }
-
   render() {
     const {
       fieldGroupConfig,
@@ -730,12 +716,10 @@ class RelationTable extends React.PureComponent<
       showDtmplEdit,
       addTmplId,
       tableLoading,
-      showRowEdit,
-      selectedDtmplData,
     } = this.state;
     const { translate } = this.context;
 
-    const { buttons } = fieldGroupConfig;
+    const { buttons,viewModel } = fieldGroupConfig;
     let mainCode1 = fieldGroupConfig.mainCode
       ? fieldGroupConfig.mainCode
       : mainCode
@@ -779,7 +763,11 @@ class RelationTable extends React.PureComponent<
         >
           <div className="editTableList">
             {this.buildButtons()}
-            <Table
+            { viewModel && viewModel=="verticalList" ?<VerticalList
+                dataSource={this.buildDataSource()}
+                columnConfigs={fieldGroupConfig?.fields}
+                serverKey={serverKey}
+                columns={this.buildColumns()}/>:<Table
               size={"small"}
               locale={{
                 emptyText: (
@@ -794,7 +782,7 @@ class RelationTable extends React.PureComponent<
               columns={this.buildColumns()}
               pagination={page}
               onChange={this.tabChange}
-            />
+            /> }
           </div>
         </CollapseCard>
         {buttons.includes("detail") ? (
@@ -825,11 +813,6 @@ class RelationTable extends React.PureComponent<
         ) : (
           ""
         )}
-        {/*{buttons.includes('rowEdit') || buttons.includes('rowAdd') ?*/}
-        {/*    <ModalRowEdit open={showRowEdit} onCancel={this.hiddenRowEdit}*/}
-        {/*                  onOk={this.handleRowEdit} dtmplData={selectedDtmplData}*/}
-        {/*                  fieldGroupConfig={fieldGroupConfig}> </ModalRowEdit>*/}
-        {/*    : ""}*/}
         {buttons.includes("selectAdd") ? (
           <ModelSelectTable
             serverKey={serverKey}

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

@@ -23,7 +23,7 @@ const ReportTable=(props:ReportTableProps)=> {
     const [reportData, setReportData] = useState<ReportData>(undefined);
 
     const { getServiceLangStr, translate} = useLocale();
-    const {tableProps,columns,queryKey,serverKey,leftFixedCols}=props
+    const {tableProps,columns,queryKey,serverKey,leftFixedCols,hiddenColIds}=props
 
     useEffect( () => {
         const queryData = async () => {
@@ -89,7 +89,7 @@ const ReportTable=(props:ReportTableProps)=> {
         });
     }
 
-    let current_cols=reportData?.columnConfigs?ColumnBuilder.buildReportTableColumns({columnConfigs:reportData.columnConfigs,translate,leftFixedCols}):columns ;
+    let current_cols=reportData?.columnConfigs?ColumnBuilder.buildReportTableColumns({columnConfigs:reportData.columnConfigs,translate,leftFixedCols,hiddenColIds}):columns ;
         let table_x = 20;
 
         current_cols.forEach((c) => {

package/src/aldehyde/tmpl/interface.tsx

@@ -24,6 +24,7 @@ export interface ReportTableProps {
     clickDisplayTotal?: boolean;
     scrollY?: number;
   };
+  hiddenColIds?: string[],
   leftFixedCols?:number;
   serverKey?: string;
   maxSelectedRows?: number;
@@ -211,7 +212,7 @@ export interface ColumnConfig extends FieldConfig {
   colWidth?: number;
   colFixed?: "left" | "right" | boolean;
   valueAlign?: "left" | "right" | "center";
-  id: string;
+  originalId:string;
   upperColumnTitle?:string,
 }
 
@@ -289,6 +290,7 @@ export interface FieldGroupConfig extends OrderableTmplBase {
   classAddConfigs?: ClassAddConfig[];
   defaultCriteriaValue?: object;
   deleteData?:boolean;
+  viewModel?:"table"|"verticalList";
 }
 
 export type SaveJumpType = "list" | "add" | "edit";
@@ -476,11 +478,12 @@ export interface LtmplConfig extends SelectConfig {
     id: string;
     aggFunc: "sum" | "avg" | "groupIsum" | "groupIavg";
     title: string;
+    originalId:string;
   }[];
   subtotalXColumn?: { id: string }[];
   subtotalYColumn?: { id: string }[];
   updrillButtonConfigs?: UpdrillButtonConfig[];
-  groupIColumns?: { id: string; title: string; sourceId: string }[];
+  groupIColumns?: { id: string; title: string; sourceId: string; originalId:string;}[];
 }
 
 export interface EnumItem {