aldehyde 0.2.160 → 0.2.161

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -8,7 +8,13 @@ import dayjs from "dayjs";
 import utc from "dayjs/plugin/utc";
 import timezone from "dayjs/plugin/timezone";
 
-import { CodeSource, DtmplConfig, PageInfo, SelectedRow } from "./interface";
+import {
+  CodeSource,
+  DtmplConfig,
+  MenuConfigAPIType,
+  PageInfo,
+  SelectedRow,
+} from "./interface";
 
 import { ProgramConfig } from "../index";
 import translate from "../locale/translate";
@@ -208,7 +214,7 @@ export default class HcserviceV3 {
     url
   ) {
     if (!sourceId) {
-      message.error("SourceId is undefined!",5);
+      message.error("SourceId is undefined!", 5);
     } else {
       let res = await Super.super({
         url: url,
@@ -236,7 +242,7 @@ export default class HcserviceV3 {
     if (res.status === "success") {
       return res.entities;
     } else {
-      message.error(translate("${没有找到实体}!"),5);
+      message.error(translate("${没有找到实体}!"), 5);
       return null;
     }
   }
@@ -277,7 +283,7 @@ export default class HcserviceV3 {
       method: "GET",
     });
     if (res.status === "success") {
-      return {sourceId,...res.entity};
+      return { sourceId, ...res.entity };
     } else {
       //message.error(translate("${实体不存在}!"),5);
       return null;
@@ -409,7 +415,7 @@ export default class HcserviceV3 {
       // }
     } else {
       if (message) {
-        message.error(translate("${保存失败}!"),5);
+        message.error(translate("${保存失败}!"), 5);
       }
     }
     return { code, status: res ? res.status : "error" };
@@ -541,12 +547,12 @@ export default class HcserviceV3 {
       if (item.code) {
         codes.push(item.code);
       } else {
-        message.error(translate("${没找到所选数据的Code}!!"),5);
+        message.error(translate("${没找到所选数据的Code}!!"), 5);
       }
     }
 
     if (codes.length < 1) {
-      message.error(translate("${没找到所选数据的Code}!!"),5);
+      message.error(translate("${没找到所选数据的Code}!!"), 5);
     }
 
     return codes;
@@ -575,7 +581,7 @@ export default class HcserviceV3 {
       message.success(translate("${删除成功}"), 1);
       return true;
     } else {
-      message.error(translate("${删除失败}"),3);
+      message.error(translate("${删除失败}"), 3);
       //console.log("删除失败消息",res.message);
       return false;
     }
@@ -676,7 +682,7 @@ export default class HcserviceV3 {
     );
     if (res && res.status == "success") {
       if (res.message) {
-        message.info( res.message, 4);
+        message.info(res.message, 4);
       }
     }
     return res.entityCode;
@@ -731,7 +737,7 @@ export default class HcserviceV3 {
     let url =
       Units.joinPath(Units.api(serverKey), Units.joinPath("/v3/files", path)) +
       `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
-    let encodeUri=encodeURI(url);
+    let encodeUri = encodeURI(url);
     return encodeUri;
   }
 
@@ -774,7 +780,10 @@ export default class HcserviceV3 {
   //     return res.l2Menus;
   // }
 
-  static async requestBlocks(l2MenuId: string, blockId: string) {
+  static async requestBlocks(
+    l2MenuId: string,
+    blockId: string
+  ): Promise<MenuConfigAPIType> {
     let url = `/v3/menu/blocks`;
     let res = await Super.super({
       url: url,
@@ -792,30 +801,30 @@ export default class HcserviceV3 {
     let res = await Super.super({
       url: url,
       method: "GET",
-      query: {
-      },
+      query: {},
     });
     return res?.blocks;
   }
 
-  static async requestRoleAuths(roleCode:string) {
+  static async requestRoleAuths(roleCode: string) {
     let url = `/v3/auth/role-auths`;
     let res = await Super.super({
       url: url,
       method: "GET",
       query: {
-        roleCode
+        roleCode,
       },
     });
     return res;
   }
-  static async postRoleAuths(roleCode:string ,auths:string[]) {
+  static async postRoleAuths(roleCode: string, auths: string[]) {
     let url = `/v3/auth/role-auths`;
     let res = await Super.super({
       url: url,
       method: "POST",
       query: {
-        roleCode,auths,
+        roleCode,
+        auths,
       },
     });
 
@@ -831,6 +840,13 @@ export default class HcserviceV3 {
     });
   }
 
+  static async logout2() {
+    return Super.super({
+      url: "/v3/auth/token",
+      method: "DELETE",
+    });
+  }
+
   static async resetPassword(
     serverKey: string,
     oPassword: string,

package/src/aldehyde/tmpl/interface.tsx

@@ -59,12 +59,22 @@ export interface CQueryConfig extends OrderableTmplBase {
 }
 export type ActTableMode = "simple" | "common" | "complete";
 
-export interface ActionConfig extends OrderableTmplBase {
+export interface ActionConfig extends ButtonConfig {
+  preposes: FieldConfig[];
+  writes: FieldConfig[];
+}
+
+export interface DoEditParam  {
+  code: string;
+  mode: AddOrUpdate;
+  toCustomPage?: boolean;
+  dtmplSourceId?:string;
+}
+
+export interface ButtonConfig extends OrderableTmplBase {
   multible: boolean;
   icon: string;
   beforeExeConfirm: string;
-  preposes: FieldConfig[];
-  writes: FieldConfig[];
   tip: string;
   buttonType?: ButtonType;
   buttonShape?: ButtonShape;
@@ -87,7 +97,10 @@ export interface JumpConfig extends OrderableTmplBase {
   searchParams: FieldConfig[];
   routeParams: FieldConfig[];
 }
-export interface ClassifiedAddConfig extends OrderableTmplBase {}
+export interface ClassAddConfig extends OrderableTmplBase {}
+export interface ClassEditConfig extends OrderableTmplBase {
+  preposes: FieldConfig[],
+}
 
 export interface ProgramAuth extends OrderableTmplBase {}
 
@@ -197,7 +210,7 @@ export interface FieldGroupConfig extends OrderableTmplBase {
   pageSourceFieldMstrucId?: string;
   codeSourceFieldMstrucId?: string;
   pointSourceId?: string;
-  classifiedAddConfigs?: ClassifiedAddConfig[];
+  classAddConfigs?: ClassAddConfig[];
   defaultCriteriaValue?: object;
 }
 
@@ -325,6 +338,9 @@ export interface TtmplConfig extends TmplBase {
 export interface LtmplConfig extends SelectConfig {
   actions?: ActionConfig[];
   rowActions: ActionConfig[];
+  fileExports?: ButtonConfig[];
+  topFileExports?: ButtonConfig[];
+  rowFileExports?: ButtonConfig[];
   ractions?: RActionConfig[];
   jumps?: JumpConfig[];
   rowJumps?: JumpConfig[];
@@ -338,7 +354,8 @@ export interface LtmplConfig extends SelectConfig {
   innerParams?: CriteriaConfig[];
   customEditPagePath?: string;
   customViewPagePath?: string;
-  classifiedAddConfigs?: ClassifiedAddConfig[];
+  classAddConfigs?: ClassAddConfig[];
+  classEditConfigs?: ClassEditConfig[];
   drillingParams?: CriteriaConfig[];
   footer?: string;
   header?: string;
@@ -508,3 +525,23 @@ export interface Menu2layersProps extends MenuProps {
   currentL2MenuId?: string;
   basePath?: string;
 }
+
+export interface MenuConfigAPIType {
+  blockId: string;
+  blocks: BlockType[];
+  programName: string;
+  status: "success" | "error" | "";
+}
+
+export interface BlockType {
+  id: string; // menu 主要为最后一级id为当前地址
+  title: string; // menu项名字
+  order?: string; // 页面位置优先级
+  disabled?: boolean; // 是否禁用
+  hiddenOnDisabled?: boolean; // 是否隐藏
+  customPath?: string; // 自定义页面路径
+  pageType?: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树"; // 页面类型
+  defaultCriteriaValue?: { [key: string]: string }; // 一些组件参数
+  linkTarget?: HTMLAttributeAnchorTarget; // 页面跳转方式
+  items?: BlockType[];
+}

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

@@ -335,6 +335,7 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
     ratmplId: string,
     mainCode: any
   ) => {
+    const { translate } = this.context;
     const { doAddSub } = this.props;
     return (
       <Button
@@ -345,7 +346,7 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
         size={"small"}
       >
         {icon}
-        {title}
+        {translate("${"+title+"}")}
       </Button>
     );
   };