aldehyde 0.2.502 → 0.2.504

package/src/aldehyde/lowcode-components/column-chart/index.tsx

@@ -112,6 +112,7 @@ export interface ComponentStyle {
     dataZoom?: boolean;
     slider?: boolean; // 区域缩放是否显示滑动条
     markLineColor?: string[]; // 标记线颜色
+    groupType?: string; // 图表分组类型（用于图表联动）
 }
 
 export interface ComponentProps {
@@ -263,7 +264,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     }, [searchParams, initSearchParams]);
 
     const renderChart = () => {
-        const { grid, barMaxWidth, legend, tooltip, color, xAxis, yAxis, dataZoom, slider, markLineColor } = config
+        const { grid, barMaxWidth, legend, tooltip, color, xAxis, yAxis, dataZoom, slider, markLineColor, groupType } = config
         const option = _.cloneDeep(defOption);
         // 编辑态无数据显示默认数据
         const temData = isDesignMode && !data?.length ? defDatas[componentType] || [] : data;
@@ -326,6 +327,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
                 }
             }
         }).filter(Boolean);
+        if (groupType) chart.current.group = groupType;
         chart.current.setOption(option, true);
     }
     useEffect(() => {

package/src/aldehyde/lowcode-components/line-bar-chart/index.tsx

@@ -105,6 +105,7 @@ export interface ComponentStyle {
     connectNulls?: boolean; // 是否连接空值
     nullSetZero?: boolean; // 空值是否置0
     markLineColor?: string[]; // 标记线颜色
+    groupType?: string; // 图表分组类型（用于图表联动）
 }
 
 export interface ComponentProps {
@@ -256,7 +257,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     }, [searchParams, initSearchParams]);
 
     const renderChart = () => {
-        const { grid, legend, tooltip, color, xAxis, yAxis, smooth, lineStyle, step, isArea, isGradient, areaStyle, barMaxWidth, symbol, dataZoom, slider, connectNulls, markLineColor } = config;
+        const { grid, legend, tooltip, color, xAxis, yAxis, smooth, lineStyle, step, isArea, isGradient, areaStyle, barMaxWidth, symbol, dataZoom, slider, connectNulls, markLineColor, groupType } = config;
         const option = _.cloneDeep(defOption);
         // 编辑态无数据显示默认数据
         const temData = isDesignMode && !data?.length ? option.series : data;
@@ -332,6 +333,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
                 }
             }
         }).filter(Boolean);
+        if (groupType) chart.current.group = groupType;
         chart.current.setOption(option, true);
     };
 

package/src/aldehyde/lowcode-components/line-chart/index.tsx

@@ -116,6 +116,7 @@ export interface ComponentStyle {
     connectNulls?: boolean; // 是否连接空值
     nullSetZero?: boolean; // 空值是否置0
     markLineColor?: string[]; // 标记线颜色
+    groupType?: string; // 图表分组类型（用于图表联动）
 }
 
 export interface ComponentProps {
@@ -267,7 +268,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     }, [searchParams, initSearchParams]);
 
     const renderChart = () => {
-        const { grid, legend, tooltip, color, xAxis, yAxis, smooth, connectNulls, lineStyle, step, isArea, isGradient, areaStyle, dataZoom, slider, symbol: configSymbol, markLineColor } = config;
+        const { grid, legend, tooltip, color, xAxis, yAxis, smooth, connectNulls, lineStyle, step, isArea, isGradient, areaStyle, dataZoom, slider, symbol: configSymbol, markLineColor, groupType } = config;
         const { itemStyle, ...symbol } = configSymbol || {};
         const option = _.cloneDeep(defOption);
         // 编辑态无数据显示默认数据
@@ -339,6 +340,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
                 }
             }
         }).filter(Boolean);
+        if (groupType) chart.current.group = groupType;
         chart.current.setOption(option, true);
     };
 

package/src/aldehyde/lowcode-components/lowcode-view/index.tsx

@@ -13,6 +13,7 @@ import abstractDesignerLoader from "./component/abstract-designer-loader";
 import { merge } from "./component/util";
 import ProgramConfig from ".././../units";
 import { useLocale } from "../../index";
+import * as echarts from "echarts";
 import "./index.less";
 
 export const ControllerContext = createContext(null);
