aldehyde 0.2.229 → 0.2.232

package/src/aldehyde/tmpl/control-type-supportor.tsx

@@ -57,7 +57,8 @@ SupportInputTypes.add('float');
 SupportInputTypes.add('double');
 SupportInputTypes.add('int');
 SupportInputTypes.add('relselect');
-SupportInputTypes.add('relselectvalue');
+SupportInputTypes.add('relselectvalue');//弃用
+SupportInputTypes.add('entity-select-value');
 SupportInputTypes.add('refselect');
 SupportInputTypes.add('field-history');
 
@@ -73,7 +74,13 @@ SupportInputTypes.add('color');
 SupportInputTypes.add('url');
 SupportInputTypes.add('hidden');
 SupportInputTypes.add('lab-tree-select');
+SupportInputTypes.add('tree-entity-select-value');
+SupportInputTypes.add('tree-entity-select');
+SupportInputTypes.add('ltree-entity-select-value');
+SupportInputTypes.add('ltree-entity-select');
 SupportInputTypes.add('field-history');
+
+
 function ControlTypeSupportor(){
 
 }

package/src/aldehyde/tmpl/interface.tsx

@@ -54,7 +54,6 @@ export interface QueryTableProps extends ReportTableProps{
     aggFunc: "sum" | "avg" | "groupIsum" | "groupIavg";
   }[];
   subtotalXColumn?: { id: string }[];
-  subtotalYColumn?: { id: string }[];
   groupIColumns?: { id: string; title: string; sourceId: string }[]; // 组间合计key
   doSearch?: (params: object) => void;
   sortColumnData?: string[];
@@ -481,7 +480,6 @@ export interface LtmplConfig extends SelectConfig {
     originalId:string;
   }[];
   subtotalXColumn?: { id: string }[];
-  subtotalYColumn?: { id: string }[];
   updrillButtonConfigs?: UpdrillButtonConfig[];
   groupIColumns?: { id: string; title: string; sourceId: string; originalId:string;}[];
 }

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

@@ -10,7 +10,6 @@ import {
   Space,
   Tooltip,
   Tree,
-  Typography,
 } from "antd";
 import {
   AlignLeftOutlined,
@@ -20,18 +19,20 @@ import {
   PlusSquareOutlined,
   ReloadOutlined,
 } from "@ant-design/icons";
-// import './index.css';
+
 import Scrollbars from "react-custom-scrollbars";
 import { HydrocarbonService } from "../index";
 import TreeUtils, { TtmplNodeConfig } from "./tree-utils";
 import { TreeDataNode } from "./tree-utils";
 import { LocaleContext } from "../locale/LocaleProvider";
 
-const { Text, Title } = Typography;
-
 interface TmplTreeProps {
+  showFilterInput?:boolean;
   ttmplNodeConfig: TtmplNodeConfig;
-  currentId?: string;
+  checkable:boolean,
+  onChangeCheck?:(checkCodes:string[])=>any,
+  currentId?: string,
+  checkedCodes?:string[],
   doEditSub?: (
     title: string,
     ratmplId: string,
@@ -65,6 +66,7 @@ interface TmplTreeState {
   currentNodeData?: TreeDataNode;
   rootAddable?: boolean;
   searchValue?: string;
+  checkedKeys?:string[];
 }
 
 class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
@@ -78,17 +80,21 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
     currentNodeData: undefined,
     rootAddable: false,
     searchValue: undefined,
+    checkedKeys:undefined,
   };
 
   static defaultProps = {
     draggable: false,
     readOnly: false,
+    checkable:true,
+    showFilterInput:true,
   };
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
 
   doDelete = async (node: TreeDataNode) => {
     let { ttmplNodeConfig } = this.props;
+    const {data,expandedKeys}=this.state;
     let sourceId;
     if (node.isLeaf) {
       sourceId = ttmplNodeConfig.leafRatmplId;
@@ -99,9 +105,11 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
       node.code,
     ]);
     if (node.parent) {
-      await this.reloadData(node.parent.code);
+    let v=  await TreeUtils.reloadData(node.parent.code,ttmplNodeConfig,data,expandedKeys);
+    this.setState({...v})
     }else{
-      await this.reloadData(null);
+     let v= await TreeUtils.reloadData(null,ttmplNodeConfig,data,expandedKeys);
+      this.setState({...v})
     }
   };
 
@@ -131,21 +139,21 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
       loading: true,
     });
     //let loadedKeys = [];
