aldehyde 0.2.197 → 0.2.199

package/src/aldehyde/form/criteria-form.tsx

@@ -1,488 +1,488 @@
-import React, { useEffect, useState } from "react";
-import {
-  Button,
-  Card,
-  Col,
-  Collapse,
-  Form as AntdForm,
-  Popconfirm,
-  Row,
-  Select,
-  Space,
-} from "antd";
-import {
-  CriteriaConfig, CustomButton,
-  DtmplData,
-  JumpConfig,
-  LtmplConfig,
-  SelectConfig,
-  SelectedRow,
-  UpdrillButtonConfig,
-} from "../tmpl/interface";
-import EntryControl from "../controls/entry-control";
-import Action from "../controls/action";
-import CquickButton from "../controls/cquery/cquick-button";
-import { useLocale } from "../locale/useLocale";
-import { SearchOutlined } from "@ant-design/icons";
-import { ProgramConfig } from "../index";
-import SelectCodeExport from "../controls/file-export/select-code-export";
-
-const { Panel } = Collapse;
-const FormItem = AntdForm.Item;
-
-export interface CriteriaFormProps {
-  serverKey?: string;
-  ltmplConfig: LtmplConfig & SelectConfig;
-  data: object;
-  selectedRows: SelectedRow[];
-  selectedDatas?: DtmplData[];
-  doSearch?: (data: object) => void;
-  doDelete?: () => void;
-  doAction?: (string, selectedRows: SelectedRow[], object) => void;
-  doCustomButton?:(customButton:CustomButton, datas:DtmplData[])=> void;
-  doJump?: (jump: JumpConfig) => void;
-  doCQuery?: (cqueryId: string) => void;
-  hiddenCriteriaIds?: string[];
-  open?: boolean;
-  loading: boolean;
-  mainCode?: string;
-}
-
-let serial_number = new Date().getTime();
-
-const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
-  const { translate } = useLocale();
-  const {
-    ltmplConfig,
-    doSearch,
-    doAction,
-    doCustomButton,
-    doJump,
-    doDelete,
-    selectedRows,
-    data,
-    open,
-    loading,
-    selectedDatas,
-    doCQuery,
-    serverKey,
-  } = props;
-  let [form] = AntdForm.useForm();
-
-  let {
-    buttons,
-    actions,
-    customButtons,
-      fileExports,
-    jumps,
-    cQuerys,
-    criterias,
-    drillingParams,
-    columns,
-    updrillButtonConfigs,
-      innerParams
-  } = ltmplConfig;
-  const initialValues = {};
-  const searchSubmit = (data) => {
-    let new_serial_number = new Date().getTime();
-
-    if (doSearch && new_serial_number - serial_number > 3000) {
-      serial_number = new_serial_number;
-      doSearch({ ...data, serial_number });
-    }
-
-    doSearch && doSearch({ ...data, serial_number });
-  };
-  // let currentDrillButton=null;
-  const [currentDrillButton, setCurrentDrillButton] = useState(null);
-  const [drillLoadings, setDrillLoadings] = useState<string>(null);
-
-  useEffect(() => {
-    form.resetFields();
-  });
-
-  let showQueryButton = buttons.includes("query") && doSearch;
-
-  let showDeleteButton = buttons.includes("batchDelete") && doDelete;
-  let deleteButtonDisabled = !(selectedRows && selectedRows.length > 0);
-
-  const renderAction = () => {
-    if (doAction && actions && actions.length > 0) {
-      return actions.map((action) => {
-        let disabled = true;
-        if (selectedRows) {
-          if (selectedRows.length > 0 && action.multible) {
-            disabled = false;
-          } else if (selectedRows.length == 1) {
-            disabled = false;
-          }
-        }
-
-        return (
-          <Action
-            serverKey={serverKey}
-            hiddenType={"disabled"}
-            key={action.id}
-            disabled={disabled}
-            data={selectedDatas}
-            actionConfig={action}
-            doAction={doAction}
-            serial={1}
-          ></Action>
-        );
-      });
-    }
-  };
-
-  const renderCustomButton = () => {
-    if (doAction && customButtons && customButtons.length > 0) {
-      return customButtons.map((customButton) => {
-        let disabled = true;
-        if (selectedRows) {
-          if (selectedRows.length > 0 && customButton.multible) {
-            disabled = false;
-          } else if (selectedRows.length == 1) {
-            disabled = false;
-          }
-        }
-
-        return (
-            <Button
-                key={customButton.id}
-                type={customButton.buttonType?customButton.buttonType:'dashed'}
-                onClick={() => doCustomButton(customButton, selectedDatas)}
-            >
-              {translate("${" + customButton.title + "}")}
-            </Button>
-        );
-      });
-    }
-  };
-
-  const renderFileExport = () => {
-    if (doAction && fileExports && fileExports.length > 0) {
-      return fileExports.map((fileExport) => {
-        let disabled = true;
-        if (selectedRows) {
-          if (selectedRows.length > 0 && fileExport.multible) {
-            disabled = false;
-          } else if (selectedRows.length == 1) {
-            disabled = false;
-          }
-        }
-        let codes=[];
-        if(selectedDatas){
-          selectedDatas.forEach(s=>{
-            codes.push(s.code);
-          })
-        }
-
-        return (
-            <SelectCodeExport
-                serverKey={serverKey}
-                hiddenType={"disabled"}
-                codes={codes}
-                key={fileExport.id}
-                fileExport={fileExport}
-                disabled={disabled}
-            ></SelectCodeExport>
-        );
-      });
-    }
-  };
-
-  const renderUpdrill = () => {
-    if (updrillButtonConfigs && updrillButtonConfigs.length > 0) {
-      let i = 0;
-      return updrillButtonConfigs.map((updrillButtonConfig) => {
-        i++;
-        return (
-          <>
-            {i == 1 ? (
-              <AntdForm.Item
-                hidden={true}
-                name={"updrillButtonId"}
-              ></AntdForm.Item>
-            ) : null}
-            <Button
-              loading={drillLoadings == updrillButtonConfig.id ? true : false}
-              disabled={
-                drillLoadings && drillLoadings != updrillButtonConfig.id
-                  ? true
-                  : false
-              }
-              icon={
-                currentDrillButton == updrillButtonConfig.id ? (
-                  <SearchOutlined />
-                ) : null
-              }
-              type={updrillButtonConfig.buttonType}
-              shape={updrillButtonConfig.buttonShape}
-              htmlType="submit"
-              onClick={() => {
-                form.setFieldValue("updrillButtonId", updrillButtonConfig.id);
-                form.setFieldValue(
-                  "drillingColIds",
-                  updrillButtonConfig.dimensions
-                );
-                 form.submit();
-              }}
-            >
-              {translate("${" + updrillButtonConfig.title + "}")}
-            </Button>
-          </>
-        );
-      });
-    }
-  };
-
-  const renderJump = () => {
-    if (doJump && jumps && jumps.length > 0) {
-      return jumps.map((jump) => {
-        let disabled = true;
-        if (selectedRows && selectedRows.length == 1) {
-          disabled = false;
-        }
-        return (
-          <Button
-            key={jump.id}
-            onClick={() => doJump(jump)}
-            disabled={disabled}
-          >
-            {jump.title}
-          </Button>
-        );
-      });
-    }
-  };
-
-  const renderCQuery = () => {
-    const { serverKey } = props;
-    if (doCQuery && cQuerys && cQuerys.length > 0) {
-      return cQuerys.map((cquery) => {
-        let disabled = true;
-        if (selectedRows && selectedRows.length == 1) {
-          disabled = false;
-        }
-        return (
-          <CquickButton
-            serverKey={serverKey}
-            key={cquery.id}
-            disabled={disabled}
-            cQueryConfig={cquery}
-            mainCode={!disabled ? selectedRows[0].code : undefined}
-          />
-        );
-      });
-    }
-  };
-
-  const hasDimension = () => {
-    columns.forEach((item) => {
-      if (item.statColType == "dimension") {
-        return true;
-      }
-    });
-    return false;
-  };
-
-  const renderDrillDimension = () => {
-    let drillingColIdsName = "drillingColIds";
-    let dimensionColIds = [];
-    const options = [];
-    columns.forEach((item) => {
-      if (item.statColType == "dimension") {
-        options.push({ label: item.title, value: item.id });
-        dimensionColIds.push(item.id);
-      }
-    });
-    options.push({ label: translate("${无}"), value: "5" });
-
-    initialValues[drillingColIdsName] = data
-      ? data[drillingColIdsName]
-        ? data[drillingColIdsName]
-        : dimensionColIds
-      : dimensionColIds;
-
-    let fieldValue = data ? data[drillingColIdsName] : dimensionColIds;
-    let antdControlProps = {
-      placeholder: translate("${请选择}${维度}"),
-      disabled: false,
-      value: fieldValue,
-      style: { minWidth: 220, width: "100%" },
-    };
-    return ltmplConfig.showDim ? (
-      <FormItem
-        label={translate("${维度}")}
-        name={drillingColIdsName}
-        key={drillingColIdsName}
-        rules={[
-          {
-            required: true,
-            message: translate("${请选择维度,上钻到顶层请只选[无]}"),
-          },
-        ]}
-      >
-        <Select
-          mode="multiple"
-          {...antdControlProps}
-          notFoundContent={translate("${暂无选项}")}
-          allowClear={true}
-          showSearch
-          showArrow={true}
-          options={options}
-        ></Select>
-      </FormItem>
-    ) : (
-      <AntdForm.Item hidden={true} name={"drillingColIds"}></AntdForm.Item>
-    );
-  };
-
-  const onValuesChange = (changedValues, allValues) => {
-   let appCtmplConfig= ProgramConfig.getAppCtmplConfig(
-        ltmplConfig,
-        data,
-        props
-    )
-    if (appCtmplConfig.onCriteriaValuesChange) {
-      //自定义值修改逻辑
-      appCtmplConfig.onCriteriaValuesChange(
-          changedValues,
-          data,
-          form
-      );
-    }
-    // if (onValuesChange) {
-    //   onValuesChange();
-    // }
-  };
-
-  const renderCriteria = (criterias: CriteriaConfig[]) => {
-    if (!criterias) {
-      return;
-    }
-    const { hiddenCriteriaIds, serverKey } = props;
-    criterias.map((item) => {
-      let formItemName = "c_" + item.id;
-      let fieldValue = data ? data[formItemName] : undefined;
-      initialValues[formItemName] = fieldValue;
-    });
-
-    if (doSearch) {
-      return criterias.map((item) => {
-        let formItemName = "c_" + item.id;
-        let fieldValue = data ? data[formItemName] : undefined;
-        if (!hiddenCriteriaIds.includes(item.id)) {
-          return (
-            <FormItem
-              label={translate("${" + item.title + "}")}
-              name={formItemName}
-              key={item.id}
-              tooltip={item.tip}
-              rules={
-                item.required
-                  ? [
-                      {
-                        required: true,
-                        message: translate("${请选择}" + item.title),
-                      },
-                    ]
-                  : undefined
-              }
-            >
-              <EntryControl
-                serverKey={serverKey}
-                mainCode={props.mainCode}
-                value={fieldValue}
-                fieldConfig={item}
-              />
-            </FormItem>
-          );
-        }
-      });
-    }
-  };
-
-  return (
-    <AntdForm
-      form={form}
-      name="control-hooks"
-      initialValues={initialValues}
-      layout="inline"
-      onFinish={searchSubmit}
-      onValuesChange={onValuesChange}
-      style={{ width: "100%" }}
-    >
-
-        {/*// <Collapse style={{ width: "100%" }} defaultActiveKey={["1"]}>*/}
-        {/*// <Panel header={""} key="1">*/}
-        <Card size={'small'} style={{ display: open ? "block" : "none", width: "100%" }}>
-          <Row>
-            <Col>
-              <Space size={"small"} wrap>
-                {showQueryButton ||
-                (updrillButtonConfigs && updrillButtonConfigs.length > 0)
-                    ? renderCriteria(innerParams)
-                    : null}
-                {buttons.includes("drilling") &&
-                open &&
-                (drillingParams.length > 0 || hasDimension() || ltmplConfig.showDim) ?
-                    <>{renderCriteria(drillingParams)}
-                      {renderDrillDimension()}</>
-                    : null}
-                {showQueryButton || (updrillButtonConfigs && updrillButtonConfigs.length > 0)
-                    ? renderCriteria(criterias)
-                    : null}
-
-                <Space className="btns">
-                  {showQueryButton ? (
-                      <Button type="primary" htmlType="submit">
-                        {translate("${查询}")}
-                      </Button>
-                  ) : (
-                      ""
-                  )}
-                  {showDeleteButton ? (
-                      <Popconfirm
-                          placement="rightBottom"
-                          title={translate("${确定要[删除]选中数据吗}?")}
-                          onConfirm={() => {
-                            doDelete();
-                          }}
-                          okText={translate("${确定}")}
-                          cancelText={translate("${取消}")}
-                          okType={"danger"}
-                      >
-                        <Button danger disabled={deleteButtonDisabled}>
-                          {translate("${删除选中}")}
-                        </Button>
-                      </Popconfirm>
-                  ) : (
-                      ""
-                  )}
-                  {renderCustomButton()}
-                  {renderAction()}
-                  {renderJump()}
-                  {renderCQuery()}
-                  {renderUpdrill()}
-                  { renderFileExport()}
-                </Space>
-              </Space>
-            </Col>
-          </Row>
-        </Card>
-      {/*<Card size={'small'}*/}
-      {/*  className="hoverable"*/}
-      {/*  style={{ display: open ? "block" : "none", width: "100%" }}*/}
-      {/*  headStyle={{ background: "#f2f4f5" }}*/}
-      {/*>*/}
-      {/*  */}
-      {/*</Card>*/}
-    </AntdForm>
-  );
-};
-CriteriaForm.defaultProps = {
-  hiddenCriteriaIds: [],
-  open: true,
-};
-export default CriteriaForm;
+import React, { useEffect, useState } from "react";
+import {
+  Button,
+  Card,
+  Col,
+  Collapse,
+  Form as AntdForm,
+  Popconfirm,
+  Row,
+  Select,
+  Space,
+} from "antd";
+import {
+  CriteriaConfig, CustomButton,
+  DtmplData,
+  JumpConfig,
+  LtmplConfig,
+  SelectConfig,
+  SelectedRow,
+  UpdrillButtonConfig,
+} from "../tmpl/interface";
+import EntryControl from "../controls/entry-control";
+import Action from "../controls/action";
+import CquickButton from "../controls/cquery/cquick-button";
+import { useLocale } from "../locale/useLocale";
+import { SearchOutlined } from "@ant-design/icons";
+import { ProgramConfig } from "../index";
+import SelectCodeExport from "../controls/file-export/select-code-export";
+
+const { Panel } = Collapse;
+const FormItem = AntdForm.Item;
+
+export interface CriteriaFormProps {
+  serverKey?: string;
+  ltmplConfig: LtmplConfig & SelectConfig;
+  data: object;
+  selectedRows: SelectedRow[];
+  selectedDatas?: DtmplData[];
+  doSearch?: (data: object) => void;
+  doDelete?: () => void;
+  doAction?: (string, selectedRows: SelectedRow[], object) => void;
+  doCustomButton?:(customButton:CustomButton, datas:DtmplData[])=> void;
+  doJump?: (jump: JumpConfig) => void;
+  doCQuery?: (cqueryId: string) => void;
+  hiddenCriteriaIds?: string[];
+  open?: boolean;
+  loading: boolean;
+  mainCode?: string;
+}
+
+let serial_number = new Date().getTime();
+
+const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
+  const { translate } = useLocale();
+  const {
+    ltmplConfig,
+    doSearch,
+    doAction,
+    doCustomButton,
+    doJump,
+    doDelete,
+    selectedRows,
+    data,
+    open,
+    loading,
+    selectedDatas,
+    doCQuery,
+    serverKey,
+  } = props;
+  let [form] = AntdForm.useForm();
+
+  let {
+    buttons,
+    actions,
+    customButtons,
+      fileExports,
+    jumps,
+    cQuerys,
+    criterias,
+    drillingParams,
+    columns,
+    updrillButtonConfigs,
+      innerParams
+  } = ltmplConfig;
+  const initialValues = {};
+  const searchSubmit = (data) => {
+    let new_serial_number = new Date().getTime();
+
+    if (doSearch && new_serial_number - serial_number > 3000) {
+      serial_number = new_serial_number;
+      doSearch({ ...data, serial_number });
+    }
+
+    doSearch && doSearch({ ...data, serial_number });
+  };
+  // let currentDrillButton=null;
+  const [currentDrillButton, setCurrentDrillButton] = useState(null);
+  const [drillLoadings, setDrillLoadings] = useState<string>(null);
+
+  useEffect(() => {
+    form.resetFields();
+  });
+
+  let showQueryButton = buttons.includes("query") && doSearch;
+
+  let showDeleteButton = buttons.includes("batchDelete") && doDelete;
+  let deleteButtonDisabled = !(selectedRows && selectedRows.length > 0);
+
+  const renderAction = () => {
+    if (doAction && actions && actions.length > 0) {
+      return actions.map((action) => {
+        let disabled = true;
+        if (selectedRows) {
+          if (selectedRows.length > 0 && action.multible) {
+            disabled = false;
+          } else if (selectedRows.length == 1) {
+            disabled = false;
+          }
+        }
+
+        return (
+          <Action
+            serverKey={serverKey}
+            hiddenType={"disabled"}
+            key={action.id}
+            disabled={disabled}
+            data={selectedDatas}
+            actionConfig={action}
+            doAction={doAction}
+            serial={1}
+          ></Action>
+        );
+      });
+    }
+  };
+
+  const renderCustomButton = () => {
+    if (doAction && customButtons && customButtons.length > 0) {
+      return customButtons.map((customButton) => {
+        let disabled = true;
+        if (selectedRows) {
+          if (selectedRows.length > 0 && customButton.multible) {
+            disabled = false;
+          } else if (selectedRows.length == 1) {
+            disabled = false;
+          }
+        }
+
+        return (
+            <Button
+                key={customButton.id}
+                type={customButton.buttonType?customButton.buttonType:'dashed'}
+                onClick={() => doCustomButton(customButton, selectedDatas)}
+            >
+              {translate("${" + customButton.title + "}")}
+            </Button>
+        );
+      });
+    }
+  };
+
+  const renderFileExport = () => {
+    if (doAction && fileExports && fileExports.length > 0) {
+      return fileExports.map((fileExport) => {
+        let disabled = true;
+        if (selectedRows) {
+          if (selectedRows.length > 0 && fileExport.multible) {
+            disabled = false;
+          } else if (selectedRows.length == 1) {
+            disabled = false;
+          }
+        }
+        let codes=[];
+        if(selectedDatas){
+          selectedDatas.forEach(s=>{
+            codes.push(s.code);
+          })
+        }
+
+        return (
+            <SelectCodeExport
+                serverKey={serverKey}
+                hiddenType={"disabled"}
+                codes={codes}
+                key={fileExport.id}
+                fileExport={fileExport}
+                disabled={disabled}
+            ></SelectCodeExport>
+        );
+      });
+    }
+  };
+
+  const renderUpdrill = () => {
+    if (updrillButtonConfigs && updrillButtonConfigs.length > 0) {
+      let i = 0;
+      return updrillButtonConfigs.map((updrillButtonConfig) => {
+        i++;
+        return (
+          <>
+            {i == 1 ? (
+              <AntdForm.Item
+                hidden={true}
+                name={"updrillButtonId"}
+              ></AntdForm.Item>
+            ) : null}
+            <Button
+              loading={drillLoadings == updrillButtonConfig.id ? true : false}
+              disabled={
+                drillLoadings && drillLoadings != updrillButtonConfig.id
+                  ? true
+                  : false
+              }
+              icon={
+                currentDrillButton == updrillButtonConfig.id ? (
+                  <SearchOutlined />
+                ) : null
+              }
+              type={updrillButtonConfig.buttonType}
+              shape={updrillButtonConfig.buttonShape}
+              htmlType="submit"
+              onClick={() => {
+                form.setFieldValue("updrillButtonId", updrillButtonConfig.id);
+                form.setFieldValue(
+                  "drillingColIds",
+                  updrillButtonConfig.dimensions
+                );
+                 form.submit();
+              }}
+            >
+              {translate("${" + updrillButtonConfig.title + "}")}
+            </Button>
+          </>
+        );
+      });
+    }
+  };
+
+  const renderJump = () => {
+    if (doJump && jumps && jumps.length > 0) {
+      return jumps.map((jump) => {
+        let disabled = true;
+        if (selectedRows && selectedRows.length == 1) {
+          disabled = false;
+        }
+        return (
+          <Button
+            key={jump.id}
+            onClick={() => doJump(jump)}
+            disabled={disabled}
+          >
+            {jump.title}
+          </Button>
+        );
+      });
+    }
+  };
+
+  const renderCQuery = () => {
+    const { serverKey } = props;
+    if (doCQuery && cQuerys && cQuerys.length > 0) {
+      return cQuerys.map((cquery) => {
+        let disabled = true;
+        if (selectedRows && selectedRows.length == 1) {
+          disabled = false;
+        }
+        return (
+          <CquickButton
+            serverKey={serverKey}
+            key={cquery.id}
+            disabled={disabled}
+            cQueryConfig={cquery}
+            mainCode={!disabled ? selectedRows[0].code : undefined}
+          />
+        );
+      });
+    }
+  };
+
+  const hasDimension = () => {
+    columns.forEach((item) => {
+      if (item.statColType == "dimension") {
+        return true;
+      }
+    });
+    return false;
+  };
+
+  const renderDrillDimension = () => {
+    let drillingColIdsName = "drillingColIds";
+    let dimensionColIds = [];
+    const options = [];
+    columns.forEach((item) => {
+      if (item.statColType == "dimension") {
+        options.push({ label: item.title, value: item.id });
+        dimensionColIds.push(item.id);
+      }
+    });
+    options.push({ label: translate("${无}"), value: "5" });
+
+    initialValues[drillingColIdsName] = data
+      ? data[drillingColIdsName]
+        ? data[drillingColIdsName]
+        : dimensionColIds
+      : dimensionColIds;
+
+    let fieldValue = data ? data[drillingColIdsName] : dimensionColIds;
+    let antdControlProps = {
+      placeholder: translate("${请选择}${维度}"),
+      disabled: false,
+      value: fieldValue,
+      style: { minWidth: 220, width: "100%" },
+    };
+    return ltmplConfig.showDim ? (
+      <FormItem
+        label={translate("${维度}")}
+        name={drillingColIdsName}
+        key={drillingColIdsName}
+        rules={[
+          {
+            required: true,
+            message: translate("${请选择维度,上钻到顶层请只选[无]}"),
+          },
+        ]}
+      >
+        <Select
+          mode="multiple"
+          {...antdControlProps}
+          notFoundContent={translate("${暂无选项}")}
+          allowClear={true}
+          showSearch
+          showArrow={true}
+          options={options}
+        ></Select>
+      </FormItem>
+    ) : (
+      <AntdForm.Item hidden={true} name={"drillingColIds"}></AntdForm.Item>
+    );
+  };
+
+  const onValuesChange = (changedValues, allValues) => {
+   let appCtmplConfig= ProgramConfig.getAppCtmplConfig(
+        ltmplConfig,
+        data,
+        props
+    )
+    if (appCtmplConfig.onCriteriaValuesChange) {
+      //自定义值修改逻辑
+      appCtmplConfig.onCriteriaValuesChange(
+          changedValues,
+          data,
+          form
+      );
+    }
+    // if (onValuesChange) {
+    //   onValuesChange();
+    // }
+  };
+
+  const renderCriteria = (criterias: CriteriaConfig[]) => {
+    if (!criterias) {
+      return;
+    }
+    const { hiddenCriteriaIds, serverKey } = props;
+    criterias.map((item) => {
+      let formItemName = "c_" + item.id;
+      let fieldValue = data ? data[formItemName] : undefined;
+      initialValues[formItemName] = fieldValue;
+    });
+
+    if (doSearch) {
+      return criterias.map((item) => {
+        let formItemName = "c_" + item.id;
+        let fieldValue = data ? data[formItemName] : undefined;
+        if (!hiddenCriteriaIds.includes(item.id)) {
+          return (
+            <FormItem
+              label={translate("${" + item.title + "}")}
+              name={formItemName}
+              key={item.id}
+              tooltip={item.tip}
+              rules={
+                item.required
+                  ? [
+                      {
+                        required: true,
+                        message: translate("${请选择}" + item.title),
+                      },
+                    ]
+                  : undefined
+              }
+            >
+              <EntryControl
+                serverKey={serverKey}
+                mainCode={props.mainCode}
+                value={fieldValue}
+                fieldConfig={item}
+              />
+            </FormItem>
+          );
+        }
+      });
+    }
+  };
+
+  return (
+    <AntdForm
+      form={form}
+      name="control-hooks"
+      initialValues={initialValues}
+      layout="inline"
+      onFinish={searchSubmit}
+      onValuesChange={onValuesChange}
+      style={{ width: "100%" }}
+    >
+
+        {/*// <Collapse style={{ width: "100%" }} defaultActiveKey={["1"]}>*/}
+        {/*// <Panel header={""} key="1">*/}
+        <Card size={'small'} style={{ display: open ? "block" : "none", width: "100%" }}>
+          <Row>
+            <Col>
+              <Space size={"small"} wrap>
+                {showQueryButton ||
+                (updrillButtonConfigs && updrillButtonConfigs.length > 0)
+                    ? renderCriteria(innerParams)
+                    : null}
+                {buttons.includes("drilling") &&
+                open &&
+                (drillingParams.length > 0 || hasDimension() || ltmplConfig.showDim) ?
+                    <>{renderCriteria(drillingParams)}
+                      {renderDrillDimension()}</>
+                    : null}
+                {showQueryButton || (updrillButtonConfigs && updrillButtonConfigs.length > 0)
+                    ? renderCriteria(criterias)
+                    : null}
+
+                <Space className="btns">
+                  {showQueryButton ? (
+                      <Button type="primary" htmlType="submit">
+                        {translate("${查询}")}
+                      </Button>
+                  ) : (
+                      ""
+                  )}
+                  {showDeleteButton ? (
+                      <Popconfirm
+                          placement="rightBottom"
+                          title={translate("${确定要[删除]选中数据吗}?")}
+                          onConfirm={() => {
+                            doDelete();
+                          }}
+                          okText={translate("${确定}")}
+                          cancelText={translate("${取消}")}
+                          okType={"danger"}
+                      >
+                        <Button danger disabled={deleteButtonDisabled}>
+                          {translate("${删除选中}")}
+                        </Button>
+                      </Popconfirm>
+                  ) : (
+                      ""
+                  )}
+                  {renderCustomButton()}
+                  {renderAction()}
+                  {renderJump()}
+                  {renderCQuery()}
+                  {renderUpdrill()}
+                  { renderFileExport()}
+                </Space>
+              </Space>
+            </Col>
+          </Row>
+        </Card>
+      {/*<Card size={'small'}*/}
+      {/*  className="hoverable"*/}
+      {/*  style={{ display: open ? "block" : "none", width: "100%" }}*/}
+      {/*  headStyle={{ background: "#f2f4f5" }}*/}
+      {/*>*/}
+      {/*  */}
+      {/*</Card>*/}
+    </AntdForm>
+  );
+};
+CriteriaForm.defaultProps = {
+  hiddenCriteriaIds: [],
+  open: true,
+};
+export default CriteriaForm;