aldehyde 0.1.83 → 0.1.85

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

@@ -286,14 +286,14 @@ HCDataSource.workbenchMenus =async ()=>{
     return [...workbenchCache];
 }
 
-HCDataSource.clear =async function (roles:string[]) {
+HCDataSource.reload =async function (roles:string[]) {
    // if(roles.includes("admin")){
      let  res= await HcserviceV3.reload();
         if (res.status != 'success') {
            // message.error(res.message);
             return;
         }
-        this.clearOnly();
+        this.clear();
         message.success("执行成功");
     // }else{
     //     this.clearOnly();
@@ -314,7 +314,7 @@ HCDataSource.getFromCache=function (code:string){
 }
 
 
-HCDataSource.clearOnly =async function () {
+HCDataSource.clear =async function () {
     enumMap.clear();
     ltmplConfigMap.clear();
     dtmplConfigMap.clear();

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

@@ -4,6 +4,7 @@ import {message} from 'antd'
 import EncryptUtils from '../units/EncryptUtils'
 import moment from 'moment';
 import { PageInfo,SelectedRow} from "./interface";
+import HCDataSource from "./hc-data-source";
 
 export default class HcserviceV3 {
 
@@ -484,10 +485,10 @@ export default class HcserviceV3 {
         Units.downloadFile(this.getFileUrl(path)+`&disposition=attachment`, fileName)
     }
 
-    static openfile(path) {
+    static openfile(path,toolbar) {
         let vars = path.split("/");
         let fileName = vars[vars.length - 1]
-        Units.openFile(this.getFileUrl(path), fileName)
+        Units.openFile(this.getFileUrl(path), fileName,toolbar)
     }
 
     static getFileUrl(path) {
@@ -603,6 +604,7 @@ export default class HcserviceV3 {
         })
         if (res.status === 'success') {
             //window.location.hash = "#/home";
+            HCDataSource.clear();
             window.location.hash = "#/context-setter";
             Units.setLocalStorge("hydrocarbonToken", res.token)
         }
@@ -694,7 +696,7 @@ export default class HcserviceV3 {
 
     }
 
-    static async requestKsListToPage(queryKey, pageNo, pageSize) {
+    static async requestKsListTopPage(queryKey, pageNo, pageSize) {
         let url = `/v3/ks/query/data`
         let res = await Super.super({
             url: url,

package/src/aldehyde/tmpl/interface.tsx

@@ -61,7 +61,7 @@ export interface Level2Menu extends MenuBase {
     displayTotal?: boolean;
     count?:number;
     defaultCriteriaValue?:object,
-    pageType:'列表'|'详情'|'编辑'|'添加'
+    pageType:'列表'|'详情'|'编辑'|'添加'|'编辑或添加'
 }
 
 export interface Level1Menu extends MenuBase {
@@ -131,6 +131,7 @@ export interface FieldConfig extends FieldBase {
     disabled?: boolean;
     max?: string;
     min?: string;
+    ellipsisLength?:number;
     buttons?: ButtonName[];
     rules?: FileRule[];
     mainCode?:((form:FormInstance)=> Function) |string,

package/src/aldehyde/tmpl/superagent.js

@@ -34,7 +34,7 @@ export default class Superagent {
                 .end((req, res) => {
                     if (!res) {
                         message.error("服务器连接失败")
-                        reject("服务器连接失败");
+                        resolve(null);
                     } else {
                         if (options.data && options.data.isShowLoading !== false) {
                             loading = document.getElementById('ajaxLoading')

package/src/aldehyde/units/index.tsx

@@ -32,7 +32,6 @@ Axios.create().get('programConfig.json').then((result) => {
     window.localStorage['programName_NavLeft'] = result.data.programName_NavLeft
     window.localStorage['programName_sub'] = result.data.programName_sub
     window.localStorage['programName_Logo'] = result.data.programName_Logo
-    debugger;
     window.localStorage['programCode'] = result.data.programCode
 }).catch((error) => {
     console.log(error)
@@ -177,10 +176,10 @@ export default {
     //         message.error(e)
     //     }
     // },
-    openFile(url, fileName) {
+    openFile(url, fileName,toolbar) {
         try {
             let a = document.createElement("a");
-            a.href = url;
+            a.href = url+toolbar;
             a.target = "_blank";
             document.body.appendChild(a);
             a.click();
@@ -540,7 +539,7 @@ export default {
         return format;
     },
     getSelectOptions(data: EnumItem[]) {
-        // debugger
+
         if (!data) {
             return [];
         }
@@ -552,7 +551,7 @@ export default {
         return options
     },
     getSelectListOfStrList(data) {
-        // debugger
+
         if (!data) {
             return [];
         }