aldehyde 0.2.179 → 0.2.181

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

@@ -19,6 +19,8 @@ import Table from "./control-table-x-axis-wrapper";
 import {
   AlignCenterOutlined,
   AlignLeftOutlined,
+  CaretDownOutlined,
+  CaretUpOutlined,
   CopyOutlined,
   DeleteOutlined,
   DownloadOutlined,
@@ -134,7 +136,7 @@ interface ActTableStat {
   showCustomCard?: boolean;
   customButton?: CustomButton;
   customButtonData?: DtmplData[];
-  showRatmplSelector?:boolean;
+  showRatmplSelector?: boolean;
 }
 
 class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
@@ -158,7 +160,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     showCustomCard: false,
     customButtonData: undefined,
     customButton: undefined,
-    showRatmplSelector:false,
+    showRatmplSelector: false,
   };
 
   static contextType = LocaleContext;
@@ -422,7 +424,10 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       let itemType = SupportInputTypes.getSupportControlType(item);
       if (s < 12 && item.title != "操作" && item.title != "序号") {
         if (hiddenColIds.includes("10000")) {
-          TableUnits.sort(column, itemType);
+          // TableUnits.sort(column, itemType, "descend");
+          const order = this.handleColumnOrder(column["dataIndex"]);
+
+          TableUnits.sort(column, itemType, order);
         }
       }
       //特殊列处理
@@ -745,7 +750,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       }
     });
 
-    console.log(tableColumns);
+    console.log("columns", tableColumns);
 
     return tableColumns;
   };
@@ -892,7 +897,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   };
 
   doDelete = async () => {
-    const { sourceId, serverKey,mainCode } = this.props;
+    const { sourceId, serverKey, mainCode } = this.props;
     const {
       selectedRows,
       hiddenColIds,
@@ -905,7 +910,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     let result: boolean = await HcserviceV3.deleteData(
       serverKey,
       sourceId,
-      selectedRows,mainCode
+      selectedRows,
+      mainCode
     );
     if (result) {
       //重新加载数据
@@ -918,13 +924,17 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   };
 
   doDeleteByCode = async (code: string) => {
-    const { sourceId, serverKey,mainCode } = this.props;
+    const { sourceId, serverKey, mainCode } = this.props;
     const { hiddenColIds, hiddenRowCodes, sortedColConfigs } = this.state;
     this.setState({
       loading: true,
     });
-    debugger
-    let result: boolean = await HcserviceV3.deleteByCode(serverKey, sourceId, [code],mainCode);
+    let result: boolean = await HcserviceV3.deleteByCode(
+      serverKey,
+      sourceId,
+      [code],
+      mainCode
+    );
     if (result) {
       //重新加载数据
       this.loadData(hiddenColIds, hiddenRowCodes, sortedColConfigs);
@@ -1092,8 +1102,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
   };
 
-
-
   changeRowSelection = (
     selectedRows: SelectedRow[],
     selectedDatas: DtmplData[]
@@ -1169,12 +1177,13 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
               </Button>
             </Popover>
           ) : null}
-          {buttons.includes("ratmplSelect")  ? (
-              <Button onClick={() => this.setState({showRatmplSelector:true})}>{translate("${选择}")}
-              </Button>
-              ) : (
-                 ""
-              )}
+          {buttons.includes("ratmplSelect") ? (
+            <Button onClick={() => this.setState({ showRatmplSelector: true })}>
+              {translate("${选择}")}
+            </Button>
+          ) : (
+            ""
+          )}
           {buttons.includes("dtmplAdd") && doCreate && !readOnly ? (
             ltmplConfig.classAddConfigs &&
             ltmplConfig.classAddConfigs.length > 0 ? (
@@ -1408,6 +1417,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       pageNo,
       onChangePage,
       serverKey,
+      doSearch,
+      criteriaData,
     } = this.props;
     const { translate } = this.context;
 
@@ -1443,6 +1454,11 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         }
       }
     }
+
+    const sortColumnData = [];
+    if (Array.isArray(criteriaData["sortColIds"])) {
+      sortColumnData.push(...criteriaData["sortColIds"]);
+    }
     return (
       <>
         {/*暂时不支持L2chart 后续用echart*/}
@@ -1525,6 +1541,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                   : ltmplConfig.subtotalYColumn
               }
               groupIColumns={ltmplConfig.groupIColumns}
+              doSearch={doSearch}
+              sortColumnData={sortColumnData}
             />
           )}
           {/*此处放页脚*/}
