aldehyde 0.2.408 → 0.2.409

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

@@ -37,6 +37,8 @@ import DraggableModal from "../module/draggable-modal";
 const { Content, Sider } = Layout;
 type Level = "l1" | "l2";
 
+const enumTypes = ["select", "multiselect", "texttags", "checkbox", "radio", "steps"];
+
 
 const defaultDisabledColIds: string[] = ["20000", "10000"];
 
@@ -156,16 +158,26 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     const options = ltmplConfig.split2TabCriterias.map(fieldConfig => {
       const id = `c_${fieldConfig.id}`;
       allIds.push(id);
-      const items = HCDataSource.getEnums(fieldConfig.mstrucId);
-      const options = items.map((item) => ({
-        label: <span style={{ padding: "0 10px" }}>{translate("${" + item.title + "}")}</span>,
-        key: item.value,
-        id
-      }));
-      if (fieldConfig.relDeduplication && fieldConfig.exceptCodes?.length) {
-        return options.filter(item => !fieldConfig.exceptCodes.includes(item.key));
+      if (enumTypes.includes(fieldConfig.controlType || fieldConfig.extControlType)) {
+        const items = HCDataSource.getEnums(fieldConfig.mstrucId);
+        const options = items.map((item) => ({
+          label: <span style={{ padding: "0 10px" }}>{translate("${" + item.title + "}")}</span>,
+          key: item.value,
+          id
+        }));
+        if (fieldConfig.relDeduplication && fieldConfig.exceptCodes?.length) {
+          return options.filter(item => !fieldConfig.exceptCodes.includes(item.key));
+        }
+        return options;
       }
-      return options;
+      if ([fieldConfig.controlType, fieldConfig.extControlType].includes("single-checkbox")) {
+        return [{
+          label: <span style={{ padding: "0 10px" }}>{translate("${" + fieldConfig.title + "}")}</span>,
+          key: "1",
+          id
+        }];
+      }
+      return [];
     })?.flat() || [];
     const defOption = {
       label: <span style={{ padding: "0 10px" }}>{translate("${全部}")}</span>,
@@ -1151,8 +1163,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   }
 
   renderCriteriaForm = () => {
-    let { loading, selectedRows, selectedDatas, userCriteriaData, editings } = this.state;
-    let { ltmplConfig, criteriaData, serverKey, sourceId } = this.props;
+    let { loading, selectedRows, selectedDatas, userCriteriaData, editings, tabActiveKey, tabsOptions } = this.state;
+    let { ltmplConfig, serverKey, sourceId } = this.props;
+    const tabCriteriaId = tabsOptions.find(r => r.key === tabActiveKey)?.id;
     return (
       <CriteriaForm
         key={sourceId}
@@ -1170,6 +1183,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         doSearch={this.actTableDoSearch}
         doMultiRowEdit={this.doMultiRowEdit}
         multiRowEditDisabled={!editings.length}
+        tabCriteriaId={tabCriteriaId}
       />
     );
   };
@@ -1295,11 +1309,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     let new_serial_number = new Date().getTime();
     if (new_serial_number - serial_number < 2000) return;
     if (tabActiveKey === val) return;
+    const ids = tabsOptions.find(r => r.key === "all").ids || [];
     const item = tabsOptions.find(r => r.key === val);
-    let params = { [item.id]: val };
-    if (val === "all") {
-      params = item.ids?.reduce((total, cur) => { total[cur] = undefined; return total; }, {});
-    }
+    let params = ids?.reduce((total, cur) => {
+      total[cur] = (val === "all" || cur !== item.id) ? undefined : val;
+      return total;
+    }, {});
     this.actTableDoSearch(params);
     this.setState({ tabActiveKey: val });
   }

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

@@ -61,6 +61,7 @@ interface RelationTableProps {
     onChange?: (fieldGroupConfig: FieldGroupConfig, value: DtmplData[]) => void;
     onEditing?: (editing: boolean) => void;
     initCollapse?: boolean;
+    showCollapseCard?: boolean; // 是否显示折叠卡片，默认显示
 }
 
 interface RelationTableStat {
@@ -98,7 +99,9 @@ class RelationTable extends React.PureComponent<
     };
     static contextType = LocaleContext;
     context: React.ContextType<typeof LocaleContext>;
-    static defaultProps = {};
+    static defaultProps = {
+        showCollapseCard: true,
+    };
     formRef = React.createRef<FormInstance>();
 
     async componentDidMount() {
@@ -959,7 +962,7 @@ class RelationTable extends React.PureComponent<
             initCollapse,
             mainCode,
             serverKey,
-            showRightNav, parentFormInstance
+            showRightNav, parentFormInstance, showCollapseCard
         } = this.props;
         const {
             pageSize,
@@ -994,52 +997,52 @@ class RelationTable extends React.PureComponent<
             }
         }
 
+        const renderEditTableList = <div className="editTableList">
+            {this.buildButtons()}
+            {viewModel && viewModel === "verticalList" ? <VerticalList
+                dataSource={this.buildDataSource()}
+                columnConfigs={fieldGroupConfig?.fields}
+                serverKey={serverKey}
+                columns={this.buildColumns()} /> :
+                <AntdForm ref={this.formRef} component={false}>
+                    <Table
+                        size={"small"}
+                        locale={{
+                            emptyText: (
+                                <div style={{ textAlign: "center", width: "100%" }}>
+                                    <Text disabled>{translate("${暂无数据}...")}</Text>
+                                </div>
+                            ),
+                        }}
+                        bordered
+                        loading={tableLoading}
+                        dataSource={this.buildDataSource()}
+                        columns={this.buildColumns()}
+                        pagination={page}
+                        onChange={this.tabChange}
+                    /></AntdForm>}
+        </div>;
+
+        console.log("showCollapseCard", showCollapseCard);
+
         return fieldGroupConfig.displayConfig.includes("nonDataNonDisplayed") &&
