aldehyde 0.2.255 → 0.2.258

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aldehyde",
-  "version": "0.2.255",
+  "version": "0.2.258",
   "author": "cosmicparticle",
   "main": "lib/index.js",
   "module": "src/aldehyde/index.txs",
@@ -29,6 +29,7 @@
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@tinymce/tinymce-react": "^3.12.2",
+    "@types/react-resizable": "^3.0.8",
     "add": "^2.0.6",
     "ahooks": "^3.8.5",
     "antd": "^5.25.0",
@@ -84,12 +85,14 @@
     "react-document-title": "^2.0.3",
     "react-dom": "^18.2.0",
     "react-draft-wysiwyg": "^1.15.0",
+    "react-draggable": "^4.4.6",
     "react-error-overlay": "^6.0.10",
     "react-file-viewer": "^1.2.1",
     "react-highlight-words": "^0.16.0",
     "react-load-script": "^0.0.6",
     "react-loadable": "^5.5.0",
     "react-markdown": "^8.0.4",
+    "react-resizable": "^3.0.5",
     "react-router-dom": "^6.10.0",
     "react-signature-canvas": "^1.0.5",
     "react-sortable-hoc": "^2.0.0",
@@ -151,7 +154,7 @@
     "@loadable/webpack-plugin": "^5.15.0",
     "@svgr/webpack": "^2.4.1",
     "@types/node": "^20.10.4",
-    "@types/react": "^18.2.45",
+    "@types/react": "^19.1.8",
     "@types/react-dom": "^18.2.17",
     "@types/webpack": "^5.28.0",
     "autoprefixer": "^10.4.2",

package/src/aldehyde/detail/view/dtmpl-view.tsx

@@ -36,6 +36,7 @@ export interface DtmplViewStat {
 class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
   static defaultProps = {
     showRightNav: true,
+    maxColsOnRow:2,
   };
 
   state = {
@@ -110,7 +111,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
       serverKey,
       mainCode,
       showRightNav,
-      parentId,
+      parentId,maxColsOnRow,
     } = this.props;
     const { dtmplData, loading, id } = this.state;
     let groups: FieldGroupConfig[] = [];
@@ -243,7 +244,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
             headStyle={{ background: "#f2f4f5" }}
             loading={loading}
           >
-            <FieldViewGroup dataCode={dtmplData ? dtmplData.code:null}
+            <FieldViewGroup column={maxColsOnRow} dataCode={dtmplData ? dtmplData.code:null}
               serverKey={serverKey}
               fields={item.fields}
               valueMap={dtmplData ? dtmplData.fieldMap : undefined}
@@ -262,7 +263,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
       code,
       sourceId,
       dtmplConfig,
-      serverKey,
+      serverKey,maxColsOnRow,
     } = this.props;
     const {
       premisesTitle,
@@ -289,7 +290,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
             headStyle={{ background: "#f2f4f5" }}
             loading={loading}
           >
-            <FieldViewGroup serverKey={serverKey} fields={premises} />
+            <FieldViewGroup column={maxColsOnRow} serverKey={serverKey} fields={premises} />
           </CollapseCard>
         ) : (
           ""

package/src/aldehyde/detail/view/field-view-group.tsx

@@ -10,6 +10,7 @@ interface FieldViewGroupProps {
   valueMap?: object;
   width?: number;
   dataCode?: string;
+  column?: number;
 }
 
 interface FieldViewGroupState {
@@ -26,6 +27,9 @@ export default class FieldViewGroup extends React.PureComponent<
       fileList: [],
     };
   }
+  static defaultProps = {
+    column: 2,
+  };
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
 
@@ -78,6 +82,7 @@ export default class FieldViewGroup extends React.PureComponent<
   };
 
   render() {
-    return <Descriptions column={2}>{this.initViewList()}</Descriptions>;
+    const {column} = this.props;
+    return <Descriptions column={column} >{this.initViewList()}</Descriptions>;
   }
 }

package/src/aldehyde/detail/view/snapshot-timeline.tsx

@@ -4,23 +4,25 @@ import HcserviceV3 from "../../tmpl/hcservice-v3";
 import "../dtmpl.css";
 import { DtmplConfig } from "../../tmpl/interface";
 import Units from "../../units";
-import DtmplView from "./dtmpl-view";
 import { LocaleContext } from "../../locale/LocaleProvider";
