aldehyde 0.2.332 → 0.2.334

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

@@ -195,6 +195,7 @@ class RelationTable extends React.PureComponent<
             column["title"] = item.tip ? <>{title1}<Tooltip placement="top" title={item.tip}>
                 <Button type={'text'} size={'small'} disabled={true} icon={<QuestionCircleOutlined />} /></Tooltip> </> : title1;
             column["dataIndex"] = item.id;
+            if (item.colWidth) column["width"] = item.colWidth;
             s++;
             let itemType = SupportInputTypes.getControlType(item, null);
             if (s < 12 && item.sortable) {

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

@@ -522,6 +522,22 @@ export default class HcserviceV3 {
     );
   }
 
+  static async postLtmplData(
+    serverKey: string,
+    sourceId: string,
+    formDataObj,
+    message
+  ) {
+    let url = `/v3/ltmpl/data`;
+    return await this.postCommonDtmplData(
+      serverKey,
+      sourceId,
+      formDataObj,
+      message,
+      url
+    );
+  }
+
   static async postMstrucDtmplData(
     serverKey: string,
     sourceId: string,
@@ -700,6 +716,19 @@ export default class HcserviceV3 {
     return res;
   }
 
+  static async requestCharMultitData(
+    serverKey: string,
+    dataSourceConfigs: string
+  ) {
+    let res = await Super.super({
+      url: `/v3/chart/multi-data`,
+      serverKey,
+      method: "GET",
+      query: { dataSourceConfigs },
+    });
+    return res;
+  }
+
 
   static async postActions(
     serverKey: string,

package/src/aldehyde/tmpl/interface.tsx

@@ -269,7 +269,7 @@ export type BuiltInButtonName = "blockAuthMenuTree";
 
 export type ButtonName =
   | "rowAdd"
-  | "rowEdit"
+  | "rowEdit" | "multiRowEdit"
   | "batchDelete"
   | "singleDelete"
   | "selectAdd"
@@ -415,6 +415,7 @@ export interface FieldConfig extends FieldBase {
   itemBreakLine?: boolean;
   configChanged?: boolean;
   rowEditType?: "editable" | "readonly" | "editonly" | "addonly";
+  colWidth?: number;
 }
 
 export interface ActionRenderProps {
@@ -432,6 +433,10 @@ export interface ActionRenderProps {
   blockMenuTreeDrawerOpen?: (record) => any,
   doRowAction?: (actionId: string, codes: string[], params: object) => any,
   doDeleteByCode?: (code: string) => any, sortColumns: any,
+  editRowEdit?: (code: string) => void, // 行内编辑
+  cancelRowEdit?: (code: string) => void,
+  saveRowData?: (data: DtmplData) => void,
+  editings?: string[],
 }
 
 export interface FileRule {

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

@@ -1,6 +1,6 @@
 // import moment, {DurationInputArg2} from "moment";
 
-import dayjs, {ManipulateType} from "dayjs";
+import dayjs, { ManipulateType } from "dayjs";
 import {
     DtmplConfig,
     DtmplData,
@@ -8,9 +8,9 @@ import {
     FieldConfig,
     LtmplConfig, SelectConfig,
 } from "./interface";
-import {FormInstance} from "antd";
+import { FormInstance } from "antd";
 import ActionUtils from "../controls/action/utils";
-import {CriteriaFormProps} from "../form/criteria-form";
+import { CriteriaFormProps } from "../form/criteria-form";
 import ControlTypeSupportor from "./control-type-supportor";
 
 function TmplConfigAnalysis() {
@@ -451,8 +451,8 @@ TmplConfigAnalysis.getRules = (fieldConfig: FieldConfig, translate) => {
                     return value;
                 }
             }
-        }else {
-            transform = (value)=>{
+        } else {
+            transform = (value) => {
                 return value
             }
         }
@@ -463,7 +463,7 @@ TmplConfigAnalysis.getRules = (fieldConfig: FieldConfig, translate) => {
         });
     }
 
-    let rulePattern = fieldConfig.rules[0]?.pattern;
+    let rulePattern = fieldConfig.rules?.[0]?.pattern;
     if (rulePattern) {
         rules.push({
             pattern: rulePattern,

package/src/aldehyde/tree/index.css

@@ -1,21 +1,23 @@
 .tree-container {
-    box-shadow:1px 0 0px 1px rgba(0,0,0,0.3) ;
+    box-shadow: 1px 0 0px 1px rgba(0, 0, 0, 0.3);
 }
 
-.tree-node{
-    box-shadow:0.4px 0px 0px 0.4px rgba(0,0,0,0.2) ;
+.tree-node {
+    box-shadow: 0.4px 0px 0px 0.4px rgba(0, 0, 0, 0.2);
     margin-bottom: 2px;
 }
 
 
 
 .tree-card-title-body {
-     padding:2px;
-     min-width: 280px;
- }
-.ant-tree-node-selected{
-    background-color: white !important;
+    padding: 2px;
+    min-width: 280px;
 }
-.ant-avatar-string{
+
+.ant-tree-node-selected {
+    background-color: transparent !important;
+}
+
+.ant-avatar-string {
     transform: scale(0.8) translateX(-50%) !important;
 }

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

@@ -516,7 +516,7 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
             }}
             size={"small"}
           >
-            <EditOutlined style={{ color: "blue" }} />
+            <EditOutlined style={{ color: "var(--ant-color-primary)" }} />
             {translate("${编辑}")}
           </Button>
         );