aldehyde 0.2.527 → 0.2.529

package/src/aldehyde/routable/ttmpl-table-route.tsx

@@ -47,6 +47,8 @@ const Index = (props: Props) => {
     const [drawerSize, setDrawerSize] = useState<number | string>("92vw");
     const [isCopy, setIsCopy] = useState<boolean>(false); // 是否复制
     const [ettmplConfig, setEttmplConfig] = useState<EttmplConfig>(); // 展开树配置
+    const [ettmplRootSourceId, setEttmplRootSourceId] = useState<string>(); // 展开树配置根 sourceId
+    const [treeAddData, setTreeAddData] = useState<{ [key: string]: any }>(); // 展开树添加递归及关联关系配置
     const { sourceId } = useParams();
     const { search } = useLocation();
     const { translate } = useLocale();
@@ -63,11 +65,13 @@ const Index = (props: Props) => {
     }, [search])
 
     const getLtmplConfig = async () => {
-        const ltmplConfigRes: LtmplConfigRes = await HCDataSource.requestLtmplConfig(serverKey, sourceId);
         const ettmplConfig: EttmplConfig = await HCDataSource.requestEttmplConfig(serverKey, sourceId);
-        const ltmplConfig = ltmplConfigRes?.ltmplConfig;
+        const ettmplSourceId_ = ettmplConfig?.sourceId || "";
+        const ettmplLtmplConfig: LtmplConfigRes = await HCDataSource.requestEttmplLtmplConfig(serverKey, ettmplSourceId_, ettmplSourceId_);
+        const ltmplConfig = ettmplLtmplConfig?.ltmplConfig;
         setLtmplConfig(ltmplConfig);
         setEttmplConfig(ettmplConfig);
+        setEttmplRootSourceId(ettmplSourceId_);
         setPageLayout(ltmplConfig?.pageLayout || "none");
     };
 
@@ -216,6 +220,25 @@ const Index = (props: Props) => {
         }
     };
 