+import ViewComparePanel, {ViewComparData} from "./view-compare-panel";
+
+type SnapshotType={code:number,time:string,userName:string};
 
 export interface SnapshotTimelineProps {
   sourceId: string;
   serverKey?: string;
   code: string;
-  showSnapshot?: (id: number) => void;
+  showSnapshot?: () => void;
   onClose: () => void;
   open: boolean;
   dtmplConfig: DtmplConfig;
 }
 
 export interface SnapshotTimelineStat {
-  list?: any[];
+  list?: SnapshotType[];
   loading?: boolean;
-  current?: number;
+  currents?: SnapshotType[];
 }
 
 class SnapshotTimeline extends React.PureComponent<
@@ -32,7 +34,7 @@ class SnapshotTimeline extends React.PureComponent<
   state = {
     list: undefined,
     loading: false,
-    current: undefined,
+    currents: [],
   };
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
@@ -48,8 +50,8 @@ class SnapshotTimeline extends React.PureComponent<
   }
 
   loadData = async () => {
-    const { sourceId, code, showSnapshot, serverKey } = this.props;
-    const { current } = this.state;
+    const { sourceId, code, serverKey } = this.props;
+    const { currents } = this.state;
     if (code) {
       this.setState({
         loading: true,
@@ -59,29 +61,69 @@ class SnapshotTimeline extends React.PureComponent<
         sourceId,
         code
       );
+      if(currents.length==0 && list.length > 0){
+        this.onAdd(list[0]);
+      }
+
       this.setState({
         list,
-        current: !current && list.length > 0 ? list[0].code : current,
         loading: false,
       });
     }
   };
 
-  onChange = (code: number) => {
+  // onChange = (versionId: number) => {
+  //   const { showSnapshot } = this.props;
+  //   this.setState({
+  //     current: versionId,
+  //   });
+  //   showSnapshot(versionId);
+  // };
+  onAdd = (item: SnapshotType) => {
+    const { showSnapshot } = this.props;
+    const { currents } = this.state;
+    if(!this.isCurrent(item,currents)){
+      this.setState({
+        currents: [...currents,item],
+      });
+    }
+
+    // showSnapshot();
+  };
+
+  onRemove = (item: SnapshotType) => {
     const { showSnapshot } = this.props;
+    const { currents } = this.state;
+
+    let list:SnapshotType[]=[];
+    for (const c of currents) {
+      if(c.code!=item.code) {
+        list.push(c);
+      }
+    }
+
     this.setState({
-      current: code,
+      currents: [...list],
     });
-    showSnapshot(code);
+   // showSnapshot();
   };
 
+  isCurrent=(item:SnapshotType,currents:SnapshotType[]) => {
+    for (const c of currents) {
+      if(c.code==item.code) {
+       return true;
+      }
+    }
+    return false;
+  }
+
   detailHistory = () => {
-    const { list, current } = this.state;
+    const { list, currents } = this.state;
     const { translate } = this.context;
     let detailHistory;
     if (list.length > 0) {
       detailHistory = list.map((item, index) => {
-        const isCurrentItem = current ? item.code === current : false;
+        const isCurrentItem =this.isCurrent(item,currents);
         const color = isCurrentItem ? "red" : "blue";
         return (
           <Timeline.Item color={color} key={index}>
@@ -89,13 +131,19 @@ class SnapshotTimeline extends React.PureComponent<
             <br />
             {`` + item.userName}
             {isCurrentItem ? (
-              ""
+                <Button
+                    style={{ marginLeft: 10 }}
+                    size="small"
+                    onClick={() => this.onRemove(item)}
+                >
+                  {translate("${取消查看}")}
+                </Button>
             ) : (
               <Button
                 style={{ marginLeft: 10 }}
                 type="primary"
                 size="small"
-                onClick={() => this.onChange(item.code)}
+                onClick={() => this.onAdd(item)}
               >
                 {translate("${查看}")}
               </Button>
@@ -103,7 +151,6 @@ class SnapshotTimeline extends React.PureComponent<
           </Timeline.Item>
         );
       });
-
       return detailHistory;
     }
   };
@@ -117,9 +164,15 @@ class SnapshotTimeline extends React.PureComponent<
       code,
       serverKey,
     } = this.props;
-    const { list, current } = this.state;
+    const { list, currents} = this.state;
     const { translate } = this.context;
 
+    let viewDatas: ViewComparData[]=[];
+    currents.sort((a, b) => b.time - a.time);
+    for (const c of currents) {
+      viewDatas.push({code,versionId: c.code, time: c.time,userName:c.userName});
+    }
+
     return (
       <>
         <Drawer
@@ -135,7 +188,7 @@ class SnapshotTimeline extends React.PureComponent<
             translate("${暂无历史记录}")
           )}
         </Drawer>
-        <Drawer
+        <Drawer key={translate("${快照查看}")}
           placement={"left"}
           title={translate("${快照查看}")}
           closable={true}
@@ -143,18 +196,20 @@ class SnapshotTimeline extends React.PureComponent<
           onClose={onClose}
           open={open}
           width={"calc(100% - 380px)"}
+          styles={{body:{padding:"6px 24px 6px 24px"}}}
           style={{
             maxWidth: 1960,
           }}
         >
-          <DtmplView
-            serverKey={serverKey}
-            showRightNav={false}
-            dtmplConfig={dtmplConfig}
-            sourceId={sourceId}
-            code={code}
-            versionId={current}
-          ></DtmplView>
+          {/*<DtmplView*/}
+          {/*  serverKey={serverKey}*/}
+          {/*  showRightNav={false}*/}
+          {/*  dtmplConfig={dtmplConfig}*/}
+          {/*  sourceId={sourceId}*/}
+          {/*  code={code}*/}
+          {/*  versionId={current}*/}
+          {/*></DtmplView>*/}
+          <ViewComparePanel  serverKey={serverKey} dtmplConfig={dtmplConfig} sourceId={sourceId} data={viewDatas}></ViewComparePanel>
         </Drawer>
       </>
     );

package/src/aldehyde/detail/view/view-compare-panel.tsx

@@ -0,0 +1,57 @@
+import { Card,  Splitter} from "antd";
+import React, { useEffect, useState } from "react";
+import {DtmplConfig} from "../../tmpl/interface";
+import DtmplView from "./dtmpl-view";
+import Units from "../../units";
+
+export type ViewComparData={
+    code: string,
+    versionId?: number,
+    time:string,
+    userName?: string,
+}
+
+type ViewComparePanelProp = {
+    serverKey?:string;
+    dtmplConfig:DtmplConfig,
+    sourceId:string,
+    data?:ViewComparData[]
+};
+
+
+
+const ViewComparePanel = (props: ViewComparePanelProp) => {
+  // button
+    const {serverKey,
+    dtmplConfig,
+        sourceId,data}=props;
+
+
+
+  return (
+      <>
+      <Card  styles={{body:{padding:'0px'}}} style={{width:data && data.length>1? 500*data.length:'100%'}}>
+      <div style={{whiteSpace: 'nowrap',
+          overflowX: 'auto'}}>
+      <Splitter >
+      {data?
+          data.map((d)=>{
+             return <Splitter.Panel >
+                 <Card title={d.userName+ ":" + Units.formateDate(d.time)} style={{minWidth:'400px'}}>
+            <DtmplView maxColsOnRow={data && data.length>1?1:2}
+                  serverKey={serverKey}
+                  showRightNav={false}
+                  dtmplConfig={dtmplConfig}
+                  sourceId={sourceId}
+                  code={d.code}
+                  versionId={d.versionId}
+              ></DtmplView> </Card></Splitter.Panel>
+          }) :null}
+      </Splitter>
+      </div>
+      </Card>
+      </>
+  );
+};
+
+export default ViewComparePanel;

package/src/aldehyde/form/criteria-form.tsx

@@ -506,7 +506,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
     </AntdForm>
   );
 };