-            (!value || value.length <= 0) ? (
-            ""
-        ) : (
+            (!value || value.length <= 0) ? "" : (
             <>
-                <CollapseCard
-                    showRightNav={showRightNav}
-                    initCollapse={
-                        initCollapse || fieldGroupConfig.displayConfig.includes("folded")
-                    }
-                    title={fieldGroupConfig.title}
-                    tip={fieldGroupConfig.tip}
-                    id={parentId + fieldGroupConfig.id}
-                    className={`hoverable`}
-                    styles={{ header: { background: "#f2f4f5" }, body: { padding: "6px" } }}
-                    loading={loading}
-                //暂时注释掉，后续要支持配置。
-                //extra={<Input.Search onSearch={this.searchValue} allowClear placeholder=""/>}
-                >
-                    <div className="editTableList">
-                        {this.buildButtons()}
-                        {viewModel && viewModel == "verticalList" ? <VerticalList
-                            dataSource={this.buildDataSource()}
-                            columnConfigs={fieldGroupConfig?.fields}
-                            serverKey={serverKey}
-                            columns={this.buildColumns()} /> :
-                            <AntdForm
-                                ref={this.formRef} component={false}>
-                                <Table
-                                    size={"small"}
-                                    locale={{
-                                        emptyText: (
-                                            <div style={{ textAlign: "center", width: "100%" }}>
-                                                <Text disabled>{translate("${暂无数据}...")}</Text>
-                                            </div>
-                                        ),
-                                    }}
-                                    bordered
-                                    loading={tableLoading}
-                                    dataSource={this.buildDataSource()}
-                                    columns={this.buildColumns()}
-                                    pagination={page}
-                                    onChange={this.tabChange}
-                                /></AntdForm>}
-                    </div>
-                </CollapseCard>
+                {showCollapseCard ?
+                    <CollapseCard
+                        showRightNav={showRightNav}
+                        initCollapse={initCollapse || fieldGroupConfig.displayConfig.includes("folded")}
+                        title={fieldGroupConfig.title}
+                        tip={fieldGroupConfig.tip}
+                        id={parentId + fieldGroupConfig.id}
+                        className="hoverable"
+                        styles={{ header: { background: "#f2f4f5" }, body: { padding: "6px" } }}
+                        loading={loading}
+                    //暂时注释掉，后续要支持配置。
+                    //extra={<Input.Search onSearch={this.searchValue} allowClear placeholder=""/>}
+                    >
+                        {renderEditTableList}
+                    </CollapseCard> : renderEditTableList}
                 {buttons.includes("detail") ? (
                     <ModalDtmplView
                         serverKey={serverKey}
@@ -1051,9 +1054,7 @@ class RelationTable extends React.PureComponent<
                     >
                         {" "}
                     </ModalDtmplView>
-                ) : (
-                    ""
-                )}
+                ) : ""}
                 {buttons.includes("dtmplEdit") || buttons.includes("dtmplAdd") ? (
                     <DtmplEditPage
                         addTmplId={addTmplId}
@@ -1066,9 +1067,7 @@ class RelationTable extends React.PureComponent<
                         parentFormInstance={parentFormInstance}
                         onOk={selectedCode ? this.handleDtmplEdit : this.handleDtmplAdd}
                     />
-                ) : (
-                    ""
-                )}
+                ) : ""}
                 {buttons.includes("selectAdd") ? (
                     <ModelSelectTable
                         serverKey={serverKey}
@@ -1083,9 +1082,7 @@ class RelationTable extends React.PureComponent<
                         mainCode={mainCode1}
                         sourceId={fieldGroupConfig.id}
                     ></ModelSelectTable>
-                ) : (
-                    ""
-                )}
+                ) : ""}
             </>
         );
     }

package/src/aldehyde/tmpl/interface.tsx

@@ -394,6 +394,7 @@ export interface DtmplConfig extends TmplBase {
   hiddenFields?: FieldConfig[];
   continueSaveBtnTitle?: string;
   saveBtnTitle?: string;
+  pageLayout?: "horizontalTabs" | "verticalScrolling";
 }
 
 export type Comparator =

package/src/aldehyde/welcome/HCWelcome.js

@@ -343,7 +343,7 @@ const HCWelcome = (props) => {
           <QuickEntrance></QuickEntrance>
         </div>
       </div>
-      <img src={orgHomeImg || homeImg || (["v2", "v5"].includes(layoutRootPath) ? WelcomeBg : welcomeBg2)} alt="" width="100%" height="100%" style={{ borderRadius: "8px", margin: "0 10px", width: "calc(100% - 20px)" }} />
+      <img src={orgHomeImg || homeImg || (!layoutRootPath || (["v2", "v5"].includes(layoutRootPath)) ? WelcomeBg : welcomeBg2)} alt="" width="100%" height="100%" style={{ borderRadius: "8px", margin: "0 10px", width: "calc(100% - 20px)" }} />
     </>
   );
 };