aldehyde 0.2.319 → 0.2.320

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

@@ -22,7 +22,7 @@ import EntryControl from "../controls/entry-control";
 import Action from "../controls/action";
 import CquickButton from "../controls/cquery/cquick-button";
 import { useLocale } from "../locale/useLocale";
-import {DownOutlined, LeftOutlined, RightOutlined, SearchOutlined, UpOutlined} from "@ant-design/icons";
+import { DownOutlined, LeftOutlined, RightOutlined, SearchOutlined, UpOutlined } from "@ant-design/icons";
 import { ProgramConfig } from "../index";
 import SelectCodeExport from "../controls/file-export/select-code-export";
 
@@ -38,7 +38,7 @@ export interface CriteriaFormProps {
   doSearch?: (data: object) => void;
   doDelete?: () => void;
   doAction?: (string, selectedRows: SelectedRow[], object) => void;
-  doCustomButton?:(customButton:CustomButton, datas:DtmplData[])=> void;
+  doCustomButton?: (customButton: CustomButton, datas: DtmplData[]) => void;
   doJump?: (jump: JumpConfig) => void;
   doCQuery?: (cqueryId: string) => void;
   hiddenCriteriaIds?: string[];
@@ -72,15 +72,15 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
     buttons,
     actions,
     customButtons,
-      fileExports,
+    fileExports,
     jumps,
     cQuerys,
     criterias,
     drillingParams,
     columns,
     updrillButtonConfigs,
-      innerParams,
-      defShowCriteriaCount,
+    innerParams,
+    defShowCriteriaCount,
   } = ltmplConfig;
   const initialValues = {};
   const searchSubmit = (data) => {
@@ -99,13 +99,13 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
   const [collapsible, setCollapsible] = useState<boolean>(false);
   const [expanded, setExpanded] = useState<boolean>(false);
 
-  let collapseCriteria:CriteriaConfig[] =defShowCriteriaCount<=0?criterias:criterias.slice(0,defShowCriteriaCount);
+  let collapseCriteria: CriteriaConfig[] = defShowCriteriaCount <= 0 ? criterias : criterias.slice(0, defShowCriteriaCount);
 
 
 
   useEffect(() => {
     form.resetFields();
-    if(collapseCriteria && criterias && collapseCriteria.length<criterias.length){
+    if (collapseCriteria && criterias && collapseCriteria.length < criterias.length) {
       setCollapsible(true);
     }
   });
@@ -144,9 +144,10 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
   };
 
   const renderCustomButton = () => {
-    if (doAction && customButtons && customButtons.length > 0) {
+    if (doCustomButton && customButtons?.length > 0) {
       return customButtons.map((customButton) => {
-        let disabled = true;
+        // defDisabled设置默认是否禁用
+        let disabled = customButton.defDisabled !== false;
         if (selectedRows) {
           if (selectedRows.length > 0 && customButton.multible) {
             disabled = false;
@@ -156,13 +157,13 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
         }
 
         return (
-            <Button disabled={disabled}
-                key={customButton.id}
-                type={customButton.buttonType?customButton.buttonType:'dashed'}
-                onClick={() => doCustomButton(customButton, selectedDatas)}
-            >
-              {translate("${" + customButton.title + "}")}
-            </Button>
+          <Button disabled={disabled}
+            key={customButton.id}
+            type={customButton.buttonType ? customButton.buttonType : 'dashed'}
+            onClick={() => doCustomButton(customButton, selectedDatas)}
+          >
+            {translate("${" + customButton.title + "}")}
+          </Button>
         );
       });
     }
@@ -179,22 +180,22 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
             disabled = false;
           }
         }
-        let codes=[];
-        if(selectedDatas){
-          selectedDatas.forEach(s=>{
+        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>
+          <SelectCodeExport
+            serverKey={serverKey}
+            hiddenType={"disabled"}
+            codes={codes}
+            key={fileExport.id}
+            fileExport={fileExport}
+            disabled={disabled}
+          ></SelectCodeExport>
         );
       });
     }
@@ -234,7 +235,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
                   "drillingColIds",
                   updrillButtonConfig.dimensions
                 );
