aldehyde 0.2.405 → 0.2.407

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

@@ -1,7 +1,7 @@
 import React, { ReactNode } from "react";
 import {
   Button, Card, Checkbox, Col, Divider, Popover, Row, Space, Drawer, Tooltip,
-  message, Layout, Table, Form as AntdForm, FormInstance
+  message, Layout, Table, Form as AntdForm, FormInstance, Modal, Input, Alert, Tabs
 } from "antd";
 import {
   ExportOutlined, FundOutlined, LineChartOutlined,
@@ -16,6 +16,7 @@ import {
 } from "../tmpl/interface";
 
 import HcserviceV3 from "../tmpl/hcservice-v3";
+import HCDataSource from "../tmpl/hc-data-source";
 import QueryTable from "./query-table";
 import CriteriaForm from "./../form/criteria-form";
 import ProgramConfig from "../units";
@@ -64,6 +65,7 @@ interface ActTableProps extends TmplBaseProps {
   tableType?: "common" | "report" | "select";
   operatable?: boolean;
   onSelectChange?: (val: { selectedRows: SelectedRow[], selectedDatas: DtmplData[] }) => void;
+  defShowType?: ActTableViewModel; // 默认视图
 }
 
 interface ActTableStat {
@@ -91,6 +93,9 @@ interface ActTableStat {
   ltreeData?: object;
   userCriteriaData: object;
   editings: string[]; // 行内编辑code
+  delModalOpen?: boolean; // 强删除弹窗是否打开
+  tabsOptions?: { key: string, label: React.ReactNode, id?: string, ids?: string[] }[]; // tabs选项
+  tabActiveKey?: string; // Tabs选中项
 }
 let serial_number = new Date().getTime();
 let busyReminderTime = 0;
@@ -122,6 +127,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     ltreeData: {},
     userCriteriaData: undefined,
     editings: [], // 行内编辑code
+    delModalOpen: false, // 强删除弹窗是否打开
+    tabsOptions: [],
+    tabActiveKey: "all",
   };
 
   static contextType = LocaleContext;
@@ -137,7 +145,37 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     operatable: true,
   };
 
-
+  // 获取标签选项
+  getTabsOptions = () => {
+    const { ltmplConfig, criteriaData } = this.props;
+    const { translate } = this.context;
+    if (!ltmplConfig?.split2TabCriterias) {
+      return;
+    }
+    const allIds = [];
+    const options = ltmplConfig.split2TabCriterias.map(fieldConfig => {
+      const id = `c_${fieldConfig.id}`;
+      allIds.push(id);
+      const items = HCDataSource.getEnums(fieldConfig.mstrucId);
+      const options = items.map((item) => ({
+        label: <span style={{ padding: "0 10px" }}>{translate("${" + item.title + "}")}</span>,
+        key: item.value,
+        id
+      }));
+      if (fieldConfig.relDeduplication && fieldConfig.exceptCodes?.length) {
+        return options.filter(item => !fieldConfig.exceptCodes.includes(item.key));
+      }
+      return options;
+    })?.flat() || [];
+    const defOption = {
+      label: <span style={{ padding: "0 10px" }}>{translate("${全部}")}</span>,
+      key: "all",
+      ids: allIds
+    };
+    const temId = Object.keys(criteriaData).find(r => allIds.includes(r));
+    const tabActiveKey = temId ? criteriaData[temId] : "all";
+    this.setState({ tabsOptions: [defOption, ...options], tabActiveKey });
+  }
 
   loadData = async (
     hiddenColIds: string[],
@@ -146,7 +184,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   ) => {
     const {
       sourceId, criteriaData, ltmplConfig,
-      mainCode, level, pageNo, pageSize, serverKey,
+      mainCode, level, pageNo, pageSize, serverKey, defShowType
     } = this.props;
 
     if (!this.isSameSourceQuery(sourceId, criteriaData)) {
@@ -200,7 +238,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       pageSize: pageSize ? pageSize : defaultPageSize ? defaultPageSize : 10,
       virtualEndPageNo: undefined,
     };
-    const viewModels = this.state.viewModels.length > 0 ? this.state.viewModels : [showType || "table"];
+    const viewModels = this.state.viewModels.length > 0 ? this.state.viewModels : [defShowType || showType || "table"];
 
     /** 构建 dataSource **/
     //构建过滤条件
@@ -342,7 +380,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 this.setState({ customButton: undefined });
               }}
             >
