aldehyde 0.2.165 → 0.2.166

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

@@ -371,17 +371,23 @@ class RelationTable extends React.PureComponent<
   };
 
   editRow = (record) => {};
-  delete = (record) => {
-    const { value, fieldGroupConfig, onChange } = this.props;
+  delete =async (record) => {
+    const { value, fieldGroupConfig, onChange,serverKey } = this.props;
     //追加
-    const selectdDatas = [];
+    const selectdDatas:DtmplData[] = [];
+    const selectdCodes:string[] = [];
     if (value) {
       for (let v of value) {
         if (v.code != record.code) {
           selectdDatas.push(v);
+          selectdCodes.push(v.code);
         }
       }
     }
+    //直接删除
+    if(fieldGroupConfig.deleteData){
+      let result: boolean = await HcserviceV3.deleteByCode(serverKey, fieldGroupConfig.id, selectdCodes);
+    }
     onChange(fieldGroupConfig, selectdDatas);
   };
 

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

@@ -718,16 +718,56 @@ export default class HcserviceV3 {
   static download(serverKey: string, path) {
     let vars = path.split("/");
     let fileName = vars[vars.length - 1];
+    this.downloadDir(this.getFileUrl(serverKey, path),fileName);
+    // let vars = path.split("/");
+    // let fileName = vars[vars.length - 1];
+    // Units.downloadFile(
+    //   this.getFileUrl(serverKey, path) + `&disposition=attachment`,
+    //   fileName
+    // );
+  }
+
+  static downloadDir(path,fileName) {
+
+   // let fileName = this.getFileNameFrom(path);
     Units.downloadFile(
-      this.getFileUrl(serverKey, path) + `&disposition=attachment`,
-      fileName
+        path + `&disposition=attachment`,
+        fileName
     );
   }
 
   static openfile(serverKey: string, path, toolbar) {
     let vars = path.split("/");
     let fileName = vars[vars.length - 1];
-    Units.openFile(this.getFileUrl(serverKey, path), fileName, toolbar);
+    this.openfileDir(fileName,this.getFileUrl(serverKey, path),toolbar)
+    // Units.openFile(this.getFileUrl(serverKey, path), fileName, toolbar);
+  }
+
+  static getFileNameFrom(path) {
+    if(!path){
+      return undefined;
+    }
+    let vars = path.split("/");
+    let fileName = vars[vars.length - 1];
+   return fileName;
+  }
+
+  static getFileSuffixFrom(fileName) {
+    if(!fileName){
+      return undefined;
+    }
+    let ss=fileName.split('.');
+    if(ss.length>1){
+      return ss.pop();
+    }else{
+      return undefined;
+    }
+  }
+
+
+  static openfileDir(path,fileName, toolbar) {
+    //let fileName = this.getFileNameFrom(path);
+    Units.openFile(path, fileName, toolbar);
   }
 
   static getFileUrl(serverKey: string, path) {
@@ -741,17 +781,17 @@ export default class HcserviceV3 {
     return encodeUri;
   }
 
-  static getFileTxtUrl(serverKey: string, path) {
-    const hydrocarbonToken = Units.hydrocarbonToken(
-      Units.programCode(serverKey)
-    );
-    let url =
-      Units.joinPath(
-        Units.api(serverKey),
-        Units.joinPath("/v3/files/text", path)
-      ) + `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
-    return encodeURI(url);
-  }
+  // static getFileTxtUrl(serverKey: string, path) {
+  //   const hydrocarbonToken = Units.hydrocarbonToken(
+  //     Units.programCode(serverKey)
+  //   );
+  //   let url =
+  //     Units.joinPath(
+  //       Units.api(serverKey),
+  //       Units.joinPath("/v3/files/text", path)
+  //     ) + `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
+  //   return encodeURI(url);
+  // }
 
   static async loadFileTxt(serverKey: string, path) {
     let res = await Super.super({

package/src/aldehyde/tmpl/interface.tsx

@@ -231,6 +231,7 @@ export interface FieldGroupConfig extends OrderableTmplBase {
   pointSourceId?: string;
   classAddConfigs?: ClassAddConfig[];
   defaultCriteriaValue?: object;
+  deleteData?:boolean;
 }
 
 export type SaveJumpType = "list" | "add" | "edit";
@@ -271,7 +272,8 @@ export type Comparator =
   | "nogreater"
   | "exclude"
   | "noLess"
-  | "noGreater";
+  | "noGreater"
+    |"none1" |"none1n";
 
 export type FieldAction = "add" | "delete" | "edit" | "detail" | "table";
 
@@ -525,6 +527,20 @@ export interface SubChartProps {
 
 export type FileValueValid = true | "new" | "delete";
 
+interface CommonFileValue {
+  type:'completeURL'|'relativePath'|'KKFile',
+  value:Object;
+};
+
+export interface CommonFilePath {
+  //type:'completeURL'|'relativePath'|'KKFile',
+  fileName?:string;
+  contentType?:string;//文件类型
+  path?:String;
+  iconPath?:string;
+  valid?:string;
+};
+
 export interface FileLoadInfo {
   path: string;
   fileName: string;