-    let data = await this.loadRootNodeData();
+    let data = await TreeUtils.loadRootNodeData(ttmplNodeConfig);
     this.setState({
       searchValue: null,
       data,
       rootAddable:
-        ttmplNodeConfig.rootLTmplConfig.buttons.indexOf("dtmplAdd") > 0,
+        ttmplNodeConfig.rootLTmplConfig?.buttons?.indexOf("dtmplAdd") > 0,
       loading: false,
     });
   }
 
-  loadRootNodeData = async () => {
-    const { ttmplNodeConfig } = this.props;
-    let data = await TreeUtils.loadRootNodeData(ttmplNodeConfig);
-    return data;
-  };
+  // loadRootNodeData = async () => {
+  //   const { ttmplNodeConfig } = this.props;
+  //   let data = await TreeUtils.loadRootNodeData(ttmplNodeConfig);
+  //   return data;
+  // };
 
   async componentWillUnmount() {}
 
@@ -216,10 +224,10 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
     } else {
       //说明是root
       //判断是否允许编辑
-      if (ttmplNodeConfig.rootLTmplConfig.buttons.indexOf("dtmplEdit") > 0) {
+      if (ttmplNodeConfig.rootLTmplConfig?.buttons.indexOf("dtmplEdit") > 0) {
         doEditRoot(ttmplNodeConfig.branchTitle, dataNode.code);
       } else if (
-        ttmplNodeConfig.rootLTmplConfig.buttons.indexOf("detail") > 0
+        ttmplNodeConfig.rootLTmplConfig?.buttons.indexOf("detail") > 0
       ) {
         doViewRoot(ttmplNodeConfig.branchTitle, dataNode.code);
       }
@@ -236,69 +244,14 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
     }
   };
 
-  reloadData = async (branchCode: string) => {
-    const { ttmplNodeConfig } = this.props;
-    const { data, expandedKeys } = this.state;
-    let newData;
-    if (branchCode == null) {
-      //加载根
-      newData = await this.loadRootNodeData();
-      this.mergeRootData(data, newData);
-      this.setState({
-        data: newData,
-      });
-    } else {
-      //重新加载 await
-      //先找到树节点
-      let rdatas = [];
-      this.searchNode(data, branchCode, rdatas);
-      await TreeUtils.pushSameCodeNodeData(rdatas, ttmplNodeConfig);
-      let newExpandeds = [];
-      for (let d of rdatas) {
-        newExpandeds.push(d.key);
-      }
-      this.setState({
-        expandedKeys: [...expandedKeys, ...newExpandeds],
-        data: [...data],
-      });
-    }
-  };
 
-  mergeRootData = (data, newData) => {
-    if (newData && data) {
-      for (let nd of newData) {
-        for (let d of data) {
-          if (nd.code == d.code) {
-            nd.children = d.children;
-            break;
-          }
-        }
-      }
-    }
-  };
 
