aldehyde 0.2.59 → 0.2.60

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

@@ -3,7 +3,7 @@ import Super from "./superagent";
 import {message} from 'antd'
 import EncryptUtils from '../units/EncryptUtils'
 import format from 'dayjs';
-import {PageInfo, SelectedRow} from "./interface";
+import {CodeSource, PageInfo, SelectedRow} from "./interface";
 import HCDataSource from "./hc-data-source";
 
 import {ProgramConfig} from "../index";
@@ -130,7 +130,7 @@ export default class HcserviceV3 {
     }
 
     static async queryTop1(serverKey:string,sourceId:string){
-        let data= await HcserviceV3.requestMstrucLtmplQueryTop(serverKey,sourceId,{top:1});
+        let data= await this.requestMstrucLtmplQueryTop(serverKey,sourceId,{top:1});
         let queriedCode=null;
         if(data && data.entities && data.entities[0]){
             queriedCode=data.entities[0].code
@@ -491,6 +491,24 @@ export default class HcserviceV3 {
     //     Units.downloadFile(url, "详情");
     // }
 
+    static async queryCode(sourceId:string,codeSource:CodeSource,serverKey?:string) {
+
+        let queriedCode=undefined;
+        if(codeSource){
+            if( codeSource=='listop'){
+                queriedCode=await this.queryTop1(serverKey,sourceId);
+                if(!queriedCode){
+                    queriedCode="bad-code";
+                }
+            }else if( codeSource=='listop-new'){
+                queriedCode=await this.queryTop1(serverKey,sourceId);
+            }else if(codeSource=='new'){
+                queriedCode=null;
+            }
+        }
+        return queriedCode;
+    }
+
     static download(serverKey:string,path) {
         let vars = path.split("/");
         let fileName = vars[vars.length - 1]

package/src/aldehyde/tmpl/interface.tsx

@@ -106,6 +106,8 @@ export interface ColumnConfig extends FieldConfig {
     statColType?: StatColType;
 }
 
+export type CodeSource = 'new'|'listop'|'listop-new'|undefined;
+
 export type FieldGroupType = 'relation' | 'fieldGroup' ;
 
 export type ButtonName = 'rowAdd' | 'rowEdit' | 'batchDelete'|'singleDelete'| 'selectAdd' | 'dtmplAdd' | 'dtmplEdit' | 'copy'|
@@ -322,6 +324,7 @@ export interface TmplBaseProps {
 };
 
 export interface DtmplBaseProps extends TmplBaseProps {
+    codeSource?:CodeSource,
     showConfirm?: boolean,
     code?: string,
     defaultDtmplData?:DtmplData,

package/src/aldehyde/tmpl/model-struc-v3.tsx

@@ -0,0 +1,98 @@
+
+import {message} from 'antd'
+import Superagent from "./superagent";
+
+
+export default class ModelStrucV3 {
+
+    static url='/v3/mstruc/data';
+
+    static async post(sourceId:string,jsonEntity:object,serverKey?:string,){
+        const formData = new FormData();
+        formData.append('sourceId', sourceId);
+        formData.append('jsonEntity', JSON.stringify(jsonEntity));
+        let res = await Superagent.super({
+            url:this.url,
+            serverKey,
+            data: formData,
+            method: 'POST'
+        }, 'formdata',null)
+        let code = null;
+        if (res) {
+            if (res.status === "success") {
+                if (message) {
+                    if (res.message) {
+                        message.warning("保存成功! " + res.message, 4);
+                    } else{
+                        message.success("保存成功! ",1);
+                    }
+                }
+                code = res.entityCode ? res.entityCode : res.code;
+            }
+        } else {
+            if (message) {
+                message.error("保存失败");
+            }
+        }
+        return {code, status: res?res.status:'error'};
+
+    }
+
+    static async get(sourceId:string,params?:object,serverKey?:string,){
+
+        let res = await Superagent.super({
+            url:this.url,
+            serverKey,
+            query: {pageSize:1000,sourceId,...params},
+            method: 'GET'
+        }, null,null)
+        let code = null;
+        if (res) {
+            if (res.status === "success") {
+                if (message) {
+                    if (res.message) {
+                        message.warning("查询成功! " + res.message, 4);
+                    }
+                }
+                code = res.entityCode ? res.entityCode : res.code;
+            }else{
+                message.error("查询失败! " + res.message, 6);
+            }
+        } else {
+            if (message) {
+                message.error("查询失败");
+            }
+        }
+        return res?res:{status:"error"};
+    }
+
+    static async delete(sourceId:string,codes:string[],serverKey?:string,){
+
+        let res = await Superagent.super({
+            url:this.url,
+            serverKey,
+            query: {sourceId,codes},
+            method: 'DELETE'
+        }, null,null)
+        let code = null;
+        if (res) {
+            if (res.status === "success") {
+                if (message) {
+                    if (res.message) {
+                        message.warning("删除成功! " + res.message, 4);
+                    }
+                }
+                code = res.entityCode ? res.entityCode : res.code;
+            }else{
+                message.error("删除失败! " + res.message, 6);
+            }
+        } else {
+            if (message) {
+                message.error("删除失败");
+            }
+        }
+        return res;
+    }
+
+
+}