aldehyde 0.2.481 → 0.2.482

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

@@ -286,7 +286,7 @@ export default class DtmplForm extends React.PureComponent<
     if (dtmplConfig) {
       groups = dtmplConfig.groups;
     }
-    return groups.map((item) => {
+    const groupElements = groups.map((item) => {
       if (item.type == "embed") {
         let codeSource = undefined;
         //code 从来源字段里面拿
@@ -430,11 +430,30 @@ export default class DtmplForm extends React.PureComponent<
                 dataCode={dtmplData ? dtmplData.code : undefined}
                 valueMap={dtmplData ? dtmplData.fieldMap : undefined}
                 valueFieldMap={valueFieldMap}
+                editStatus={dtmplData?.code ? "changed" : "new"} // 新增或修改状态
               />}
           </CollapseCard>
         );
       }
     });
+
+    if (dtmplConfig?.editRactions?.length) { // 关系操作
+      const viewRactions = dtmplConfig.editRactions.map(item => {
+        return <CollapseCard
+          title={item.title}
+          key={item.id}
+          id={item.id}
+          className="hoverable"
+          styles={{ header: { background: "#f2f4f5" } }}
+          loading={loading}
+        >
+          <LtmplTable funcMode="common" serverKey={serverKey} sourceId={item.id} mainCode={dtmplData?.code} />
+        </CollapseCard>;
+      });
+      groupElements.push(...viewRactions);
+    }
+
+    return groupElements;
   };
 
   onValuesChange = (changedValues, allValues) => {

package/src/aldehyde/form/field-group-form.tsx

@@ -16,7 +16,7 @@ export interface FieldGroupFormProps {
   onFinish: (value: DtmplData) => void;
 }
 
-interface FieldGroupFormStat {}
+interface FieldGroupFormStat { }
 
 export default class Form extends React.PureComponent<
   FieldGroupFormProps,
@@ -29,7 +29,7 @@ export default class Form extends React.PureComponent<
   static defaultProps = {
   }
 
-  async componentDidMount() {}
+  async componentDidMount() { }
 
   onSubmit = (values: any) => {
     const { dtmplData, fieldGroupConfig } = this.props;
@@ -87,14 +87,15 @@ export default class Form extends React.PureComponent<
         >
           {this.selectRelation()}
           <FormItemGroup
-              maxColsOnRow={fieldGroupConfig && fieldGroupConfig.addOrEditType=="doubleCol"?2:1}
-              dataCode={dtmplData ? dtmplData.code : undefined}
+            maxColsOnRow={fieldGroupConfig && fieldGroupConfig.addOrEditType == "doubleCol" ? 2 : 1}
+            dataCode={dtmplData ? dtmplData.code : undefined}
             serverKey={serverKey}
             formRef={formRef}
             nameAttr={"id"}
             fields={fieldGroupConfig ? fieldGroupConfig.fields : undefined}
             valueMap={dtmplData ? dtmplData.fieldMap : {}}
-          ></FormItemGroup>
+            editStatus={dtmplData ? dtmplData.editStatus : "new"}
+          />
         </AntdForm>
       </>
     );

package/src/aldehyde/form/form-Item-group.tsx

@@ -1,6 +1,6 @@
 import React, { RefObject, useState, useMemo } from "react";
 import { Col, Form, Row, Popconfirm } from "antd";
-import { FieldConfig } from "../tmpl/interface";
+import { FieldConfig, EditStatus } from "../tmpl/interface";
 import EntryControl from "../controls/entry-control";
 import Units from "../units";
 import { FormInstance } from "antd/lib/form/hooks/useForm";
@@ -12,11 +12,11 @@ const FormItem = Form.Item;
 
 // 渲染表单项，如果有关联项，则在更改值时弹出确认框，否则直接更改值
 const RenderEntryControl = ({ fieldValue, item, props, translate, getMainCode, ...otherProps }) => {
-  const { mainCode, serverKey, dataCode, valueFieldMap } = props;
+  const { mainCode, serverKey, dataCode, valueFieldMap, editStatus } = props;
   const { onChange } = otherProps;
   const [isUpdateItem, setIsUpdateItem] = useState<boolean>(false);
   const [value, setValue] = useState<any>(fieldValue);
-  const controlProps = { dataCode, serverKey, mainCode: getMainCode(item, mainCode), value: fieldValue, fieldConfig: item, ...otherProps };
+  const controlProps = { dataCode, serverKey, mainCode: getMainCode(item, mainCode), value: fieldValue, fieldConfig: item, editStatus, ...otherProps };
 
   const popconfirm = useMemo(() => {
     if (!valueFieldMap) {
@@ -65,7 +65,8 @@ export interface FieldGroupProps {
   formRef?: RefObject<FormInstance>;
   dataCode?: string,
   layout?: "horizontal" | "vertical";
-  valueFieldMap?: { [key: string]: any } // 表单关联项配置
+  valueFieldMap?: { [key: string]: any }; // 表单关联项配置
+  editStatus?: EditStatus
 }
 
 interface FieldGroupState {

package/src/aldehyde/list/card-list/card-list-item.tsx

@@ -19,6 +19,7 @@ const dataKeys = ["primaryColumn", "primaryColumnLabel", "secondColumn", "second
 const Index = (props: Props) => {
     const { cardListConfig, item, renderOpt, serverKey, sourceId } = props;
     const { buttons, customViewPagePath, mainCode } = cardListConfig;
+    const cardColSpan = Math.trunc(24 / (cardListConfig.colNumOnRow || 2));
     const { translate } = useLocale();
     const [data, setData] = useState({});
     const [detailOpen, setDetailOpen] = useState<boolean>(false);
@@ -91,8 +92,8 @@ const Index = (props: Props) => {
                             <div className="card-show-cols">
                                 <Row gutter={6}>
                                     {data["cardShowCols"].map((col, index) => // 卡片展示字段是两个，则右侧对齐
-                                        <Col className="card-show-col" span={12} key={index} style={data["cardShowCols"].length < 3 && index % 2 ? { justifyContent: "flex-end" } : {}}>
-                                            <div className="card-show-col-title">{translate("${" + col.title + "}")}:</div>
+                                        <Col className="card-show-col" span={cardColSpan} key={index} style={data["cardShowCols"].length < 3 && index % 2 ? { justifyContent: "flex-end" } : {}}>
+                                            {cardListConfig?.notDisplayFieldName ? "" : <div className="card-show-col-title">{translate("${" + col.title + "}")}:</div>}
                                             <div className="card-show-col-value">{col.value || col.value === 0 ? col.element : "-"}</div>
                                         </Col>)
                                     }

package/src/aldehyde/list/card-list/index.less

@@ -80,7 +80,7 @@
 
     .card-list-item-main {
         width: 100%;
-        min-height: 100px;
+        // min-height: 100px;
         margin-bottom: 12px;
         background-color: #f5f5f5;
         flex-grow: 1;

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

@@ -54,7 +54,7 @@ const handleValue = (val: string, ossConfig: OssConfig,) => {
         if (!ossConfig) {
             return;
         }
-        return `http://${ossConfig.bucket}.${ossConfig.endpoint}/${val}`;
+        return `${ossConfig.protocol || "http"}://${ossConfig.bucket}.${ossConfig.endpoint}/${val}`;
     }
 };
 
@@ -104,8 +104,8 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     const { translate } = useLocale();
 
     const getOssConfig = (serverKey: string) => {
-        const { accessKeyId, accessKeySecret, bucket, endpoint } = ProgramConfig.getExtendServers(serverKey) || {};
-        const temObj = { accessKeyId, accessKeySecret, bucket, endpoint }
+        const { accessKeyId, accessKeySecret, bucket, endpoint, protocol } = ProgramConfig.getExtendServers(serverKey) || {};
+        const temObj = { accessKeyId, accessKeySecret, bucket, endpoint, protocol }
         return temObj;
     }
 

package/src/aldehyde/lowcode-components/data.d.ts

@@ -16,4 +16,5 @@ export interface OssConfig {
     accessKeySecret: string;
     bucket: string;
     endpoint: string;
+    protocol: string;
 }

package/src/aldehyde/module/ltmpl-table.tsx

@@ -38,6 +38,7 @@ export interface LtmplTableProps {
   showAggregates?: boolean; // 是否显示统计卡片数据
   deleteCallback?: (val: object) => void; // 删除回调
   loadDataCallback?: (val: object[]) => void; // 请求数据回调函数
+  defRowCardCount?: number; // 卡片展示模式-默认行卡片数量
 }
 
 export interface LtmplTableState {
@@ -263,7 +264,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
       tip, title, collapsible,
       initCollapse, doCustomEdit, doCustomCreate,
       serverKey, rowOperatable, readOnly, defShowType, showPagination, showAggregates, deleteCallback,
-      loadDataCallback
+      loadDataCallback, defRowCardCount
     } = this.props;
     const { translate } = this.context;
 
@@ -286,7 +287,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
             criteriaData={criteriaData}
             customEditable={doCustomEdit ? true : false}
             customCreatable={doCustomCreate ? true : false}
-            ltmplConfig={ltmplConfigRes.ltmplConfig}
+            ltmplConfig={defRowCardCount ? { ...ltmplConfigRes.ltmplConfig, rowCardCount: defRowCardCount } : ltmplConfigRes.ltmplConfig}
             defShowType={defShowType}
             showPagination={showPagination}
             showAggregates={showAggregates}

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

@@ -647,7 +647,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   changeViewModel = (viewModels) => {
     const { setUserPageConfig } = this.props;
     const { hiddenColIds, hiddenRowCodes, sortedColConfigs, viewModels: oldViewModels } = this.state;
-    setUserPageConfig({ viewModels });
+    setUserPageConfig && setUserPageConfig({ viewModels });
     this.setState({ viewModels }, () => {
       if (viewModels.length && viewModels.includes("ganttChart") !== oldViewModels.includes("ganttChart")) {
         this.loadData(hiddenColIds, hiddenRowCodes, sortedColConfigs); // 前后选择是否存在甘特图，刷新数据
@@ -658,7 +658,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   changeHiddenColumns = (hiddenColIds: string[]) => {
     const { setUserPageConfig } = this.props;
     this.setState({ showL2Chart: false, hiddenColIds });
-    setUserPageConfig({ hiddenColIds });
+    setUserPageConfig && setUserPageConfig({ hiddenColIds });
   };
 
   doSelectedAction = async (actionId: string, codes, params: object) => {
@@ -933,14 +933,14 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     const { setUserPageConfig } = this.props;
     this.setState({ sortedColConfigs });
     const sortedColIds = sortedColConfigs.map(r => r.id);
-    setUserPageConfig({ sortedColIds });
+    setUserPageConfig && setUserPageConfig({ sortedColIds });
   };
 
   // 更新本地缓存列宽度
   onChangeResize = (colResize: { [key: string]: number }) => {
     const { setUserPageConfig, userPageConfig } = this.props;
     const oldColResize = userPageConfig?.colResize || {};
-    setUserPageConfig({ colResize: { ...oldColResize, ...colResize } });
+    setUserPageConfig && setUserPageConfig({ colResize: { ...oldColResize, ...colResize } });
   }
 
   getAddTmplButton = (classAddConfigs: ClassAddConfig[]) => {
@@ -1546,7 +1546,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     );
 
     let { buttons, extDisplayConfig, rowCardCount, customViewPagePath, splitTabShowType } = ltmplConfig;
-    let { primaryColumn, primaryColumnLabel, secondColumn, secondColumnLabel, mainPicture, mainPictureLabel, labelColumn, cardShowCols } = extDisplayConfig;
+    let { primaryColumn, primaryColumnLabel, secondColumn, secondColumnLabel, mainPicture, mainPictureLabel, labelColumn, cardShowCols, notDisplayFieldName, colNumOnRow } = extDisplayConfig;
     let displayCriteriaCard: boolean = false;
     if (funcMode == "simple" || funcMode == "common") {
       displayCriteriaCard = false;
@@ -1607,7 +1607,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         groupIColumns={ltmplConfig.groupIColumns}
         doSearch={this.actTableDoSearch}
         sortColumnData={sortColumnData}
-        cardListConfig={{ primaryColumn, primaryColumnLabel, secondColumn, secondColumnLabel, mainPicture, mainPictureLabel, labelColumn, cardShowCols, rowCardCount, buttons, customViewPagePath, mainCode }}
+        cardListConfig={{ primaryColumn, primaryColumnLabel, secondColumn, secondColumnLabel, mainPicture, mainPictureLabel, labelColumn, cardShowCols, rowCardCount, buttons, customViewPagePath, mainCode, notDisplayFieldName, colNumOnRow }}
         ltmplConfig={ltmplConfig}
         showView={showView}
         showPagination={showPagination}
@@ -1644,10 +1644,10 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
           ""
         )}
         <div className="actTable">
-          <Row>
-            <Col span={24}>
-              {funcMode == "complete" || funcMode == "common" ? (
-                collapsible ? null : (
+          {["complete", "common"].includes(funcMode) ?
+            <Row>
+              <Col span={24}>
+                {collapsible ? null : (
                   <span>
                     {ltmplConfig.header ? (
                       <div
@@ -1667,10 +1667,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                         <p className="fr" style={{ marginBottom: "4px" }}>{this.renderHeaderButtons()}</p>
                       </>}
                   </span>
-                )
-              ) : null}
-            </Col>
-          </Row>
+                )}
+              </Col>
+            </Row> : null}
           {(<Row><Col span={24}><Layout hasSider style={{ backgroundColor: "#fff" }}>
             <Sider
               width={ltreeEntitySelect ? 260 : 0}

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

@@ -2,7 +2,7 @@ import React from "react";
 import { ActionRenderProps, ColumnConfig, DtmplData, LtmplConfig, FieldConfig, 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 } from "antd";
+import { Button, Popconfirm, Popover, Space, Tooltip, Form as AntdForm, theme } from "antd";
 import { SortableHandle } from "react-sortable-hoc";
 import {
     AlignLeftOutlined, CopyOutlined, DeleteOutlined,
@@ -12,7 +12,7 @@ import {
     FormOutlined,
     KeyOutlined,
     MenuOutlined, QuestionCircleOutlined, PlaySquareOutlined,
-    SettingOutlined
+    SettingOutlined, UpSquareFilled, DownSquareFilled
 } from "@ant-design/icons";
 import ActionUtils from "../../controls/action/utils";
 import ViewButton from "../../detail/button/view-button";
@@ -31,20 +31,11 @@ import "./index.less";
 
 const FormItem = AntdForm.Item;
 
-const isDisabled = (record: DtmplData, item: FieldConfig) => {
-    if (!item.rowEditType) {
-        return false;
-    }
-    let isNew: boolean = record.editStatus === "new";
-    let type = item.rowEditType;
-    if (type === "editable" || (type === "editonly" && !isNew) || (type === "addonly" && isNew)) {
-        return false;
-    } else if (type === "readonly") {
-        return true;
-    }
-    return true;
-}
-
+// 负责提取 token
+const ThemeToken = (props) => {
+    const { token } = theme.useToken();
+    return props.children(token); // 使用 render props 模式
+};
 
 interface ColumnBuilderProps extends ActionRenderProps {
     ltmplConfig: LtmplConfig,
@@ -127,6 +118,15 @@ export default {
                     const order = this.handleColumnOrder(column["dataIndex"], sortColumns);
                     if (item.sortable) {
                         TableUnits.sort(column, itemType, order);
+                    } else if (item.pageSortable) {
+                        // column["sorter"] = (a, b) => a[column["dataIndex"]] - b[column["dataIndex"]];
+                        // column["sortIcon"] = ({ sortOrder }) =>
+                        //     <ThemeToken>
+                        //         {(token) => <span className="pageSortable" >
+                        //             <UpSquareFilled className="ascend" style={sortOrder === 'ascend' ? { color: token.colorPrimary } : {}} />
+                        //             <DownSquareFilled className="descend" style={sortOrder === 'descend' ? { color: token.colorPrimary } : {}} />
+                        //         </span>}
+                        //     </ThemeToken>
                     }
                 }
             }
@@ -228,8 +228,9 @@ export default {
                             initialValue={record[item.id]}>
                             <EntryControl
                                 serverKey={serverKey}
-                                fieldConfig={{ ...item, disabled: isDisabled(record, item) }}
+                                fieldConfig={{ ...item }}
                                 value={record[item.id]}
+                                editStatus={record.editStatus}
                             />
                         </FormItem> :
                         <div className={record['dataType'] ? record['dataType'] === "小计" ? "xiaoji" : 'heji' : ""}>

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

@@ -61,4 +61,26 @@
     .column-action {
         display: block;
     }
+}
+
+.pageSortable {
+    display: inline-flex;
+    flex-direction: column;
+    margin-left: 4;
+
+    .ascend,
+    .descend {
+        font-size: var(--ant-font-size-icon);
+        color: var(--ant-table-header-icon-color);
+    }
+}
+
+.ant-table-column-sorters:hover {
+    .pageSortable {
+
+        .ascend,
+        .descend {
+            color: var(--ant-table-header-icon-hover-color);
+        }
+    }
 }

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

@@ -355,7 +355,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
 
   onChange(pagination, filters, sorter, extra) {
     console.log("params", pagination, filters, sorter, extra);
-    if (extra.action === "sort") {
+    if (extra.action === "sort" && typeof sorter.column?.sorter !== "function") { // 非函数排序处理
       let new_sort_serial_number = new Date().getTime();
       if (new_sort_serial_number - this.sort_serial_number < 2000) {
         const { translate } = this.context;

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

@@ -158,24 +158,6 @@ class RelationTable extends React.PureComponent<
         return dataSource;
     };
 
-    isDisabled = (record: DtmplData, item: FieldConfig) => {
-        if (!item.rowEditType) {
-            return false;
-        }
-        let isNew: boolean = record.editStatus && record.editStatus == "new";
-        let type = item.rowEditType;
-        if (type == "editable") {
-            return false;
-        } else if (type == "readonly") {
-            return true;
-        } else if (type == "editonly" && !isNew) {
-            return false;
-        } else if (type == "addonly" && isNew) {
-            return false;
-        }
-        return true;
-    }
-
     buildColumns = () => {
         const { viewOrEdit, fieldGroupConfig, serverKey, parentFormInstance } = this.props;
         const {
@@ -211,7 +193,7 @@ class RelationTable extends React.PureComponent<
                 }
                 item.baseCriteria = {
                     ...item.baseCriteria,
-                    "secondCriterion": parentFormInstance.getFieldValue(item.relValueField.id)
+                    "secondCriterion": parentFormInstance?.getFieldValue?.(item.relValueField.id)
                 };
                 item.configChanged = true;
             }
@@ -224,8 +206,9 @@ class RelationTable extends React.PureComponent<
                         initialValue={record[item.id]}>
                         <EntryControl
                             serverKey={serverKey}
-                            fieldConfig={{ ...item, disabled: this.isDisabled(record, item) }}
+                            fieldConfig={{ ...item }}
                             value={record[item.id]}
+                            editStatus={record.editStatus}
                         /></FormItem> :
                     <ViewControl
                         serverKey={serverKey}
@@ -857,6 +840,8 @@ class RelationTable extends React.PureComponent<
                                 addOrEditType == "tableRow" ?
                                     <>
                                         <Button
+                                            styles={{ root: { marginBottom: "10px" } }}
+                                            disabled={buttonDisabled}
                                             onClick={() => this.addNewRow(undefined)}>{translate("${添加一行}")}</Button>
                                         {batchAddFileField ?
                                             <EntryControl value={uploadingFiles} onChange={this.uploadFiles}
@@ -918,7 +903,7 @@ class RelationTable extends React.PureComponent<
                                 ""
                             )}
                             {fieldGroupConfig.min && (!value || value.length <= 0) ? (
-                                <Text style={{ color: "red" }}>
+                                <Text style={{ color: "red", display: 'inline-block', marginBottom: "10px" }}>
                                     {translate("${请选择或添加}")}
                                     {translate("${" + fieldGroupConfig.title + "}")}
                                 </Text>

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

@@ -369,6 +369,14 @@ HCDataSource.getEnums = function (mstrucId: string): EnumItem[] {
   return enumMap.get(mstrucId);
 };
 
+// 获取枚举，缓存没有则请求
+HCDataSource.getSelectEnums = async function (serverKey: string, mstrucId: string): Promise<EnumItem[]> {
+  if (!enumMap.has(mstrucId)) {
+    await loadEnum(serverKey, [mstrucId]);
+  }
+  return enumMap.get(mstrucId);
+};
+
 HCDataSource.getEnumsValueMap = function (
   mstrucId: string
 ): Map<string, string> {

package/src/aldehyde/tmpl/interface.tsx

@@ -63,6 +63,8 @@ export interface CardListConfig {
   buttons?: string[];
   customViewPagePath?: string;
   mainCode?: string;
+  notDisplayFieldName?: boolean;
+  colNumOnRow?: number;
 }
 
 export interface QueryTableProps extends ReportTableProps {
@@ -459,6 +461,7 @@ export interface FieldConfig extends FieldBase {
   defaultDtmplData?: DtmplData;
   optionCodeColId?: string;
   sortable?: boolean;
+  pageSortable?: boolean; // 页内排序
   itemBreakLine?: boolean;
   configChanged?: boolean;
   rowEditType?: "editable" | "readonly" | "editonly" | "addonly";
@@ -635,6 +638,8 @@ export interface LtmplConfig extends SelectConfig {
     mainPictureLabel?: ColumnConfig;
     labelColumn?: ColumnConfig;
     cardShowCols?: ColumnConfig[];
+    notDisplayFieldName?: boolean;
+    colNumOnRow?: number; // 卡片展示字段每行列数
   };
   rowCardCount?: number;
   defaultDtmplData?: DtmplData;