aldehyde 0.2.474 → 0.2.475

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

@@ -1550,4 +1550,34 @@ export default class HcserviceV3 {
       return {};
     }
   }
+
+  // 保存2D图
+  static async postDiagram2DConfig(recordCode: string, content: string) {
+    let res = await Super.super({
+      url: `/v3/devops/diagram-2d-config`,
+      method: "POST",
+      data: { recordCode, content },
+    });
+    if (res?.status === "success") {
+      message.success(translate("${保存成功}"), 1);
+      return true;
+    } else {
+      message.error(translate("${保存失败}"), 3);
+      return false;
+    }
+  }
+
+  // 查询2D图
+  static async getDiagram2DConfig(recordCode: string) {
+    let res = await Super.super({
+      url: `/v3/devops/diagram-2d-config`,
+      method: "GET",
+      query: { recordCode }
+    });
+    if (res?.status === "success") {
+      return res?.configs || [];
+    } else {
+      return [];
+    }
+  }
 }

package/src/aldehyde/tmpl/interface.tsx

@@ -338,7 +338,7 @@ export type ButtonName =
   | "ltmplSelectAdd"
   | "reStat"
   | "drilling"
-  | "ratmplSelect";
+  | "ratmplSelect" | "edit2D" | "view2D";
 
 export type ChartType = "line" | "pie" | "column";
 export type GroupDisplayConfig =
@@ -450,6 +450,7 @@ export interface FieldConfig extends FieldBase {
   usableRuleCriterias?: FieldConfig[];
   relValueField?: FieldConfig;
   subRelValueField?: FieldConfig;
+  relValueField3?: FieldConfig;
   hidden?: boolean;
   serverKey?: string;
   sourceId?: string;
@@ -479,6 +480,8 @@ export interface FieldConfig extends FieldBase {
   unusableMode?: "hidden" | "disabled" | "default"; // 不可用展示模式、默认PC端就是禁用
   style?: { [key: string]: any }; // 自定义样式
   noStyle?: boolean; // antd表单样式显示
+  options?: any[]; // 选择框下拉选项（2D图编辑页使用）
+  defaultSelectFirst?: boolean; // 选择框下拉选项默认选中第一个
 }
 
 export interface ActionRenderProps {
@@ -501,6 +504,8 @@ export interface ActionRenderProps {
   saveRowData?: (data: DtmplData) => void,
   editings?: string[],
   doDelModalOpen?: (record: DtmplData) => any,
+  doView2D?: (recordCode: string) => any,
+  doEdit2D?: (recordCode: string) => any
 }
 
 export interface FileRule {
@@ -637,6 +642,12 @@ export interface LtmplConfig extends SelectConfig {
   pageLayout?: "leftRightSplit" | "upDownSplit" | "quadSplit" | "none" | "leftRightSplit-21" | "leftRightSplit-12";
   primaryColumnButtons?: ActionConfig[]; // 首字段操作按钮
   secondColumnButtons?: ActionConfig[]; // 次字段操作按钮
+  detailBtnTitle?: string; // 详情按钮标题
+  editBtnTitle?: string; // 编辑按钮标题
+  createBtnTitle?: string; // 创建按钮标题
+  edit2DBtnTitle?: string; // 编辑2D按钮标题
+  view2DBtnTitle?: string; // 查看2D按钮标题
+  deleteBtnTitle?: string; // 删除按钮标题
   // 甘特图配置
   gttTableProportion?: number;
   gttBeginTime?: ColumnConfig;
@@ -713,6 +724,7 @@ export interface UserInfo {
   changePersonalInfoable?: boolean;
   viewPersonalInfoable?: boolean;
   orgName?: string; // 组织名称
+  extInfo?: DtmplData; // 用户信息
 }
 
 export interface QueryKey {

package/src/aldehyde/tmpl/tmpl-config-analysis.tsx

@@ -337,7 +337,7 @@ TmplConfigAnalysis.buildInFuncFields = (dtmplConfig: DtmplConfig) => {
                 (field.requiredRuleCriterias &&
                     field.requiredRuleCriterias.length > 0) ||
                 (field.usableRuleCriterias && field.usableRuleCriterias.length > 0)
-                || field.relValueField
+                || field.relValueField || field.relValueField3
             ) {
                 field.shouldUpdate = true;
                 buildInFuncFields.push(field);

package/src/aldehyde/units/index.tsx

@@ -231,6 +231,9 @@ export default {
     let programCode = null;
     if (key) {
       programCode = window.localStorage.getItem(key + "programCode");
+      if (!programCode && key === "localDevopsServer") { // 2D图图片上传模型，配置为空则使用默认值
+        programCode = "282877560559017986";
+      }
     } else {
       programCode = window.sessionStorage.getItem("programCode");
     }
@@ -851,12 +854,15 @@ export default {
   configParamTrans(value: string, itemType: string) {
     if (value && value.startsWith && value.startsWith("$$current")) {
       return TmplConfigAnalysis.current(value, this.getDayjsFormat(itemType));
-    } else if (value && value.startsWith && value.startsWith("$$user.code")) {
+    } else if (value?.startsWith && value.startsWith("$$user.")) { // 默认值根据用户配置
       let userInfo: UserInfo = this.getCurrentUserInfo();
-      if (userInfo) {
+      if (!userInfo) {
+        return null;
+      }
+      if (value?.startsWith && value.startsWith("$$user.code")) {
         return userInfo.id + "@R@";
       } else {
-        return null;
+        return userInfo?.extInfo?.fieldMap?.[value.split("user.")[1]] || null;
       }
     } else {
       return value;
@@ -1301,7 +1307,7 @@ export default {
     }
     return undefined;
   },
-  async get2DComponent(groups: string[]) {
+  async get2DComponent(groups: string[]) { // 获取2D组件数据
     const temGroups = groups.filter(r => !components2DMap[r]);
     if (!temGroups?.length) {
       return components2DMap;
@@ -1313,5 +1319,12 @@ export default {
     }, {});
     components2DMap = { ...components2DMap, ...temObj };
     return components2DMap;
+  },
+  get2DComponentByType(type: string) { // 获取指定类型组件
+    if (!type) {
+      return;
+    }
+    const item = Object.values(components2DMap).flat(Infinity).find((r: any) => r.type === type);
+    return item;
   }
 };