-                 form.submit();
+                form.submit();
               }}
             >
               {translate("${" + updrillButtonConfig.title + "}")}
@@ -348,17 +349,17 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
   };
 
   const onValuesChange = (changedValues, allValues) => {
-    let appCtmplConfig= ProgramConfig.getAppCtmplConfig(
-        ltmplConfig,
-        data,
-        props
+    let appCtmplConfig = ProgramConfig.getAppCtmplConfig(
+      ltmplConfig,
+      data,
+      props
     )
     if (appCtmplConfig.onCriteriaValuesChange) {
       //自定义值修改逻辑
       appCtmplConfig.onCriteriaValuesChange(
-          changedValues,
-          data,
-          form
+        changedValues,
+        data,
+        form
       );
     }
     // if (onValuesChange) {
@@ -381,11 +382,11 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
       return criterias.map((item) => {
         let formItemName = "c_" + item.id;
         let fieldValue = data ? data[formItemName] : undefined;
-        if(item?.extControlType=="ltree-entity-select" || item?.extControlType=="ltree-entity-select-value"){
-         // return <FormItem>
-         //    <Input type={"hidden"} name={formItemName} value={fieldValue} />
-         //  </FormItem>
-         // return null;
+        if (item?.extControlType == "ltree-entity-select" || item?.extControlType == "ltree-entity-select-value") {
+          // return <FormItem>
+          //    <Input type={"hidden"} name={formItemName} value={fieldValue} />
+          //  </FormItem>
+          // return null;
         } else if (!hiddenCriteriaIds.includes(item.id)) {
           return (
             <FormItem
@@ -396,11 +397,11 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
               rules={
                 item.required
                   ? [
-                      {
-                        required: true,
-                        message: translate("${请选择}" + item.title),
-                      },
-                    ]
+                    {
+                      required: true,
+                      message: translate("${请选择}" + item.title),
+                    },
+                  ]
                   : undefined
               }
             >
@@ -428,74 +429,74 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
       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 ||
+      {/*// <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") &&
+                ? renderCriteria(innerParams)
+                : null}
+              {buttons.includes("drilling") &&
                 open &&
                 (drillingParams.length > 0 || hasDimension() || ltmplConfig.showDim) ?
-                    <>{renderCriteria(drillingParams)}
-                      {renderDrillDimension()}</>
-                    : null}
-                {showQueryButton || (updrillButtonConfigs && updrillButtonConfigs.length > 0)
-                    ? renderCriteria(expanded?criterias:collapseCriteria)
-                    : null}
-
-                <Space className="btns">
-                  {collapsible ? (
-                      expanded?<Button icon={<LeftOutlined />} type={"link"}  onClick={()=>setExpanded(false)}>
-                            {translate("${收起}")}
-                          </Button>:
-                      <Button icon={<RightOutlined />} type={"link"}   onClick={()=>setExpanded(true)}>
-                        {translate("${更多条件}")}
-                      </Button>
-                  ) : (
-                      ""
-                  )}
-                  {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>
+                <>{renderCriteria(drillingParams)}
+                  {renderDrillDimension()}</>
+                : null}
+              {showQueryButton || (updrillButtonConfigs && updrillButtonConfigs.length > 0)
+                ? renderCriteria(expanded ? criterias : collapseCriteria)
+                : null}
+
+              <Space className="btns">
+                {collapsible ? (
+                  expanded ? <Button icon={<LeftOutlined />} type={"link"} onClick={() => setExpanded(false)}>
+                    {translate("${收起}")}
+                  </Button> :
+                    <Button icon={<RightOutlined />} type={"link"} onClick={() => setExpanded(true)}>
+                      {translate("${更多条件}")}
+                    </Button>
+                ) : (
+                  ""
+                )}
+                {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>
-            </Col>
-          </Row>
-        </Card>
+            </Space>
+          </Col>
+        </Row>
+      </Card>
       {/*<Card size={'small'}*/}
       {/*  className="hoverable"*/}
       {/*  style={{ display: open ? "block" : "none", width: "100%" }}*/}