@@ -1543,7 +1561,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     this.setState({
       showRatmplSelector: false,
     });
-    const {serverKey,sourceId,mainCode,doSearch}=this.props;
+    const { serverKey, sourceId, mainCode, doSearch } = this.props;
     if (!selectedRows || selectedRows.length <= 0) {
       return;
     }
@@ -1553,10 +1571,33 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     for (let row of selectedRows) {
       codes.push(row.code);
     }
-    await HcserviceV3.saveRatmplSelectCodes(serverKey,sourceId,mainCode,codes);
+    await HcserviceV3.saveRatmplSelectCodes(
+      serverKey,
+      sourceId,
+      mainCode,
+      codes
+    );
     doSearch(null);
   };
 
+  handleColumnOrder(columnId) {
+    const sortColumns = this.props.criteriaData["sortColIds"];
+
+    if (!Array.isArray(sortColumns)) return undefined;
+
+    for (const column of sortColumns) {
+      const [key, sort] = column.split("_");
+
+      if (key === columnId) {
+        if (sort === "asc") return "ascend";
+        if (sort === "desc") return "descend";
+        continue;
+      }
+    }
+
+    return undefined;
+  }
+
   render() {
     let {
       queryKey,
@@ -1565,7 +1606,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       recordCode,
       showCustomCard,
       customButton,
-      customButtonData,showRatmplSelector
+      customButtonData,
+      showRatmplSelector,
     } = this.state;
     let {
       sourceId,
@@ -1573,7 +1615,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       title,
       collapsible,
       initCollapse,
-      tip,serverKey,mainCode
+      tip,
+      serverKey,
+      mainCode,
     } = this.props;
     const { translate } = this.context;
 
@@ -1630,21 +1674,21 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
           roleCode={recordCode}
         />
         {showRatmplSelector ? (
-            <ModelSelectTable
-                serverKey={serverKey}
-                // defaultCriteriaValue={fieldGroupConfig.defaultCriteriaValue}
-                // maxSelectedRows={fieldGroupConfig.max}
-                open={showRatmplSelector}
-                onOK={this.saveRatmplSelect}
-                onCancel={() => {
-                  this.setState({ showRatmplSelector: false });
-                }}
-                mainCode={mainCode}
-                sourceId={sourceId}
-                existRelation={"false"}
-            ></ModelSelectTable>
+          <ModelSelectTable
+            serverKey={serverKey}
+            // defaultCriteriaValue={fieldGroupConfig.defaultCriteriaValue}
+            // maxSelectedRows={fieldGroupConfig.max}
+            open={showRatmplSelector}
+            onOK={this.saveRatmplSelect}
+            onCancel={() => {
+              this.setState({ showRatmplSelector: false });
+            }}
+            mainCode={mainCode}
+            sourceId={sourceId}
+            existRelation={"false"}
+          ></ModelSelectTable>
         ) : (
-            ""
+          ""
         )}
       </>
     );

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

@@ -67,6 +67,8 @@ interface QueryTableProps {
   subtotalXColumn?: { id: string }[];
   subtotalYColumn?: { id: string }[];
   groupIColumns?: { id: string; title: string; sourceId: string }[]; // 组间合计key
+  doSearch?: (params: object) => void;
+  sortColumnData?: string[];
 }
 
 interface QueryTableStat {
@@ -1012,6 +1014,41 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     // return {};
   }
 
+  onChange(pagination, filters, sorter, extra) {
+    console.log("params", pagination, filters, sorter, extra);
+    if (extra.action === "sort") {
+      const extParams: Record<string, string> = {};
+      const sortColumnData = JSON.parse(
+        JSON.stringify(this.props.sortColumnData)
+      );
+
+      const tgt = sortColumnData.findIndex((item) => {
+        const key = item.split("_")[0];
+
+        if (key === sorter.field) return true;
+        return false;
+      });
+
+      if (tgt !== -1) {
+        sortColumnData.splice(tgt, 1);
+      }
+
+      if (sorter.order) {
+        Object.assign(extParams, {
+          sortColIds: [
+            ...sortColumnData,
+            sorter.field + "_" + (sorter.order === "ascend" ? "asc" : "desc"),
+          ],
+        });
+      } else {
+        Object.assign(extParams, {
+          sortColIds: [...sortColumnData],
+        });
+      }
+      this.props.doSearch(extParams);
+    }
+  }
+
   render() {
     const {
       pageInfo,
@@ -1332,6 +1369,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                 row: this.DraggableBodyRow,
               },
             }}
