aldehyde 0.2.473 → 0.2.475

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;
@@ -477,6 +478,10 @@ export interface FieldConfig extends FieldBase {
   uploadText?: string; // 上传组件文本配置
   fieldSwitchRequiredClearType?: "doNotClear" | "toOptionalClear" | "toRequiredClear" | "switchClear"; // 必填条件-是否清除关联项
   unusableMode?: "hidden" | "disabled" | "default"; // 不可用展示模式、默认PC端就是禁用
+  style?: { [key: string]: any }; // 自定义样式
+  noStyle?: boolean; // antd表单样式显示
+  options?: any[]; // 选择框下拉选项（2D图编辑页使用）
+  defaultSelectFirst?: boolean; // 选择框下拉选项默认选中第一个
 }
 
 export interface ActionRenderProps {
@@ -499,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 {
@@ -635,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;
@@ -711,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

@@ -50,6 +50,8 @@ let themeConfig: ThemeConfig = undefined; // 系统配置主题等
 
 const pageConfigCommons = {}; // 用户页面自定义配置
 
+let components2DMap = {}; // 2D图形组件
+
 // let siderCollapsed:boolean = true;
 
 export default {
@@ -229,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");
     }
@@ -849,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;
@@ -1298,5 +1306,25 @@ export default {
       }
     }
     return undefined;
+  },
+  async get2DComponent(groups: string[]) { // 获取2D组件数据
+    const temGroups = groups.filter(r => !components2DMap[r]);
+    if (!temGroups?.length) {
+      return components2DMap;
+    }
+    const res = await HcserviceV3.get2DComponent(temGroups);
+    const temObj = Object.keys(res).reduce((total, next) => {
+      total[next] = res[next] || [];
+      return total;
+    }, {});
+    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;
   }
 };