-              {" "}
               {translate("${关闭}")}
             </Button>
           }
@@ -398,6 +435,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         ...ltmplConfig.columns,
       ];
     }
+    this.getTabsOptions();
     this.loadData(defaultDisabledColIds, [], sortedColConfigs);
   }
 
@@ -586,10 +624,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       //重新加载数据
       this.loadData(hiddenColIds, hiddenRowCodes, sortedColConfigs);
       doDelete && doDelete(code);
+      this.setState({ loading: false, delModalOpen: false, recordCode: undefined });
     } else {
-      this.setState({
-        loading: false,
-      });
+      this.setState({ loading: false });
     }
   };
 
@@ -1247,11 +1284,30 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   }
   // 行内编辑end
 
+  // 删除确认弹窗打开
+  doDelModalOpen = (code: string) => {
+    this.setState({ recordCode: code, delModalOpen: true });
+  };
+
+  // tab页切换查询
+  doTabSearch = (val: string) => {
+    const { tabsOptions, tabActiveKey } = this.state;
+    let new_serial_number = new Date().getTime();
+    if (new_serial_number - serial_number < 2000) return;
+    if (tabActiveKey === val) return;
+    const item = tabsOptions.find(r => r.key === val);
+    let params = { [item.id]: val };
+    if (val === "all") {
+      params = item.ids?.reduce((total, cur) => { total[cur] = undefined; return total; }, {});
+    }
+    this.actTableDoSearch(params);
+    this.setState({ tabActiveKey: val });
+  }
 
   renderContent = () => {
     let {
       queryKey, loading, selectedRows, hiddenRowCodes, viewModels, sortedColConfigs, hiddenColIds, showL2ActTable,
-      pageInfo, editings
+      pageInfo, editings, userCriteriaData, tabsOptions, tabActiveKey
     } = this.state;
     let {
       mainCode, sourceId, ltmplConfig, funcMode, operatable,
@@ -1281,7 +1337,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         onHide: this.onHide, doCustomButton: this.doCustomButton, doRowJump: this.doRowJump,
         blockMenuTreeDrawerOpen: this.blockMenuTreeDrawerOpen,
         doRowAction: this.doRowAction, doDeleteByCode: this.doDeleteByCode, sortColumns: criteriaData["sortColIds"],
-        editings, editRowEdit: this.editRowEdit, cancelRowEdit: this.cancelRowEdit, saveRowData: this.saveRowData
+        editings, editRowEdit: this.editRowEdit, cancelRowEdit: this.cancelRowEdit, saveRowData: this.saveRowData,
+        doDelModalOpen: this.doDelModalOpen, mainCode, criteriaData: userCriteriaData, actTableDoSearch: this.actTableDoSearch
       }
     );
 
@@ -1381,21 +1438,18 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                         dangerouslySetInnerHTML={{ __html: ltmplConfig.header }}
                       ></div>
                     ) : null}