+            onChange={this.onChange.bind(this)}
           ></Table>
         ) : (
           ""

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

@@ -1,26 +1,26 @@
 import React from "react";
 
 export default {
-    sort(col, itemType: string,defaultSort?) {
-        let colName=col['dataIndex'];
-        if (itemType == "decimal" || itemType == "int" || itemType == "float" || itemType == "double") { //排序b
-            col["sorter"] = (a, b) => a[colName] - b[colName];
-        } else if (itemType == "text" || itemType == "textarea" || itemType == "date" || itemType == "datetime") {
-            col["sorter"] = (a, b) => a[colName] ? a[colName].localeCompare(b[colName], 'zh-CN') : -1;
-        } else {
-            col["sorter"] = (a, b) => { //排序
-                if (a[colName] && b[colName] && a[colName].localeCompare) {
-                    return a[colName] ? a[colName].localeCompare(b[colName], 'zh-CN') : -1;
-                } else {
-                    return 1;
-                }
-            }
-        }
-        if(defaultSort){
-            col['defaultSortOrder'] = defaultSort;
-        }
-
-        col['showSorterTooltip'] = false;
+  sort(col, itemType: string, defaultSort?) {
+    let colName = col["dataIndex"];
+    // if (itemType == "decimal" || itemType == "int" || itemType == "float" || itemType == "double") { //排序b
+    //     col["sorter"] = (a, b) => a[colName] - b[colName];
+    // } else if (itemType == "text" || itemType == "textarea" || itemType == "date" || itemType == "datetime") {
+    //     col["sorter"] = (a, b) => a[colName] ? a[colName].localeCompare(b[colName], 'zh-CN') : -1;
+    // } else {
+    //     col["sorter"] = (a, b) => { //排序
+    //         if (a[colName] && b[colName] && a[colName].localeCompare) {
+    //             return a[colName] ? a[colName].localeCompare(b[colName], 'zh-CN') : -1;
+    //         } else {
+    //             return 1;
+    //         }
+    //     }
+    // }
+    col["sorter"] = true;
+    if (defaultSort) {
+      col["defaultSortOrder"] = defaultSort;
     }
 
-}
+    col["showSorterTooltip"] = false;
+  },
+};

package/src/aldehyde/units/index.tsx

@@ -600,17 +600,21 @@ export default {
     }
     //排序
     paramKeys.sort();
-
+debugger
     for (let key of paramKeys) {
       let value = data[key];
-      let str = encodeURI(key);
+      let str = encodeURIComponent(key);
       if (!value) {
+      } else if (key === "sortColIds") {
+        value.forEach((_value) => {
+          _result.push(str + "[]=" + encodeURIComponent(_value));
+        });
       } else if (value && value.constructor === Array) {
         value.forEach((_value) => {
-          _result.push(str + "[]=" + encodeURI(_value));
+          _result.push(str + "[]=" + encodeURIComponent(_value));
         });
       } else {
-        _result.push(str + "=" + encodeURI(value));
+        _result.push(str + "=" + encodeURIComponent(value));
       }
     }
     return _result.length ? prefix + _result.join("&") : "";
@@ -659,7 +663,7 @@ export default {
             obj[name] = [];
           }
           obj[name].push(
-            decodeURI(
+              decodeURIComponent(
               this.configParamTrans(
                 res[1],
                 this.getItemType(name, res[1], ltmplConfig)
@@ -670,7 +674,7 @@ export default {
           const res = arr2[i].split("=");
           const name = res[0];
           if (name) {
-            obj[name] = decodeURI(
+            obj[name] = decodeURIComponent(
               this.configParamTrans(
                 res[1],
                 this.getItemType(name, res[1], ltmplConfig)