+    // 展开树行操作添加按钮
+    const doAddRaction = (ractionId: string, mainCode: string) => {
+        doClose();
+        let showType: PageType = !ltmplConfig.buttonAddConfig ? "default" : ltmplConfig.buttonAddConfig.showType;
+        let path = `${basePath}${computedLayoutPath}/${sourceId}/detail-edit?menuId=${menuId}&addTmplId=${ractionId ? ractionId : ""}`;
+        if (mainCode) {
+            path = path + `&mainCode=${mainCode}`;
+        }
+        if (showType === "routing") {
+            navigate(path);
+        } else if (showType === "blank") {
+            window.open("#" + path, '_blank');
+        } else {
+            setShowEdit(true);
+            setShowWindowType(pageLayout === "none" ? "drawer" : showType);
+            setTreeAddData({ ractionId, mainCode });
+        }
+    }
+
     const doRAction = (ractionId: string, mainCode: string) => {
         setSelectedCode(mainCode);
         setRactionId(ractionId);
@@ -224,11 +247,14 @@ const Index = (props: Props) => {
 
     // 嵌套表格配置
     const expandedRowRender = (val: { [key: string]: any }) => {
-        const { subNodes, recursiveRatmplId } = ettmplConfig;
+        const { subNodes, recursiveRatmplId, sourceId: ettmplSourceId } = ettmplConfig;
         return <div style={{ marginLeft: "24px", background: token.colorBgContainer }}>
             {recursiveRatmplId ?
                 <TtmplTable
+                    isRecursion={true}
+                    recursionSourceId={ettmplSourceId}
                     ettmplConfig={ettmplConfig}
+                    ettmplRootSourceId={ettmplRootSourceId}
                     hideOnSinglePage={true}
                     funcMode="simple"
                     serverKey={serverKey}
@@ -239,6 +265,7 @@ const Index = (props: Props) => {
                 {subNodes.length > 1 ? <h4 style={{ padding: "12px 0 0 12px" }}>{item.title}</h4> : ""}
                 <TtmplTable
                     ettmplConfig={item}
+                    ettmplRootSourceId={ettmplRootSourceId}
                     hideOnSinglePage={true}
                     funcMode="simple"
                     serverKey={serverKey}
@@ -275,6 +302,7 @@ const Index = (props: Props) => {
             showHeader={false}
             requestQueryKey={HcserviceV3.requestEttmplQueryKey}
             showEmpty={false}
+            doAddRaction={doAddRaction}
         />;
     };
 
@@ -294,6 +322,7 @@ const Index = (props: Props) => {
         setShowWindowType(undefined);
         setSelectedCode(undefined);
         setToCustomPage(false);
+        setTreeAddData(undefined);
     };
 
     // 关联查询close
@@ -364,8 +393,8 @@ const Index = (props: Props) => {
                     open={showEdit}
                     onOk={doSubmited}
                     customPath={ltmplConfig?.customEditPagePath}
-                    sourceId={sourceId}
-                    mainCode={mainCode}
+                    sourceId={treeAddData?.ractionId || sourceId}
+                    mainCode={treeAddData?.mainCode || mainCode}
                     code={selectedCode}
                     isCopy={isCopy}
                 />
@@ -379,8 +408,8 @@ const Index = (props: Props) => {
                     width={windowSize.editWidth}
                     height={windowSize.editHeight}
                     onCancel={doClose}
-                    mainCode={mainCode}
-                    sourceId={editSourceId}
+                    mainCode={treeAddData?.mainCode || mainCode}
+                    sourceId={treeAddData?.ractionId || sourceId}
                     code={selectedCode}
                     onOk={doSubmited}
                     isCopy={isCopy}

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

@@ -96,6 +96,7 @@ interface ActTableProps extends TmplBaseProps {
   bordered?: boolean; // 表格是否显示边框
   showHeader?: boolean; // 表格是否显示表头
   requestQueryKey?: Function; // queryKey 查询
+  doAddRaction?: (ractionId: string, mainCode: string) => void; // 展开树行操作添加按钮
 }
 
 interface ActTableStat {
@@ -1574,7 +1575,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       title, collapsible,
       onChangePage, serverKey, criteriaData, showEmpty, loadDataCallback,
       showView, doEdit, doRAction, customEditable, readOnly, tableType, showPagination, showAggregates, userPageConfig,
-      doEdit2D, doView2D, showTableAdd, setUserPageConfig, expandable, hideOnSinglePage, bordered, showHeader, doAuditView, doAuditEdit
+      doEdit2D, doView2D, showTableAdd, setUserPageConfig, expandable, hideOnSinglePage, bordered, showHeader, doAuditView, doAuditEdit,
+      doAddRaction
     } = this.props;
     const { translate } = this.context;
 
@@ -1600,7 +1602,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         doRowAction: this.doRowAction, doDeleteByCode: this.doDeleteByCode, sortColumns: criteriaData["sortColIds"],
         editings, editRowEdit: this.editRowEdit, cancelRowEdit: this.cancelRowEdit, saveRowData: this.saveRowData,
         doDelModalOpen: this.doDelModalOpen, mainCode, criteriaData: userCriteriaData, actTableDoSearch: this.actTableDoSearch,
-        columnResize: userPageConfig?.colResize, doEdit2D, doView2D, doAuditView, doAuditEdit
+        columnResize: userPageConfig?.colResize, doEdit2D, doView2D, doAuditView, doAuditEdit, doAddRaction
       }
     );
 

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

@@ -1,8 +1,8 @@
 import React from "react";
-import { ActionRenderProps, ColumnConfig, DtmplData, LtmplConfig, FieldConfig, CustomButton, CQueryConfig } from "../../tmpl/interface";
+import { ActionRenderProps, ColumnConfig, DtmplData, LtmplConfig, CustomButton, CQueryConfig } from "../../tmpl/interface";
 import TableUnits from "../table-util";
 import SupportInputTypes from "../../tmpl/control-type-supportor";
-import { Button, Popconfirm, Popover, Space, Tooltip, Form as AntdForm, theme, message } from "antd";
+import { Button, Popconfirm, Popover, Space, Tooltip, Form as AntdForm, theme, message, Dropdown } from "antd";
 import { SortableHandle } from "react-sortable-hoc";
 import {
     AlignLeftOutlined, CopyOutlined, DeleteOutlined,
@@ -13,7 +13,7 @@ import {
     KeyOutlined,
     MenuOutlined, QuestionCircleOutlined, PlaySquareOutlined,
     SettingOutlined, UpSquareFilled, DownSquareFilled, AlignCenterOutlined,
-    EditOutlined
+    EditOutlined, PlusOutlined
 } from "@ant-design/icons";
 import ActionUtils from "../../controls/action/utils";
 import ViewButton from "../../detail/button/view-button";
@@ -554,9 +554,9 @@ export default {
             readOnly,
             sourceId, translate, doCustomButton, doRowJump, blockMenuTreeDrawerOpen,
             doRowAction, doDeleteByCode, editRowEdit, editings, cancelRowEdit, saveRowData, doDelModalOpen,
-            doView2D, doEdit2D, actTableDoSearch, doAuditView, doAuditEdit
+            doView2D, doEdit2D, actTableDoSearch, doAuditView, doAuditEdit, doAddRaction
         } = props;
-        const { buttons, builtInButtons, defShowRowActionCount, strongDeleteConfirmText, edit2DBtnTitle, view2DBtnTitle, deleteBtnTitle, copyMode } = ltmplConfig;
+        const { buttons, builtInButtons, defShowRowActionCount, strongDeleteConfirmText, edit2DBtnTitle, view2DBtnTitle, deleteBtnTitle, copyMode, rowRactionAddConfigs } = ltmplConfig;
         let actionButtons: any[] = [];
 
         const isShowDetail = buttons.includes("detail") && showView && ActionUtils.isShow(ltmplConfig.buttonViewAction?.preposes, [record], undefined);
@@ -579,6 +579,32 @@ export default {
                 buttonType={isShowCustomDetail ? "default" : "primary"} />);
         }
 
+        // 展开树行操作添加按钮
+        if (rowRactionAddConfigs?.length && doAddRaction && !readOnly) {
+            const temConfigs = rowRactionAddConfigs.filter(item => ActionUtils.isShow(item.addableActionConfig?.preposes, [record], undefined)); // 过滤前置条件
+            if (temConfigs?.length > 1) {
+                const temItems = temConfigs.map(item => ({ key: item.id, label: <Tooltip title={`${translate("${添加}")}${translate("${" + item.title + "}")}`}><div onClick={() => doAddRaction(item.id, record.code)}><PlusOutlined style={{ marginRight: "6px" }} /><span>{item.title}</span></div></Tooltip> }));
+                actionButtons.push(<Dropdown menu={{ items: temItems }}>
+                    <Button
+                        size="small"
+                        type="dashed"
+                        icon={<PlusOutlined />}
+                    />
+                </Dropdown>);
+            } else if (temConfigs[0]) {
+                const tItem = temConfigs[0];
+                actionButtons.push(
+                    <Tooltip title={`${translate("${添加}")}${translate("${" + tItem.title + "}")}`}>
+                        <Button
+                            onClick={() => doAddRaction(tItem.id, record.code)}
+                            size="small"
+                            type="dashed"
+                            icon={<PlusOutlined />}
+                        />
+                    </Tooltip>);
+            }
+        }
+
         if (buttons.includes("dtmplEdit") && doEdit && !readOnly) {
             (
                 actionButtons.push(<EditButton

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

@@ -790,7 +790,7 @@ class RelationTable extends React.PureComponent<
         if (res.status === "success") {
             this.cancelRowEdit(editStatus !== "new" ? res.code : code);
             if (editStatus === "new") {
-                onChange(fieldGroupConfig, value.filter(item => item.code !== code)); // 单独提交添加成功后，删除原未保存的数据
+                onChange(fieldGroupConfig, value?.filter(item => item.code !== code)); // 单独提交添加成功后，删除原未保存的数据
                 setTimeout(() => this.handleDtmplAdd(res.code), 100);
             } else {
                 this.handleDtmplEdit(res.code);

package/src/aldehyde/tmpl/hc-data-source.tsx

@@ -48,6 +48,7 @@ const l2LtmplConfigMap: Map<string, LtmplConfigRes> = new Map<
 const dtmplConfigMap: Map<string, DtmplConfig> = new Map<string, DtmplConfig>();
 const ttmplConfigMap: Map<string, TtmplConfig> = new Map<string, TtmplConfig>();
 const ettmplConfigMap: Map<string, EttmplConfig> = new Map<string, EttmplConfig>();
+const ettmplLtmplConfigMap: Map<string, LtmplConfigRes> = new Map<string, LtmplConfigRes>();
 const viewDtmplConfigMap: Map<string, DtmplConfig> = new Map<
   string,
   DtmplConfig
@@ -327,6 +328,16 @@ HCDataSource.requestEttmplConfig = async function (serverKey: string, sourceId:
   return ettmplConfigMap.get(sourceId);
 };
 
+// 展开树页面Config请求,用于页面配置信息，设置操作列添加等
+HCDataSource.requestEttmplLtmplConfig = async function (serverKey: string, ettmplId: string, sourceId: string) {
+  if (!ettmplLtmplConfigMap.has(sourceId)) {
+    let res = await HcserviceV3.requestEttmplLtmplConfig(serverKey, ettmplId, sourceId);
+    ettmplLtmplConfigMap.set(sourceId, res);
+  }
+  return ettmplLtmplConfigMap.get(sourceId);
+};
+
+
 HCDataSource.requestViewDtmplConfig = async function (
   serverKey: string,
   sourceId: string

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -1621,4 +1621,15 @@ export default class HcserviceV3 {
     });
     return res;
   }
+
+  static async requestEttmplLtmplConfig(serverKey: string, ettmplId: string, sourceId: string) {
+    let url = `v3/ettmpl/ltmpl/config`;
+    let res = await Super.super({
+      url,
+      serverKey,
+      method: "GET",
+      query: { ettmplId, sourceId },
+    });
+    return res;
+  }
 }

package/src/aldehyde/tmpl/interface.tsx

@@ -528,6 +528,7 @@ export interface ActionRenderProps {
   actTableDoSearch?: (data: object) => void,
   doAuditView?: (recordCode: string) => any, // 审计查看
   doAuditEdit?: (recordCode: string) => any, // 审计编辑
+  doAddRaction?: (ractionId: string, mainCode: string) => void, // 展开树行操作添加按钮
 }
 
 export interface FileRule {
@@ -722,6 +723,7 @@ export interface LtmplConfig extends SelectConfig {
   tableLayout?: "auto" | "fixed"; // 表格布局(自适应列宽/固定列宽)
   buttonAuditViewAction?: ActionConfig; // 审计查看按钮
   buttonAuditEditAction?: ActionConfig; // 审计编辑按钮
+  rowRactionAddConfigs?: { id: string, order: number, tip: string, title: string, addableActionConfig: ActionConfig }[]; // 展开树行操作添加按钮配置
 }
 
 export interface EnumItem {
@@ -778,7 +780,7 @@ export interface UserInfo {
   viewPersonalInfoable?: boolean;
   orgName?: string; // 组织名称
   extInfo?: DtmplData; // 用户信息
-  devops?:boolean;
+  devops?: boolean;
 }
 
 export interface QueryKey {