aldehyde 0.2.213 → 0.2.215

package/src/aldehyde/tmpl/interface.tsx

@@ -17,6 +17,49 @@ export type ActTableViewModel = "table" | "verticalList" | "horizontalList";
 
 export type ControlHolderType = "table" | "descriptions";
 export type PageType = "modal" | "drawer" |"card"| "routing" |"blank";
+
+export interface ReportTableProps {
+  tableProps?: {
+    size?: "small" | "middle" | "large";
+    clickDisplayTotal?: boolean;
+    scrollY?: number;
+  };
+  leftFixedCols?:number;
+  serverKey?: string;
+  maxSelectedRows?: number;
+  selectedRows?: SelectedRow[];
+  columns: any[];
+  onChangeRowSelection?: (
+      selectedRows: SelectedRow[],
+      selectedDatas: DtmplData[],
+      allRowKeys: string[]
+  ) => void;
+  queryKey: QueryKey;
+}
+export interface QueryTableProps extends ReportTableProps{
+  viewModels?: ActTableViewModel[];
+  // defaultPageSize?: number;
+  pageInfo: {
+    pageNo: number;
+    pageSize: number;
+  };
+  primaryColumn?: ColumnConfig;
+  onChangePage: (pageNo: number, pageSize: number) => void;
+  hiddenRowCodes?: string[];
+  viewModel?: string;
+  columnConfigs?: FieldConfig[];
+  summaryConfigs?: {
+    id: string;
+    aggFunc: "sum" | "avg" | "groupIsum" | "groupIavg";
+  }[];
+  subtotalXColumn?: { id: string }[];
+  subtotalYColumn?: { id: string }[];
+  groupIColumns?: { id: string; title: string; sourceId: string }[]; // 组间合计key
+  doSearch?: (params: object) => void;
+  sortColumnData?: string[];
+}
+
+
 export interface TmplBase {
   id?: string;
   title?: string;
@@ -28,7 +71,7 @@ export interface OrderableTmplBase extends TmplBase {
 }
 
 export interface FieldBase extends OrderableTmplBase {
-  colNum?: number;
+  colSpan?: number;
   mstrucId?: string;
   defaultValue?: string;
   value?: string;
@@ -142,7 +185,7 @@ export interface Level2Menu extends MenuBase {
   disabled?: boolean;
   hiddenOnDisabled?: boolean;
   defaultCriteriaValue?: object;
-  pageType: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树"|"导入";
+  pageType: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树"|"导入"|"报表";
   programAuths?: ProgramAuth[];
   linkTarget?: HTMLAttributeAnchorTarget;
 }
@@ -164,10 +207,12 @@ export interface CriteriaConfig extends FieldConfig {}
 
 export interface ColumnConfig extends FieldConfig {
   statColType?: StatColType;
+  rowSpan?:number;
   colWidth?: number;
   colFixed?: "left" | "right" | boolean;
   valueAlign?: "left" | "right" | "center";
   id: string;
+  upperColumnTitle?:string,
 }
 
 export type CodeSource = "new" | "listop" | "listop-new" | undefined;
@@ -441,6 +486,14 @@ export interface DtmplData {
   fieldMap?: object;
   arrayMap?: object; //Map<number,DtmplData[]>
 }
+export interface GridLayout{
+  rowSpan?:number,
+  colSpan?:number;
+}
+
+export interface LtmplData extends DtmplData{
+  layout:GridLayout[];
+}
 
 export interface PageInfo {
   pageNo: number;
@@ -448,12 +501,12 @@ export interface PageInfo {
   virtualEndPageNo?: number;
 }
 
-export interface LtmplData {
-  entities: DtmplData[];
-  pageInfo: PageInfo;
-  queryKey: string;
-  isEndList: boolean;
-}
+// export interface LtmplData {
+//   entities: DtmplData[];
+//   pageInfo: PageInfo;
+//   queryKey: string;
+//   isEndList: boolean;
+// }
 
 export interface UserInfo {
   id: string;
@@ -481,6 +534,13 @@ export interface QueryData {
   pageInfo: PageInfo;
 }
 
+export interface ReportData {
+  entities: LtmplData[];
+  key: string;
+  columnConfigs: ColumnConfig[];
+  rowGrids:object;
+}
+
 export interface EControlProps extends ControlBaseProps {
   onChange?: (value: any) => void;
   min?: string;
@@ -607,7 +667,7 @@ export interface BlockType {
   disabled?: boolean; // 是否禁用
   hiddenOnDisabled?: boolean; // 是否隐藏
   customPath?: string; // 自定义页面路径
-  pageType?: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树"|"导入"; // 页面类型
+  pageType?: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树"|"导入"|"报表"; // 页面类型
   defaultCriteriaValue?: { [key: string]: string }; // 一些组件参数
   linkTarget?: HTMLAttributeAnchorTarget; // 页面跳转方式
   items?: BlockType[];

package/lib/login2/LoginPage.d.ts

@@ -1,4 +0,0 @@
-import React from "react";
-declare const LoginPage: () => React.JSX.Element;
-export default LoginPage;
-//# sourceMappingURL=LoginPage.d.ts.map

package/lib/login2/LoginPage.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"LoginPage.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/login2/LoginPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,QAAA,MAAM,SAAS,yBAoDd,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/lib/login2/LoginPage.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LoginPage.js","sourceRoot":"","sources":["../../../../src/aldehyde/login2/LoginPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,UAAU,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAClD,OAAO,KAAK,MAAM,UAAU,CAAC;AAC7B,OAAO,EAAS,GAAG,EAAE,GAAG,EAAC,MAAM,MAAM,CAAC;AACtC,OAAO,aAAa,MAAM,+BAA+B,CAAC;AAE1D,MAAM,SAAS,GAAG,GAAG,EAAE;IACrB,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAElC,OAAO,CACL,6BACE,KAAK,EAAE;YACL,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,MAAM;YACd,sBAAsB;YACtB,QAAQ,EAAE,UAAU;YACpB,UAAU,EAAE,OAAO,UAAU,GAAG;YAChC,cAAc,EAAE,OAAO;YACvB,OAAO,EAAE,MAAM;YACf,aAAa,EAAE,aAAa;YAC5B,cAAc,EAAE,YAAY;YAC5B,UAAU,EAAE,QAAQ;SACrB;QAED,6BACE,KAAK,EAAE;gBACL,KAAK,EAAE,OAAO;gBACd,mBAAmB;gBACnB,UAAU,EAAE,6CAA6C;gBACzD,SAAS,EAAE,oCAAoC;gBAC/C,WAAW,EAAE,KAAK;gBAClB,OAAO,EAAE,MAAM;gBACf,WAAW,EAAE,KAAK;aACnB;YAED,6BACE,KAAK,EAAE;oBACL,UAAU,EAAE,GAAG;oBACf,QAAQ,EAAE,MAAM;oBAChB,KAAK,EAAE,SAAS;oBAChB,YAAY,EAAE,EAAE;iBACjB,IAEA,SAAS,CAAC,QAAQ,CAAC,CAChB;YACN,oBAAC,KAAK,IACJ,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;oBAClB,YAAY,CAAC,KAAK,EAAE,CAAC;oBACrB,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC;oBAC7B,KAAK,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;gBACnC,CAAC,GACM;YACP,oBAAC,GAAG;gBACA,oBAAC,GAAG,IAAC,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE;oBAAE,oBAAC,aAAa,IAAC,YAAY,EAAE,IAAI,GAAkB,CAAM,CACjF,CACJ,CACF,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/lib/login2/index.d.ts

@@ -1,4 +0,0 @@
-import Login from "./Login";
-import LoginPage from "./LoginPage";
-export { Login, LoginPage };
-//# sourceMappingURL=index.d.ts.map

package/lib/login2/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/login2/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC"}

package/lib/login2/index.js

@@ -1,4 +0,0 @@
-import Login from "./Login";
-import LoginPage from "./LoginPage";
-export { Login, LoginPage };
-//# sourceMappingURL=index.js.map

package/lib/login2/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/aldehyde/login2/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC"}

package/src/aldehyde/login2/LoginPage.tsx

@@ -1,64 +0,0 @@
-import React from "react";
-import Login from "./Login";
-import LoginBgPng from "./img/login-bg.png";
-import { useLocale } from "../locale/useLocale";
-import HCDataSource from "../tmpl/hc-data-source";
-import Units from "../units";
-import {Button, Col, Row} from "antd";
-import ResetPassword from "../layout/menu/reset-password";
-
-const LoginPage = () => {
-  const { translate } = useLocale();
-
-  return (
-    <div
-      style={{
-        width: "100%",
-        height: "100%",
-        // minWidth: "1600px",
-        position: "absolute",
-        background: `url(${LoginBgPng})`,
-        backgroundSize: "cover",
-        display: "flex",
-        flexDirection: "row-reverse",
-        justifyContent: "flex-start",
-        alignItems: "center",
-      }}
-    >
-      <div
-        style={{
-          width: "500px",
-          // height: "500px",
-          background: "linear-gradient(0deg, #FFFFFF 65%, #DFEDFF)",
-          boxShadow: "0px 10px 15px -3px rgba(0,0,0,0.1)",
-          marginRight: "10%",
-          padding: "60px",
-          aspectRatio: "1/1",
-        }}
-      >
-        <div
-          style={{
-            fontWeight: 600,
-            fontSize: "30px",
-            color: "#222222",
-            marginBottom: 60,
-          }}
-        >
-          {translate("欢迎, 登录")}
-        </div>
-        <Login
-          onFinish={(token) => {
-            HCDataSource.clear();
-            window.location.hash = "/v2";
-            Units.setHydrocarbonToken(token);
-          }}
-        ></Login>
-          <Row>
-              <Col span={6} offset={18}><ResetPassword showUserName={true}></ResetPassword></Col>
-          </Row>
-      </div>
-    </div>
-  );
-};
-
-export default LoginPage;

package/src/aldehyde/login2/index.tsx

@@ -1,4 +0,0 @@
-import Login from "./Login";
-import LoginPage from "./LoginPage";
-
-export { Login, LoginPage };