-CriteriaForm.defaultProps = {
+CriteriaForm["defaultProps"] = {
   hiddenCriteriaIds: [],
   open: true,
 };

package/src/aldehyde/layout/footer/index.js

@@ -10,7 +10,7 @@ export default class Footer extends React.Component {
         return (
             <AntdFooter style={{textAlign: 'center'}}>
                 <div className="footer">
-                    {content?content:"Enterprise Applications ©2022 Created by  旷识科技"}
+                    {/*{content?content:"Enterprise Applications ©2022 Created by  旷识科技"}*/}
                 </div>
             </AntdFooter>
         )

package/src/aldehyde/layout2/header.tsx

@@ -22,14 +22,13 @@ import {
 import { useLocale } from "../locale/useLocale";
 import { generate } from "@ant-design/colors";
 import { useLayoutContext } from "./layout-context";
-import { useSessionStorageState } from 'ahooks';
-import {AppstoreOutlined, DesktopOutlined, MacCommandOutlined, SettingOutlined} from "@ant-design/icons";
+
 import Units from "../units";
 
 type HeaderPropsType = {
   systemName: string;
   menuList: MenuType[];
-  style?: typeof Layout.Header.defaultProps.style;
+  style?: any;
 };
 
 type MenuItem = Required<MenuProps>["items"][number];

package/src/aldehyde/layout2/main.tsx

@@ -4,7 +4,7 @@ import TabsLayout from "./tabs/tabs-layout";
 
 
 type MainPropsType = {
-  style?: typeof Layout.Content.defaultProps.style;
+  style?: any;
   children?: React.ReactNode;
 };
 

package/src/aldehyde/layout2/page.tsx

@@ -188,7 +188,8 @@ const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
   }, []);
 
   // page ref
-  const pageRef = useRef<HTMLDivElement>();
+  const pageRef = useRef<HTMLDivElement>(undefined);
+
   useEffect(() => {
     useVarCssColor(generate(colorPrimary));
   }, []);

package/src/aldehyde/module/ltmpl-table.tsx

@@ -106,7 +106,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
     //提取 过滤条件的默认值
     if (ltmplConfigRes) {
       let defaultCriteriaValue =
-        ltmplConfigRes.ltmplConfig.defaultCriteriaValue;
+        ltmplConfigRes.ltmplConfig?.defaultCriteriaValue;
       if (defaultCriteriaValue) {
         criteriaData = this.toCriteriaData(defaultCriteriaValue);
       }

package/src/aldehyde/table/column/column-builder.tsx

@@ -77,6 +77,7 @@ export default {
       }
       column["title"] = item.title;
       column["dataIndex"] = item.id;
+       column["key"] = item.id;
       if (item["colWidth"]) column["width"] = item["colWidth"];
       if (item["statColType"]) column["statColType"] = item["statColType"];
       if (item["aggFunc"]) column["cal"] = item["aggFunc"];
@@ -91,7 +92,6 @@ export default {
             TableUnits.sort(column, itemType, order);
           }
         }
-
       }
       //特殊列处理
       //序号