-  searchNode = (
-    data: TreeDataNode[],
-    brachCode: string,
-    result: TreeDataNode[]
-  ) => {
-    if (!data) {
-      return;
-    }
-    for (let d of data) {
-      if (d.code == brachCode) {
-        result.push(d);
-        break;
-      } else if (d.children.length > 0) {
-        //继续寻找
-        this.searchNode(d.children, brachCode, result);
-      }
-    }
-  };
+
 
   getDeleteButton = (sourceId, node: TreeDataNode) => {
-    const { doDelete } = this.props;
+    const { doDelete ,ttmplNodeConfig} = this.props;
     const { translate } = this.context;
+
     return (
       <div
         onClick={(e) => {
@@ -309,11 +262,17 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
           placement="topLeft"
           title={translate("${确定要删除吗}?")}
           onConfirm={ async () =>  {
+            const {data,expandedKeys}=this.state;
             await doDelete(sourceId, node.code);
             if (node.parent) {
-              await this.reloadData(node.parent.code);
+             let v = await TreeUtils.reloadData(node.parent.code,ttmplNodeConfig,data,expandedKeys);
+             this.setState({
+               ...v
+             })
             }else{
-              await this.reloadData(null);
+              const {data,expandedKeys}=this.state;
+              let v = await TreeUtils.reloadData(null,ttmplNodeConfig,data,expandedKeys);
+              this.setState({...v})
             }
           }}
           okText={translate("${确定}")}
@@ -350,6 +309,23 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
       </Button>
     );
   };
+  onCheck=(checkedKeys,e)=>{
+    console.log(checkedKeys);
+    console.log(e);
+    if(this.props.onChangeCheck){
+      let checks:string[]=[];
+      if(e.checkedNodes){
+        e.checkedNodes.forEach((c)=>{
+          checks.push(c.code+"@R@"+c.title);
+        })
+      }
+      this.props.onChangeCheck(checks);
+
+    }
+    this.setState({
+      checkedKeys
+    })
+  }
 
   packageTitle = (dataNode) => {
     const {
@@ -500,7 +476,7 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
     } else {
       //说明是root
       //判断是否允许编辑
-      if (ttmplNodeConfig.rootLTmplConfig.buttons.indexOf("dtmplEdit") > 0) {
+      if (ttmplNodeConfig.rootLTmplConfig?.buttons.indexOf("dtmplEdit") > 0) {
         buttons.push(
           <Button
             onClick={(e) => {
@@ -514,7 +490,7 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
           </Button>
         );
       }
-      if (ttmplNodeConfig.rootLTmplConfig.buttons.indexOf("detail") > 0) {
+      if (ttmplNodeConfig.rootLTmplConfig?.buttons.indexOf("detail") > 0) {
         buttons.push(
           <Button
             onClick={(e) => {
@@ -530,7 +506,7 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
       }
       //debugger
       if (ttmplNodeConfig.branchLTmplConfig) {
-        if (ttmplNodeConfig.rootLTmplConfig.buttons.indexOf("dtmplAdd") > 0) {
+        if (ttmplNodeConfig.rootLTmplConfig?.buttons.indexOf("dtmplAdd") > 0) {
           buttons.push(
             this.getAddButton(
               ttmplNodeConfig.branchTitle,
@@ -552,7 +528,7 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
         );
       }
 
-      if (ttmplNodeConfig.rootLTmplConfig.buttons.indexOf("singleDelete") > 0) {
+      if (ttmplNodeConfig.rootLTmplConfig?.buttons.indexOf("singleDelete") > 0) {
         buttons.push(
           this.getDeleteButton(ttmplNodeConfig.branchRatmplId?ttmplNodeConfig.branchRatmplId:ttmplNodeConfig.rootGtmplId, dataNode)
         );
@@ -579,7 +555,7 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
   };
 
   render() {
-    const { doEditRoot, ttmplNodeConfig } = this.props;
+    const { doEditRoot, ttmplNodeConfig,checkable,checkedCodes,showFilterInput } = this.props;
     const {
       data,
       loading,
@@ -592,14 +568,17 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
     if (searchValue) {
       treeData = TreeUtils.filterTree(data, searchValue);
     }
+
+
+
     return (
       <>
         <Row>
           <Col span={24}>
             <Card
               style={{ marginBottom: 0, width: "100%" }}
-              bordered={false}
-              bodyStyle={{ padding: "4px 2px 4px 8px" }}
+              variant={"borderless"}
+              styles={ { body:{ padding: "0px 2px 0px 8px"} }}
             >
               <Row align="middle">
                 <Col span={8}>
@@ -612,6 +591,7 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
                     </Button>
                   ) : null}
                 </Col>
+                {showFilterInput?
                 <Col span={16}>
                   <Input.Search
                     value={searchValue}
@@ -627,7 +607,7 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
                     }}
                     enterButton={<ReloadOutlined />}
                   />
-                </Col>
+                </Col>:null}
               </Row>
             </Card>
           </Col>
@@ -635,11 +615,11 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
         <Row>
           <Col span={24}>
             <Card
-              bodyStyle={{
-                padding: "4px 4px 4px 16px",
+              styles={{body:{
+                padding: "4px 0px 4px 0px",
                 height: "80vh",
-                minWidth: "292px",
-              }}
+                minWidth: "194px",
+              }}}
               loading={loading}
             >
               {treeData.length == 0 ? (
@@ -651,9 +631,12 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
                   autoHideTimeout={1000}
                 >
                   <Tree
+                      checkStrictly
                     blockNode
                     showLine={ttmplNodeConfig.showLine}
-                    checkable={false}
+                    // checkable={checkable}
+                    //   onCheck={this.onCheck}
+                    //   checkedKeys={checkKeys}
                     expandedKeys={expandedKeys}
                     onExpand={this.onExpand}
                     titleRender={(nodeData) => {

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

@@ -13,7 +13,7 @@ interface TreeNodeState {
 }
 
 const treeCardTitleBody0 = {
-    padding: '4px 4px 4px 4px',
+    padding: '4px 4px 4px 0px',
     maxWidth: '300px',
 }
 

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

@@ -53,6 +53,70 @@ export default class TreeUtils {
         return ttmplNodeConfig;
     }
 
+
+   static mergeRootData = (data, newData) => {
+        if (newData && data) {
+            for (let nd of newData) {
+                for (let d of data) {
+                    if (nd.code == d.code) {
+                        nd.children = d.children;
+                        break;
+                    }
+                }
+            }
+        }
+    };
+
+    static reloadData = async (branchCode: string,ttmplNodeConfig,data:TreeDataNode[],expandedKeys:string[]) => {
+        let newData;
+        if (branchCode == null) {
+            //加载根
+            newData = await this.loadRootNodeData(ttmplNodeConfig);
+            this.mergeRootData(data, newData);
+            return {
+                data: newData,
+            };
+        } else {
+            //重新加载 await
+            //先找到树节点
+            let rdatas = [];
+            this.searchNode(data, branchCode, rdatas);
+            await TreeUtils.pushSameCodeNodeData(rdatas, ttmplNodeConfig);
+            let newExpandeds = [];
+            for (let d of rdatas) {
+                newExpandeds.push(d.key);
+            }
+            if(expandedKeys){
+                newExpandeds.push(expandedKeys)
+            };
+
+            return {
+               expandedKeys: [...newExpandeds],
+                data: [...data],
+            };
+        }
+    };
+
+    static searchNode = (
+        data: TreeDataNode[],
+        brachCode: string,
+        result: TreeDataNode[]
+    ) => {
+        if (!data) {
+            return;
+        }
+        for (let d of data) {
+            if (d.code == brachCode) {
+                result.push(d);
+                break;
+            } else if (d.children.length > 0) {
+                //继续寻找
+                this.searchNode(d.children, brachCode, result);
+            }
+        }
+    };
+
+
     static loadRootNodeData = async (config: TtmplNodeConfig) => {
         let res = await HydrocarbonService.requestTtmplRootData(null, config.id, {});
         let data = [];
@@ -120,10 +184,12 @@ export default class TreeUtils {
         let d = {
             code: item.code,
             key: keyPrex + parent?.code+item.code,
+            value:keyPrex + parent?.code+item.code,
             name,
             title: <><span>{name?name:item.code}</span></>,
             children: [],
             isLeaf,
+            selectable:isLeaf,
             parent,
         };
 
@@ -161,6 +227,78 @@ export default class TreeUtils {
         return newNodes;
     }
 
+    static getNodesOfArrayNode=(nodes:any[], nodeCodes: string[])=>{
+        let newNodes: TreeDataNode[] = [];
+        if(!nodeCodes || nodeCodes.length==0){
+            return newNodes;
+        }
+        //let tagNodes: TreeDataNode[] = [];
+        nodes.forEach((no) => {
+            let n = {...no};
+            let  v=no.code;
+            let vn=no.name;
+            if (nodeCodes.includes(v) || nodeCodes.includes(vn)) {
+                newNodes.push(n);
+            }
+            if (n.children && n.children.length > 0) {
+                let retNodes: TreeDataNode[] = this.getNodes(n, nodeCodes);
+                if (retNodes && retNodes.length > 0) {
+                    newNodes.push(...retNodes);
+                } else {
+                    // 没有子节点情况
+                    n.children = [];
+                    // 标记,循环结束后删除
+                    //tagNodes.push(n);
+                }
+            }
+        })
+        return newNodes;
+}
+
+    static getNodes = (node, nodeCodes: string[]) => {
+        let children:any[] = [...node.children];
+        return this.getNodesOfArrayNode(children,nodeCodes);
+    }
+
+    static getNodesOfKey = (node, nodeCodes: string[]) => {
+        let children:any[] = [...node.children];
+        let newNodes: TreeDataNode[] = [];
+        if(!nodeCodes || nodeCodes.length==0){
+            return newNodes;
+        }
+        //let tagNodes: TreeDataNode[] = [];
+        children.forEach((no) => {
+            let n = {...no};
+            let  v=no.key;
+            if (nodeCodes.includes(v)) {
+                newNodes.push(n);
+            }
+            if (n.children && n.children.length > 0) {
+                let retNodes: TreeDataNode[] = this.getNodesOfKey(n, nodeCodes);
+                if (retNodes && retNodes.length > 0) {
+                    newNodes.push(...retNodes);
+                } else {
+                    // 没有子节点情况
+                    n.children = [];
+                    // 标记,循环结束后删除
+                    //tagNodes.push(n);
+                }
+            }
+        })
+        return newNodes;
+    }
+
+    static getNodeKeys(node, nodeCodes: string[]){
+       let newNodes: TreeDataNode[] =  this.getNodes(node,nodeCodes);
+       let keys:string[]=[];
+        newNodes.forEach(n=>{
+            // @ts-ignore
+            keys.push(n.key);
+        })
+        return keys;
+    }
+
+
     static filterTree = (nodes: any[], searchValue: string) => {
         let root = {code: "", config: undefined, key: undefined, children: [...nodes]};
         this.filterNode(root, searchValue);