aldehyde 0.1.80 → 0.1.81

package/src/aldehyde/tmpl/hc-data-source.tsx

@@ -287,18 +287,18 @@ HCDataSource.workbenchMenus =async ()=>{
 }
 
 HCDataSource.clear =async function (roles:string[]) {
-    if(roles.includes("admin")){
+   // if(roles.includes("admin")){
      let  res= await HcserviceV3.reload();
         if (res.status != 'success') {
-            message.error(res.message);
+           // message.error(res.message);
             return;
         }
         this.clearOnly();
         message.success("执行成功");
-    }else{
-        this.clearOnly();
-        message.success("执行成功");
-    }
+    // }else{
+    //     this.clearOnly();
+    //     message.success("执行成功");
+    // }
 };
 
 HCDataSource.cache=function (data:DtmplData){

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

@@ -232,19 +232,7 @@ export default class HcserviceV3 {
         return await this.requestCommonDtmplData(sourceId, code,versionId,url)
     }
 
-    // static async requestUserDtmplData() {
-    //     let url = `/v3/user/dtmpl/data`;
-    //     let res = await Super.super({
-    //         url: url,
-    //         method: 'GET'
-    //     });
-    //     if (res.status === "success") {
-    //         return res.entity;
-    //     } else {
-    //         message.error("实体不存在！")
-    //         return null;
-    //     }
-    // }
+
 
     static async postCommonDtmplData(sourceId:string, formDataObj, message,url) {
         const formData = new FormData();
@@ -334,7 +322,6 @@ export default class HcserviceV3 {
 
 
     static async requestLtmplCount(sourceId) {
-
         let url = `/v3/ltmpl/data/count`;
         let res = await Super.super({
             url: url,
@@ -487,7 +474,7 @@ export default class HcserviceV3 {
 
     static downloadDetailExcel(sourceId, entityCode) {
         const hydrocarbonToken = Units.getLocalStorge("hydrocarbonToken")
-        let url = Units.api() + `/v3/dtmpl/excel?sourceId=${sourceId}&code=${entityCode}&@token=${hydrocarbonToken}`
+        let url = Units.api() + `/v3/dtmpl/excel?sourceId=${sourceId}&code=${entityCode}&@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`
         Units.downloadFile(url,"详情");
     }
 
@@ -505,13 +492,13 @@ export default class HcserviceV3 {
 
     static getFileUrl(path) {
         const hydrocarbonToken = Units.getLocalStorge("hydrocarbonToken")
-        let url = Units.api() + Units.joinPath("/v3/files",path)+ `?@token=${hydrocarbonToken}`;
+        let url = Units.api() + Units.joinPath("/v3/files",path)+ `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
         return url;
     }
 
     static getFileTxtUrl(path) {
         const hydrocarbonToken = Units.getLocalStorge("hydrocarbonToken")
-        let url = Units.api() + "/v3/files/text" + path + `?@token=${hydrocarbonToken}`;
+        let url = Units.api() + "/v3/files/text" + path + `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
         return url;
     }
 
@@ -578,11 +565,32 @@ export default class HcserviceV3 {
         return res;
     }
 
-    static async login(username, password,kaptchaToken,kaptchaText,pubkey) {
+    static async  getContextSourceConfig(){
+        let res = await Super.super({
+            url: '/v3/context-source-config',
+            method: "GET"
+        })
+        if(res){
+            return res.config;
+        }else{
+            return null
+        }
+
+    }
+
+    static async  getContextSourceValue(){
+        let res = await Super.super({
+            url: '/v3/auth/context-source-value',
+            method: "GET"
+        })
+        return res.value;
+    }
+
+    static async login(json,kaptchaToken,kaptchaText,pubkey) {
 
      let datetime= moment(new Date()).format("YYYY-MM-DD HH:mm:ss")
         let programCode
-        let  json={username,password,datetime}
+        json['datetime']=datetime;
 
         let userInfo=  EncryptUtils.rsaEncrypt(JSON.stringify(json),pubkey);
 
@@ -594,12 +602,28 @@ export default class HcserviceV3 {
             method: "GET"
         })
         if (res.status === 'success') {
-            window.location.hash = "#/home";
+            //window.location.hash = "#/home";
+            window.location.hash = "#/context-setter";
             Units.setLocalStorge("hydrocarbonToken", res.token)
         }
         return res;
     }
 
+    static async setContext(json) {
+        const formData = new FormData();
+        formData.append("context",JSON.stringify(json));
+        let res = await Super.super({
+            url: '/v3/auth/context',
+            data: formData,
+            method: 'POST'
+        }, 'formdata')
+
+        if (res.status === 'success') {
+            window.location.hash = "#/home";
+        }
+        return res;
+    }
+
     static async getKaptchaToken() {
         let res = await Super.super({
             url: '/v3/auth/kaptcha',

package/src/aldehyde/tmpl/interface.tsx

@@ -135,6 +135,7 @@ export interface FieldConfig extends FieldBase {
     rules?: FileRule[];
     mainCode?:((form:FormInstance)=> Function) |string,
     updateSelf?:(form:FormInstance)=>FieldConfig,
+    suppleOptions?:any[],
 
 }
 

package/src/aldehyde/tmpl/superagent.js

@@ -6,8 +6,9 @@ export default class Superagent {
     static super(options, type, load) {
         const hydrocarbonToken = Units.getLocalStorge("hydrocarbonToken") ? Units.getLocalStorge("hydrocarbonToken")
             : options.header && options.header.hydrocarbonToken ?
-                options.header.hydrocarbonToken : null;
-        const programCode=Units.programCode();
+                options.header.hydrocarbonToken : Units.getAnoHydrocarbonToken();
+        const programCode = Units.programCode();
+
         let loading;
         if (options.data && options.data.isShowLoading !== false) {
             loading = document.getElementById('ajaxLoading')
@@ -32,9 +33,8 @@ export default class Superagent {
                 .send(options.data)
                 .end((req, res) => {
                     if (!res) {
-
                         message.error("服务器连接失败")
-                        reject(res.body);
+                        reject("服务器连接失败");
                     } else {
                         if (options.data && options.data.isShowLoading !== false) {
                             loading = document.getElementById('ajaxLoading')
@@ -47,17 +47,24 @@ export default class Superagent {
                                 message.error("错误消息：" + result.message)
                             }
                             resolve(result)
-                        }else if (res.status === 201) {
+                        } else if (res.status === 201) {
                             Units.setLocalStorge("hydrocarbonToken", hydrocarbonToken)
                             resolve(res)
                         } else if (res.status === 403) {
                             //message.info("请求权限不足,可能是token已经超时")
                             //console.log('权限不足或登录超时',options);
+                            //
                             Units.toLogin();
+                            // resolve(undefined);
+                        } else if (res.status === 405 || res.status === 406) {
+                            message.error("权限不足")
+                            resolve(undefined);
                         } else if (res.status === 404 || res.status === 504) {
-                            message.error("服务资源未找到("+res.status+")")
+                            message.error("服务资源未找到(" + res.status + ")")
+                            resolve(undefined);
                         } else if (res.status === 500) {
-                            message.error("后台处理错误("+res.status+")")
+                            message.error("后台处理错误(" + res.text + ")")
+                            resolve(undefined);
                         } else {
                             message.error("服务资源请求失败!")
                             reject(res.body)
@@ -86,8 +93,10 @@ export default class Superagent {
                             Units.toLogin();
                         } else if (res.status === 404 || res.status === 504) {
                             message.error("服务资源未找到("+res.status+")")
+                            resolve(undefined);
                         } else if (res.status === 500) {
-                            message.error("后台处理错误("+res.status+")")
+                            message.error("后台处理错误(" + res.text + ")")
+                            resolve(undefined);
                         } else {
                             message.error("服务资源请求失败!");
                             reject(res.body)
@@ -99,8 +108,8 @@ export default class Superagent {
 
     static getHeaderObj() {
         return {
-            'hydrocarbon-token': Units.getLocalStorge("hydrocarbonToken"),
-            'hydrocarbon-program-token': Units.getLocalStorge(Units.programCode())
+            'hydrocarbon-token': Units.getLocalStorge("hydrocarbonToken") ? Units.getLocalStorge("hydrocarbonToken") : Units.getAnoHydrocarbonToken(),
+            'hydrocarbon-program-token': Units.programCode()
         }
 
     }

package/src/aldehyde/units/index.tsx

@@ -296,6 +296,15 @@ export default {
         } finally {
         }
     },
+    getAnoHydrocarbonToken() {
+        let token = this.getLocalStorge("anoHydrocarbonToken");
+        if (!token) {
+            token="tmpl" + this.getRandomNum(6);
+            this.setLocalStorge("anoHydrocarbonToken", token);
+        }
+        return token;
+
+    },
     transQueryParamsToStr(data, isPrefix = false) {
         let prefix = isPrefix ? '?' : '';
         let _result = [];