@@ -161,10 +161,10 @@ export default {
         );
         column["width"] = 40;
         column["dataIndex"] = item.id;
+        column["key"] = item.id;
         column["className"] = "drag-visible";
         column["render"] = () => <DragHandle/>;
     },
-
     setHiddenRecordOpt(column:object,hiddenRowCodes,unHiden,onHide,translate){
         //隐藏
         column["align"] = "center";
@@ -236,6 +236,7 @@ export default {
 
       column["title"] = item.title;
       column["dataIndex"] = item.id;
+      column["key"] = item.id;
       if (item["colWidth"]) column["width"] = item["colWidth"];
       if (item["order"]) column["order"] = Number(item["order"]);
       // column['ellipsis']= true;

package/src/aldehyde/table/index.css

@@ -22,6 +22,20 @@
   z-index: 3; /* 或者更高的值 */
 }
 
+.react-resizable {
+  position: relative;
+  background-clip: padding-box;
+}
+
+.react-resizable-handle {
+  position: absolute;
+  width: 10px;
+  height: 100%;
+  bottom: 0;
+  right: -5px;
+  cursor: col-resize;
+  z-index: 1;
+}
 
 .row-dragging {
   background: #fafafa;

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

@@ -15,9 +15,10 @@ import { LocaleContext } from "../locale/LocaleProvider";
 import { init, merge, statistic } from "../utils/dsu";
 import VerticalList from "../list/vertical-list";
 import SummaryBuilder from "./column/summary-builder";
-import {Button, Card, Descriptions, message, Space, Statistic, Table} from "antd";
+import {Button, Card, Descriptions, message, Statistic, Table} from "antd";
 import Units from "../units";
 import {DownOutlined, UpOutlined} from "@ant-design/icons";
+import ResizableTable from "./resizable-table";
 
 const SortableItem = SortableElement((props) => (
   <tr className="sortable-item-hover" {...props} />
@@ -358,33 +359,33 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
   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);
-      }
+      // 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 === "ascend") {
+      if (sorter.order === "ascend") {
         Object.assign(extParams, {
-          sortColIds: [...sortColumnData, sorter.field + "_" + "desc"],
+          sortColIds: [ sorter.field + "_" + "asc"],
         });
       } else if (sorter.order === "descend") {
         Object.assign(extParams, {
-          sortColIds: [...sortColumnData],
+          sortColIds: [ sorter.field + "_" + "desc"],
         });
       } else {
         Object.assign(extParams, {
-          sortColIds: [...sortColumnData, sorter.field + "_" + "asc"],
+          sortColIds: [],
         });
       }
       this.props.doSearch(extParams);
@@ -550,14 +551,6 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
 
     return (
       <>
-        {/*{aggregateVO && aggregateVO.aggregates && aggregateVO.aggregates.length>0?<Card styles={{body:{padding:2}}}>*/}
-        {/*  <Space size={"large"} style={{marginLeft:50}}>*/}
-        {/*    {*/}
-        {/*      aggregateVO.aggregates.map(av=>{*/}
-        {/*        return <Statistic title={av.fieldTitle} value={av.value} />*/}
-        {/*      })}*/}
-        {/*  </Space>*/}
-        {/*</Card>:null}*/}
         {aggregateVO && aggregateVO.aggregates && aggregateVO.aggregates.length>0 ?
             <Card variant="borderless" styles={{body:{paddingLeft:10,paddingTop:4,paddingBottom:4,paddingRight:10}}}>
           <Descriptions
@@ -565,35 +558,66 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
               items={aggregateItems}
           />
         </Card>:null}
+        {/*{viewModels.includes("table") ? (*/}
+        {/*  <Table*/}
+        {/*    size={tableProps.size ? tableProps.size : undefined}*/}
+        {/*    rowSelection={this.getRowSelection()}*/}
+        {/*    columns={current_cols}*/}
+        {/*    dataSource={originData}*/}
+        {/*    scroll={*/}
+        {/*      tableProps.scrollY == -1 || tableProps.scrollY == 0*/}
+        {/*        ? null*/}
+        {/*        : {*/}
+        {/*            y: tableProps.scrollY,*/}
+        {/*            x: table_x,*/}
+        {/*          }*/}
+        {/*    }*/}
+        {/*    bordered*/}
+        {/*    pagination={false}*/}
+        {/*    style={{ display: columns ? "block" : "none" }}*/}
+        {/*    summary={summary}*/}
+        {/*    loading={loading}*/}
+        {/*    components={{*/}
+        {/*      body: {*/}
+        {/*        wrapper: this.DraggableContainer,*/}
+        {/*        row: this.DraggableBodyRow,*/}
+        {/*      },*/}
+        {/*    }}*/}
+        {/*    onChange={this.onChange.bind(this)}*/}
+        {/*  ></Table>*/}
+        {/*) : (*/}
+        {/*  ""*/}
+        {/*)}*/}
         {viewModels.includes("table") ? (
-          <Table
-            size={tableProps.size ? tableProps.size : undefined}
-            rowSelection={this.getRowSelection()}
-            columns={current_cols}
-            dataSource={originData}
-            scroll={
-              tableProps.scrollY == -1 || tableProps.scrollY == 0
-                ? null
-                : {
-                    y: tableProps.scrollY,
-                    x: table_x,
-                  }
-            }
-            bordered
-            pagination={false}
-            style={{ display: columns ? "block" : "none" }}
-            summary={summary}
-            loading={loading}
-            components={{
-              body: {
-                wrapper: this.DraggableContainer,
-                row: this.DraggableBodyRow,
-              },
-            }}
-            onChange={this.onChange.bind(this)}
-          ></Table>
+            <ResizableTable
+                size={tableProps.size ? tableProps.size : undefined}
+                rowSelection={this.getRowSelection()}
+                columns={current_cols}
+                dataSource={originData}
+                rowKey={"序号"}
+                scroll={
+                  tableProps.scrollY == -1 || tableProps.scrollY == 0
+                      ? null
+                      : {
+                        y: tableProps.scrollY,
+                        x: table_x,
+                      }
+                }
+                bordered
+                pagination={false}
+                style={{ display: columns ? "block" : "none" }}
+                summary={summary}
+                loading={loading}
+                components={{
+                  body: {
+                    wrapper: this.DraggableContainer,
+                    row: this.DraggableBodyRow,
+                  },
+                }}
+                onChange={this.onChange.bind(this)}
+            ></ResizableTable>
         ) : (
-          ""
+            ""
         )}
         <Pagination key={queryKey? queryKey.key:Units.getReactKey()}
           touchEnd={touchEnd}