aldehyde 0.2.382 → 0.2.384

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aldehyde",
-  "version": "0.2.382",
+  "version": "0.2.384",
   "author": "cosmicparticle",
   "main": "lib/index.js",
   "module": "src/aldehyde/index.txs",

package/src/aldehyde/lowcode-components/lowcode-view/component/screen-fit/index.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-expressions */
 import React, { ReactNode, useEffect, useRef, useState } from 'react'
 import debounce from "lodash/debounce";
 import './index.less';
@@ -56,7 +57,11 @@ export default function ScreenFit(props: ScreenFitProps) {
             case 'full-y':
                 elRef.current.style.transform = `scale(${heightScale})`;
                 scaleChange?.(heightScale, heightScale);
-                elRef.current.style.margin = `0px ${(currentWidth - +realWidth * heightScale) / 2}px`;
+                if (currentWidth > (+realWidth * heightScale)) {
+                    elRef.current.style.margin = `0px ${(currentWidth - +realWidth * heightScale) / 2}px`;
+                } else {
+                    elRef.current.style.margin = "0px";
+                }
                 break;
             default:
                 // 按照宽高最小比例进行缩放

package/src/aldehyde/lowcode-components/lowcode-view/index.tsx

@@ -170,7 +170,13 @@ const LowcodeView = (props: Props) => {
 
     return (
         <ControllerContext.Provider value={{ setControllers, setSearchParams }}>
-            <div className='lowcodeView' style={{ height: isFullScreen ? "100vh" : viewHeight[layoutRootPath || "v2"], ...screenFitStyleMap[adaptationType || "scale"] }}>
+            <div className='lowcodeView' style={{
+                height: isFullScreen ? "100vh" : viewHeight[layoutRootPath || "v2"], ...screenFitStyleMap[adaptationType || "scale"],
+                background: backgroundColor,
+                backgroundImage: `url(${backgroundImage})`,
+                backgroundSize: "100% 100%",
+                backgroundRepeat: 'no-repeat',
+            }}>
                 {loading || !layerManager ?
                     <Loading />
                     :

package/src/aldehyde/module/block-menu-tree-drawer.tsx

@@ -1,40 +1,38 @@
-import React, {ReactNode} from 'react';
-import {Button, Drawer,message} from 'antd'
+import React from 'react';
+import { Button, Drawer, message } from 'antd'
 import BlockMenuTree from "../tree/block-menu-auth-tree";
 import HcserviceV3 from '../tmpl/hcservice-v3'
 import translate from "../locale/translate";
 
-
-
-interface BlockMenuTreeDrawerProps  {
-    roleCode:string,
+interface BlockMenuTreeDrawerProps {
+    roleCode: string,
     onCancel: () => void,
     onOk: () => void,
-    placement?:'top' | 'right' | 'bottom' | 'left',
-    width?:number,
-    open   :boolean,
+    placement?: 'top' | 'right' | 'bottom' | 'left',
+    width?: number,
+    open: boolean,
 }
 
 interface BlockMenuTreeDrawerState {
-    selectedAuths:string[],
-    loading:boolean,
-    role?:object
+    selectedAuths: string[],
+    loading: boolean,
+    role?: object
 }
 
 export default class BlockMenuTreeDrawer extends React.PureComponent<BlockMenuTreeDrawerProps, BlockMenuTreeDrawerState> {
 
     static defaultProps = {
         showConfirm: true,
-        width:'500',
+        width: '500',
         forceRender: true,
-        style: {maxWidth: '92vw', maxHeight: '92vh'},
-        placement:'left',
-        roleCode:undefined
+        style: { maxWidth: '92vw', maxHeight: '92vh' },
+        placement: 'left',
+        roleCode: undefined
     }
     state = {
-        selectedAuths:[],
-        loading:true,
-        role:undefined
+        selectedAuths: [],
+        loading: true,
+        role: undefined
     }
 
     async componentDidMount() {
@@ -42,73 +40,74 @@ export default class BlockMenuTreeDrawer extends React.PureComponent<BlockMenuTr
         await this.loadData();
     }
     async componentDidUpdate(preProps) {
-        const {roleCode}=this.props
-        const {roleCode:preRoleCode}=preProps
+        const { roleCode } = this.props
+        const { roleCode: preRoleCode } = preProps
 
-        if(!preRoleCode  || preRoleCode!=roleCode){
+        if (!preRoleCode || preRoleCode != roleCode) {
             //debugger
-           await this.loadData();
+            await this.loadData();
         }
     }
-    loadData=async ()=>{
-        const {roleCode}=this.props
-        if(!roleCode){
+    loadData = async () => {
+        const { roleCode } = this.props
+        if (!roleCode) {
             return
         }
         this.setState({
             loading: true
         })
         //查询角色对应的权限
-        let res=await HcserviceV3.requestRoleAuths(roleCode)
+        let res = await HcserviceV3.requestRoleAuths(roleCode)
 
 
         this.setState({
             loading: false,
-            selectedAuths:res?.auths,
-            role:res?.role
+            selectedAuths: res?.auths,
+            role: res?.role
         })
     }
 
 
 
-    saveAuth=async ()=>{
-        const {roleCode,onOk}=this.props
-        let res=await HcserviceV3.postRoleAuths(roleCode,this.state.selectedAuths);
-        if(res.status=='success'){
+    saveAuth = async () => {
+        const { roleCode, onOk } = this.props
+        let res = await HcserviceV3.postRoleAuths(roleCode, this.state.selectedAuths);
+        if (res.status == 'success') {
             message.success(translate("${保存成功}!"));
         }
-        if(onOk)onOk();
+        if (onOk) onOk();
     }
 
 
     render() {
-        const {placement,width,onCancel,open,...other} = this.props
-       const {loading,role}=this.state;
+        const { width, onCancel, open } = this.props;
+        const placement = this.props.placement || 'left';
+        const { loading, role } = this.state;
         return (<Drawer
-                loading={loading}
-                title={role?.name}
-                placement={placement}
-                closable={true}
-                mask={false}
-                onClose={onCancel}
-                // onOk={()=>this.saveAuth}
-                open={open}
-                width={width}
-                extra={[<Button type={'primary'} onClick={this.saveAuth} >{translate("${保存}")}</Button>]}
-                style={{
-                    maxWidth: '92vw',
-                }}
-                // extra={
-                //     <Space>{this.getFooter()}</Space>
-                // }
-            >
-                <BlockMenuTree checks={this.state.selectedAuths} onChange={(auths)=>{
-                    this.setState({
-                        selectedAuths:auths
-                    })
-                }}></BlockMenuTree>
+            loading={loading}
+            title={role?.name}
+            placement={placement}
+            closable={true}
+            mask={false}
+            onClose={onCancel}
+            // onOk={()=>this.saveAuth}
+            open={open}
+            width={width}
+            extra={[<Button type={'primary'} onClick={this.saveAuth} >{translate("${保存}")}</Button>]}
+            style={{
+                maxWidth: '92vw',
+            }}
+        // extra={
+        //     <Space>{this.getFooter()}</Space>
+        // }
+        >
+            <BlockMenuTree checks={this.state.selectedAuths} onChange={(auths) => {
+                this.setState({
+                    selectedAuths: auths
+                })
+            }}></BlockMenuTree>
         </Drawer>
-    )
+        )
 
     }
 

package/src/aldehyde/module/dtmpl-edit-page.tsx

@@ -399,12 +399,12 @@ export default class DtmplEditPage extends React.PureComponent<
       mainCode,
       width,
       pageType,
-      placement,
       maxColsOnRow,
       title,
       serverKey, parentFormInstance
     } = this.props;
     const { dtmplConfig, id, dtmplData, valueFieldMap } = this.state;
+    const placement = this.props.placement || "left";
 
     let title1 = title ? title : dtmplConfig ? dtmplConfig.title : "";
     const { translate } = this.context;
@@ -460,11 +460,11 @@ export default class DtmplEditPage extends React.PureComponent<
             width={width}
             onClose={onCancel}
             open={open}
-            height={placement == "top" || placement == "bottom" ? height : "calc(100%)"}
+            height={["top", "bottom"].includes(placement) ? height : "calc(100%)"}
             style={{
-              maxWidth: (placement == "top" || placement == "bottom") ? "100vw" : "92vw",
+              maxWidth: ["top", "bottom"].includes(placement) ? "100vw" : "92vw",
               border: "2px solid #d9d9d9",
-              width: width,
+              width,
             }}
             extra={<Space>{this.getFooter()}</Space>}
           >

package/src/aldehyde/module/dtmpl-view-drawer.tsx

@@ -1,18 +1,17 @@
-import React, {ReactNode} from 'react'
-import {Drawer, Space, Button} from 'antd'
+import React, { ReactNode } from 'react'
+import { Drawer, Space, Button } from 'antd'
 import DtmplViewCard from "./dtmpl-view-card";
-import {DtmplBaseProps} from "../tmpl/interface";
-import ToolTipBar from "../detail/tooltipbar";
+import { DtmplBaseProps } from "../tmpl/interface";
 
-interface DtmplViewDrawerProps extends DtmplBaseProps{
-    title?:ReactNode,
+interface DtmplViewDrawerProps extends DtmplBaseProps {
+    title?: ReactNode,
     open: boolean,
     onClose: () => void,
-    placement?:'top' | 'right' | 'bottom' | 'left',
-    width?:string|number,
-    height?:string|number,
-    cancelText:string,
-    editable?:boolean,
+    placement?: 'top' | 'right' | 'bottom' | 'left',
+    width?: string | number,
+    height?: string | number,
+    cancelText: string,
+    editable?: boolean,
 }
 
 interface DtmplViewDrawerState {
@@ -21,18 +20,18 @@ interface DtmplViewDrawerState {
 
 
 class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplViewDrawerState> {
-    state={
+    state = {
 
     }
 
     static defaultProps = {
         height: "82vh",
-        width:"82vw",
+        width: "82vw",
         forceRender: true,
         cancelText: "关闭",
-        placement:'left',
-        open:false,
-        editable:true,
+        placement: 'left',
+        open: false,
+        editable: true,
     }
 
     async componentDidMount() {
@@ -40,31 +39,33 @@ class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplVie
     }
 
     render() {
-        const {title,sourceId,code,placement,open,onClose,width,height,cancelText,editable,serverKey,codeSource}=this.props;
-        return  (<Drawer
-                    height={placement=="top" || placement=="bottom" ? height: "calc(100%)"}
-                    placement={placement}
-                    title={<>{title}</>}
-                    closable={true}
-                    mask={false}
-                    onClose={onClose}
-                    open={open}
-                    style={{
-                       maxWidth: (placement=="top" || placement=="bottom")?"100vw" :"92vw",
-                        //borderRightStyle:"2px solid #d9d9d9",
-                        border:"2px solid #d9d9d9",
-                        width:width,
-                        // borderRightWidth:"2px",
-                        // borderLeftWidth:"2px",
-                    }}
-                    extra={
-                        <Space>
-                            <Button onClick={()=>onClose()}>{cancelText}</Button>
-                        </Space>
-                    }
-                >
-                   <DtmplViewCard  codeSource={codeSource} serverKey={serverKey} editable={editable} sourceId={sourceId} code={code}></DtmplViewCard>
-             </Drawer>)
+        const { title, sourceId, code, open, onClose, width, height, cancelText, editable, serverKey, codeSource } = this.props;
+        const placement = this.props.placement || 'left';
+
+        return (<Drawer
+            height={["top", "bottom"].includes(placement) ? height : "100%"}
+            placement={placement}
+            title={title}
+            closable={true}
+            mask={false}
+            destroyOnHidden={true}
+            onClose={onClose}
+            open={open}
+            style={{
+                maxWidth: ["top", "bottom"].includes(placement) ? "100vw" : "92vw",
+                border: "2px solid #d9d9d9",
+                width
+                // borderRightWidth:"2px",
+                // borderLeftWidth:"2px",
+            }}
+            extra={
+                <Space>
+                    <Button onClick={() => onClose()}>{cancelText}</Button>
+                </Space>
+            }
+        >
+            <DtmplViewCard codeSource={codeSource} serverKey={serverKey} editable={editable} sourceId={sourceId} code={code} />
+        </Drawer>)
     }
 }
 

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

@@ -1,14 +1,14 @@
-import React, {ReactNode} from 'react';
-import {Drawer} from 'antd'
-import LtmplTable, {LtmplTableProps} from "./ltmpl-table";
+import React, { ReactNode } from 'react';
+import { Drawer } from 'antd'
+import LtmplTable, { LtmplTableProps } from "./ltmpl-table";
 
 
 interface LtmplDrawPageProps extends LtmplTableProps {
     onCancel: () => void,
-    placement?:'top' | 'right' | 'bottom' | 'left',
-    title?:ReactNode,
-    width?:number,
-    open:boolean,
+    placement?: 'top' | 'right' | 'bottom' | 'left',
+    title?: ReactNode,
+    width?: number,
+    open: boolean,
 }
 
 interface LtmplDrawPageState {
@@ -19,12 +19,12 @@ export default class LtmplDrawer extends React.PureComponent<LtmplDrawPageProps,
 
     static defaultProps = {
         showConfirm: true,
-        width:'76vw',
+        width: '76vw',
         forceRender: true,
-        style: {maxWidth: '92vw', maxHeight: '92vh'},
+        style: { maxWidth: '92vw', maxHeight: '92vh' },
         okText: "确定",
         cancelText: "取消",
-        placement:'left',
+        placement: 'left',
     }
     state = {
 
@@ -32,26 +32,27 @@ export default class LtmplDrawer extends React.PureComponent<LtmplDrawPageProps,
 
 
     render() {
-        const {title,placement,width,onCancel,open,...other} = this.props
+        const { title, width, onCancel, open, ...other } = this.props;
+        const placement = this.props.placement || 'left';
 
         return (<Drawer
-                title={title}
-                placement={placement}
-                closable={true}
-                mask={false}
-                onClose={onCancel}
-                open={open}
-                width={width}
-                style={{
-                    maxWidth: '92vw',
-                }}
-                // extra={
-                //     <Space>{this.getFooter()}</Space>
-                // }
-            >
-                <LtmplTable {...other}></LtmplTable>
+            title={title}
+            placement={placement}
+            closable={true}
+            mask={false}
+            onClose={onCancel}
+            open={open}
+            width={width}
+            style={{
+                maxWidth: '92vw',
+            }}
+        // extra={
+        //     <Space>{this.getFooter()}</Space>
+        // }
+        >
+            <LtmplTable {...other}></LtmplTable>
         </Drawer>
-    )
+        )
 
     }
 

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

@@ -332,6 +332,24 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
         }
     };
 
+    doSelectedAction = async (actionId: string, codes, params: object) => {
+        const { selectedRows } = this.props;
+        this.doAction(actionId, selectedRows, params);
+    };
+
+    doAction = async (actionId: string, selectedRows: SelectedRow[], params) => {
+        const { serverKey } = this.props;
+        const { selectConfig, criteriaData } = this.state;
+        this.setState({ loading: true });
+        let result: boolean = await HcserviceV3.postActions(serverKey, actionId, selectedRows, params);
+        if (result) {
+            //重新加载数据
+            await this.loadData(selectConfig, criteriaData);
+        } else {
+            this.setState({ loading: false });
+        }
+    };
+
 
     render() {
         let { maxSelectedRows, selectedRows, selectedDatas, serverKey, sourceId, mainCode, fieldConfig, funcMode } = this.props;
@@ -370,6 +388,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
                             data={criteriaData}
                             doSearch={this.doSearch} loading={loading}
                             doCustomButton={() => this.editItem()}
+                            doAction={this.doSelectedAction}
                         />
                     </div> : null}
                 <QueryTable key={"QueryTable" + sourceId} serverKey={serverKey} maxSelectedRows={maxSelectedRows ? maxSelectedRows : selectConfig.maxSelectedRows}

package/src/aldehyde/tmpl/hc-data-source.tsx

@@ -169,9 +169,9 @@ async function loadEnum(serverKey: string, mstrucIds: string[], path?: string) {
   }
 }
 
-function HCDataSource() {}
+function HCDataSource() { }
 
-HCDataSource.loadEnumOfFields = async function(
+HCDataSource.loadEnumOfFields = async function (
   serverKey: string,
   fields: FieldBase[]
 ) {
@@ -179,7 +179,7 @@ HCDataSource.loadEnumOfFields = async function(
   await loadEnum(serverKey, mstrucIds);
 };
 
-HCDataSource.loadEnumOfFieldsWithPath = async function(
+HCDataSource.loadEnumOfFieldsWithPath = async function (
   serverKey: string,
   fields: FieldBase[],
   path: string
@@ -188,7 +188,7 @@ HCDataSource.loadEnumOfFieldsWithPath = async function(
   await loadEnum(serverKey, mstrucIds, path);
 };
 
-HCDataSource.getOptions = async function(serverKey: string, mstrucId: string) {
+HCDataSource.getOptions = async function (serverKey: string, mstrucId: string) {
   if (!mstrucId) {
     return null;
   }
@@ -209,7 +209,7 @@ HCDataSource.getOptions = async function(serverKey: string, mstrucId: string) {
   return enumMap.get(mstrucId);
 };
 
-HCDataSource.requestLtmplConfig = async function(
+HCDataSource.requestLtmplConfig = async function (
   serverKey: string,
   sourceId: string
 ) {
@@ -224,7 +224,7 @@ HCDataSource.requestLtmplConfig = async function(
   }
   return ltmplConfigMap.get(sourceId);
 };
-HCDataSource.requestL2LtmplConfig = async function(
+HCDataSource.requestL2LtmplConfig = async function (
   serverKey: string,
   sourceId: string
 ) {
@@ -240,7 +240,7 @@ HCDataSource.requestL2LtmplConfig = async function(
   return l2LtmplConfigMap.get(sourceId);
 };
 
-HCDataSource.requestSelectConfig = async function(
+HCDataSource.requestSelectConfig = async function (
   serverKey: string,
   sourceId: string
 ) {
@@ -254,7 +254,7 @@ HCDataSource.requestSelectConfig = async function(
   }
   return selectConfigMap.get(sourceId);
 };
-HCDataSource.requestDtmplConfig = async function(
+HCDataSource.requestDtmplConfig = async function (
   serverKey: string,
   sourceId: string,
   code: string
@@ -278,7 +278,7 @@ HCDataSource.requestDtmplConfig = async function(
   return dtmplConfigMap.get(sourceId);
 };
 
-HCDataSource.requestTtmplConfig = async function(
+HCDataSource.requestTtmplConfig = async function (
   serverKey: string,
   sourceId: string
 ) {
@@ -290,7 +290,7 @@ HCDataSource.requestTtmplConfig = async function(
   return ttmplConfigMap.get(sourceId);
 };
 
-HCDataSource.requestViewDtmplConfig = async function(
+HCDataSource.requestViewDtmplConfig = async function (
   serverKey: string,
   sourceId: string
 ) {
@@ -305,7 +305,7 @@ HCDataSource.requestViewDtmplConfig = async function(
   return viewDtmplConfigMap.get(sourceId);
 };
 
-HCDataSource.requestAddDtmplConfig = async function(
+HCDataSource.requestAddDtmplConfig = async function (
   serverKey: string,
   sourceId: string,
   addTmplId: string
@@ -338,12 +338,12 @@ HCDataSource.requestAddDtmplConfig = async function(
 //   return ltmplConfigMap.get(sourceId);
 // };
 
-HCDataSource.getEnums = function(mstrucId: string): EnumItem[] {
+HCDataSource.getEnums = function (mstrucId: string): EnumItem[] {
   //这里是不是后续可以考虑防止串改
   return enumMap.get(mstrucId);
 };
 
-HCDataSource.getEnumsValueMap = function(
+HCDataSource.getEnumsValueMap = function (
   mstrucId: string
 ): Map<string, string> {
   //这里是不是后续可以考虑防止串改
@@ -364,7 +364,7 @@ HCDataSource.getEnumsValueMap = function(
   return map;
 };
 
-HCDataSource.getEnumOption = function(
+HCDataSource.getEnumOption = function (
   mstrucId: string,
   enumValue: string
 ): EnumItem {
@@ -428,7 +428,7 @@ HCDataSource.requestBlocks = async (l2MenuId: string, blockId: string) => {
 };
 
 HCDataSource.initfastMenu = async () => {
-   if (!fastMenuCached) {
+  if (!fastMenuCached) {
     if (fastMenuCache.size < 1) {
       let re = await HcserviceV3.requestFastMenu();
       if (re) {
@@ -438,7 +438,7 @@ HCDataSource.initfastMenu = async () => {
       }
 
     }
-     fastMenuCached = true;
+    fastMenuCached = true;
   }
 };
 
@@ -446,7 +446,7 @@ HCDataSource.fastMenu = async (key: string) => {
   // let result:Map<string,Level2Menu[]> ;
   // if (!fastMenuCached) {
   //   fastMenuCached = true;
-    let re = await HCDataSource.initfastMenu();
+  let re = await HCDataSource.initfastMenu();
   //}
   return fastMenuCache.get(key);
 };
@@ -484,7 +484,7 @@ HCDataSource.fastMenu = async (key: string) => {
 //     return [...workbenchCache];
 // }
 
-HCDataSource.reload = async function(roles: string[]) {
+HCDataSource.reload = async function (roles: string[]) {
   // if(roles.includes("admin")){
   let res = await HcserviceV3.reload();
   if (res.status != "success") {
@@ -499,19 +499,19 @@ HCDataSource.reload = async function(roles: string[]) {
   // }
 };
 
-HCDataSource.cache = function(data: DtmplData) {
+HCDataSource.cache = function (data: DtmplData) {
   if (data) {
     // console.log('put----',data);
     objctCacheMap.set(data.code, data);
   }
 };
 
-HCDataSource.getCache = function(code: string) {
+HCDataSource.getCache = function (code: string) {
   //console.log('objctCacheMap',objctCacheMap);
   return objctCacheMap.get(code);
 };
 
-HCDataSource.clear = async function() {
+HCDataSource.clear = async function () {
   fastMenuCache.clear();
   enumMap.clear();
   ltmplConfigMap.clear();
@@ -523,11 +523,12 @@ HCDataSource.clear = async function() {
   // optionsMap.clear();
   blocksCache.splice(0, blocksCache.length);
   blocksCached = false;
-  fastMenuCached=false;
+  fastMenuCached = false;
   // quickEntranceCache.splice(0, quickEntranceCache.length);
   // messageCache.splice(0, quickEntranceCache.length);
   // workbenchCache.splice(0, workbenchCache.length);
   objctCacheMap.clear();
+  ttmplConfigMap.clear();
 };
 
 export default HCDataSource; //对外 TmplDataSource

package/src/aldehyde/tree/tree-utils.tsx

@@ -205,7 +205,7 @@ export default class TreeUtils {
         children.forEach((no) => {
             let n = { ...no };
             let v = n.searchValue ? n.searchValue : n.name;
-            if (v.indexOf(searchValue) >= 0) {
+            if (v?.indexOf(searchValue) >= 0) {
                 newNodes.push(n);
             }
             if (n.children && n.children.length > 0) {