aldehyde 0.2.286 → 0.2.288

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

@@ -34,6 +34,7 @@ interface DtmplFormStat {
   appDtmplConfig?: DtmplConfig;
   embedForm?: object;
   embedRefValue?: object;
+  editingGroups?:string[];
 }
 
 export default class DtmplForm extends React.PureComponent<
@@ -51,6 +52,7 @@ export default class DtmplForm extends React.PureComponent<
     appDtmplConfig: undefined,
     embedForm: {},
     embedRefValue: {},
+    editingGroups:[],
   };
   static defaultPorps = {
     maxCols: 2,
@@ -123,6 +125,17 @@ export default class DtmplForm extends React.PureComponent<
     const { translate } = this.context;
     message.info(translate("${已刷新}!"));
   };
+  onGroupEditing=(groupCode,editing:boolean)=>{
+
+    const {editingGroups}=this.state;
+    let arr=[...editingGroups];
+    if (editing) {
+      arr.push(groupCode);
+    }else{
+      arr = editingGroups.filter(item => item !== groupCode);
+    }
+    this.setState({editingGroups:arr});
+  }
 
   onGroupChange = (
     fieldGroupConfig: FieldGroupConfig,
@@ -173,9 +186,19 @@ export default class DtmplForm extends React.PureComponent<
       currentDtmplData,
       appDtmplConfig,
       embedForm,
-      embedRefValue,
+      embedRefValue,editingGroups
     } = this.state;
-    dtmplData.fieldMap={...values}
+
+    if (editingGroups.length > 0) {
+      message.error("请提交表格数据后再保存");
+      this.props.onFinish(false);
+      return;
+    }
+
+    if(dtmplData){
+      dtmplData.fieldMap={...values}
+    }
+
     let resultCode = undefined;
     const result = values;
     for (let group of dtmplConfig.groups) {
@@ -361,6 +384,9 @@ export default class DtmplForm extends React.PureComponent<
               value={data}
               parentFormInstance={formRef?.current}
               viewOrEdit={item.readOnly ? "view" : "edit"}
+              onEditing={(editing)=>{
+                this.onGroupEditing(item.id,editing);
+              }}
               onChange={this.onGroupChange}
             />
           );

package/src/aldehyde/import/excel-import.tsx