-                    <h3 >
-                      <p className="act-table-title" style={{ position: "relative", float: "left", marginBottom: "4px" }}> {!title
-                        ? translate("${" + ltmplConfig.title + "}")
-                        : typeof title == "string"
-                          ? translate("${" + title + "}")
-                          : title}</p>
-                      {/*<Space size={"large"} style={{marginLeft:50}}>*/}
-                      {/*{aggregateVO && aggregateVO.aggregates?*/}
-                      {/*    aggregateVO.aggregates.map(av=>{*/}
-                      {/*      return <Statistic title={av.fieldTitle} value={av.value} />*/}
-                      {/*    }):null*/}
-                      {/*}*/}
-                      {/*</Space>*/}
-                      <p className="fr" style={{ marginBottom: "4px" }}>{this.renderHeaderButtons()}</p>
-                    </h3>
+                    {tabsOptions.length ?
+                      <Tabs tabBarGutter={12} size="small" activeKey={tabActiveKey} items={tabsOptions} onChange={this.doTabSearch} tabBarExtraContent={this.renderHeaderButtons()} /> :
+                      <>
+                        <h3 >
+                          <p className="act-table-title" style={{ position: "relative", float: "left", marginBottom: "4px" }}> {!title
+                            ? translate("${" + ltmplConfig.title + "}")
+                            : typeof title == "string"
+                              ? translate("${" + title + "}")
+                              : title}</p>
+                        </h3>
+                        <p className="fr" style={{ marginBottom: "4px" }}>{this.renderHeaderButtons()}</p>
+                      </>}
                   </span>
                 )
               ) : null}
@@ -1458,13 +1512,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   };
 
   render() {
-    let {
-      queryKey, loading, blockMenuTreeDrawerOpen, recordCode, showRatmplSelector
-    } = this.state;
-    let {
-      sourceId, ltmplConfig, title, collapsible, initCollapse,
-      tip, serverKey, mainCode,
-    } = this.props;
+    let { queryKey, loading, blockMenuTreeDrawerOpen, recordCode, showRatmplSelector, delModalOpen } = this.state;
+    let { sourceId, ltmplConfig, title, collapsible, initCollapse, tip, serverKey, mainCode } = this.props;
+    const { strongDeleteConfirmText } = ltmplConfig || {};
+    const { translate } = this.context;
+    const delFormRef = React.createRef<FormInstance>(); // 强删除表单的form Ref
+
     if (!ltmplConfig || !sourceId) {
       return (
         <>
@@ -1528,10 +1581,31 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             mainCode={mainCode}
             sourceId={sourceId}
             existRelation={"false"}
-          ></ModelSelectTable>
-        ) : (
-          ""
-        )}
+          />
+        ) : ""}
+        {delModalOpen ?
+          <Modal
+            open={delModalOpen}
+            title={translate("${确定要[删除]此数据吗}?")}
+            onOk={() => delFormRef.current.validateFields().then(() => this.doDeleteByCode(recordCode)).catch(() => { })}
+            onCancel={() => this.setState({ recordCode: undefined, delModalOpen: false })}
+          >
+            <AntdForm ref={delFormRef} layout="vertical">
+              <AntdForm.Item noStyle >
+                <Alert message={translate("${风险操作，此操作不可逆，是否继续操作}?")} type="warning" showIcon style={{ margin: "12px 0" }} />
+              </AntdForm.Item>
+              <AntdForm.Item
+                label={<div>{translate("${请手动输入}")}<span style={{ color: "#ff4d4f" }}> “ {translate("${" + strongDeleteConfirmText + "}")} ” </span>{translate("${完成验证}")}</div>}
+                name="rule"
+                rules={[
+                  { required: true, message: translate("${请输入" + strongDeleteConfirmText + "}") },
+                  { validator: (_, value) => value && value !== translate("${" + strongDeleteConfirmText + "}") ? Promise.reject(new Error(translate("${请输入" + strongDeleteConfirmText + "}"))) : Promise.resolve() }
+                ]}
+              >
+                <Input placeholder={translate("${" + strongDeleteConfirmText + "}")} />
+              </AntdForm.Item>
+            </AntdForm>
+          </Modal> : ""}
       </>
     );
   }

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

