aldehyde 0.2.235 → 0.2.237

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

@@ -7,10 +7,11 @@ import {
 } from "../../tmpl/interface";
 import TableUnits from "../table-util";
 import SupportInputTypes from "../../tmpl/control-type-supportor";
-import {Button, Popconfirm, Space, Tooltip} from "antd";
+import {Button, Popconfirm, Popover, Space, Tooltip} from "antd";
 import {SortableHandle} from "react-sortable-hoc";
 import {
   AlignLeftOutlined, CopyOutlined, DeleteOutlined,
+    EllipsisOutlined,
   EyeInvisibleOutlined,
   EyeOutlined,
   FormOutlined,
@@ -33,14 +34,15 @@ interface ColumnBuilderProps extends ActionRenderProps{
   hiddenRowCodes?: string[],
   sortedColConfigs?: ColumnConfig[],
   unHiden?:()=>any,
-  onHide?:(code: string)=>any,
+    onHide?:(code: string)=>any,
+    operatable?:boolean,
 }
 
 interface ReportColumnBuilderProps {
-  columnConfigs: ColumnConfig[],
+    columnConfigs: ColumnConfig[],
     hiddenColIds?: string[],
-  translate:(...strs: string[]) => string;
-  leftFixedCols: number,
+    translate:(...strs: string[]) => string;
+    leftFixedCols: number,
     hiddenRowCodes?: string[],
     unHiden?:()=>any,
     onHide?:(code: string)=>any,
@@ -56,7 +58,7 @@ export default {
       hiddenRowCodes,
       sortedColConfigs, unHiden,
         onHide,translate,
-       sortColumns,serverKey
+       sortColumns,serverKey,
     } = props;
 
 
@@ -103,10 +105,10 @@ export default {
           this.setSortProps(column,item,translate);
       } else if (item.id == "20000") {
           this.setHiddenRecordOpt(column,hiddenRowCodes,unHiden,onHide,translate);
-      } else if (item.title === "操作") {
+      } else if (item.title === "操作" && props.operatable) {
           column["操作"] = "1";
         column["fixed"] = "right";
-        column["align"] = "center";
+        column["align"] = "left";
         column["width"] = item.colWidth ? item.colWidth : 160;
         column["className"] = "opsColumn";
         column["title"] = <>{translate("${操作}")}</>;
@@ -316,259 +318,256 @@ export default {
         readOnly,
         sourceId, translate,doCustomButton, doRowJump, blockMenuTreeDrawerOpen,
         doRowAction, doDeleteByCode}=props;
-    const {buttons, builtInButtons} = ltmplConfig;
-   return <Space size={[0, 4]} wrap>
-      {buttons.includes("detail") &&
-      showView &&
-      ActionUtils.isShow(
-          ltmplConfig.buttonViewAction?.preposes,
-          [record],
-          undefined
-      ) ? (
-          <ViewButton
-              showView={showView}
-              data={record}
-              ltmplConfig={ltmplConfig}
-          ></ViewButton>
-      ) : (
-          ""
-      )}
-      {buttons.includes("customDetail") &&
-      showView &&
-      ActionUtils.isShow(
-          ltmplConfig.buttonViewAction?.preposes,
-          [record],
-          undefined
-      ) ? (
-          <Button
-              size="small"
-              type="primary"
-              icon={<AlignLeftOutlined/>}
-              onClick={() => showView({code: record.code})}
-          ></Button>
-      ) : (
-          ""
-      )}
-      {buttons.includes("dtmplEdit") && doEdit && !readOnly ? (
-          <EditButton
-              doEdit={doEdit}
-              data={record}
-              ltmplConfig={ltmplConfig}
-          ></EditButton>
-      ) : (
-          ""
-      )}
-      {builtInButtons?.includes("blockAuthMenuTree") && !readOnly ? (
-          <Button
-              size="small"
-              type="dashed"
-              icon={
-                <KeyOutlined
-                    rotate={180}
-                    style={{color: "#f5222d", marginRight: "4px"}}
-                />
-              }
-              onClick={() => blockMenuTreeDrawerOpen(record)
-              }
-          ></Button>
-      ) : (
-          ""
-      )}
-      {(buttons.includes("dtmplCustomEdit") || customEditable) &&
-      doEdit &&
-      !readOnly &&
-      ActionUtils.isShow(
-          ltmplConfig.buttonEditAction?.preposes,
-          [record],
-          undefined
-      ) ? (
-          <Button
-              size="small"
-              type="dashed"
-              icon={<FormOutlined/>}
-              onClick={() =>
-                  doEdit({
-                    code: record.code,
-                    mode: "update",
-                    toCustomPage: true,
-                  })
-              }
-          ></Button>
-      ) : (
-          ""
-      )}
-      {buttons.includes("copy") && doEdit && !readOnly ? (
-          <Tooltip title={translate("${复制}")}>
-            <Button
-                size="small"
-                type="dashed"
-                icon={<CopyOutlined/>}
-                onClick={async () => {
-                  //先复制
-                  let toCustomPage = false;
-                  if (buttons.includes("dtmplCustomEdit") || customEditable) {
-                    toCustomPage = true;
+    const {buttons, builtInButtons,defShowRowActionCount} = ltmplConfig;
+
+    let actionButtons:any[]=[];
+
+    if(buttons.includes("detail") &&
+          showView &&
+          ActionUtils.isShow(
+              ltmplConfig.buttonViewAction?.preposes,
+              [record],
+              undefined
+          ) ){actionButtons.push(<ViewButton
+        showView={showView}
+        data={record}
+        ltmplConfig={ltmplConfig}></ViewButton>);}
+
+
+          if(buttons.includes("customDetail") &&
+          showView &&
+          ActionUtils.isShow(
+              ltmplConfig.buttonViewAction?.preposes,
+              [record],
+              undefined
+          ) ) {
+              actionButtons.push(<Button
+                  size="small"
+                  type="primary"
+                  icon={<AlignLeftOutlined/>}
+                  onClick={() => showView({code: record.code})}
+              ></Button>)
+          }
+
+          if(buttons.includes("dtmplEdit") && doEdit && !readOnly ){ (
+              actionButtons.push(<EditButton
+                  doEdit={doEdit}
+                  data={record}
+                  ltmplConfig={ltmplConfig}
+              ></EditButton>)
+          ) };
+         if( builtInButtons?.includes("blockAuthMenuTree") && !readOnly ) {
+             actionButtons.push(<Button
+                 size="small"
+                 type="dashed"
+                 icon={
+                     <KeyOutlined
+                         rotate={180}
+                         style={{color: "#f5222d", marginRight: "4px"}}
+                     />
+                 }
+                 onClick={() => blockMenuTreeDrawerOpen(record)
+                 }
+             ></Button>)
+         }
+
+          if((buttons.includes("dtmplCustomEdit") || customEditable) &&
+          doEdit &&
+          !readOnly &&
+          ActionUtils.isShow(
+              ltmplConfig.buttonEditAction?.preposes,
+              [record],
+              undefined
+          ) ){
+              actionButtons.push(<Button
+                  size="small"
+                  type="dashed"
+                  icon={<FormOutlined/>}
+                  onClick={() =>
+                      doEdit({
+                          code: record.code,
+                          mode: "update",
+                          toCustomPage: true,
+                      })
                   }
-                  let code = await HcserviceV3.doCopy(
-                      serverKey,
-                      sourceId,
-                      record.code
+              ></Button>)
+          }
+          if(buttons.includes("copy") && doEdit && !readOnly ) {
+              actionButtons.push( <Tooltip title={translate("${复制}")}>
+                  <Button
+                      size="small"
+                      type="dashed"
+                      icon={<CopyOutlined/>}
+                      onClick={async () => {
+                          //先复制
+                          let toCustomPage = false;
+                          if (buttons.includes("dtmplCustomEdit") || customEditable) {
+                              toCustomPage = true;
+                          }
+                          let code = await HcserviceV3.doCopy(
+                              serverKey,
+                              sourceId,
+                              record.code
+                          );
+                          if (code) {
+                              doEdit({code, mode: "update", toCustomPage});
+                          }
+                      }}
+                  ></Button>
+              </Tooltip>)
+          }
+
+          if(ltmplConfig.rowCustomButtons){
+              ltmplConfig.rowCustomButtons.map((customButton) => {
+                  actionButtons.push(
+                      <Button
+                          key={customButton.id}
+                          size="small"
+                          type={
+                              customButton.buttonType
+                                  ? customButton.buttonType
+                                  : "dashed"
+                          }
+                          onClick={() =>
+                              doCustomButton(customButton, [record])
+                          }
+                      >
+                          {translate("${" + customButton.title + "}")}
+                      </Button>
                   );
-                  if (code) {
-                    doEdit({code, mode: "update", toCustomPage});
-                  }
-                }}
-            ></Button>
-          </Tooltip>
-      ) : (
-          ""
-      )}
-      {ltmplConfig.rowCustomButtons
-          ? ltmplConfig.rowCustomButtons.map((customButton) => {
-            return (
-                <Button
-                    key={customButton.id}
-                    size="small"
-                    type={
-                      customButton.buttonType
-                          ? customButton.buttonType
-                          : "dashed"
-                    }
-                    onClick={() =>
-                        doCustomButton(customButton, [record])
-                    }
-                >
-                  {translate("${" + customButton.title + "}")}
-                </Button>
-            );
-          })
-          : ""}
-      {ltmplConfig.ractions && !readOnly
-          ? ltmplConfig.ractions.map((raction) => {
-            return (
-                ActionUtils.isShow(
-                    raction?.preposes,
-                    [record],
-                    undefined
-                ) ?
-                    <Button
-                        key={raction.id}
-                        size="small"
-                        type="dashed"
-                        onClick={() => doRAction(raction.id, record.code)}
-                    >
-                      {translate("${" + raction.title + "}")}
-                    </Button> : ""
-            );
-          })
-          : ""}
-
-      {ltmplConfig.rowActions &&
-      !readOnly &&
-      ltmplConfig.rowActions.length > 0
-          ? ltmplConfig.rowActions.map((action) => {
-            return (
-                <Action
-                    serverKey={serverKey}
-                    iconType={"icon"}
-                    key={action.id}
-                    data={[record]}
-                    actionConfig={action}
-                    doAction={doRowAction}
-                    buttonSize={"small"}
-                    serial={1}
-                ></Action>
-            );
-          })
-          : ""}
-
-      {ltmplConfig.rowJumps &&
-      ltmplConfig.rowJumps.length > 0 &&
-      !readOnly
-          ? ltmplConfig.rowJumps.map((jump) => {
-            return (
-                <Button
-                    key={jump.id}
-                    size="small"
-                    type="dashed"
-                    onClick={() => doRowJump(jump, record)}
-                >
-                  {translate("${" + jump.title + "}")}
-                </Button>
-            );
-          })
-          : ""}
-      {ltmplConfig.rowCQuerys &&
-      ltmplConfig.rowCQuerys.length > 0 &&
-      !readOnly
-          ? ltmplConfig.rowCQuerys.map((cquery) => {
-            // console.log("record record", record);
-            return (
-                <CquickButton
-                    serverKey={serverKey}
-                    key={cquery.id}
-                    size={"small"}
-                    pageType={"drawer"}
-                    // onClick={() => doCQuery(cquery.id)}
-                    cQueryConfig={cquery}
-                    mainCode={
-                      cquery.mainCodeColId
-                          ? record[cquery.mainCodeColId]
-                          : record.code
-                    }
-                />
-            );
-          })
-          : ""}
-      {ltmplConfig.rowFileButtons &&
-      ltmplConfig.rowFileButtons.length > 0
-          ? ltmplConfig.rowFileButtons.map((openFileButton) => {
-            let v = record[openFileButton.fieldId];
-            if (v) {
-              if (v instanceof Array) {
-                v = v[0];
-              }
-              if (v.includes("@R@") > 0) {
-                v = v.split("@R@")[1];
+              })}
+          if(ltmplConfig.ractions && !readOnly){
+               ltmplConfig.ractions.map((raction) => {
+                   actionButtons.push (
+                      ActionUtils.isShow(
+                          raction?.preposes,
+                          [record],
+                          undefined
+                      ) ?
+                          <Button
+                              key={raction.id}
+                              size="small"
+                              type="dashed"
+                              onClick={() => doRAction(raction.id, record.code)}
+                          >
+                              {translate("${" + raction.title + "}")}
+                          </Button> : ""
+                  );
+              })}
+
+          if(ltmplConfig.rowActions &&
+          !readOnly &&
+          ltmplConfig.rowActions.length > 0)
+          { ltmplConfig.rowActions.map((action) => {
+              actionButtons.push(
+                      <Action
+                          serverKey={serverKey}
+                          iconType={"icon"}
+                          key={action.id}
+                          data={[record]}
+                          actionConfig={action}
+                          doAction={doRowAction}
+                          buttonSize={"small"}
+                          serial={1}
+                      ></Action>
+                  );
+              })}
+
+          if(ltmplConfig.rowJumps &&
+          ltmplConfig.rowJumps.length > 0 &&
+          !readOnly) {
+                 ltmplConfig.rowJumps.map((jump) => {
+                     actionButtons.push (
+                      <Button
+                          key={jump.id}
+                          size="small"
+                          type="dashed"
+                          onClick={() => doRowJump(jump, record)}
+                      >
+                          {translate("${" + jump.title + "}")}
+                      </Button>
+                  );
+              })}
+          if(ltmplConfig.rowCQuerys &&
+          ltmplConfig.rowCQuerys.length > 0 &&
+          !readOnly
+          ){
+              ltmplConfig.rowCQuerys.map((cquery) => {
+                  actionButtons.push (
+                      <CquickButton
+                          serverKey={serverKey}
+                          key={cquery.id}
+                          size={"small"}
+                          pageType={"drawer"}
+                          cQueryConfig={cquery}
+                          mainCode={
+                              cquery.mainCodeColId
+                                  ? record[cquery.mainCodeColId]
+                                  : record.code
+                          }
+                      />
+                  );
+              })
               }
-              return (
-                  <NewinFileView
-                      title={openFileButton.title}
-                      filePath={HcserviceV3.toFilePath(v, serverKey)}
-                      serverKey={serverKey}
-                      key={openFileButton.id}
-                      //size={"small"}
-                  />
+          if(ltmplConfig.rowFileButtons &&
+          ltmplConfig.rowFileButtons.length > 0)
+          { ltmplConfig.rowFileButtons.map((openFileButton) => {
+                  let v = record[openFileButton.fieldId];
+                  if (v) {
+                      if (v instanceof Array) {
+                          v = v[0];
+                      }
+                      if (v.includes("@R@") > 0) {
+                          v = v.split("@R@")[1];
+                      }
+                      actionButtons.push (
+                          <NewinFileView
+                              title={openFileButton.title}
+                              filePath={HcserviceV3.toFilePath(v, serverKey)}
+                              serverKey={serverKey}
+                              key={openFileButton.id}
+                              //size={"small"}
+                          />
+                      );
+                  }
+              })}
+          if(buttons.includes("singleDelete") &&
+          !readOnly &&
+          ActionUtils.isShow(
+              ltmplConfig.buttonDeleteAction?.preposes,
+              [record],
+              undefined
+          ) ){ actionButtons.push(
+              <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=[];
+          if(defShowRowActionCount<=0 || defShowRowActionCount >= actionButtons.length ) {
+              showButtons = actionButtons
+          } else{
+              showButtons = actionButtons.slice(0,defShowRowActionCount)
+              showButtons.push(
+                  <Popover content={ <Space wrap>
+                      {actionButtons.slice(defShowRowActionCount,actionButtons.length)}
+                  </Space> } title={"更多操作"} trigger="hover">
+                      <Button size={"small"} icon={<EllipsisOutlined />} shape="circle" ></Button>
+                  </Popover>
               );
-            } else {
-              return "";
-            }
-          })
-          : ""}
-      {buttons.includes("singleDelete") &&
-      !readOnly &&
-      ActionUtils.isShow(
-          ltmplConfig.buttonDeleteAction?.preposes,
-          [record],
-          undefined
-      ) ? (
-          <Popconfirm
-              placement="rightBottom"
-              title={translate("${确定要[删除]此数据吗}?")}
-              onConfirm={() => {
-                doDeleteByCode(record.code);
-              }}
-              okText={translate("${确定}")}
-              cancelText={translate("${取消}")}
-              okType={"danger"}
-          >
-            <Button size="small" type="dashed" danger>
-              <DeleteOutlined/>
-            </Button>
-          </Popconfirm>
-      ) : (
-          ""
-      )}
+          }
+   return  <Space size={[0, 4]} wrap>
+       {showButtons}
     </Space>
   }
 

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

@@ -254,7 +254,7 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
         return (
             <Modal
                 open={open}
-                title={<SelectedRowsCard value={selectedRows} onChange={this.changeRowSelection}></SelectedRowsCard>}
+                title={<SelectedRowsCard value={selectedRows} onChange={this.changeRowSelection} ></SelectedRowsCard>}
                 width={1150}
                 destroyOnClose={true}
                 centered
@@ -265,7 +265,8 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
                 <div className="actTable">
                     <CriteriaForm serverKey={serverKey} selectedRows={selectedRows} ltmplConfig={selectConfig} data={criteriaData}
                                   doSearch={this.doSearch} loading={loading} />
-                    <QueryTable serverKey={serverKey}  pageInfo={{pageNo:pageNo?pageNo:1,pageSize:pageSize?pageSize:selectConfig.defaultPageSize}} onChangePage={this.onChangePage} maxSelectedRows={maxSelectedRows} selectedRows={selectedRows}
+                    <QueryTable serverKey={serverKey}  pageInfo={{pageNo:pageNo?pageNo:1,pageSize:pageSize?pageSize:selectConfig.defaultPageSize}} onChangePage={this.onChangePage}
+                                maxSelectedRows={maxSelectedRows?maxSelectedRows:selectConfig.maxSelectedRows} selectedRows={selectedRows}
                                 primaryColumn={selectConfig.primaryColumn}
                                 columns={columns}
                                 queryKey={queryKey}