@@ -87,6 +88,13 @@ const LowcodeView = (props: Props) => {
 
     const backgroundImage = useMemo(() => handleImgUrl(canvasConfig?.backgroundImage), [canvasConfig]);
 
+    // 设置echarts图表联动
+    const handleEchartsConnect = (configs: { [key: string]: any }) => {
+        const groupTypes = Object.values(configs || {}).map(r => r.style?.groupType).filter(Boolean);
+        const groups = [...new Set(groupTypes)];
+        groups.forEach(r => echarts.connect(r));
+    }
+
     useEffect(() => {
         //加载
         abstractDesignerLoader.load();
@@ -101,6 +109,7 @@ const LowcodeView = (props: Props) => {
         const { entity } = await HcserviceV3.requestDDpageData(ddpageId);
         const data = entity?.fieldMap || {};
         const { layerManager, canvasManager } = data["内容"] ? JSON.parse(fromBase64(data["内容"]) || '{}') : {};
+        handleEchartsConnect(layerManager?.elemConfigs || {});
         setLayerManager(layerManager);
         setCanvasConfig(canvasManager);
         setLoading(false);

package/src/aldehyde/module/dtmpl-edit-page.tsx

@@ -412,14 +412,6 @@ export default class DtmplEditPage extends React.PureComponent<
     const { saveBtnTitle, continueSaveBtnTitle } = dtmplConfig || {};
     const { translate } = this.context;
     if (dtmplConfig?.buttons?.includes("dtmplSave")) {
-      footerButtons.unshift(
-        <Button type="primary" loading={loading || btnLoading === "saveLoading"} onClick={() => {
-          this.setState({ btnLoading: "saveLoading" });
-          this.doSubmit();
-        }}>
-          {translate("${" + (saveBtnTitle || "保存") + "}")}
-        </Button>
-      );
       if (continueSaveBtnTitle) {
         footerButtons.unshift(
           <Button type="primary" loading={loading || btnLoading === "continueSaveLoading"} onClick={() => {
@@ -429,6 +421,15 @@ export default class DtmplEditPage extends React.PureComponent<
             {translate("${" + continueSaveBtnTitle + "}")}
           </Button>
         );
+      } else {
+        footerButtons.unshift(
+          <Button type="primary" loading={loading || btnLoading === "saveLoading"} onClick={() => {
+            this.setState({ btnLoading: "saveLoading" });
+            this.doSubmit();
+          }}>
+            {translate("${" + (saveBtnTitle || "保存") + "}")}
+          </Button>
+        );
       }
     }
     //处理action
@@ -475,9 +476,8 @@ export default class DtmplEditPage extends React.PureComponent<
     if (code) {
       if (propsCode && isContinueSave) {
         this.loadConfigData();
-      } else {
-        this.props.onOk(code, isContinueSave);
       }
+      this.props.onOk(code, isContinueSave);
     }
   }
 

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

@@ -767,20 +767,19 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   doJump = async (jump: JumpConfig, record_: DtmplData) => {
     let record = record_.fieldMap ? record_.fieldMap : record_;
     const version = localStorage.getItem("version") || "";
-
     let url = null;
     let path = jump.path;
     if (!path) {
       path = "/";
     }
     //是否以http开头
-    if (path?.indexOf("#") == 0 || url?.indexOf("/#") == 0) {
+    if (path?.startsWith("#") || url?.startsWith("/#")) {
       url = "";
     } else if (
-      path.indexOf("http://") == 0 ||
-      path.indexOf("HTTP://") == 0 ||
-      path.indexOf("https://") == 0 ||
-      path.indexOf("HTTPS://") == 0
+      path.startsWith("http://") ||
+      path.startsWith("HTTP://") ||
+      path.startsWith("https://") ||
+      path.startsWith("HTTPS://")
     ) {
       url = path.split("//")[0] + "//";
       path = path.split("//")[1];
@@ -1634,6 +1633,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       leftFixedCols={ltmplConfig.leftFixedCols}
       onChangeResize={this.onChangeResize}
       showEmpty={showEmpty}
+      tableLayout={ltmplConfig.tableLayout}
     /> :
       <QueryTable key={"querytable" + sourceId} sourceId={sourceId}
         // queryTotal={this.queryTotal}

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

@@ -59,6 +59,7 @@ interface ReportColumnBuilderProps {
     hiddenRowCodes?: string[],
     unHiden?: () => any,
     onHide?: (code: string) => any,
+    tableLayout?: "auto" | "fixed"; // 表格布局(自适应列宽/固定列宽)
 }
 
 
@@ -73,16 +74,15 @@ export default {
             onHide, translate,
             sortColumns, serverKey,
             editings, mainCode, criteriaData, actTableDoSearch, showView,
-            columnResize
+            columnResize, doRowJump
         } = props;
 
         const { primaryColumn, secondColumn, primaryColumnLabel } = ltmplConfig.extDisplayConfig || {};
-
+        const fieldJumps = ltmplConfig.fieldJumps || [];
         let tableColumns = [];
         let s = 0;
         let colConfigs = sortedColConfigs ? sortedColConfigs : ltmplConfig.columns;
         let buttons = ltmplConfig.buttons || [];
-
         let currentDataColIndex = 0;
 
         colConfigs.forEach((item) => {
@@ -182,6 +182,7 @@ export default {
                             : "left"
                         : false;
                 }
+                const fieldJump = fieldJumps.find(r => r.appendMstrucId === item.mstrucId); // 当前列对应的跳转按钮配置
                 column["render"] = (text, record) => {
                     let detailParams = undefined;
                     if (showView && primaryColumn?.id === item.id) { // 首字段增加主题色显示/查看详情功能
@@ -197,16 +198,21 @@ export default {
                             detailParams = { code: record.code, toCustomPage: true };
                         }
                     }
+                    // 跳转按钮是否可以跳转
+                    const isShowFieldJump = fieldJump ? ActionUtils.isShow(fieldJump.preposes, [record], undefined) : false;
+                    // 渲染内容
+                    const renderView = <ViewControl serverKey={serverKey} fieldConfig={item} value={record[item.id]} holderType="table" />;
 
                     // 首字段渲染
                     const renderPrimaryColumn = <div className="column-table-primary">
-                        <div className="primary-column" onClick={() => detailParams && showView(detailParams)}>
-                            <ViewControl
-                                serverKey={serverKey}
-                                fieldConfig={item}
-                                value={record[item.id]}
-                                holderType="table"
-                            />
+                        <div className="table-primary-column" onClick={() => {
+                            if (isShowFieldJump) {
+                                doRowJump(fieldJump, record);
+                                return;
+                            }
+                            detailParams && showView(detailParams);
+                        }}>
+                            {renderView}
                         </div>
                         {primaryColumnLabel?.id ?
                             <div className="primary-column-label" >
@@ -223,12 +229,7 @@ export default {
                     </div>;
                     // 次字段渲染
                     const renderSecondColumn = <div className="column-table-second">
-                        <ViewControl
-                            serverKey={serverKey}
-                            fieldConfig={item}
-                            value={record[item.id]}
-                            holderType="table"
-                        />
+                        {isShowFieldJump ? <div className="table-primary-column" onClick={() => doRowJump(fieldJump, record)}>{renderView}</div> : renderView}
                         {this.renderColumnAction(props, record, "secondary")}
                     </div>;
 
@@ -247,12 +248,7 @@ export default {
                         </FormItem> :
                         <div className={record['dataType'] ? record['dataType'] === "小计" ? "xiaoji" : 'heji' : ""}>
                             {primaryColumn?.id === item.id ? renderPrimaryColumn : secondColumn?.id === item.id ? renderSecondColumn :
-                                <ViewControl
-                                    serverKey={serverKey}
-                                    fieldConfig={item}
-                                    value={record[item.id]}
-                                    holderType="table"
-                                />
+                                (isShowFieldJump ? <div className="table-primary-column" onClick={() => doRowJump(fieldJump, record)}>{renderView}</div> : renderView)
                             }
                         </div>
                     );
@@ -344,7 +340,7 @@ export default {
 
     buildReportTableColumns(props: ReportColumnBuilderProps) {
         const {
-            columnConfigs, translate, leftFixedCols, hiddenColIds, hiddenRowCodes, unHiden, onHide
+            columnConfigs, translate, leftFixedCols, hiddenColIds, hiddenRowCodes, unHiden, onHide, tableLayout
         } = props;
 
         let tableColumns = [];
@@ -400,9 +396,10 @@ export default {
                 this.setHiddenRecordOpt(column, hiddenRowCodes, unHiden, onHide, translate);
             } else {
                 currentDataColIndex++;
-                column["className"] = "opsColumn";
+                if (tableLayout !== "auto") column["className"] = "opsColumn"; // 表格非自适应设置
                 //column["title"] = translate("${" + item.title + "}");
                 column["width"] = item.colWidth ? item.colWidth : 160;
+                column["onCell"] = () => ({ style: { maxWidth: item.maxColWidth || undefined, minWidth: item.minColWidth || undefined } });
                 column["ellipsis"] = { showTitle: true };
                 column["align"] = item.valueAlign ? item.valueAlign : "left";
                 if (
@@ -735,9 +732,7 @@ export default {
             })
         }
 
-        if (ltmplConfig.rowActions &&
-            !readOnly &&
-            ltmplConfig.rowActions.length > 0) {
+        if (!readOnly && ltmplConfig.rowActions?.length) {
             ltmplConfig.rowActions.map((action) => {
                 actionButtons.push(
                     <Action
@@ -747,22 +742,17 @@ export default {
                         data={[record]}
                         actionConfig={action}
                         doAction={doRowAction}
+                        doEdit={doEdit}
                         buttonSize={"small"}
                         serial={1}
-                    ></Action>
+                    />
                 );
             })
         }
 
-        if (ltmplConfig.rowJumps &&
-            ltmplConfig.rowJumps.length > 0 &&
-            !readOnly) {
+        if (!!ltmplConfig.rowJumps?.length && !readOnly) {
             ltmplConfig.rowJumps.map((jump) => {
-                if (ActionUtils.isShow(
-                    jump.preposes,
-                    [record],
-                    undefined
-                )) {
+                if (ActionUtils.isShow(jump.preposes, [record], undefined)) {
                     actionButtons.push(
                         <Button
                             key={jump.id}

package/src/aldehyde/table/column/index.less

@@ -12,15 +12,15 @@
     visibility: visible;
 }
 
-.column-table-primary {
+.table-primary-column {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    color: var(--ant-color-primary-active);
+    cursor: pointer;
+}
 
-    .primary-column {
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
-        color: var(--ant-color-primary-active);
-        cursor: pointer;
-    }
+.column-table-primary {
 
     .primary-column-label {
         margin-left: 8px;

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

@@ -7,7 +7,7 @@ import ColumnBuilder from "./column/column-builder";
 import ResizableTable from "./resizable-table";
 
 const ReportTable = (props: ReportTableProps) => {
-    const { showEmpty = true } = props;
+    const { showEmpty = true, tableLayout } = props;
     const [loading, setLoading] = useState<boolean>(false);
     const [dataSource, setDataSource] = useState<object[]>(undefined);
     const [reportData, setReportData] = useState<ReportData>(undefined);
@@ -94,7 +94,7 @@ const ReportTable = (props: ReportTableProps) => {
         });
     }
 
-    let current_cols = reportData?.columnConfigs ? ColumnBuilder.buildReportTableColumns({ columnConfigs: [...reportData.columnConfigs], translate, leftFixedCols, hiddenColIds }) : columns;
+    let current_cols = reportData?.columnConfigs ? ColumnBuilder.buildReportTableColumns({ columnConfigs: [...reportData.columnConfigs], translate, leftFixedCols, hiddenColIds, tableLayout }) : columns;
     let table_x = 20;
 
     current_cols.forEach((c) => {
@@ -107,6 +107,7 @@ const ReportTable = (props: ReportTableProps) => {
         loading={loading}
         columns={current_cols}
         dataSource={dataSource}
+        tableLayout={tableLayout || "fixed"}
         scroll={
             tableProps?.scrollY == -1 || tableProps?.scrollY == 0
                 ? null

package/src/aldehyde/tmpl/interface.tsx

@@ -48,6 +48,7 @@ export interface ReportTableProps {
   queryKey: QueryKey;
   onChangeResize?: (value: { [key: string]: number }) => void; // 表格列尺寸更新
   showEmpty?: boolean;
+  tableLayout?: "auto" | "fixed"; // 表格布局(自适应列宽/固定列宽)
 }
 
 export interface CardListConfig {
@@ -162,6 +163,10 @@ export interface ActionConfig extends ButtonConfig {
   preposes: FieldConfig[];
   writes: FieldConfig[];
   functionType?: "action" | "raction" | "customButton" | "fileExport" | "cQuery" | "customExport";
+  dtmplSourceId?: string; // 关联页面模板
+  winShowType?: string; // 关联编辑模板-窗口显示类型
+  windowHeight?: number;  // 关联编辑模板-窗口高度
+  windowWidth?: number;  // 关联编辑模板-窗口宽度
 }
 
 export interface BuinButtonConfig extends ButtonConfig {
@@ -235,6 +240,7 @@ export interface JumpConfig extends OrderableTmplBase {
   routeParams: FieldConfig[];
   preposes: FieldConfig[];
   icon?: string;
+  appendMstrucId?: string; // 关联列MstrucId
 }
 export interface ClassAddConfig extends OrderableTmplBase { }
 export interface ClassEditConfig extends OrderableTmplBase {
@@ -610,6 +616,7 @@ export interface LtmplConfig extends SelectConfig {
   ractions?: RActionConfig[];
   jumps?: JumpConfig[];
   rowJumps?: JumpConfig[];
+  fieldJumps?: JumpConfig[]; // 列表字段跳转配置
   cQuerys?: CQueryConfig[];
   rowCQuerys?: CQueryConfig[];
   chartType?: ChartType[];