aldehyde 0.2.234 → 0.2.236

package/src/aldehyde/table/stat/restat.tsx

@@ -4,7 +4,6 @@ import {
   Card,
   Form as AntdForm,
   FormInstance,
-  Popconfirm,
   Popover,
   Space,
   Tooltip,
@@ -16,7 +15,7 @@ import FormItemGroup from "../../form/form-Item-group";
 import HcserviceV3 from "../../tmpl/hcservice-v3";
 import { LocaleContext } from "../../locale/LocaleProvider";
 interface RestatProps {
-  onfinish: () => void;
+  onfinish: (value) => void;
   fields: FieldConfig[];
   value?: object;
   serverKey?: string;
@@ -46,7 +45,7 @@ class Restat extends React.PureComponent<RestatProps, RestatStat> {
     this.setState({
       loading: false,
     });
-    onfinish();
+    onfinish(val);
   };
 
   render() {

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

@@ -79,6 +79,7 @@ SupportInputTypes.add('tree-entity-select');
 SupportInputTypes.add('ltree-entity-select-value');
 SupportInputTypes.add('ltree-entity-select');
 SupportInputTypes.add('field-history');
+SupportInputTypes.add('relfile');
 
 
 function ControlTypeSupportor(){

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

@@ -57,21 +57,29 @@ export default class HcserviceV3 {
         filePath.contentType = this.getFileSuffixFrom(filePath.fileName);
       } else {
         let jsonValue = this.getJsonValue(value);
-        if (jsonValue) {
-
-          filePath.path = this.getFileUrl(serverKey, jsonValue.base?.path);
-          filePath.iconPath = jsonValue.icon?.path ? this.getFileUrl(serverKey, jsonValue.icon?.path) : null;
-          filePath.fileName = jsonValue.fileName ? jsonValue.fileName : this.getFileNameFrom(jsonValue.base?.path);
-          filePath.contentType = this.getFileSuffixFrom(filePath.fileName);
-          filePath.valid = jsonValue.valid;
-          filePath.baseType=jsonValue.base?.type;
-          filePath.basePath=jsonValue.base?.path;
-        }
+        filePath=this.toFilePathObject(jsonValue,serverKey);
       }
+    }else if(value.base){
+      filePath=this.toFilePathObject(value,serverKey);
     }
     return filePath;
   }
 
+  static toFilePathObject(jsonValue,serverKey:string){
+    let filePath:any={};
+    if (jsonValue) {
+      filePath.path = this.getFileUrl(serverKey, jsonValue.base?.path);
+      filePath.iconPath = jsonValue.icon?.path ? this.getFileUrl(serverKey, jsonValue.icon?.path) : null;
+      filePath.fileName = jsonValue.fileName ? jsonValue.fileName : this.getFileNameFrom(jsonValue.base?.path);
+      filePath.contentType = this.getFileSuffixFrom(filePath.fileName);
+      filePath.valid = jsonValue.valid;
+      filePath.baseType=jsonValue.base?.type;
+      filePath.basePath=jsonValue.base?.path;
+      return filePath;
+    }
+    return null;
+  }
+
   static async requestEnumWithPath(serverKey: string, mstrucIds, path) {
     if (mstrucIds.length > 0) {
       let res = await Super.super({
@@ -667,23 +675,16 @@ export default class HcserviceV3 {
     }
   }
 
-  static async requestQueryCount(serverKey: string, queryKey: string) {
+  static async requestQueryAggregates(serverKey: string, queryKey: string) {
     let res = await Super.super({
       url: `/v3/ltmpl/query/count`,
       serverKey,
       method: "GET",
       query: { queryKey },
     });
-    return res.count;
+    return res;
   }
 
-  // static async requestFile(path) {
-  //     let res = await Super.super({
-  //         url:  Units.joinPath("/v3/files/", path),
-  //         method: "GET"
-  //     });
-  //     return res;
-  // }
 
   static async postActions(
     serverKey: string,
@@ -863,13 +864,28 @@ export default class HcserviceV3 {
     Units.openFile(path, fileName, toolbar);
   }
 
-  static getFileUrl(serverKey: string, path) {
+  static getFileUrl(serverKey: string, path:string) {
     const hydrocarbonToken = Units.hydrocarbonToken(
       Units.programCode(serverKey)
     );
-    let url =
-      Units.joinPath(Units.api(serverKey), Units.joinPath("/v3/files", path)) +
+    let root;
+    let url;
+    //判断是否为全URL
+    if(path?.startsWith("http") || path?.startsWith("HTTP")){
+      root=path;
+      if(path.indexOf("?")>0){
+        url = root +
+            `&@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
+      }else{
+        url = root +
+            `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
+      }
+    }else{
+      root=Units.joinPath(Units.api(serverKey), Units.joinPath("/v3/files", path));
+      url = root +
       `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
+    }
+
     let encodeUri = encodeURI(url);
     return encodeUri;
   }

package/src/aldehyde/tmpl/interface.tsx

@@ -57,6 +57,19 @@ export interface QueryTableProps extends ReportTableProps{
   groupIColumns?: { id: string; title: string; sourceId: string }[]; // 组间合计key
   doSearch?: (params: object) => void;
   sortColumnData?: string[];
+  queryTotal?:()=> any; //暂时无用
+}
+
+export interface AggregateVO {
+  queryKey?: string;
+  aggregates?: AggregateValue[];
+  count?: number;
+}
+
+export interface AggregateValue {
+  fieldTitle?: string;
+  fieldId?: string;
+  value?: number;
 }
 
 
@@ -304,6 +317,8 @@ export interface DtmplConfig extends TmplBase {
   editAction?: ActionConfig;
   actions?: ActionConfig[];
   viewActions?: ActionConfig[];
+  viewRactions?:RActionConfig[];
+  editRactions?:RActionConfig[];
   premises?: FieldConfig[];
   groups?: FieldGroupConfig[];
   buttonPosition?: ButtonPosition;
@@ -389,6 +404,8 @@ export interface SelectConfig extends TmplBase {
   defaultPageSize: number;
   buttons: ButtonName[];
   builtInButtons: BuiltInButtonName[];
+  defShowCriteriaCount:number;
+  defShowRowActionCount:number;
   columns: ColumnConfig[];
   criterias: CriteriaConfig[];
   defaultCriteriaValue?: object;
@@ -655,6 +672,9 @@ export interface FileLoadInfo {
 }
 
 export interface FileValue {
+  uid?:string,
+  url?:string,
+  status?:string,
   valid: FileValueValid;
   fileKey?: string;
   fileName?: string;

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

@@ -88,7 +88,7 @@ export default class TreeUtils {
                 newExpandeds.push(d.key);
             }
             if(expandedKeys){
-                newExpandeds.push(expandedKeys)
+                newExpandeds.push(...expandedKeys)
             };
 
             return {