@@ -257,7 +257,7 @@ export default class ExcelImport extends React.PureComponent<
   };
   download = () => {
     const { sourceId, serverKey } = this.props;
-    const hydrocarbonToken = Units.hydrocarbonToken();
+    const hydrocarbonToken = Units.serverHydrocarbonToken(serverKey);
     Units.downloadFile(
       Units.joinPath(
         Units.api(serverKey),

package/src/aldehyde/lowcode-components/act-table/index.less

@@ -0,0 +1,27 @@
+.act-table-component {
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+
+    .ant-layout {
+        background: transparent !important;
+
+        .ant-pagination-options {
+
+            .ant-select-selector,
+            input {
+                background: transparent !important;
+            }
+        }
+    }
+
+    .empty {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        font-size: 14px;
+        color: #999;
+    }
+}

package/src/aldehyde/lowcode-components/act-table/index.tsx

@@ -0,0 +1,127 @@
+
+import React, { ForwardedRef, forwardRef, useEffect, useImperativeHandle, useState } from 'react';
+import { ConfigProvider } from "antd";
+import { LtmplConfig } from "../../tmpl/interface";
+import HydrocarbonService from "../../tmpl/hcservice-v3";
+import ActTable from "../../../aldehyde/table/act-table";
+import { DataConfigProps } from "../data";
+import './index.less';
+
+export interface ComponentStyle {
+    table: {
+        background?: string;
+        pageSize?: number;
+        padding?: number;
+        fontSize?: number;
+    },
+    header?: {
+        background?: string;
+        color?: string;
+        borderRadius?: number;
+    };
+    body?: {
+        background?: string;
+        color?: string;
+    };
+}
+
+export interface ComponentProps {
+    style?: ComponentStyle;
+    data?: DataConfigProps;
+}
+
+export interface ComponentRef {
+    updateConfig: (newConfig: ComponentProps) => void;
+}
+
+const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>) => {
+    const { style, data: propsData } = props;
+    const [config, setConfig] = useState<ComponentStyle>({ ...style });
+    const [dataConfig, setDataConfig] = useState<DataConfigProps>({ ...propsData });
+    const [ltmplConfig, setLtmplConfig] = useState<LtmplConfig>();
+    const [pageInfo, setPageInfo] = useState({ pageNo: 1, pageSize: style?.table?.pageSize || 10 });
+
+    useImperativeHandle(ref, () => ({
+        updateConfig: (newConfig) => {
+            const { style: newStyle, data: newDataConfig } = newConfig;
+            setConfig({ ...newStyle });
+            setDataConfig({ ...newDataConfig });
+        },
+    }));
+
+    // 获取数据源表格配置
+    const getLtmplConfig = async () => {
+        const { ltmplConfig: temConfig } = await HydrocarbonService.requestLtmplConfig(dataConfig?.serverKey || null, dataConfig?.sourceId) || {};
+        setLtmplConfig(temConfig);
+    };
+
+    // 数据源数据请求
+    useEffect(() => {
+        if (dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId) {
+            getLtmplConfig();
+        } else {
+            setLtmplConfig(undefined);
+        }
+    }, [dataConfig?.sourceType, dataConfig?.sourceId]);
+
+    return (
+        <div className="act-table-component"
+            style={{ background: config?.table?.background }}
+        >
+            {ltmplConfig ?
+                <ConfigProvider
+                    theme={{
+                        token: {
+                            colorText: config?.body?.color,
+                            fontSize: config?.table?.fontSize,
+                        },
+                        components: {
+                            Table: {
+                                headerBg: config?.header?.background,
+                                headerColor: config?.header?.color,
+                                headerBorderRadius: config?.header?.borderRadius,
+                                cellPaddingBlock: config?.table?.padding,
+                                cellPaddingInline: config?.table?.padding,
+                                colorBgContainer: config?.body?.background,
+                            },
+                            Pagination: {
+                                itemBg: "transparent",
+                                itemLinkBg: "transparent",
+                                itemActiveBg: "transparent",
+                            },
+                            // 以下是弹框中组件样式兼容
+                            Modal: {
+                                contentBg: config?.body?.background,
+                                headerBg: config?.body?.background,
+                                titleColor: config?.body?.color,
+                                colorIcon: config?.body?.color,
+                            },
+                            Card: {
+                                headerBg: `${config?.body?.background} !important`,
+                                colorBgContainer: config?.body?.background
+                            },
+                            Descriptions: {
+                                labelColor: config?.body?.color,
+                            },
+                            Button: {
+                                defaultBg: "transparent"
+                            }
+                        },
+                    }}>
+                    <ActTable
+                        sourceId={dataConfig.sourceId}
+                        ltmplConfig={ltmplConfig}
+                        funcMode="simple"
+                        operatable={false}
+                        pageNo={pageInfo.pageNo}
+                        pageSize={pageInfo.pageSize}
+                        onChangePage={(pageNo, pageSize) => setPageInfo({ pageNo, pageSize })}
+                    />
+                </ConfigProvider> :
+                <div className='empty' style={{ color: config?.body?.color }}>暂无数据</div>
+            }
+        </div>
+    );
+});
+
+export default Index;

package/src/aldehyde/lowcode-components/base-table/index.tsx

@@ -135,9 +135,10 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
 
     // 获取数据源表格配置
     const getLtmplConfig = async () => {
-        const { ltmplConfig } = await HcserviceV3.requestLtmplConfig(dataConfig?.serverKey || null, dataConfig?.sourceId) || {};
+        const { ltmplConfig, status } = await HcserviceV3.requestLtmplConfig(dataConfig?.serverKey || null, dataConfig?.sourceId) || {};
         const temColumns = ltmplConfig?.columns?.map((item) => ({ ...item, dataIndex: item.id }))?.filter((item) => !item.hidden);
         setColumns(temColumns || []);
+        return status;
     };
 
     // 请求数据
@@ -156,6 +157,11 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 初始化请求数据
     const getInitData = async () => {
         pollingIntervalRef.current && clearInterval(pollingIntervalRef.current);
+        setData([]);
+        const status = await getLtmplConfig();
+        if (isDesignMode || status === 'error') {
+            return;
+        }
         await getData();
         if (request?.polling) {
             pollingIntervalRef.current = setInterval(() => { getData(); }, request?.pollingInterval * 1000 || 60000);
@@ -177,9 +183,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      */
     useEffect(() => {
         if (dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId) {
-            setData([]);
-            getLtmplConfig();
-            !isDesignMode && getInitData();
+            getInitData();
         } else if (dataConfig?.sourceType === 'sourceId') {
             setData([]);
             setColumns([]);

package/src/aldehyde/lowcode-components/index.ts

@@ -40,6 +40,7 @@ import BaseTable from "./base-table";
 import TextScroller from "./text-scroller";
 import CapsuleBarChart from "./capsule-bar-chart";
 import CircularProgressChart from "./circular-progress-chart";
+import ActTable from "./act-table";
 
 
 type CompoundedComponent = {
@@ -84,7 +85,8 @@ type CompoundedComponent = {
     BaseTable?: typeof BaseTable;
     TextScroller?: typeof TextScroller;
     CapsuleBarChart?: typeof CapsuleBarChart;
-    CircularProgressChart?: typeof CircularProgressChart
+    CircularProgressChart?: typeof CircularProgressChart;
+    ActTable?: typeof ActTable
 };
 
 const LowcodeComponents: CompoundedComponent = {
@@ -95,7 +97,7 @@ const LowcodeComponents: CompoundedComponent = {
     Border7, Border8, Border9, Border10, Border11, Border12, Border13,
     Decoration1, Decoration2, Decoration3, Decoration4, Decoration5,
     Decoration6, Decoration7, Decoration8, Decoration9, Decoration10, Decoration11,
-    BaseTable, TextScroller, CapsuleBarChart, CircularProgressChart
+    BaseTable, TextScroller, CapsuleBarChart, CircularProgressChart, ActTable
 };
 
 export default LowcodeComponents;

package/src/aldehyde/lowcode-components/lowcode-view/component/assets.ts

@@ -42,6 +42,7 @@ import BaseTable from "../../base-table";
 import TextScroller from "../../text-scroller";
 import CapsuleBarChart from "../../capsule-bar-chart";
 import CircularProgressChart from "../../circular-progress-chart";
+import ActTable from "../../act-table";
 
 interface ComponentItemConfig {
     baseInfo: BaseInfoType, // 基础信息
@@ -371,5 +372,12 @@ export const compsConfig: { [key: string]: ComponentItemConfig } = {
             compName: "环形进度图",
             compKey: "CircularProgressChart"
         }
+    },
+    ActTable: {
+        componentNode: ActTable,
+        baseInfo: {
+            compName: "全表格",
+            compKey: "ActTable"
+        }
     }
 };