aldehyde 0.2.461 → 0.2.463

package/src/aldehyde/controls/chemstruc/graph.tsx

@@ -11,7 +11,7 @@ import { DeploymentUnitOutlined } from "@ant-design/icons";
 import { LocaleContext } from "../../locale/LocaleProvider";
 import DraggableModal from "../../module/draggable-modal";
 
-interface ChemStrucProps extends VEControlProps {}
+interface ChemStrucProps extends VEControlProps { }
 
 interface ChemStrucState {
   modalOpen?: boolean;
@@ -33,7 +33,7 @@ export default class ChemStruc extends React.PureComponent<
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
 
-  componentDidMount() {}
+  componentDidMount() { }
 
   //
   // async componentDidUpdate(prevProps, prevState, snapshot) {
@@ -126,36 +126,36 @@ export default class ChemStruc extends React.PureComponent<
           footer={
             disabled
               ? [
-                  <Button
-                    key={1}
-                    onClick={() => {
-                      this.onCancel();
-                    }}
-                  >
-                    {translate("${取消}")}
-                  </Button>,
-                ]
+                <Button
+                  key={1}
+                  onClick={() => {
+                    this.onCancel();
+                  }}
+                >
+                  {translate("${取消}")}
+                </Button>,
+              ]
               : [
-                  <Popconfirm
-                    key={2}
-                    placement="top"
-                    title={translate("${确定要取消本次编辑的数据吗}?")}
-                    onConfirm={this.onCancel}
-                    okText={translate("${确定}")}
-                    cancelText={translate("${取消}")}
-                  >
-                    <Button>取消</Button>
-                  </Popconfirm>,
-                  <Button
-                    key={3}
-                    onClick={() => {
-                      this.saveMolfile();
-                    }}
-                    type="primary"
-                  >
-                    确定
-                  </Button>,
-                ]
+                <Popconfirm
+                  key={2}
+                  placement="top"
+                  title={translate("${确定要取消本次编辑的数据吗}?")}
+                  onConfirm={this.onCancel}
+                  okText={translate("${确定}")}
+                  cancelText={translate("${取消}")}
+                >
+                  <Button>取消</Button>
+                </Popconfirm>,
+                <Button
+                  key={3}
+                  onClick={() => {
+                    this.saveMolfile();
+                  }}
+                  type="primary"
+                >
+                  确定
+                </Button>,
+              ]
           }
           bodyStyle={{ width: "1200px" }}
         >
@@ -173,7 +173,7 @@ export default class ChemStruc extends React.PureComponent<
                   global.ketcher = ketcher;
                 }}
                 staticResourcesUrl={"ketcher"}
-                structServiceProvider={structServiceProvider}
+                structServiceProvider={structServiceProvider as any}
                 errorHandler={undefined}
               />
             </Col>

package/src/aldehyde/controls/cquery/cquick-button.tsx

@@ -15,6 +15,7 @@ interface CquickButtonProps extends ButtonProps {
 
 interface CquickButtonState {
   showDraw?: boolean;
+  drawerSize?: number | string; // 抽屉组件尺寸
 }
 
 const outlinedMap = {
@@ -27,6 +28,7 @@ class CquickButton extends React.PureComponent<
 > {
   state = {
     showDraw: false,
+    drawerSize: "92vw",
   };
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
@@ -57,7 +59,7 @@ class CquickButton extends React.PureComponent<
       serverKey,
       ...button
     } = this.props;
-    const { showDraw } = this.state;
+    const { showDraw, drawerSize } = this.state;
     const { translate } = this.context;
     //console.log("cQuery mainCode",mainCode);
     let mcode =
@@ -109,15 +111,12 @@ class CquickButton extends React.PureComponent<
           <Drawer
             placement={"left"}
             title={translate("${关联查询}")}
+            size={drawerSize}
+            resizable={{ onResize: (newSize => this.setState({ drawerSize: newSize })) }}
             closable={true}
             mask={false}
             onClose={this.closeDrawer}
             open={showDraw}
-            width="100%"
-            rootStyle={{
-              width: "calc(100% - 280px)",
-              maxWidth: 1960,
-            }}
             extra={
               <Space>
                 <Button onClick={this.closeDrawer}>
@@ -125,6 +124,7 @@ class CquickButton extends React.PureComponent<
                 </Button>
               </Space>
             }
+            styles={{ body: { minWidth: "720px" } }}
           >
             {cQueryConfig.path ? (
               React.createElement(Units.getCustomPage(cQueryConfig.path))
@@ -133,7 +133,7 @@ class CquickButton extends React.PureComponent<
                 serverKey={serverKey}
                 sourceId={cQueryConfig.id}
                 mainCode={mcode}
-              ></LtmplTable>
+              />
             )}
           </Drawer>
         )}

