aldehyde 0.2.33 → 0.2.35

package/src/aldehyde/tmpl/superagent.js

@@ -1,8 +1,6 @@
 import superagent from 'superagent'
-import {Alert, message, Spin} from 'antd';
+import {message} from 'antd';
 import Units from '../units';
-import React from "react";
-
 
 export default class Superagent {
     static super(options, type, load) {
@@ -10,7 +8,6 @@ export default class Superagent {
             : options.header && options.header.hydrocarbonToken ?
                 options.header.hydrocarbonToken : Units.getAnoHydrocarbonToken();
         const programCode = Units.programCode();
-
         let loading;
         if (options.data && options.data.isShowLoading !== false) {
             loading = document.getElementById('ajaxLoading')
@@ -53,11 +50,7 @@ export default class Superagent {
                             //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(res);
@@ -87,7 +80,7 @@ export default class Superagent {
                 .end((req, res) => {
                     if (!res) {
                         message.error("服务器连接失败")
-                        reject(res.body);
+                        resolve(null);
                     } else {
                         if (res.status === 200) {
                             resolve(res.body)
@@ -134,7 +127,6 @@ export default class Superagent {
             'hydrocarbon-token': Units.hydrocarbonToken() ?Units.hydrocarbonToken() : Units.getAnoHydrocarbonToken(),
             'hydrocarbon-program-token': Units.programCode()
         }
-
     }
 
 

package/src/aldehyde/units/EncryptUtils.js

@@ -1,4 +1,3 @@
-import React from 'react'
 import CryptoJS from 'crypto-js'
 import JSEncrypt from 'jsencrypt';
 

package/src/aldehyde/units/index.tsx

@@ -1,19 +1,9 @@
-import React from 'react'
-import {Radio, Select} from 'antd'
+// import React from 'react'
 import {DtmplConfig, DtmplData, EnumItem} from "../tmpl/interface";
-import HCDataSource from "../tmpl/hc-data-source";
 import dayjs from "dayjs";
 import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
 
-const Option = Select.Option;
-
-// let api = undefined;
-// let programCode = undefined;
-// let programName = undefined;
-// let programName_sub = undefined;
-// let programName_NavLeft = undefined;
 let storageKeyPrefix = undefined;
-// let logo = undefined;
 
 const CUSTOM_PAGE_MAP = {}
 
@@ -258,17 +248,17 @@ export default {
         }
         return page
     },
-    getRadioList(data) {
-        if (!data) {
-            return [];
-        }
-        const options = []
-        data.map((item) => {
-            options.push(<Radio value={item.id} key={item.id}>{item.name}</Radio>)
-            return false
-        })
-        return options
-    },
+    // getRadioList(data) {
+    //     if (!data) {
+    //         return [];
+    //     }
+    //     const options = []
+    //     data.map((item) => {
+    //         options.push(<Radio value={item.id} key={item.id}>{item.name}</Radio>)
+    //         return false
+    //     })
+    //     return options
+    // },
     // downloadFile_(url) {
     //     try {
     //         let elemIF = document.createElement("iframe");
@@ -411,7 +401,6 @@ export default {
     transQueryParamsToStr(data, isPrefix = false,excudekeys=[]) {
         let prefix = isPrefix ? '?' : '';
         let _result = [];
-
         let paramKeys = [];
         //寻找参数
         for (let key in data) {
@@ -513,18 +502,18 @@ export default {
         }
         return result;
     },
-    forPic(fieldMap) { //原始数据的图片url转化为图片
-        for (let i in fieldMap) {
-            if (fieldMap[i] && fieldMap[i].includes("download-files")) {
-                const url = this.api() + fieldMap[i]
-                fieldMap[i] = <img
-                    style={{width: 55}}
-                    src={url}
-                    alt=""/>
-            }
-        }
-        return fieldMap
-    },
+    // forPic(fieldMap) { //原始数据的图片url转化为图片
+    //     for (let i in fieldMap) {
+    //         if (fieldMap[i] && fieldMap[i].includes("download-files")) {
+    //             const url = this.api() + fieldMap[i]
+    //             fieldMap[i] = <img
+    //                 style={{width: 55}}
+    //                 src={url}
+    //                 alt=""/>
+    //         }
+    //     }
+    //     return fieldMap
+    // },
     getFileUrl(file) {
         if (!file) {
             return file;
@@ -645,33 +634,34 @@ export default {
 
         return format;
     },
-    getSelectOptions(data: EnumItem[]) {
-
-        if (!data) {
-            return [];
-        }
-        const options = []
-        data.map((item) => {
-            options.push(<Option value={item.value} key={item.title}>{item.title}</Option>)
-            return false
-        })
-        return options
-    },
-    getSelectListOfStrList(data) {
-
-        if (!data) {
-            return [];
-        }
-        const options = []
-        data.map((item) => {
-            options.push(<Option value={item} key={item}>{item}</Option>)
-            return false
-        })
-        return options
-    },
-    getSelectOptionsOfMstrucId(mstrucId: string) {
-        return this.getSelectOptions(HCDataSource.getEnums(mstrucId));
-    }, concatValue(value1, vaule2) {
+    // getSelectOptions(data: EnumItem[]) {
+    //
+    //     if (!data) {
+    //         return [];
+    //     }
+    //     const options = []
+    //     data.map((item) => {
+    //         options.push(<Option value={item.value} key={item.title}>{item.title}</Option>)
+    //         return false
+    //     })
+    //     return options
+    // },
+    // getSelectListOfStrList(data) {
+    //
+    //     if (!data) {
+    //         return [];
+    //     }
+    //     const options = []
+    //     data.map((item) => {
+    //         options.push(<Option value={item} key={item}>{item}</Option>)
+    //         return false
+    //     })
+    //     return options
+    // },
+    // getSelectOptionsOfMstrucId(mstrucId: string) {
+    //     return this.getSelectOptions(HCDataSource.getEnums(mstrucId));
+    // },
+    concatValue(value1, vaule2) {
         let newValue = undefined;
         if (value1) {
             newValue = value1 + "~"
@@ -683,7 +673,8 @@ export default {
             newValue = newValue + vaule2
         }
         return newValue;
-    }, splitValue(value) {
+    },
+    splitValue(value) {
         let valueBegin, valueEnd;
         if (value) {
             if (value.toString().indexOf("~") >= 0) {