@@ -24,6 +24,7 @@ import { ViewControl } from "../../index";
 import NewinFileView from "../../controls/file-view/newin-file-view";
 import { EntryControl } from "../../index";
 import TmplConfigAnalysis from "../../tmpl/tmpl-config-analysis";
+import Icon from "../../icon/aliIcon";
 import "./index.less";
 
 const FormItem = AntdForm.Item;
@@ -50,7 +51,10 @@ interface ColumnBuilderProps extends ActionRenderProps {
     sortedColConfigs?: ColumnConfig[],
     unHiden?: () => any,
     onHide?: (code: string) => any,
-    operatable?: boolean
+    operatable?: boolean,
+    mainCode?: string,
+    criteriaData?: object,
+    actTableDoSearch?: (data: object) => void
 }
 
 interface ReportColumnBuilderProps {
@@ -74,7 +78,7 @@ export default {
             sortedColConfigs, unHiden,
             onHide, translate,
             sortColumns, serverKey,
-            editings
+            editings, mainCode, criteriaData, actTableDoSearch
         } = props;
 
         const { primaryColumn, primaryColumnLabel } = ltmplConfig
@@ -196,6 +200,35 @@ export default {
                     );
                 };
             }
+            // 表头列搜索
+            if (item.appendCriteria) {
+                const criteria = item.appendCriteria;
+                let searchVal = criteriaData?.[`c_${criteria.id}`];
+                column["filterDropdown"] = ({ setSelectedKeys, selectedKeys, confirm, clearFilters }) => (<div style={{ padding: 8 }} onKeyDown={(e) => e.stopPropagation()}>
+                    <EntryControl
+                        serverKey={serverKey}
+                        mainCode={mainCode}
+                        value={searchVal}
+                        fieldConfig={criteria}
+                        onChange={(val) => {
+                            const value = val?.target ? val.target.value : val;
+                            setSelectedKeys(value ? [value] : []);
+                            searchVal = value;
+                        }}
+                    />
+                    <div style={{ display: "flex", justifyContent: "space-between", alignItems: "center", paddingTop: 8 }}>
+                        <Button type="text" size="small" onClick={() => {
+                            clearFilters();
+                            searchVal = undefined;
+                        }}>{translate("${重置}")}</Button>
+                        <Button onClick={() => {
+                            actTableDoSearch({ [`c_${criteria.id}`]: selectedKeys[0] });
+                            confirm();
+                        }} type="primary" size="small">{translate("${确定}")}</Button>
+                    </div>
+                </div>);
+                column["filteredValue"] = searchVal || undefined;
+            }
         });
         return tableColumns;
     },
@@ -366,8 +399,8 @@ export default {
             serverKey,
             readOnly,
             sourceId, translate, doCustomButton, doRowJump, blockMenuTreeDrawerOpen,
-            doRowAction, doDeleteByCode, editRowEdit, editings, cancelRowEdit, saveRowData } = props;
-        const { buttons, builtInButtons, defShowRowActionCount } = ltmplConfig;
+            doRowAction, doDeleteByCode, editRowEdit, editings, cancelRowEdit, saveRowData, doDelModalOpen } = props;
+        const { buttons, builtInButtons, defShowRowActionCount, strongDeleteConfirmText } = ltmplConfig;
 
         let actionButtons: any[] = [];
 
@@ -499,7 +532,11 @@ export default {
                                 doCustomButton(customButton, [record])
                             }
                         >
-                            {translate("${" + customButton.title + "}")}
+                            {customButton.icon ?
+                                <Tooltip placement="top" title={translate("${" + customButton.title + "}")}>
+                                    <Icon type={customButton.icon}></Icon>
+                                </Tooltip>
+                                : translate("${" + customButton.title + "}")}
                         </Button>
                     )
                 };
