aldehyde 0.2.181 → 0.2.183

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

@@ -683,7 +683,12 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
 
     // 序号
     if (columns[0].title === "序号") {
-      const col: any = { dataIndex: "序号", title: "序号", width: 160 };
+      const col: any = {
+        dataIndex: "序号",
+        title: "序号",
+        width: 160,
+        order: -1,
+      };
       if (columns[0].colWidth) {
         col.width = columns[0].colWidth;
       }
@@ -773,11 +778,6 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     // 给小计和总计染色
     this.stain(proSummaryTableColumns);
 
-    // 排序
-    proSummaryTableColumns = proSummaryTableColumns.sort((a, b) => {
-      return a.order < b.order ? -1 : 1;
-    });
-
     // 删除默认数据在组内顺序字段
     proSummaryTableColumns.splice(
       proSummaryTableColumns.findIndex(
@@ -788,6 +788,14 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
 
     proSummaryTableData.forEach((item) => delete item.orderInGroup);
 
+    // 排序
+    proSummaryTableColumns = proSummaryTableColumns.sort((a, b) => {
+      if (a.order === undefined && b.order === undefined) return 0;
+      if (a.order === undefined) return 1;
+      if (b.order === undefined) return -1;
+      return a.order < b.order ? -1 : 1;
+    });
+
     console.log("proSummaryTableColumns", proSummaryTableColumns);
     console.log("proSummaryTableData", proSummaryTableData);
 
@@ -864,7 +872,6 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
           );
         data[key] = data[key]?.toString();
       }
-      // debugger
       list.push(data);
     } else {
       for (const [k, v] of Object.entries(rowMp)) {
@@ -1033,17 +1040,18 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
         sortColumnData.splice(tgt, 1);
       }
 
-      if (sorter.order) {
+      if (sorter.order === "ascend") {
         Object.assign(extParams, {
-          sortColIds: [
-            ...sortColumnData,
-            sorter.field + "_" + (sorter.order === "ascend" ? "asc" : "desc"),
-          ],
+          sortColIds: [...sortColumnData, sorter.field + "_" + "desc"],
         });
-      } else {
+      } else if (sorter.order === "descend") {
         Object.assign(extParams, {
           sortColIds: [...sortColumnData],
         });
+      } else {
+        Object.assign(extParams, {
+          sortColIds: [...sortColumnData, sorter.field + "_" + "asc"],
+        });
       }
       this.props.doSearch(extParams);
     }

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

@@ -261,7 +261,11 @@ export default class HcserviceV3 {
     return res.versions;
   }
 
-  static async requestFieldVersionList(serverKey: string, sourceId: string, code) {
+  static async requestFieldVersionList(
+    serverKey: string,
+    sourceId: string,
+    code
+  ) {
     let res = await Super.super({
       url: `/v3/dtmpl/field-data/versions`,
       serverKey,
@@ -575,24 +579,29 @@ export default class HcserviceV3 {
   static async deleteData(
     serverKey: string,
     sourceId,
-    selectedRows: SelectedRow[],mainCode?
+    selectedRows: SelectedRow[],
+    mainCode?
   ) {
     const codes = this.getCodesOfSelectedRows(selectedRows);
-    debugger
-    return await this.deleteByCode(serverKey, sourceId, codes,mainCode);
+    return await this.deleteByCode(serverKey, sourceId, codes, mainCode);
   }
 
-  static async deleteByCode(serverKey: string, sourceId, codes: string[],mainCode?) {
+  static async deleteByCode(
+    serverKey: string,
+    sourceId,
+    codes: string[],
+    mainCode?
+  ) {
     let res = await Super.super({
       url: `/v3/ltmpl/data`,
       serverKey,
       data: {
         codes,
-        sourceId,mainCode
+        sourceId,
+        mainCode,
       },
       method: "DELETE",
     });
-    debugger
     if (res && res.status == "success") {
       message.success(translate("${删除成功}"), 1);
       return true;
@@ -674,15 +683,20 @@ export default class HcserviceV3 {
     return res;
   }
 
-  static async saveRatmplSelectCodes(serverKey: string, sourceId: string,mainCode, codes:string[] ) {
+  static async saveRatmplSelectCodes(
+    serverKey: string,
+    sourceId: string,
+    mainCode,
+    codes: string[]
+  ) {
     let res = await Super.super({
       url: `/v3/ratmpl-select/data`,
       serverKey,
       method: "POST",
-      data: { codes,mainCode, sourceId },
+      data: { codes, mainCode, sourceId },
     });
     if (res && res.status != "success") {
-      message.error(translate("${"+res.message+"}"));
+      message.error(translate("${" + res.message + "}"));
     }
     return res;
   }
@@ -747,7 +761,7 @@ 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);
+    this.downloadDir(this.getFileUrl(serverKey, path), fileName);
     // let vars = path.split("/");
     // let fileName = vars[vars.length - 1];
     // Units.downloadFile(
@@ -756,45 +770,40 @@ export default class HcserviceV3 {
     // );
   }
 
-  static downloadDir(path,fileName) {
-
-   // let fileName = this.getFileNameFrom(path);
-    Units.downloadFile(
-        path + `&disposition=attachment`,
-        fileName
-    );
+  static downloadDir(path, fileName) {
+    // let fileName = this.getFileNameFrom(path);
+    Units.downloadFile(path + `&disposition=attachment`, fileName);
   }
 
   static openfile(serverKey: string, path, toolbar) {
     let vars = path.split("/");
     let fileName = vars[vars.length - 1];
-    this.openfileDir(fileName,this.getFileUrl(serverKey, path),toolbar)
+    this.openfileDir(fileName, this.getFileUrl(serverKey, path), toolbar);
     // Units.openFile(this.getFileUrl(serverKey, path), fileName, toolbar);
   }
 
   static getFileNameFrom(path) {
-    if(!path){
+    if (!path) {
       return undefined;
     }
     let vars = path.split("/");
     let fileName = vars[vars.length - 1];
-   return fileName;
+    return fileName;
   }
 
   static getFileSuffixFrom(fileName) {
-    if(!fileName){
+    if (!fileName) {
       return undefined;
     }
-    let ss=fileName.split('.');
-    if(ss.length>1){
+    let ss = fileName.split(".");
+    if (ss.length > 1) {
       return ss.pop();
-    }else{
+    } else {
       return undefined;
     }
   }
 
-
-  static openfileDir(path,fileName, toolbar) {
+  static openfileDir(path, fileName, toolbar) {
     //let fileName = this.getFileNameFrom(path);
     Units.openFile(path, fileName, toolbar);
   }

package/src/aldehyde/tmpl/interface.tsx

@@ -16,7 +16,7 @@ export type StatColType = "fact" | "dimension";
 export type ActTableViewModel = "table" | "verticalList" | "horizontalList";
 
 export type ControlHolderType = "table" | "descriptions";
-export type PageType = "modal" | "drawer" | "card";
+export type PageType = "modal" | "drawer" |"card"| "routing" |"blank";
 export interface TmplBase {
   id?: string;
   title?: string;
@@ -64,6 +64,13 @@ export interface ActionConfig extends ButtonConfig {
   writes: FieldConfig[];
 }
 
+export interface BuinButtonConfig extends ButtonConfig {
+  showType: "routing"|"modal"|"drawer"|"blank";
+  windowPosition:"left"|"right"|"bottom"|"top";
+  windowHeight:number;
+  windowWidth:number;
+}
+
 export interface CustomButton extends ButtonConfig {
    path:string;
    params:string;
@@ -131,7 +138,7 @@ export interface Level2Menu extends MenuBase {
   disabled?: boolean;
   hiddenOnDisabled?: boolean;
   defaultCriteriaValue?: object;
-  pageType: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树";
+  pageType: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树"|"导入";
   programAuths?: ProgramAuth[];
   linkTarget?: HTMLAttributeAnchorTarget;
 }
@@ -272,9 +279,13 @@ export type Comparator =
     | "include_all"
   | "noless"
   | "nogreater"
+    | "less"
+    | "greater"
   | "exclude"
   | "noLess"
   | "noGreater"
+    | "Less"
+    | "Greater"
     |"none1" |"none1n";
 
 export type FieldAction = "add" | "delete" | "edit" | "detail" | "table";
@@ -384,6 +395,9 @@ export interface LtmplConfig extends SelectConfig {
   classAddConfigs?: ClassAddConfig[];
   classEditConfigs?: ClassEditConfig[];
   classViewConfigs?: ClassViewConfig[];
+  buttonAddConfig?:BuinButtonConfig;
+  buttonEditConfig?:BuinButtonConfig;
+  buttonViewConfig?:BuinButtonConfig;
   drillingParams?: CriteriaConfig[];
   footer?: string;
   header?: string;
@@ -582,7 +596,7 @@ export interface BlockType {
   disabled?: boolean; // 是否禁用
   hiddenOnDisabled?: boolean; // 是否隐藏
   customPath?: string; // 自定义页面路径
-  pageType?: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树"; // 页面类型
+  pageType?: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树"|"导入"; // 页面类型
   defaultCriteriaValue?: { [key: string]: string }; // 一些组件参数
   linkTarget?: HTMLAttributeAnchorTarget; // 页面跳转方式
   items?: BlockType[];

package/src/aldehyde/units/index.tsx

@@ -600,7 +600,6 @@ export default {
     }
     //排序
     paramKeys.sort();
-debugger
     for (let key of paramKeys) {
       let value = data[key];
       let str = encodeURIComponent(key);
@@ -663,7 +662,7 @@ debugger
             obj[name] = [];
           }
           obj[name].push(
-              decodeURIComponent(
+            decodeURIComponent(
               this.configParamTrans(
                 res[1],
                 this.getItemType(name, res[1], ltmplConfig)