aldehyde 0.2.319 → 0.2.321

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

@@ -1,60 +1,60 @@
 import React from "react";
-import {DataNode} from "antd/es/tree";
-import {HydrocarbonService} from "../index";
-import {DtmplData, LtmplConfig, LtmplConfigRes, TtmplConfig} from "../tmpl/interface";
+import { DataNode } from "antd/es/tree";
+import { HydrocarbonService } from "../index";
+import { DtmplData, LtmplConfig, LtmplConfigRes, TtmplConfig } from "../tmpl/interface";
 import HCDataSource from "../tmpl/hc-data-source";
 
-export interface TtmplNodeConfig extends TtmplConfig{
-    leafTitleId?:string,
-    branchTitleId?:string,
-    rootTitleId?:string,
-    rootLTmplConfig?:LtmplConfig,
-    branchLTmplConfig?:LtmplConfig,
-    leafLTmplConfig?:LtmplConfig,
+export interface TtmplNodeConfig extends TtmplConfig {
+    leafTitleId?: string,
+    branchTitleId?: string,
+    rootTitleId?: string,
+    rootLTmplConfig?: LtmplConfig,
+    branchLTmplConfig?: LtmplConfig,
+    leafLTmplConfig?: LtmplConfig,
 
 }
 
-export interface TreeDataNode extends DataNode{
-    parent:TreeDataNode,
-    code:string,
-    name:string,
-    avatar:any,
-    level:number,
-    children:any,
+export interface TreeDataNode extends DataNode {
+    parent: TreeDataNode,
+    code: string,
+    name: string,
+    avatar: any,
+    level: number,
+    children: any,
 }
 
 export default class TreeUtils {
 
     static initTtmplNodeConfig = async (config: TtmplConfig) => {
 
-        if(!config){
+        if (!config) {
             return null;
         }
-        let ttmplNodeConfig:TtmplNodeConfig={...config}
-        if(ttmplNodeConfig.rootGtmplId){
-            let res:LtmplConfigRes =await HCDataSource.requestLtmplConfig(null,ttmplNodeConfig.rootGtmplId);
-            let rootLTmplConfig: LtmplConfig=res.ltmplConfig;
-            ttmplNodeConfig.rootLTmplConfig=rootLTmplConfig;
-            ttmplNodeConfig.rootTitleId=rootLTmplConfig.primaryColumn.id;
+        let ttmplNodeConfig: TtmplNodeConfig = { ...config }
+        if (ttmplNodeConfig.rootGtmplId) {
+            let res: LtmplConfigRes = await HCDataSource.requestLtmplConfig(null, ttmplNodeConfig.rootGtmplId);
+            let rootLTmplConfig: LtmplConfig = res.ltmplConfig;
+            ttmplNodeConfig.rootLTmplConfig = rootLTmplConfig;
+            ttmplNodeConfig.rootTitleId = rootLTmplConfig.primaryColumn.id;
         }
-        if(ttmplNodeConfig.branchRatmplId){
-            let res:LtmplConfigRes =await HCDataSource.requestLtmplConfig(null,ttmplNodeConfig.branchRatmplId);
-            let branchLTmplConfig: LtmplConfig=res.ltmplConfig;
-            ttmplNodeConfig.branchLTmplConfig=branchLTmplConfig;
-            ttmplNodeConfig.branchTitleId=branchLTmplConfig.primaryColumn.id;
+        if (ttmplNodeConfig.branchRatmplId) {
+            let res: LtmplConfigRes = await HCDataSource.requestLtmplConfig(null, ttmplNodeConfig.branchRatmplId);
+            let branchLTmplConfig: LtmplConfig = res.ltmplConfig;
+            ttmplNodeConfig.branchLTmplConfig = branchLTmplConfig;
+            ttmplNodeConfig.branchTitleId = branchLTmplConfig.primaryColumn.id;
         }
-        if(ttmplNodeConfig.leafRatmplId){
-            let res:LtmplConfigRes =await HCDataSource.requestLtmplConfig(null,ttmplNodeConfig.leafRatmplId);
-            let leafLTmplConfig: LtmplConfig =res.ltmplConfig;
-            ttmplNodeConfig.leafLTmplConfig=leafLTmplConfig;
-            ttmplNodeConfig.leafTitleId=leafLTmplConfig.primaryColumn.id;
+        if (ttmplNodeConfig.leafRatmplId) {
+            let res: LtmplConfigRes = await HCDataSource.requestLtmplConfig(null, ttmplNodeConfig.leafRatmplId);
+            let leafLTmplConfig: LtmplConfig = res.ltmplConfig;
+            ttmplNodeConfig.leafLTmplConfig = leafLTmplConfig;
+            ttmplNodeConfig.leafTitleId = leafLTmplConfig.primaryColumn.id;
         }
 
         return ttmplNodeConfig;
     }
 
 
-   static mergeRootData = (data, newData) => {
+    static mergeRootData = (data, newData) => {
         if (newData && data) {
             for (let nd of newData) {
                 for (let d of data) {
@@ -67,7 +67,7 @@ export default class TreeUtils {
         }
     };
 
-    static reloadData = async (branchCode: string,ttmplNodeConfig,data:TreeDataNode[],expandedKeys:string[]) => {
+    static reloadData = async (branchCode: string, ttmplNodeConfig, data: TreeDataNode[], expandedKeys: string[]) => {
         let newData;
         if (branchCode == null) {
             //加载根
@@ -86,12 +86,12 @@ export default class TreeUtils {
             for (let d of rdatas) {
                 newExpandeds.push(d.key);
             }
-            if(expandedKeys){
+            if (expandedKeys) {
                 newExpandeds.push(...expandedKeys)
             };
 
             return {
-               expandedKeys: [...newExpandeds],
+                expandedKeys: [...newExpandeds],
                 data: [...data],
             };
         }
@@ -123,15 +123,15 @@ export default class TreeUtils {
         //组织data
         if (res?.entities) {
             res.entities.forEach((item, index) => {
-                data.push(this.toTreeNodeData(item,config.rootTitleId,null,false,"R"));
+                data.push(this.toTreeNodeData(item, config.rootTitleId, null, false, "R", config));
             })
         }
         return data;
     }
 
-    static pushNodeData =  (parentNode: TreeDataNode, config: TtmplNodeConfig,brancEntities:any[],leafEntities:any[]) => {
+    static pushNodeData = (parentNode: TreeDataNode, config: TtmplNodeConfig, brancEntities: any[], leafEntities: any[]) => {
         //先查询branch
-        parentNode.children.splice(0,parentNode.children.length);
+        parentNode.children.splice(0, parentNode.children.length);
         if (brancEntities) {
             brancEntities.forEach((item, index) => {
                 parentNode.children.push(this.toBanchTreeNodeData(item, config, parentNode));
@@ -151,45 +151,46 @@ export default class TreeUtils {
         if (parentNodes.length > 0) {
             //先查询branch
             let brancEntities: any[];
-            if(config.branchRatmplId){
-                let res = await HydrocarbonService.requestLtmplQueryTop(null, config.branchRatmplId, {mainCode: parentNodes[0].code});
-                 brancEntities = res.entities;
+            if (config.branchRatmplId) {
+                let res = await HydrocarbonService.requestLtmplQueryTop(null, config.branchRatmplId, { mainCode: parentNodes[0].code });
+                brancEntities = res.entities;
             }
             let leafEntities: any[];
-            if(config.leafRatmplId){
-                let res1 = await HydrocarbonService.requestLtmplQueryTop(null, config.leafRatmplId, {mainCode: parentNodes[0].code});
+            if (config.leafRatmplId) {
+                let res1 = await HydrocarbonService.requestLtmplQueryTop(null, config.leafRatmplId, { mainCode: parentNodes[0].code });
                 leafEntities = res1.entities;
             }
 
-            for(let parentNode of parentNodes){
-                this.pushNodeData(parentNode, config,brancEntities,leafEntities);
+            for (let parentNode of parentNodes) {
+                this.pushNodeData(parentNode, config, brancEntities, leafEntities);
             }
         }
     }
 
 
-    static toLeafTreeNodeData = (item: DtmplData,config:TtmplNodeConfig, parent: TreeDataNode ) => {
-        let d=  this.toTreeNodeData(item,config.leafTitleId,parent,true,"B");
+    static toLeafTreeNodeData = (item: DtmplData, config: TtmplNodeConfig, parent: TreeDataNode) => {
+        let d = this.toTreeNodeData(item, config.leafTitleId, parent, true, "B");
         return d;
     }
 
-    static toBanchTreeNodeData = (item: DtmplData,config:TtmplNodeConfig, parent: TreeDataNode) => {
-      let d=  this.toTreeNodeData(item,config.branchTitleId,parent,false,"L");
+    static toBanchTreeNodeData = (item: DtmplData, config: TtmplNodeConfig, parent: TreeDataNode) => {
+        let d = this.toTreeNodeData(item, config.branchTitleId, parent, false, "L", config);
         return d;
     }
 
-    static toTreeNodeData = (item: DtmplData,titleId:string, parent: TreeDataNode,isLeaf:boolean,keyPrex
-        :string) => {
+    static toTreeNodeData = (item: DtmplData, titleId: string, parent: TreeDataNode, isLeaf: boolean, keyPrex
+        : string, config?: TtmplNodeConfig) => {
         let name = item.fieldMap[titleId];
+        // leafRatmplId为null,所有节点都可以选择；leafRatmplId有值，只能选择叶子节点
         let d = {
             code: item.code,
-            key: keyPrex + parent?.code+item.code,
-            value:keyPrex + parent?.code+item.code,
+            key: keyPrex + parent?.code + item.code,
+            value: keyPrex + parent?.code + item.code,
             name,
-            title: <><span>{name?name:item.code}</span></>,
+            title: <><span>{name ? name : item.code}</span></>,
             children: [],
             isLeaf,
-            selectable:isLeaf,
+            selectable: isLeaf || !config.leafRatmplId,
             parent,
         };
 
@@ -202,8 +203,8 @@ export default class TreeUtils {
         let tagNodes: TreeDataNode[] = [];
 
         children.forEach((no) => {
-            let n = {...no};
-            let  v=n.searchValue?n.searchValue:n.name;
+            let n = { ...no };
+            let v = n.searchValue ? n.searchValue : n.name;
             if (v.indexOf(searchValue) >= 0) {
                 newNodes.push(n);
             }
@@ -212,7 +213,7 @@ export default class TreeUtils {
                 if (retNodes.length > 0) {
                     n.children = retNodes;
                     //补充父没有的
-                    if ((n.searchValue?n.searchValue:n.name).indexOf(searchValue) < 0) {
+                    if ((n.searchValue ? n.searchValue : n.name).indexOf(searchValue) < 0) {
                         newNodes.push(n);
                     }
                 } else {
@@ -227,17 +228,17 @@ export default class TreeUtils {
         return newNodes;
     }
 
-    static getNodesOfArrayNode=(nodes:any[], nodeCodes: string[])=>{
+    static getNodesOfArrayNode = (nodes: any[], nodeCodes: string[]) => {
         let newNodes: TreeDataNode[] = [];
-        if(!nodeCodes || nodeCodes.length==0 || !nodes){
+        if (!nodeCodes || nodeCodes.length == 0 || !nodes) {
             return newNodes;
         }
 
         //let tagNodes: TreeDataNode[] = [];
         nodes.forEach((no) => {
-            let n = {...no};
-            let  v=no.code;
-            let vn=no.name;
+            let n = { ...no };
+            let v = no.code;
+            let vn = no.name;
             if (nodeCodes.includes(v) || nodeCodes.includes(vn)) {
                 newNodes.push(n);
             }
@@ -254,26 +255,26 @@ export default class TreeUtils {
             }
         })
         return newNodes;
-}
+    }
 
     static getNodes = (node, nodeCodes: string[]) => {
-        let children:any[]=undefined;
-        if(node.children) {
+        let children: any[] = undefined;
+        if (node.children) {
             children = [...node.children];
         }
-        return this.getNodesOfArrayNode(children,nodeCodes);
+        return this.getNodesOfArrayNode(children, nodeCodes);
     }
 
     static getNodesOfKey = (node, nodeCodes: string[]) => {
-        let children:any[] = [...node.children];
+        let children: any[] = [...node.children];
         let newNodes: TreeDataNode[] = [];
-        if(!nodeCodes || nodeCodes.length==0){
+        if (!nodeCodes || nodeCodes.length == 0) {
             return newNodes;
         }
         //let tagNodes: TreeDataNode[] = [];
         children.forEach((no) => {
-            let n = {...no};
-            let  v=no.key;
+            let n = { ...no };
+            let v = no.key;
             if (nodeCodes.includes(v)) {
                 newNodes.push(n);
             }
@@ -292,15 +293,15 @@ export default class TreeUtils {
         return newNodes;
     }
 
-    static getNodeKeys(node, nodeCodes: string[]){
-        let newNodes: TreeDataNode[] ;
-        if(Array.isArray(node)){
-            newNodes=this.getNodesOfArrayNode(node,nodeCodes);
-        }else{
-            newNodes=this.getNodes(node,nodeCodes);
+    static getNodeKeys(node, nodeCodes: string[]) {
+        let newNodes: TreeDataNode[];
+        if (Array.isArray(node)) {
+            newNodes = this.getNodesOfArrayNode(node, nodeCodes);
+        } else {
+            newNodes = this.getNodes(node, nodeCodes);
         }
-       let keys:string[]=[];
-        newNodes.forEach(n=>{
+        let keys: string[] = [];
+        newNodes.forEach(n => {
             // @ts-ignore
             keys.push(n.key);
         })
@@ -308,7 +309,7 @@ export default class TreeUtils {
     }
 
     static filterTree = (nodes: any[], searchValue: string) => {
-        let root = {code: "", config: undefined, key: undefined, children: [...nodes]};
+        let root = { code: "", config: undefined, key: undefined, children: [...nodes] };
         this.filterNode(root, searchValue);
         return root.children;
     }

package/src/aldehyde/units/index.tsx

@@ -528,15 +528,31 @@ export default {
       window.location.hash = version === "v2" ? "#/login2/" : "#/login/";
     }
   },
-  downloadFile(url, fileName) {
+  async downloadFile(url, fileName) {
     try {
-      let a = document.createElement("a");
-      a.download = fileName;
-      a.href = url;
-      //a.target= "_blank";
-      document.body.appendChild(a);
-      a.click();
-      document.body.removeChild(a);
+      // 检查是否跨域
+      if (new URL(url).origin !== window.location.origin) {
+        // 跨域资源使用Fetch API方式
+        const response = await fetch(url);
+        const blob = await response.blob();
+        const blobUrl = window.URL.createObjectURL(blob);
+        let a = document.createElement('a');
+        a.href = blobUrl;
+        a.download = fileName;
+        document.body.appendChild(a);
+        a.click();
+        // 清理
+        window.URL.revokeObjectURL(blobUrl);
+        document.body.removeChild(a);
+      } else {
+        let a = document.createElement("a");
+        a.download = fileName;
+        a.href = url;
+        //a.target= "_blank";
+        document.body.appendChild(a);
+        a.click();
+        document.body.removeChild(a);
+      }
     } catch (e) {
       console.log(e);
     }
@@ -766,7 +782,7 @@ 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("$$user.code")) {
+    } else if (value && value.startsWith && value.startsWith("$$user.code")) {
       let userInfo: UserInfo = this.getCurrentUserInfo();
       if (userInfo) {
         return userInfo.id + "@R@";