aldehyde 0.2.469 → 0.2.471

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

@@ -1,9 +1,9 @@
 import React from 'react';
-import { Space, Button, Popconfirm } from "antd";
+import { Space, Button, Popconfirm, message } from "antd";
 import { DeleteOutlined, EditOutlined, AlignCenterOutlined } from "@ant-design/icons";
 import debounce from "lodash/debounce";
 import "./index.css";
-import { DtmplData, QueryKey, SelectConfig, SelectedRow, ControlBaseProps, LtmplConfig, ActTableMode, RouterCompProps } from "../tmpl/interface";
+import { DtmplData, QueryKey, SelectConfig, SelectedRow, ControlBaseProps, LtmplConfig, ActTableMode, RouterCompProps, CustomButtonConfig, CustomButton } from "../tmpl/interface";
 import TableUnits from "./table-util";
 import Units from "../units";
 import SupportInputTypes from '../tmpl/control-type-supportor';
@@ -50,6 +50,8 @@ interface SelectTableStat {
     ltmplConfig?: LtmplConfig;
 };
 
+let serial_number = new Date().getTime();
+
 class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat> {
     static contextType = LocaleContext;
     context: React.ContextType<typeof LocaleContext>;
@@ -389,6 +391,60 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
         }
     };
 
+    buttonClickable = () => {
+        let new_serial_number = new Date().getTime();
+        if (new_serial_number - serial_number > 1500) {
+            serial_number = new_serial_number;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    // 自由按钮事件
+    doCustomButton = async (customButton: CustomButton, records: DtmplData[]) => {
+        if (customButton?.onClick) {
+            customButton.onClick();
+            return;
+        }
+        if (!this.buttonClickable()) {
+            return;
+        }
+        const { serverKey } = this.props;
+        let doType = customButton.doType;
+        let config: CustomButtonConfig = Units.getCustomButtonConfig(customButton.id);
+        if ("request_refresh" == doType) {
+            if (config && config.doAction) {
+                await config.doAction(customButton, records);
+            } else if (config && config.getRequestUrl) {
+                let url = await config.getRequestUrl(customButton, records);
+                await HcserviceV3.doPostRequest(serverKey, url);
+            } else if (customButton.path) {
+                let codes = [];
+                let res = undefined;
+                if (records != null) {
+                    records.forEach(item => {
+                        codes.push(item.code)
+                    })
+                }
+                if (customButton.requestMethod === "get") {
+                    res = await HcserviceV3.doGetRequest(serverKey, customButton.path, { codes });
+                } else {
+                    res = await HcserviceV3.doPostRequest(serverKey, customButton.path, { codes });
+                }
+                if (res?.msg || res?.message) {
+                    message.info(res.msg || res.message);
+                }
+            } else {
+                message.error("Button Config Error");
+                return;
+            }
+            this.doSearch({ serial_number });
+        } else {
+            message.error("Unsuport Button dotype " + doType);
+        }
+    };
+
 
     render() {
         let { maxSelectedRows, selectedRows, selectedDatas, serverKey, sourceId, mainCode, fieldConfig, funcMode, onClosePopover } = this.props;
@@ -431,7 +487,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
                             ltmplConfig={{ ...selectConfig, customButtons: [...(selectConfig.customButtons || []), ...addAction, ...closePopover] }}
                             data={criteriaData}
                             doSearch={this.doSearch} loading={loading}
-                            doCustomButton={(customButton) => customButton?.onClick()}
+                            doCustomButton={this.doCustomButton}
                             doAction={this.doSelectedAction}
                         />
                     </div> : null}

package/src/aldehyde/tmpl/interface.tsx

@@ -517,7 +517,6 @@ export interface SelectConfig extends TmplBase {
   commonCriterias: CriteriaConfig[];
   split2TabCriterias: CriteriaConfig[];
   defaultCriteriaValue?: object;
-  primaryColumn?: ColumnConfig;
   groupIColumns?: ColumnConfig[];
   primaryCriteria: CriteriaConfig;
   orderColumn: ColumnConfig;
@@ -620,13 +619,16 @@ export interface LtmplConfig extends SelectConfig {
   rowTotalCols?: number;
   defaultShowTotalCols?: number;
   showType?: "table" | "verticalList" | "cardList";
-  primaryColumnLabel?: ColumnConfig;
-  secondColumn?: ColumnConfig;
-  secondColumnLabel?: ColumnConfig;
-  mainPicture?: ColumnConfig;
-  mainPictureLabel?: ColumnConfig;
-  labelColumn?: ColumnConfig;
-  cardShowCols?: ColumnConfig[];
+  extDisplayConfig?: { // 展示增强配置
+    primaryColumn?: ColumnConfig;
+    primaryColumnLabel?: ColumnConfig;
+    secondColumn?: ColumnConfig;
+    secondColumnLabel?: ColumnConfig;
+    mainPicture?: ColumnConfig;
+    mainPictureLabel?: ColumnConfig;
+    labelColumn?: ColumnConfig;
+    cardShowCols?: ColumnConfig[];
+  };
   rowCardCount?: number;
   defaultDtmplData?: DtmplData;
   rightPercent?: number;

package/src/aldehyde/tmpl/superagent.js

@@ -1,5 +1,5 @@
 import superagent from "superagent";
-import {message} from "antd";
+import { message } from "antd";
 import Units from "../units";
 import translate from "../locale/translate";
 
@@ -73,9 +73,9 @@ export default class Superagent {
                         } else if (res.status === 201) {
                             //Units.setLocalStorge("hydrocarbonToken", hydrocarbonToken)
                             resolve(res);
-                        } else if (res.status === 403) {
+                        } else if (res.status === 401) {
                             Units.toLogin();
-                        } else if (res.status === 405 || res.status === 406) {
+                        } else if ([403, 405, 406].includes(res.status)) {
                             message.error(translate("${权限不足}"), 5);
                             resolve(res);
                         } else if (res.status === 404 || res.status === 504) {

package/src/aldehyde/tree/tree-utils.tsx

@@ -35,19 +35,19 @@ export default class TreeUtils {
             let res: LtmplConfigRes = await HCDataSource.requestLtmplConfig(null, ttmplNodeConfig.rootGtmplId);
             let rootLTmplConfig: LtmplConfig = res.ltmplConfig;
             ttmplNodeConfig.rootLTmplConfig = rootLTmplConfig;
-            ttmplNodeConfig.rootTitleId = rootLTmplConfig.primaryColumn.id;
+            ttmplNodeConfig.rootTitleId = rootLTmplConfig.extDisplayConfig.primaryColumn?.id;
         }
         if (ttmplNodeConfig.branchRatmplId) {
             let res: LtmplConfigRes = await HCDataSource.requestLtmplConfig(null, ttmplNodeConfig.branchRatmplId);
             let branchLTmplConfig: LtmplConfig = res.ltmplConfig;
             ttmplNodeConfig.branchLTmplConfig = branchLTmplConfig;
-            ttmplNodeConfig.branchTitleId = branchLTmplConfig.primaryColumn.id;
+            ttmplNodeConfig.branchTitleId = branchLTmplConfig.extDisplayConfig.primaryColumn?.id;
         }
         if (ttmplNodeConfig.leafRatmplId) {
             let res: LtmplConfigRes = await HCDataSource.requestLtmplConfig(null, ttmplNodeConfig.leafRatmplId);
             let leafLTmplConfig: LtmplConfig = res.ltmplConfig;
             ttmplNodeConfig.leafLTmplConfig = leafLTmplConfig;
-            ttmplNodeConfig.leafTitleId = leafLTmplConfig.primaryColumn.id;
+            ttmplNodeConfig.leafTitleId = leafLTmplConfig.extDisplayConfig.primaryColumn?.id;
         }
 
         return ttmplNodeConfig;

package/src/aldehyde/units/index.tsx

@@ -1151,8 +1151,8 @@ export default {
     if (user?.orgGtmplSourceId && !["null"].includes(user.orgGtmplSourceId)) {
       const { ltmplConfig } = await HcserviceV3.requestLtmplConfig(null, user.orgGtmplSourceId) || {};
       const { entities } = await HcserviceV3.requestLtmplQueryTop(null, user.orgGtmplSourceId, { top: 1 }) || {};
-      const primaryColumnId = ltmplConfig?.primaryColumn?.id; // 首字段
-      const mainPictureId = ltmplConfig?.mainPicture?.id; // 主图字段
+      const primaryColumnId = ltmplConfig?.extDisplayConfig?.primaryColumn?.id; // 首字段
+      const mainPictureId = ltmplConfig?.extDisplayConfig?.mainPicture?.id; // 主图字段
       const orgName = entities?.[0]?.fieldMap?.[primaryColumnId];
       const homeImg = entities?.[0]?.fieldMap?.[mainPictureId];
       user = { ...user, orgName, homeImg }