@@ -507,21 +544,26 @@ export default {
         }
         if (ltmplConfig.ractions && !readOnly) {
             ltmplConfig.ractions.map((raction) => {
-                actionButtons.push(
-                    ActionUtils.isShow(
-                        raction?.preposes,
-                        [record],
-                        undefined
-                    ) ?
+                if (ActionUtils.isShow(
+                    raction?.preposes,
+                    [record],
+                    undefined
+                )) {
+                    actionButtons.push(
                         <Button
                             key={raction.id}
                             size="small"
                             type="dashed"
                             onClick={() => doRAction(raction.id, record.code)}
                         >
-                            {translate("${" + raction.title + "}")}
-                        </Button> : ""
-                );
+                            {raction.icon ?
+                                <Tooltip placement="top" title={translate("${" + raction.title + "}")}>
+                                    <Icon type={raction.icon}></Icon>
+                                </Tooltip>
+                                : translate("${" + raction.title + "}")}
+                        </Button>
+                    );
+                }
             })
         }
 
@@ -560,7 +602,11 @@ export default {
                             type="dashed"
                             onClick={() => doRowJump(jump, record)}
                         >
-                            {translate("${" + jump.title + "}")}
+                            {jump.icon ?
+                                <Tooltip placement="top" title={translate("${" + jump.title + "}")}>
+                                    <Icon type={jump.icon}></Icon>
+                                </Tooltip>
+                                : translate("${" + jump.title + "}")}
                         </Button>
                     )
                 };
@@ -624,20 +670,22 @@ export default {
                 undefined
             )) {
             actionButtons.push(
-                <Popconfirm
-                    placement="rightBottom"
-                    title={translate("${确定要[删除]此数据吗}?")}
-                    onConfirm={() => {
-                        doDeleteByCode(record.code);
-                    }}
-                    okText={translate("${确定}")}
-                    cancelText={translate("${取消}")}
-                    okType={"danger"}
-                >
-                    <Button size="small" type="dashed" danger>
+                strongDeleteConfirmText ?
+                    <Button size="small" type="dashed" danger onClick={() => doDelModalOpen(record.code)}>
                         <DeleteOutlined />
-                    </Button>
-                </Popconfirm>
+                    </Button> :
+                    <Popconfirm
+                        placement="rightBottom"
+                        title={translate("${确定要[删除]此数据吗}?")}
+                        onConfirm={() => doDeleteByCode(record.code)}
+                        okText={translate("${确定}")}
+                        cancelText={translate("${取消}")}
+                        okType={"danger"}
+                    >
+                        <Button size="small" type="dashed" danger>
+                            <DeleteOutlined />
+                        </Button>
+                    </Popconfirm>
             )
         }
         let showButtons = [];

package/src/aldehyde/table/index.css

@@ -1,25 +1,30 @@
 .editTableList .ant-upload-list-picture .ant-upload-list-item {
   width: 110px;
 }
+
 .SearchForm {
   padding: 8px;
   background: #fff;
   box-shadow: 0 0 5px rgb(187, 182, 182);
   border-radius: 3px;
 }
+
 .actTable button {
   margin-right: 5px;
 }
+
 .actTable a {
   margin-right: 5px;
 }
+
 .actTable h3 {
   font-size: 18px;
 }
 
 .ant-table .ant-table-selection-column {
   /*position: relative;*/
-  z-index: 3; /* 或者更高的值 */
+  z-index: 3;
+  /* 或者更高的值 */
 }
 
 .react-resizable {
@@ -86,6 +91,15 @@
   background-color: var(--color-3) !important;
 }
 