package/src/aldehyde/controls/direct-file-view/drawer-file-view.tsx

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React, { useState } from 'react';
 import { Button, Drawer, Space, Spin } from 'antd';
 import { DownloadOutlined, CloseOutlined } from '@ant-design/icons';
 import { CommonFilePath } from "../../tmpl/interface";
@@ -16,7 +16,8 @@ interface DrawerFileViewProps {
 
 const Index = (props: DrawerFileViewProps) => {
     const { filePath, downloadable } = props;
-    const [drawerOpen, setDrawerOpen] = React.useState(false);
+    const [drawerOpen, setDrawerOpen] = useState<boolean>(false);
+    const [drawerSize, setDrawerSize] = useState<number | string>("1200px");
 
     const download = (filePath: CommonFilePath) => {
         Units.downloadFile(filePath.path, filePath.fileName);
@@ -28,10 +29,12 @@ const Index = (props: DrawerFileViewProps) => {
         {drawerOpen ? <Drawer
             title={filePath.fileName}
             placement="left"
+            size={drawerSize}
+            resizable={{ onResize: (newSize => setDrawerSize(newSize)) }}
             closable={false}
             onClose={() => setDrawerOpen(false)}
-            width="1200px"
             open={drawerOpen}
+            styles={{ body: { minWidth: "1000px" } }}
             extra={
                 <Space>
                     {downloadable ? <Button onClick={() => download(filePath)} ><DownloadOutlined /></Button> : null}

package/src/aldehyde/controls/entity-select/entity-select.tsx

@@ -21,7 +21,6 @@ import HcserviceV3 from "../../tmpl/hcservice-v3";
 import HCDataSource from "../../tmpl/hc-data-source";
 import DtmplViewDrawer from "../../module/dtmpl-view-drawer";
 import DtmplEditPage from "../../module/dtmpl-edit-page";
-import { CustomTagProps } from "rc-select/lib/BaseSelect";
 import DtmplCustomEditModalPage from "../../custom-page/dtmpl-custom-edit-modal-page";
 import { LtmplModal } from "../../index";
 import { LocaleContext } from "../../locale/LocaleProvider";
@@ -549,7 +548,7 @@ export default class EntitySelect extends React.PureComponent<
     this.props.onChange(formValues.join("@,@"));
   };
 
-  tagRender = (props: CustomTagProps) => {
+  tagRender = (props) => {
     const { label, closable, onClose } = props;
     const onPreventMouseDown = (event: React.MouseEvent<HTMLSpanElement>) => {
       event.preventDefault();
@@ -712,8 +711,7 @@ export default class EntitySelect extends React.PureComponent<
           open={useSelectOpenStat ? selectOpen : undefined}
           popupRender={this.dropdownRender}
           tagRender={
-            actions &&
-              (actions.indexOf("detail") >= 0 || actions.indexOf("edit") >= 0)
+            actions?.some(r => ["detail", "edit"].includes(r))
               ? this.tagRender
               : undefined
           }

package/src/aldehyde/controls/entity-select/index.css

@@ -1,6 +1,8 @@
-.entity-select-popover{
+.entity-select-popover {
   /*padding: 4px;*/
 }
-.entity-select-popover .ant-popover-inner-content {
+
+.entity-select-popover .ant-popover-inner-content,
+.entity-select-popover .ant-popover-content {
   padding: 4px;
-}
+}

package/src/aldehyde/controls/entity-select/popover-entity-select.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { Button, Popover, Select } from "antd";
-import { EControlProps, SelectedRow } from "../../tmpl/interface";
+import { EControlProps, SelectedRow, DtmplData } from "../../tmpl/interface";
 import { SearchOutlined } from "@ant-design/icons";
 import SelectTable from "../../table/select-table";
 import "./index.css";
@@ -9,10 +9,12 @@ import { LocaleContext } from "../../locale/LocaleProvider";
 interface PopoverEntitySelectProps extends EControlProps {
   maxSelected?: number;
   onEntityClick?: (code: string) => void;
+  onChange?: (value: any, selectedDatas?: DtmplData[]) => void;
 }
 
 interface PopoverEntitySelectState {
   open: boolean;
+  selectedDatas: DtmplData[];
 }
 
 export default class PopoverEntitySelect extends React.PureComponent<
@@ -24,7 +26,8 @@ export default class PopoverEntitySelect extends React.PureComponent<
   };
 
   state = {
-    open: false
+    open: false,
+    selectedDatas: []
   };
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
@@ -33,7 +36,7 @@ export default class PopoverEntitySelect extends React.PureComponent<
     this.setState({ open: true });
   };
 
-  onSelect = (selectedRows: SelectedRow[]) => {
+  onSelect = (selectedRows: SelectedRow[], selectedDatas: DtmplData[]) => {
     const { value, onChange } = this.props;
     let newValue = [];
     if (selectedRows) {
@@ -45,7 +48,6 @@ export default class PopoverEntitySelect extends React.PureComponent<
           title = row.title;
         }
 
-        // console.log('1323',title);
         if (row.title && row.title.includes("@R@")) {
           let ts = title.split("@R@");
           title = ts[ts.length - 1];
@@ -53,8 +55,8 @@ export default class PopoverEntitySelect extends React.PureComponent<
         newValue.push(row.code + "@R@" + title);
       }
     }
-
-    onChange(newValue.join("@,@"));
+    onChange(newValue.join("@,@"), selectedDatas);
+    this.setState({ selectedDatas });
   };
 
   toArray = (value) => {
@@ -99,7 +101,7 @@ export default class PopoverEntitySelect extends React.PureComponent<
       mainCode,
       serverKey,
     } = this.props;
-    const { open } = this.state;
+    const { open, selectedDatas } = this.state;
     const { translate } = this.context;
     let selectedRows: SelectedRow[] = [];
     let relationOptions = [];
@@ -143,7 +145,7 @@ export default class PopoverEntitySelect extends React.PureComponent<
               maxWidth: "calc(100vw - 20vw)",
               maxHeight: "calc(100vh - 50px)",
             },
-            body: { padding: 0 }
+            container: { padding: 0 }
           }}
           align={{ offset: [20, 0] }}
           content={
@@ -190,7 +192,8 @@ export default class PopoverEntitySelect extends React.PureComponent<
             onChange={(value) => {
               // 关系字段更改选中项
               const selOptions = selectedRows?.filter(r => value.includes(r.code))?.map(r => `${r.code}@R@${r.title}`).join("@,@");
-              onChange(selOptions || value.join("@,@"));
+              const temSelectedDatas = selectedDatas?.filter(r => value.includes(r.code));
+              onChange(selOptions || value.join("@,@"), temSelectedDatas);
             }}
             options={relationOptions}
             onClick={this.onClick}

package/src/aldehyde/controls/file-view/drawer-file-view.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { Button, Drawer, Space, Spin } from 'antd';
 import { DownloadOutlined, CloseOutlined } from '@ant-design/icons';
 import loadable from '@loadable/component';
@@ -21,7 +21,8 @@ interface DrawerFileViewProps {
 
 const DrawerFileView: React.FC<DrawerFileViewProps> = (props) => {
     const { filePath, serverKey, downloadable = true, contentType } = props;
-    const [drawerOpen, setDrawerOpen] = React.useState<boolean>(false);
+    const [drawerOpen, setDrawerOpen] = useState<boolean>(false);
+    const [drawerSize, setDrawerSize] = useState<number | string>("1200px");
     const containerRef = useRef(null);
 
     const loadDocx = async () => {
@@ -79,10 +80,12 @@ const DrawerFileView: React.FC<DrawerFileViewProps> = (props) => {
                 <Drawer
                     title={filePath.fileName}
                     placement={'left'}
+                    size={drawerSize}
+                    resizable={{ onResize: (newSize => setDrawerSize(newSize)) }}
                     closable={false}
                     onClose={onClose}
-                    width={'1200px'}
                     open={drawerOpen}
+                    styles={{ body: { minWidth: "1000px" } }}
                     extra={
                         <Space>
                             {downloadable ? (

package/src/aldehyde/controls/qr-code/index.less

@@ -22,7 +22,8 @@
         opacity: 1;
     }
 
-    .ant-modal-wrap .ant-modal-content {
+    .ant-modal-wrap .ant-modal-content,
+    .ant-modal-wrap .ant-modal-container {
         border: none !important;
     }
 }

package/src/aldehyde/controls/qr-code/index.tsx

@@ -31,7 +31,7 @@ const Index: React.FC<Props> = (props) => {
                 <EyeOutlined />
                 {translate("${预览}")}
             </div>
-            <Modal getContainer={QRRef.current} style={{ top: `calc(50% - ${previewSize / 2}px)` }} width={previewSize} destroyOnHidden styles={{ content: { padding: 0, borderRadius: 0, width: "fit-content" } }} onCancel={() => setPreview(false)} open={preview} footer={null} closable={false}>
+            <Modal getContainer={QRRef.current} style={{ top: `calc(50% - ${previewSize / 2}px)` }} width={previewSize} destroyOnHidden styles={{ container: { padding: 0, borderRadius: 0, width: "fit-content" } }} onCancel={() => setPreview(false)} open={preview} footer={null} closable={false}>
                 <QRCode size={previewSize} value={value as string} bordered={false} />
             </Modal>
         </div >

package/src/aldehyde/controls/relation-existion/index.css

@@ -1,4 +1,4 @@
-
-.ant-popover-inner-content {
+.ant-popover-inner-content,
+.ant-popover-content {
   padding: 4px;
-}
+}

package/src/aldehyde/controls/relation-existion/index.tsx

@@ -94,7 +94,7 @@ export default class RelationExistion extends React.PureComponent<
               maxHeight: "calc(100vh - 50px)",
               left: 12,
             },
-            body: { padding: 0 }
+            container: { padding: 0 }
           }}
           content={
             <div

package/src/aldehyde/controls/text/ellipsis-text.tsx

@@ -1,7 +1,8 @@
 import * as React from "react";
 import Units from "../../units";
-import { Button, Popover, Card, Tooltip } from "antd";
+import { Popover, Tooltip } from "antd";
 import { LocaleContext } from "../../locale/LocaleProvider";
+import "./index.less";
 
 interface EllipsisTextProps {
   isHtml?: boolean;
@@ -84,7 +85,8 @@ export default class EllipsisText extends React.PureComponent<
             <Tooltip placement="top" title={text} >
               <span className="infoStyle" style={style}>
                 {text}
-              </span></Tooltip>
+              </span>
+            </Tooltip>
           ) : (
             <span className="infoStyle" style={style}>
               {this.viewButton(text.substring(0, showMax) + "...")}

package/src/aldehyde/controls/text/index.less

@@ -0,0 +1,7 @@
+.infoStyle {
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: fit-content;
+    max-width: 100%;
+}

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

@@ -25,6 +25,8 @@ export interface SnapshotTimelineStat {
   pageNo?: number;
   currents?: SnapshotType[];
   isEnd?: boolean;
+  rightDrawerSize?: number | string; // 抽屉组件尺寸
+  leftDrawerSize?: number | string; // 抽屉组件尺寸
 }
 
 class SnapshotTimeline extends React.PureComponent<
@@ -39,6 +41,8 @@ class SnapshotTimeline extends React.PureComponent<
     currents: [],
     pageNo: 1,
     isEnd: false,
+    rightDrawerSize: 370,
+    leftDrawerSize: "calc(100% - 380px)"
   };
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
@@ -163,8 +167,9 @@ class SnapshotTimeline extends React.PureComponent<
       code,
       serverKey,
     } = this.props;
-    const { list, currents, loading, pageNo, isEnd } = this.state;
+    const { list, currents, loading, pageNo, isEnd, rightDrawerSize, leftDrawerSize } = this.state;
     const { translate } = this.context;
+    const leftDrawerMaxSize = document.documentElement.clientWidth - 380;
 
     let viewDatas: ViewComparData[] = [];
     currents.sort((a, b) => b.time - a.time);
@@ -179,7 +184,10 @@ class SnapshotTimeline extends React.PureComponent<
           closable={true}
           onClose={onClose}
           open={open}
-          width={370}
+          resizable={{ onResize: (newSize => this.setState({ rightDrawerSize: newSize })) }}
+          size={rightDrawerSize}
+          maxSize={370}
+          styles={{ body: { minWidth: "300px" } }}
         >
           {loading ? <Skeleton /> :
             list && list.length > 0 ? (
@@ -196,16 +204,14 @@ class SnapshotTimeline extends React.PureComponent<
         <Drawer key={translate("${快照查看}")}
           placement={"left"}
           title={translate("${快照查看}")}
+          resizable={{ onResize: (newSize => this.setState({ leftDrawerSize: newSize })) }}
+          size={leftDrawerSize}
+          maxSize={leftDrawerMaxSize}
           closable={true}
           mask={false}
           onClose={onClose}
           open={open}
-          styles={{ body: { padding: "6px 24px 6px 24px" } }}
-          width="100%"
-          rootStyle={{
-            width: "calc(100% - 380px)",
-            maxWidth: 1960,
-          }}
+          styles={{ body: { padding: "6px 24px 6px 24px", minWidth: "1000px" } }}
         >
           {/*<DtmplView*/}
           {/*  serverKey={serverKey}*/}
@@ -215,7 +221,7 @@ class SnapshotTimeline extends React.PureComponent<
           {/*  code={code}*/}
           {/*  versionId={current}*/}
           {/*></DtmplView>*/}
-          <ViewComparePanel serverKey={serverKey} dtmplConfig={dtmplConfig} sourceId={sourceId} data={viewDatas}></ViewComparePanel>
+          <ViewComparePanel serverKey={serverKey} dtmplConfig={dtmplConfig} sourceId={sourceId} data={viewDatas} />
         </Drawer>
       </>
     );

package/src/aldehyde/layout/menu/l2menu-message-bar.tsx

@@ -1,7 +1,6 @@
 import React, { CSSProperties, useEffect, useState, useRef } from "react";
-import { Badge, Dropdown, Menu, Button } from "antd";
+import { Badge, Dropdown, Button } from "antd";
 import { BellOutlined } from "@ant-design/icons";
-import "antd/dist/reset.css";
 import { Level2Menu } from "../../tmpl/interface";
 import HcserviceV3 from "../../tmpl/hcservice-v3";
 import { NavLink } from "react-router-dom";
@@ -66,34 +65,31 @@ const Index = (props: L2MenuMessageBarProps) => {
   const renderMessageBar = () => {
     let total: number = 0;
     const syyy: CSSProperties = { "--message-bar-backgroupd": backgroudColor } as CSSProperties;
-    const menu = (
-      <Menu key={1}>
-        {messageBars.map((messageBar, index) => {
-          if (messageBar.count) {
-            total = total + messageBar.count;
-          }
-          let defaultCriteriaData = "";
-          if (messageBar.l2Menu.defaultCriteriaValue) {
-            defaultCriteriaData = "&" + Units.transQueryParamsToStr(messageBar.l2Menu.defaultCriteriaValue);
-          }
-          return (
-            <Menu.Item key={index}>
-              <NavLink
-                to={`/${version}/${messageBar.l2Menu.id}/act-table?menuId=${messageBar.l2Menu.id}${defaultCriteriaData}`}
-              >
-                {messageBar.l2Menu.title}
-                <Badge
-                  count={messageBar.count}
-                  overflowCount={99}
-                  offset={[2, -2]}
-                  size="small"
-                />
-              </NavLink>
-            </Menu.Item>
-          );
-        })}
-      </Menu>
-    );
+
+    const menu = messageBars.map((messageBar, index) => {
+      if (messageBar.count) {
+        total = total + messageBar.count;
+      }
+      let defaultCriteriaData = "";
+      if (messageBar.l2Menu.defaultCriteriaValue) {
+        defaultCriteriaData = "&" + Units.transQueryParamsToStr(messageBar.l2Menu.defaultCriteriaValue);
+      }
+      return {
+        key: index,
+        label: <NavLink
+          to={`/${version}/${messageBar.l2Menu.id}/act-table?menuId=${messageBar.l2Menu.id}${defaultCriteriaData}`}
+        >
+          {messageBar.l2Menu.title}
+          <Badge
+            count={messageBar.count}
+            overflowCount={99}
+            offset={[2, -2]}
+            size="small"
+          />
+        </NavLink>
+      };
+    });
+
     if (!messageBars?.length) {
       return;
     }
@@ -135,7 +131,7 @@ const Index = (props: L2MenuMessageBarProps) => {
       );
     } else {
       return (
-        <Dropdown overlay={menu} placement="bottomCenter">
+        <Dropdown menu={{ items: menu }} placement="bottomCenter">
           <div style={syyy}>
             <Badge size="small" count={total} overflowCount={99} offset={[6, -2]} className="ripple-dot">
               <Button