-.sortable-item-hover:hover > td {
+.sortable-item-hover:hover>td {
   background-color: var(--ant-table-row-hover-bg);
 }
+
+.actTable .ant-tabs-nav {
+  margin-bottom: 8px;
+  align-items: end;
+}
+
+.actTable .ant-tabs-nav::before {
+  display: none;
+}

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

@@ -3,8 +3,9 @@ import { Space, Button, Popconfirm } from "antd";
 import { DeleteOutlined, EditOutlined, AlignCenterOutlined } from "@ant-design/icons";
 import debounce from "lodash/debounce";
 import "./index.css";
-import { DtmplData, QueryKey, SelectConfig, SelectedRow, ControlBaseProps, LtmplConfig, ActTableMode } from "../tmpl/interface";
+import { DtmplData, QueryKey, SelectConfig, SelectedRow, ControlBaseProps, LtmplConfig, ActTableMode, RouterCompProps } from "../tmpl/interface";
 import TableUnits from "./table-util";
+import Units from "../units";
 import SupportInputTypes from '../tmpl/control-type-supportor';
 import HCDataSource from '../tmpl/hc-data-source';
 import HcserviceV3 from "../tmpl/hcservice-v3";
@@ -15,8 +16,12 @@ import { LocaleContext } from "../locale/LocaleProvider";
 import DtmplViewDrawer from "../module/dtmpl-view-drawer";
 import DtmplEditPage from "../module/dtmpl-edit-page";
 import DtmplCustomEditModalPage from "../custom-page/dtmpl-custom-edit-modal-page";
+import withRouter from "../routable/withroute";
 
-interface SelectTableProps extends ControlBaseProps {
+// 弹窗selectTable类型，查询参数不缓存
+const popoverTableTypes = ["table-entity-select", "relation-existion"];
+
+interface SelectTableProps extends ControlBaseProps, RouterCompProps {
     mainCode?: string,
     maxSelectedRows?: number,
     serverKey?: string,
@@ -69,31 +74,42 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
         ltmplConfig: undefined,
     }
 
-    loadData = async (selectConfig: SelectConfig, criteriaData: object, npageNo?: number) => {
+    loadData = async (selectConfig: SelectConfig, criteriaData: { [key: string]: any }, npageNo?: number) => {
         this.setState({ loading: true });
         const { mainCode, serverKey, sourceId, fieldConfig } = this.props;
         const baseCriteria = fieldConfig.baseCriteria || {};
         const { pageNo, pageSize } = this.state;
         const { defaultPageSize } = selectConfig;
-        const pno = npageNo ? npageNo : pageNo;
         let pageInfo = {
-            pageNo: pno,
-            pageSize: pageSize ? pageSize : defaultPageSize ? defaultPageSize : 10,
+            pageNo: npageNo || criteriaData?.pageNo || pageNo,
+            pageSize: criteriaData?.pageSize || pageSize || defaultPageSize || 10,
             virtualEndPageNo: undefined,
         }
         /** 构建 dataSource **/
         //构建过滤条件
         let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(serverKey, sourceId, { ...criteriaData, ...baseCriteria, ...pageInfo, mainCode });
         this.setState({
-            pageNo: pno,
+            pageNo: pageInfo.pageNo,
             queryKey,
             criteriaData,
             loading: false,
         });
     }
 
+    // 判断是否为弹出表格
+    getIsPopoverTable = () => {
+        const { fieldConfig } = this.props;
+        return !popoverTableTypes.includes(fieldConfig.controlType || fieldConfig.extControlType)
+    }
+
     async componentDidMount() {
-        await this.loadData(await this.loadConfig(), {});
+        const { location } = this.props;
+        let criteriaData = {};
+        const ltmplConfig = await this.loadConfig();
+        if (this.getIsPopoverTable()) {
+            criteriaData = Units.transQueryStrToParams(location.search, ltmplConfig);
+        }
+        await this.loadData(ltmplConfig, criteriaData || {});
     }
 
     loadConfig = async () => {
@@ -190,9 +206,22 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
         }
     }
 
+    getMenuId = () => {
+        const { searchParams } = this.props;
+        let menuId = searchParams.get("menuId");
+        return menuId;
+    };
+
     doSearch = async (params_) => {
+        const { location } = this.props;
         const { selectConfig, criteriaData } = this.state;
-        let params = { ...criteriaData, ...params_ }
+        let params = { ...criteriaData, ...params_, pageNo: 1, };
+        if (this.getIsPopoverTable()) {
+            // 自定义页面中使用组件选择表格，查询条件缓存在url中
+            const menuId = this.getMenuId();
+            const newfliter = Units.transQueryParamsToStr({ ...params, menuId, sourceId: menuId });
+            this.props.navigate(`${location.pathname}?${newfliter}`, { replace: true });
+        }
         await this.loadData(selectConfig, params, 1);
     }
 
@@ -267,6 +296,13 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
     }
 
     onChangePage = (pageNo, pageSize) => {
+        const { location } = this.props;
+        const { criteriaData } = this.state;
+        if (this.getIsPopoverTable()) {
+            const menuId = this.getMenuId();
+            const newfliter = Units.transQueryParamsToStr({ ...criteriaData, pageNo, pageSize, menuId, sourceId: menuId });
+            this.props.navigate(`${location.pathname}?${newfliter}`, { replace: true });
+        }
         this.setState({ pageNo, pageSize });
     }
 
@@ -447,4 +483,4 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
     }
 }
 
-export default SelectTable;
+export default withRouter(SelectTable);

package/src/aldehyde/tmpl/interface.tsx

@@ -108,6 +108,7 @@ export interface TmplBase {
   id?: string;
   title?: string;
   tip?: string;
+  icon?: string;
 }
 
 export interface OrderableTmplBase extends TmplBase {
@@ -220,6 +221,7 @@ export interface JumpConfig extends OrderableTmplBase {
   searchParams: FieldConfig[];
   routeParams: FieldConfig[];
   preposes: FieldConfig[];
+  icon?: string;
 }
 export interface ClassAddConfig extends OrderableTmplBase { }
 export interface ClassEditConfig extends OrderableTmplBase {
@@ -446,6 +448,8 @@ export interface FieldConfig extends FieldBase {
   relDeduplication?: boolean;
   preview?: boolean; // 图片组件预览配置
   dateControlShortcutKeys?: string[]; // 时间范围预设配置
+  placeholder?: string; // 占位符
+  appendCriteria?: CriteriaConfig; // 列查询条件配置
 }
 
 export interface ActionRenderProps {
@@ -467,6 +471,7 @@ export interface ActionRenderProps {
   cancelRowEdit?: (code: string) => void,
   saveRowData?: (data: DtmplData) => void,
   editings?: string[],
+  doDelModalOpen?: (code: string) => any,
 }
 
 export interface FileRule {
@@ -482,6 +487,8 @@ export interface SelectConfig extends TmplBase {
   defShowRowActionCount: number;
   columns: ColumnConfig[];
   criterias: CriteriaConfig[];
+  commonCriterias: CriteriaConfig[];
+  split2TabCriterias: CriteriaConfig[];
   defaultCriteriaValue?: object;
   primaryColumn?: ColumnConfig;
   groupIColumns?: ColumnConfig[];
@@ -614,6 +621,7 @@ export interface LtmplConfig extends SelectConfig {
   calendarDateColumnConfig?: ColumnConfig;
   calendarShowType?: "month" | "year";
   calendarDateSelectorUsable?: boolean;
+  strongDeleteConfirmText?: string; // 强确认删除文本
 }
 
 export interface EnumItem {
@@ -828,7 +836,7 @@ export interface BlockType {
   hiddenOnDisabled?: boolean; // 是否隐藏
   customPath?: string; // 自定义页面路径
   dragDropPageId?: string;
-  pageType?: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树" | "导入" | "报表" | "分屏-列表" | "分屏-报表"; // 页面类型
+  pageType?: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树" | "导入" | "报表" | "分屏-列表" | "分屏-报表" | "甘特图" | "日历"; // 页面类型
   defaultCriteriaValue?: { [key: string]: string }; // 一些组件参数
   linkTarget?: HTMLAttributeAnchorTarget; // 页面跳转方式
   items?: BlockType[];